crux-commits
Threads by month
- ----- 2025 -----
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
January 2022
- 1 participants
- 999 discussions
commit afb882b1a900565070933a40ca8c6e94296fd8ab
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:33:57 2021 +0100
binutils: 2.35.2 -> 2.37
diff --git a/binutils/.footprint b/binutils/.footprint
index 576dd4ff..f1588adf 100644
--- a/binutils/.footprint
+++ b/binutils/.footprint
@@ -21,7 +21,6 @@ drwxr-xr-x root/root usr/bin/
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/ansidecl.h
-rw-r--r-- root/root usr/include/bfd.h
--rw-r--r-- root/root usr/include/bfd_stdint.h
-rw-r--r-- root/root usr/include/bfdlink.h
-rw-r--r-- root/root usr/include/ctf-api.h
-rw-r--r-- root/root usr/include/ctf.h
@@ -44,6 +43,8 @@ drwxr-xr-x root/root usr/include/libiberty/
-rw-r--r-- root/root usr/include/plugin-api.h
-rw-r--r-- root/root usr/include/symcat.h
drwxr-xr-x root/root usr/lib/
+drwxr-xr-x root/root usr/lib/bfd-plugins/
+-rwxr-xr-x root/root usr/lib/bfd-plugins/libdep.so
drwxr-xr-x root/root usr/lib/ldscripts/
-rw-r--r-- root/root usr/lib/ldscripts/elf32_x86_64.x
-rw-r--r-- root/root usr/lib/ldscripts/elf32_x86_64.xbn
@@ -177,10 +178,10 @@ drwxr-xr-x root/root usr/lib/ldscripts/
-rw-r--r-- root/root usr/lib/ldscripts/elf_x86_64.xu
-rw-r--r-- root/root usr/lib/ldscripts/elf_x86_64.xw
-rw-r--r-- root/root usr/lib/ldscripts/elf_x86_64.xwe
--rwxr-xr-x root/root usr/lib/libbfd-2.35.2.so
+-rwxr-xr-x root/root usr/lib/libbfd-2.37.so
-rw-r--r-- root/root usr/lib/libbfd.a
-rwxr-xr-x root/root usr/lib/libbfd.la
-lrwxrwxrwx root/root usr/lib/libbfd.so -> libbfd-2.35.2.so
+lrwxrwxrwx root/root usr/lib/libbfd.so -> libbfd-2.37.so
-rw-r--r-- root/root usr/lib/libctf-nobfd.a
-rwxr-xr-x root/root usr/lib/libctf-nobfd.la
lrwxrwxrwx root/root usr/lib/libctf-nobfd.so -> libctf-nobfd.so.0.0.0
@@ -192,10 +193,10 @@ lrwxrwxrwx root/root usr/lib/libctf.so -> libctf.so.0.0.0
lrwxrwxrwx root/root usr/lib/libctf.so.0 -> libctf.so.0.0.0
-rwxr-xr-x root/root usr/lib/libctf.so.0.0.0
-rw-r--r-- root/root usr/lib/libiberty.a
--rwxr-xr-x root/root usr/lib/libopcodes-2.35.2.so
+-rwxr-xr-x root/root usr/lib/libopcodes-2.37.so
-rw-r--r-- root/root usr/lib/libopcodes.a
-rwxr-xr-x root/root usr/lib/libopcodes.la
-lrwxrwxrwx root/root usr/lib/libopcodes.so -> libopcodes-2.35.2.so
+lrwxrwxrwx root/root usr/lib/libopcodes.so -> libopcodes-2.37.so
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
diff --git a/binutils/.signature b/binutils/.signature
index 605a0551..fe02bf5b 100644
--- a/binutils/.signature
+++ b/binutils/.signature
@@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqlgHyvcijz2Kgxx89tjzoIr1VvY6y6qGLTKkJbiXDSvRH4NzQ70KE8XGCOnzBT2oJzgWnBNHFDEx4bqUngzNIQg=
-SHA256 (Pkgfile) = aeee3c170678ae2f95d26d25b623bafaa162cd4d307dc3968e7db163dca63e68
-SHA256 (.footprint) = 018f2f411ba6e94e067535b3e8ce1f4c9d6d131ca345f208e97837825f5c5a4e
-SHA256 (binutils-2.35.2.tar.xz) = dcd5b0416e7b0a9b24bed76cd8c6c132526805761863150a26d016415b8bdc7b
+RWRJc1FUaeVeqoXQABzUYsdcqv2mX6K/h3hGOnFMEZx4Hhd8yy5FqK5bj/B95gOeEWfw9eBHlag4Qj35C2SazXffbQjdwQZDoww=
+SHA256 (Pkgfile) = e3b8a34ea68ede149412d967524c8b646de71d8c550234bc8e39c021349d0971
+SHA256 (.footprint) = c3bf3cdddb84aefc9632031b3c68aee20d3948478dad8ada0183920d30c6483b
+SHA256 (binutils-2.37.tar.xz) = 820d9724f020a3e69cb337893a0b63c2db161dadcb0e06fc11dc29eb1e84a32c
+SHA256 (binutils-2.37-upstream_fix-1.patch) = bd852a3959553b4e90bc60e2db4842f461329fe6d4089c9a3e24d8db285ed81e
diff --git a/binutils/Pkgfile b/binutils/Pkgfile
index 296ff6d2..e6e0af7e 100644
--- a/binutils/Pkgfile
+++ b/binutils/Pkgfile
@@ -4,30 +4,39 @@
# Depends on: zlib flex
name=binutils
-version=2.35.2
+version=2.37
release=1
-source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz)
+source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz
+ binutils-2.37-upstream_fix-1.patch)
build() {
- sed -i '/^SUBDIRS/s/doc//' $name-$version/bfd/Makefile.in
- sed -i '/^SUBDIRS/s/doc//' $name-$version/binutils/Makefile.in
-
- mkdir build
- cd build
-
- ../$name-$version/configure --prefix=/usr \
- --enable-shared \
- --disable-nls \
- --enable-ld=default \
- --enable-gold=yes \
- --enable-plugins \
- --enable-install-libiberty \
- --disable-werror \
- --with-system-zlib
-
- make tooldir=/usr
- make tooldir=/usr DESTDIR=$PKG install
-
- rm -r $PKG/usr/share/info
- sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.la
+ patch -Np1 -d $name-$version -i $SRC/binutils-2.37-upstream_fix-1.patch
+
+ # fix empty manpages
+ sed -i '63d' $name-$version/etc/texi2pod.pl
+ find -name \*.1 -delete
+
+ sed -i '/^SUBDIRS/s/doc//' $name-$version/bfd/Makefile.in
+ sed -i '/^SUBDIRS/s/doc//' $name-$version/binutils/Makefile.in
+
+ mkdir build
+ cd build
+
+ ../$name-$version/configure --prefix=/usr \
+ --enable-shared \
+ --disable-nls \
+ --enable-ld=default \
+ --enable-gold=yes \
+ --enable-lto \
+ --enable-plugins \
+ --enable-install-libiberty \
+ --disable-werror \
+ --with-system-zlib \
+ --with-bugurl=https://crux.nu/bugs/
+
+ make tooldir=/usr
+ make tooldir=/usr DESTDIR=$PKG install
+
+ rm -r $PKG/usr/share/info
+ sed -i "s|-L$SRC[^ ]* ||g" $PKG/usr/lib/lib{bfd,ctf,ctf-nobfd,opcodes}.la
}
diff --git a/binutils/binutils-2.37-upstream_fix-1.patch b/binutils/binutils-2.37-upstream_fix-1.patch
new file mode 100644
index 00000000..eec8bf22
--- /dev/null
+++ b/binutils/binutils-2.37-upstream_fix-1.patch
@@ -0,0 +1,239 @@
+Submitted By: Bruce Dubbs <bdubbs(a)linuxfromscratch.org>
+Date: 2021-08-13
+Initial Package Version: 2.37
+Upstream Status: Committed
+Origin: Upstream
+Description: bfd: Close the file descriptor if there is no archive fd
+
+From 1c611b40e6bfc8029bff7696814330b5bc0ee5c0 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools(a)gmail.com>
+Date: Mon, 26 Jul 2021 05:59:55 -0700
+Subject: [PATCH] bfd: Close the file descriptor if there is no archive fd
+
+Close the file descriptor if there is no archive plugin file descriptor
+to avoid running out of file descriptors on thin archives with many
+archive members.
+
+bfd/
+
+ PR ld/28138
+ * plugin.c (bfd_plugin_close_file_descriptor): Close the file
+ descriptor there is no archive plugin file descriptor.
+
+ld/
+
+ PR ld/28138
+ * testsuite/ld-plugin/lto.exp: Run tmpdir/pr28138 only for
+ native build.
+
+ PR ld/28138
+ * testsuite/ld-plugin/lto.exp: Run ld/28138 tests.
+ * testsuite/ld-plugin/pr28138.c: New file.
+ * testsuite/ld-plugin/pr28138-1.c: Likewise.
+ * testsuite/ld-plugin/pr28138-2.c: Likewise.
+ * testsuite/ld-plugin/pr28138-3.c: Likewise.
+ * testsuite/ld-plugin/pr28138-4.c: Likewise.
+ * testsuite/ld-plugin/pr28138-5.c: Likewise.
+ * testsuite/ld-plugin/pr28138-6.c: Likewise.
+ * testsuite/ld-plugin/pr28138-7.c: Likewise.
+
+(cherry picked from commit 5a98fb7513b559e20dfebdbaa2a471afda3b4742)
+(cherry picked from commit 7dc37e1e1209c80e0bab784df6b6bac335e836f2)
+---
+ bfd/plugin.c | 8 +++++++
+ ld/testsuite/ld-plugin/lto.exp | 34 ++++++++++++++++++++++++++++++
+ ld/testsuite/ld-plugin/pr28138-1.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-2.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-3.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-4.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-5.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-6.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138-7.c | 6 ++++++
+ ld/testsuite/ld-plugin/pr28138.c | 20 ++++++++++++++++++
+ 10 files changed, 104 insertions(+)
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-1.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-2.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-3.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-4.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-5.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-6.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138-7.c
+ create mode 100644 ld/testsuite/ld-plugin/pr28138.c
+
+diff --git a/bfd/plugin.c b/bfd/plugin.c
+index 6cfa2b66470..3bab8febe88 100644
+--- a/bfd/plugin.c
++++ b/bfd/plugin.c
+@@ -291,6 +291,14 @@ bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
+ && !bfd_is_thin_archive (abfd->my_archive))
+ abfd = abfd->my_archive;
+
++ /* Close the file descriptor if there is no archive plugin file
++ descriptor. */
++ if (abfd->archive_plugin_fd == -1)
++ {
++ close (fd);
++ return;
++ }
++
+ abfd->archive_plugin_fd_open_count--;
+ /* Dup the archive plugin file descriptor for later use, which
+ will be closed by _bfd_archive_close_and_cleanup. */
+diff --git a/ld/testsuite/ld-plugin/lto.exp b/ld/testsuite/ld-plugin/lto.exp
+index def69e43ab3..999d911ce6a 100644
+--- a/ld/testsuite/ld-plugin/lto.exp
++++ b/ld/testsuite/ld-plugin/lto.exp
+@@ -687,6 +687,40 @@ if { [is_elf_format] && [check_lto_shared_available] } {
+ }
+ }
+
++run_cc_link_tests [list \
++ [list \
++ "Build pr28138.a" \
++ "-T" "" \
++ {pr28138-1.c pr28138-2.c pr28138-3.c pr28138-4.c pr28138-5.c \
++ pr28138-6.c pr28138-7.c} {} "pr28138.a" \
++ ] \
++ [list \
++ "Build pr28138.o" \
++ "" "" \
++ {pr28138.c} {} \
++ ] \
++]
++
++set exec_output [run_host_cmd "sh" \
++ "-c \"ulimit -n 20; \
++ $CC -Btmpdir/ld -o tmpdir/pr28138 \
++ tmpdir/pr28138.o tmpdir/pr28138.a\""]
++set exec_output [prune_warnings $exec_output]
++if [string match "" $exec_output] then {
++ if { [isnative] } {
++ set exec_output [run_host_cmd "tmpdir/pr28138" ""]
++ if [string match "PASS" $exec_output] then {
++ pass "PR ld/28138"
++ } else {
++ fail "PR ld/28138"
++ }
++ } else {
++ pass "PR ld/28138"
++ }
++} else {
++ fail "PR ld/28138"
++}
++
+ set testname "Build liblto-11.a"
+ remote_file host delete "tmpdir/liblto-11.a"
+ set catch_output [run_host_cmd "$ar" "rc $plug_opt tmpdir/liblto-11.a tmpdir/lto-11a.o tmpdir/lto-11b.o tmpdir/lto-11c.o"]
+diff --git a/ld/testsuite/ld-plugin/pr28138-1.c b/ld/testsuite/ld-plugin/pr28138-1.c
+new file mode 100644
+index 00000000000..51d119e1642
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-1.c
+@@ -0,0 +1,6 @@
++extern int a0(void);
++int
++a1(void)
++{
++ return 1 + a0();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-2.c b/ld/testsuite/ld-plugin/pr28138-2.c
+new file mode 100644
+index 00000000000..1120cd797e9
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-2.c
+@@ -0,0 +1,6 @@
++extern int a1(void);
++int
++a2(void)
++{
++ return 1 + a1();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-3.c b/ld/testsuite/ld-plugin/pr28138-3.c
+new file mode 100644
+index 00000000000..ec464947ee6
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-3.c
+@@ -0,0 +1,6 @@
++extern int a2(void);
++int
++a3(void)
++{
++ return 1 + a2();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-4.c b/ld/testsuite/ld-plugin/pr28138-4.c
+new file mode 100644
+index 00000000000..475701b2c5c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-4.c
+@@ -0,0 +1,6 @@
++extern int a3(void);
++int
++a4(void)
++{
++ return 1 + a3();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-5.c b/ld/testsuite/ld-plugin/pr28138-5.c
+new file mode 100644
+index 00000000000..e24f86c363e
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-5.c
+@@ -0,0 +1,6 @@
++extern int a4(void);
++int
++a5(void)
++{
++ return 1 + a4();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-6.c b/ld/testsuite/ld-plugin/pr28138-6.c
+new file mode 100644
+index 00000000000..b5b938bdb21
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-6.c
+@@ -0,0 +1,6 @@
++extern int a5(void);
++int
++a6(void)
++{
++ return 1 + a5();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138-7.c b/ld/testsuite/ld-plugin/pr28138-7.c
+new file mode 100644
+index 00000000000..4ef75bf0f0c
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138-7.c
+@@ -0,0 +1,6 @@
++extern int a6(void);
++int
++a7(void)
++{
++ return 1 + a6();
++}
+diff --git a/ld/testsuite/ld-plugin/pr28138.c b/ld/testsuite/ld-plugin/pr28138.c
+new file mode 100644
+index 00000000000..68252c9f382
+--- /dev/null
++++ b/ld/testsuite/ld-plugin/pr28138.c
+@@ -0,0 +1,20 @@
++#include <stdio.h>
++
++extern int a7(void);
++
++int
++a0(void)
++{
++ return 0;
++}
++
++int
++main()
++{
++ if (a7() == 7)
++ {
++ printf ("PASS\n");
++ return 0;
++ }
++ return 1;
++}
+--
+2.27.0
+
1
0
commit a87941c2b30fd54b011e2af1038a8b5b64d0c138
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:33:34 2021 +0100
exim: added patch for openssl 3
diff --git a/exim/.signature b/exim/.signature
index 61be0a49..39c4f160 100644
--- a/exim/.signature
+++ b/exim/.signature
@@ -1,7 +1,8 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVequbjWeT48jNQ7x4Sdtr9mra1gQQtNIJDdCJa1ITdC2OLzMjwPt0M6KYvxUnhnPZ7EVe7L8zZ/MnNdk/0U5xmLwM=
-SHA256 (Pkgfile) = 7248b3c3c87972a224e095308cd2f26b57c3ea40b7f1130bf1187b18441516de
+RWRJc1FUaeVeqkut1gnxUFXwF0WPkAg3wEynncwLzl0I5Zb+dcbRoT59QYGU6muY3ntjvsG0dEyacqddJw8VpmNcEjgwbPq26As=
+SHA256 (Pkgfile) = c2f55a04a64d60beb56137e9f67469430b78a788754c32222e5b5f86a0c828a6
SHA256 (.footprint) = 3e5fe8471a7a9057c0c7486c016ea2ed1dc5ebd72adc13c23f432ef468d2fc5d
SHA256 (exim-4.95.tar.xz) = cc9cb653fff2ea947c3702680b59c99ac0bd1bbf19976d37e22a463cd804f167
SHA256 (exim) = 850f72cb4d069dc8d15ce138623e6b6a7fe33f5daebe37fbf93c7801fa2d6134
SHA256 (exim-config.patch) = 9b634234d24679b689a1fb664ddaab98d8f80f9563244dbebbf8a81eeedd541e
+SHA256 (exim-4.95-openssl30-build-fix.patch) = 86408bbe358d4d074a10e427e62afc0b4e82f17472512317b92fe62e51f25262
diff --git a/exim/Pkgfile b/exim/Pkgfile
index 4c27bf5c..cdfdb37e 100644
--- a/exim/Pkgfile
+++ b/exim/Pkgfile
@@ -5,13 +5,15 @@
name=exim
version=4.95
-release=1
+release=2
source=(https://ftp.exim.org/pub/exim/exim4/$name-$version.tar.xz \
- $name $name-config.patch)
+ $name $name-config.patch exim-4.95-openssl30-build-fix.patch)
build() {
cd $name-$version
+ patch -Np1 -i $SRC/exim-4.95-openssl30-build-fix.patch
+
sed "s/#CFLAGS#/$CFLAGS/" $SRC/$name-config.patch | patch -p1
cp src/EDITME Local/Makefile
diff --git a/exim/exim-4.95-openssl30-build-fix.patch b/exim/exim-4.95-openssl30-build-fix.patch
new file mode 100644
index 00000000..7331f5c1
--- /dev/null
+++ b/exim/exim-4.95-openssl30-build-fix.patch
@@ -0,0 +1,22 @@
+diff --git a/src/tls-openssl.c b/src/tls-openssl.c
+index bc454c8..c6da62c 100644
+--- a/src/tls-openssl.c
++++ b/src/tls-openssl.c
+@@ -232,10 +232,14 @@ static exim_openssl_option exim_openssl_options[] = {
+ { US"no_tlsv1", SSL_OP_NO_TLSv1 },
+ #endif
+ #ifdef SSL_OP_NO_TLSv1_1
+-# if SSL_OP_NO_TLSv1_1 == 0x00000400L
++# if OPENSSL_VERSION_NUMBER < 0x30000000L
++# if SSL_OP_NO_TLSv1_1 == 0x00000400L
+ /* Error in chosen value in 1.0.1a; see first item in CHANGES for 1.0.1b */
+-# warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
+-# else
++# warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
++# define NO_SSL_OP_NO_TLSv1_1
++# endif
++# endif
++# ifndef NO_SSL_OP_NO_TLSv1_1
+ { US"no_tlsv1_1", SSL_OP_NO_TLSv1_1 },
+ # endif
+ #endif
1
0
commit 0399a7a7c804c095519608c800ef85fd7a9c9cd6
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:32:44 2021 +0100
gcc: 10.3.0 -> 11.2.0
diff --git a/gcc/.footprint b/gcc/.footprint
index a498d001..6b65f455 100644
--- a/gcc/.footprint
+++ b/gcc/.footprint
@@ -16,1467 +16,1509 @@ lrwxrwxrwx root/root usr/bin/cc -> gcc
-rwxr-xr-x root/root usr/bin/lto-dump
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/c++/
-drwxr-xr-x root/root usr/include/c++/10.3.0/
--rw-r--r-- root/root usr/include/c++/10.3.0/algorithm
--rw-r--r-- root/root usr/include/c++/10.3.0/any
--rw-r--r-- root/root usr/include/c++/10.3.0/array
--rw-r--r-- root/root usr/include/c++/10.3.0/atomic
-drwxr-xr-x root/root usr/include/c++/10.3.0/backward/
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/auto_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/backward_warning.h
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/binders.h
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/hash_fun.h
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/hash_map
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/hash_set
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/hashtable.h
--rw-r--r-- root/root usr/include/c++/10.3.0/backward/strstream
--rw-r--r-- root/root usr/include/c++/10.3.0/bit
-drwxr-xr-x root/root usr/include/c++/10.3.0/bits/
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/algorithmfwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/alloc_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/allocated_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/atomic_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/atomic_futex.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/atomic_lockfree_defines.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/basic_ios.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/basic_ios.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/basic_string.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/basic_string.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/boost_concept_check.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/c++0x_warning.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/char_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/charconv.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/codecvt.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/concept_check.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/cpp_type_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/cxxabi_forced.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/cxxabi_init_exception.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/deque.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/enable_special_members.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/erase_if.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/exception.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/exception_defines.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/exception_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/forward_list.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/forward_list.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/fs_dir.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/fs_fwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/fs_ops.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/fs_path.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/fstream.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/functexcept.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/functional_hash.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/gslice.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/gslice_array.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/hash_bytes.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/hashtable.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/hashtable_policy.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/indirect_array.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/invoke.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ios_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/istream.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/iterator_concepts.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/list.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_classes.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_classes.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_conv.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_facets.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_facets.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_facets_nonio.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/locale_facets_nonio.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/localefwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/mask_array.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/memoryfwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/move.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/nested_exception.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/node_handle.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ostream.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ostream_insert.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/parse_numbers.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/postypes.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/predefined_ops.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ptr_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/quoted_string.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/random.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/random.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/range_access.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/range_cmp.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ranges_algo.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ranges_algobase.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/ranges_uninitialized.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/refwrap.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_automaton.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_automaton.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_compiler.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_compiler.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_constants.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_error.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_executor.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_executor.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_scanner.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/regex_scanner.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/shared_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/shared_ptr_atomic.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/shared_ptr_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/slice_array.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/specfun.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/sstream.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/std_abs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/std_function.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/std_mutex.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_algo.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_algobase.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_bvector.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_construct.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_deque.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_function.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_heap.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_iterator_base_funcs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_iterator_base_types.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_list.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_map.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_multimap.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_multiset.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_numeric.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_pair.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_queue.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_raw_storage_iter.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_relops.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_set.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_stack.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_tempbuf.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_tree.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_uninitialized.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stl_vector.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stream_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/streambuf.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/streambuf_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/string_view.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/stringfwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/uniform_int_dist.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/unique_lock.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/unique_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/unordered_map.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/unordered_set.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/uses_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/valarray_after.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/valarray_array.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/valarray_array.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/valarray_before.h
--rw-r--r-- root/root usr/include/c++/10.3.0/bits/vector.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/bitset
--rw-r--r-- root/root usr/include/c++/10.3.0/cassert
--rw-r--r-- root/root usr/include/c++/10.3.0/ccomplex
--rw-r--r-- root/root usr/include/c++/10.3.0/cctype
--rw-r--r-- root/root usr/include/c++/10.3.0/cerrno
--rw-r--r-- root/root usr/include/c++/10.3.0/cfenv
--rw-r--r-- root/root usr/include/c++/10.3.0/cfloat
--rw-r--r-- root/root usr/include/c++/10.3.0/charconv
--rw-r--r-- root/root usr/include/c++/10.3.0/chrono
--rw-r--r-- root/root usr/include/c++/10.3.0/cinttypes
--rw-r--r-- root/root usr/include/c++/10.3.0/ciso646
--rw-r--r-- root/root usr/include/c++/10.3.0/climits
--rw-r--r-- root/root usr/include/c++/10.3.0/clocale
--rw-r--r-- root/root usr/include/c++/10.3.0/cmath
--rw-r--r-- root/root usr/include/c++/10.3.0/codecvt
--rw-r--r-- root/root usr/include/c++/10.3.0/compare
--rw-r--r-- root/root usr/include/c++/10.3.0/complex
--rw-r--r-- root/root usr/include/c++/10.3.0/complex.h
--rw-r--r-- root/root usr/include/c++/10.3.0/concepts
--rw-r--r-- root/root usr/include/c++/10.3.0/condition_variable
--rw-r--r-- root/root usr/include/c++/10.3.0/coroutine
--rw-r--r-- root/root usr/include/c++/10.3.0/csetjmp
--rw-r--r-- root/root usr/include/c++/10.3.0/csignal
--rw-r--r-- root/root usr/include/c++/10.3.0/cstdalign
--rw-r--r-- root/root usr/include/c++/10.3.0/cstdarg
--rw-r--r-- root/root usr/include/c++/10.3.0/cstdbool
--rw-r--r-- root/root usr/include/c++/10.3.0/cstddef
--rw-r--r-- root/root usr/include/c++/10.3.0/cstdint
--rw-r--r-- root/root usr/include/c++/10.3.0/cstdio
--rw-r--r-- root/root usr/include/c++/10.3.0/cstdlib
--rw-r--r-- root/root usr/include/c++/10.3.0/cstring
--rw-r--r-- root/root usr/include/c++/10.3.0/ctgmath
--rw-r--r-- root/root usr/include/c++/10.3.0/ctime
--rw-r--r-- root/root usr/include/c++/10.3.0/cuchar
--rw-r--r-- root/root usr/include/c++/10.3.0/cwchar
--rw-r--r-- root/root usr/include/c++/10.3.0/cwctype
--rw-r--r-- root/root usr/include/c++/10.3.0/cxxabi.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/debug/
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/array
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/assertions.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/bitset
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/debug.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/deque
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/formatter.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/forward_list
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/functions.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/helper_functions.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/list
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/macros.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/map
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/map.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/multimap.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/multiset.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_container.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_iterator.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_local_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_local_iterator.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_sequence.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_sequence.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_unordered_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_unordered_container.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/safe_unordered_container.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/set
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/set.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/stl_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/string
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/unordered_map
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/unordered_set
--rw-r--r-- root/root usr/include/c++/10.3.0/debug/vector
-drwxr-xr-x root/root usr/include/c++/10.3.0/decimal/
--rw-r--r-- root/root usr/include/c++/10.3.0/decimal/decimal
--rw-r--r-- root/root usr/include/c++/10.3.0/decimal/decimal.h
--rw-r--r-- root/root usr/include/c++/10.3.0/deque
--rw-r--r-- root/root usr/include/c++/10.3.0/exception
--rw-r--r-- root/root usr/include/c++/10.3.0/execution
-drwxr-xr-x root/root usr/include/c++/10.3.0/experimental/
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/algorithm
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/any
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/array
-drwxr-xr-x root/root usr/include/c++/10.3.0/experimental/bits/
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/fs_dir.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/fs_fwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/fs_ops.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/fs_path.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/lfts_config.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/net.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/shared_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/bits/string_view.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/buffer
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/chrono
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/deque
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/executor
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/filesystem
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/forward_list
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/functional
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/internet
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/io_context
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/iterator
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/list
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/map
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/memory
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/memory_resource
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/net
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/netfwd
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/numeric
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/optional
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/propagate_const
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/random
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/ratio
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/regex
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/set
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/socket
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/source_location
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/string
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/string_view
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/system_error
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/timer
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/tuple
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/type_traits
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/unordered_map
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/unordered_set
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/utility
--rw-r--r-- root/root usr/include/c++/10.3.0/experimental/vector
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/algorithm
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/aligned_buffer.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/alloc_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/atomicity.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/bitmap_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/cast.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/cmath
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/codecvt_specializations.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/concurrence.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/debug_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/enc_filebuf.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/extptr_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/functional
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/hash_map
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/hash_set
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/iterator
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/malloc_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/memory
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/mt_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/new_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/numeric
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/numeric_traits.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/assoc_container.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/bin_search_tree_/traits.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/branch_policy/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/branch_policy/branch_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/branch_policy/traits.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/cond_dealtor.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/container_base_dispatch.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/debug_map_base.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/eq_fn/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_policy/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/ov_tree_map_/traits.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/traits.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/node.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rb_tree_map_/traits.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/node.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/splay_tree_/traits.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/standard_policies.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/tree_policy/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/tree_trace_base.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/type_utils.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/types_traits.hpp
-drwxr-xr-x root/root usr/include/c++/10.3.0/ext/pb_ds/detail/unordered_iterator/
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/unordered_iterator/iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/exception.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/hash_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/list_update_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/priority_queue.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/tag_and_trait.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/tree_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pb_ds/trie_policy.hpp
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pod_char_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pointer.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/pool_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/random
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/random.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/rb_tree
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/rc_string_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/rope
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/ropeimpl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/slist
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/sso_string_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/stdio_filebuf.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/stdio_sync_filebuf.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/string_conversions.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/throw_allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/type_traits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/typelist.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/vstring.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/vstring.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/vstring_fwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/ext/vstring_util.h
--rw-r--r-- root/root usr/include/c++/10.3.0/fenv.h
--rw-r--r-- root/root usr/include/c++/10.3.0/filesystem
--rw-r--r-- root/root usr/include/c++/10.3.0/forward_list
--rw-r--r-- root/root usr/include/c++/10.3.0/fstream
--rw-r--r-- root/root usr/include/c++/10.3.0/functional
--rw-r--r-- root/root usr/include/c++/10.3.0/future
--rw-r--r-- root/root usr/include/c++/10.3.0/initializer_list
--rw-r--r-- root/root usr/include/c++/10.3.0/iomanip
--rw-r--r-- root/root usr/include/c++/10.3.0/ios
--rw-r--r-- root/root usr/include/c++/10.3.0/iosfwd
--rw-r--r-- root/root usr/include/c++/10.3.0/iostream
--rw-r--r-- root/root usr/include/c++/10.3.0/istream
--rw-r--r-- root/root usr/include/c++/10.3.0/iterator
--rw-r--r-- root/root usr/include/c++/10.3.0/limits
--rw-r--r-- root/root usr/include/c++/10.3.0/list
--rw-r--r-- root/root usr/include/c++/10.3.0/locale
--rw-r--r-- root/root usr/include/c++/10.3.0/map
--rw-r--r-- root/root usr/include/c++/10.3.0/math.h
--rw-r--r-- root/root usr/include/c++/10.3.0/memory
--rw-r--r-- root/root usr/include/c++/10.3.0/memory_resource
--rw-r--r-- root/root usr/include/c++/10.3.0/mutex
--rw-r--r-- root/root usr/include/c++/10.3.0/new
--rw-r--r-- root/root usr/include/c++/10.3.0/numbers
--rw-r--r-- root/root usr/include/c++/10.3.0/numeric
--rw-r--r-- root/root usr/include/c++/10.3.0/optional
--rw-r--r-- root/root usr/include/c++/10.3.0/ostream
-drwxr-xr-x root/root usr/include/c++/10.3.0/parallel/
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/algo.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/algobase.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/algorithm
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/algorithmfwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/balanced_quicksort.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/basic_iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/checkers.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/compatibility.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/compiletime_settings.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/equally_split.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/features.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/find.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/find_selectors.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/for_each.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/for_each_selectors.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/iterator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/list_partition.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/losertree.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/merge.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/multiseq_selection.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/multiway_merge.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/multiway_mergesort.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/numeric
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/numericfwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/omp_loop.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/omp_loop_static.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/par_loop.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/parallel.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/partial_sum.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/partition.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/queue.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/quicksort.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/random_number.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/random_shuffle.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/search.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/set_operations.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/settings.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/sort.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/tags.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/types.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/unique_copy.h
--rw-r--r-- root/root usr/include/c++/10.3.0/parallel/workstealing.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/pstl/
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/algorithm_fwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/algorithm_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/execution_defs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/execution_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_algorithm_defs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_algorithm_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_execution_defs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_memory_defs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_memory_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_numeric_defs.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/glue_numeric_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/memory_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/numeric_fwd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/numeric_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/parallel_backend.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/parallel_backend_serial.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/parallel_backend_tbb.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/parallel_backend_utils.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/parallel_impl.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/pstl_config.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/unseq_backend_simd.h
--rw-r--r-- root/root usr/include/c++/10.3.0/pstl/utils.h
--rw-r--r-- root/root usr/include/c++/10.3.0/queue
--rw-r--r-- root/root usr/include/c++/10.3.0/random
--rw-r--r-- root/root usr/include/c++/10.3.0/ranges
--rw-r--r-- root/root usr/include/c++/10.3.0/ratio
--rw-r--r-- root/root usr/include/c++/10.3.0/regex
--rw-r--r-- root/root usr/include/c++/10.3.0/scoped_allocator
--rw-r--r-- root/root usr/include/c++/10.3.0/set
--rw-r--r-- root/root usr/include/c++/10.3.0/shared_mutex
--rw-r--r-- root/root usr/include/c++/10.3.0/span
--rw-r--r-- root/root usr/include/c++/10.3.0/sstream
--rw-r--r-- root/root usr/include/c++/10.3.0/stack
--rw-r--r-- root/root usr/include/c++/10.3.0/stdexcept
--rw-r--r-- root/root usr/include/c++/10.3.0/stdlib.h
--rw-r--r-- root/root usr/include/c++/10.3.0/stop_token
--rw-r--r-- root/root usr/include/c++/10.3.0/streambuf
--rw-r--r-- root/root usr/include/c++/10.3.0/string
--rw-r--r-- root/root usr/include/c++/10.3.0/string_view
--rw-r--r-- root/root usr/include/c++/10.3.0/system_error
--rw-r--r-- root/root usr/include/c++/10.3.0/tgmath.h
--rw-r--r-- root/root usr/include/c++/10.3.0/thread
-drwxr-xr-x root/root usr/include/c++/10.3.0/tr1/
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/array
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/bessel_function.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/beta_function.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/ccomplex
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cctype
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cfenv
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cfloat
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cinttypes
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/climits
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cmath
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/complex
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/complex.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cstdarg
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cstdbool
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cstdint
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cstdio
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cstdlib
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/ctgmath
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/ctime
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/ctype.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cwchar
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/cwctype
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/ell_integral.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/exp_integral.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/fenv.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/float.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/functional
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/functional_hash.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/gamma.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/hashtable.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/hashtable_policy.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/hypergeometric.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/inttypes.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/legendre_function.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/limits.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/math.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/memory
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/modified_bessel_func.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/poly_hermite.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/poly_laguerre.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/random
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/random.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/random.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/regex
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/riemann_zeta.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/shared_ptr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/special_function_util.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/stdarg.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/stdbool.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/stdint.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/stdio.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/stdlib.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/tgmath.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/tuple
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/type_traits
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/unordered_map
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/unordered_map.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/unordered_set
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/unordered_set.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/utility
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/wchar.h
--rw-r--r-- root/root usr/include/c++/10.3.0/tr1/wctype.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/tr2/
--rw-r--r-- root/root usr/include/c++/10.3.0/tr2/bool_set
--rw-r--r-- root/root usr/include/c++/10.3.0/tr2/bool_set.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr2/dynamic_bitset
--rw-r--r-- root/root usr/include/c++/10.3.0/tr2/dynamic_bitset.tcc
--rw-r--r-- root/root usr/include/c++/10.3.0/tr2/ratio
--rw-r--r-- root/root usr/include/c++/10.3.0/tr2/type_traits
--rw-r--r-- root/root usr/include/c++/10.3.0/tuple
--rw-r--r-- root/root usr/include/c++/10.3.0/type_traits
--rw-r--r-- root/root usr/include/c++/10.3.0/typeindex
--rw-r--r-- root/root usr/include/c++/10.3.0/typeinfo
--rw-r--r-- root/root usr/include/c++/10.3.0/unordered_map
--rw-r--r-- root/root usr/include/c++/10.3.0/unordered_set
--rw-r--r-- root/root usr/include/c++/10.3.0/utility
--rw-r--r-- root/root usr/include/c++/10.3.0/valarray
--rw-r--r-- root/root usr/include/c++/10.3.0/variant
--rw-r--r-- root/root usr/include/c++/10.3.0/vector
--rw-r--r-- root/root usr/include/c++/10.3.0/version
-drwxr-xr-x root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/
-drwxr-xr-x root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/
-drwxr-xr-x root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/atomic_word.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/basic_file.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/c++allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/c++config.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/c++io.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/c++locale.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/cpu_defines.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/ctype_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/ctype_inline.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/cxxabi_tweaks.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/error_constants.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/extc++.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/gthr-default.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/gthr-posix.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/gthr-single.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/gthr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/messages_members.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/opt_random.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/os_defines.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/stdc++.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/stdtr1c++.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/bits/time_members.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/ext/
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/32/ext/opt_random.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/atomic_word.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/basic_file.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/c++allocator.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/c++config.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/c++io.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/c++locale.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/cpu_defines.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/ctype_base.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/ctype_inline.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/cxxabi_tweaks.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/error_constants.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/extc++.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/gthr-default.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/gthr-posix.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/gthr-single.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/gthr.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/messages_members.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/opt_random.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/os_defines.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/stdc++.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/stdtr1c++.h
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/bits/time_members.h
-drwxr-xr-x root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/ext/
--rw-r--r-- root/root usr/include/c++/10.3.0/x86_64-pc-linux-gnu/ext/opt_random.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/
+-rw-r--r-- root/root usr/include/c++/11.2.0/algorithm
+-rw-r--r-- root/root usr/include/c++/11.2.0/any
+-rw-r--r-- root/root usr/include/c++/11.2.0/array
+-rw-r--r-- root/root usr/include/c++/11.2.0/atomic
+drwxr-xr-x root/root usr/include/c++/11.2.0/backward/
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/auto_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/backward_warning.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/binders.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/hash_fun.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/hash_map
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/hash_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/hashtable.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/backward/strstream
+-rw-r--r-- root/root usr/include/c++/11.2.0/barrier
+-rw-r--r-- root/root usr/include/c++/11.2.0/bit
+drwxr-xr-x root/root usr/include/c++/11.2.0/bits/
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/algorithmfwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/align.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/alloc_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/allocated_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/atomic_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/atomic_futex.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/atomic_lockfree_defines.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/atomic_timed_wait.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/atomic_wait.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/basic_ios.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/basic_ios.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/basic_string.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/basic_string.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/boost_concept_check.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/c++0x_warning.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/char_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/charconv.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/codecvt.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/concept_check.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/cpp_type_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/cxxabi_forced.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/cxxabi_init_exception.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/deque.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/enable_special_members.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/erase_if.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/exception.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/exception_defines.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/exception_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/forward_list.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/forward_list.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/fs_dir.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/fs_fwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/fs_ops.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/fs_path.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/fstream.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/functexcept.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/functional_hash.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/gslice.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/gslice_array.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/hash_bytes.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/hashtable.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/hashtable_policy.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/indirect_array.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/invoke.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ios_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/istream.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/iterator_concepts.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/list.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_classes.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_classes.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_conv.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_facets.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_facets.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_facets_nonio.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/locale_facets_nonio.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/localefwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/mask_array.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/max_size_type.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/memoryfwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/move.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/nested_exception.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/node_handle.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ostream.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ostream_insert.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/parse_numbers.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/postypes.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/predefined_ops.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ptr_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/quoted_string.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/random.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/random.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/range_access.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ranges_algo.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ranges_algobase.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ranges_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ranges_cmp.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ranges_uninitialized.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/ranges_util.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/refwrap.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_automaton.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_automaton.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_compiler.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_compiler.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_constants.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_error.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_executor.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_executor.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_scanner.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/regex_scanner.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/semaphore_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/shared_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/shared_ptr_atomic.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/shared_ptr_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/slice_array.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/specfun.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/sstream.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/std_abs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/std_function.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/std_mutex.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/std_thread.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_algo.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_algobase.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_bvector.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_construct.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_deque.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_function.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_heap.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_iterator_base_funcs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_iterator_base_types.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_list.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_map.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_multimap.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_multiset.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_numeric.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_pair.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_queue.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_raw_storage_iter.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_relops.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_set.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_stack.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_tempbuf.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_tree.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_uninitialized.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stl_vector.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stream_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/streambuf.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/streambuf_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/string_view.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/stringfwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/this_thread_sleep.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/uniform_int_dist.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/unique_lock.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/unique_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/unordered_map.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/unordered_set.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/uses_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/uses_allocator_args.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/valarray_after.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/valarray_array.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/valarray_array.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/valarray_before.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/bits/vector.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/bitset
+-rw-r--r-- root/root usr/include/c++/11.2.0/cassert
+-rw-r--r-- root/root usr/include/c++/11.2.0/ccomplex
+-rw-r--r-- root/root usr/include/c++/11.2.0/cctype
+-rw-r--r-- root/root usr/include/c++/11.2.0/cerrno
+-rw-r--r-- root/root usr/include/c++/11.2.0/cfenv
+-rw-r--r-- root/root usr/include/c++/11.2.0/cfloat
+-rw-r--r-- root/root usr/include/c++/11.2.0/charconv
+-rw-r--r-- root/root usr/include/c++/11.2.0/chrono
+-rw-r--r-- root/root usr/include/c++/11.2.0/cinttypes
+-rw-r--r-- root/root usr/include/c++/11.2.0/ciso646
+-rw-r--r-- root/root usr/include/c++/11.2.0/climits
+-rw-r--r-- root/root usr/include/c++/11.2.0/clocale
+-rw-r--r-- root/root usr/include/c++/11.2.0/cmath
+-rw-r--r-- root/root usr/include/c++/11.2.0/codecvt
+-rw-r--r-- root/root usr/include/c++/11.2.0/compare
+-rw-r--r-- root/root usr/include/c++/11.2.0/complex
+-rw-r--r-- root/root usr/include/c++/11.2.0/complex.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/concepts
+-rw-r--r-- root/root usr/include/c++/11.2.0/condition_variable
+-rw-r--r-- root/root usr/include/c++/11.2.0/coroutine
+-rw-r--r-- root/root usr/include/c++/11.2.0/csetjmp
+-rw-r--r-- root/root usr/include/c++/11.2.0/csignal
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstdalign
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstdarg
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstdbool
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstddef
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstdint
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstdio
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstdlib
+-rw-r--r-- root/root usr/include/c++/11.2.0/cstring
+-rw-r--r-- root/root usr/include/c++/11.2.0/ctgmath
+-rw-r--r-- root/root usr/include/c++/11.2.0/ctime
+-rw-r--r-- root/root usr/include/c++/11.2.0/cuchar
+-rw-r--r-- root/root usr/include/c++/11.2.0/cwchar
+-rw-r--r-- root/root usr/include/c++/11.2.0/cwctype
+-rw-r--r-- root/root usr/include/c++/11.2.0/cxxabi.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/debug/
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/assertions.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/bitset
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/debug.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/deque
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/formatter.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/forward_list
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/functions.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/helper_functions.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/list
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/macros.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/map
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/map.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/multimap.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/multiset.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_container.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_iterator.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_local_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_local_iterator.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_sequence.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_sequence.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_unordered_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_unordered_container.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/safe_unordered_container.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/set
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/set.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/stl_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/string
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/unordered_map
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/unordered_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/debug/vector
+drwxr-xr-x root/root usr/include/c++/11.2.0/decimal/
+-rw-r--r-- root/root usr/include/c++/11.2.0/decimal/decimal
+-rw-r--r-- root/root usr/include/c++/11.2.0/decimal/decimal.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/deque
+-rw-r--r-- root/root usr/include/c++/11.2.0/exception
+-rw-r--r-- root/root usr/include/c++/11.2.0/execution
+drwxr-xr-x root/root usr/include/c++/11.2.0/experimental/
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/algorithm
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/any
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/array
+drwxr-xr-x root/root usr/include/c++/11.2.0/experimental/bits/
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/fs_dir.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/fs_fwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/fs_ops.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/fs_path.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/lfts_config.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/net.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/numeric_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/shared_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_builtin.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_converter.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_detail.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_fixed_size.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_math.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_neon.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_ppc.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_scalar.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_x86.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/simd_x86_conversions.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/bits/string_view.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/buffer
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/chrono
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/deque
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/executor
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/filesystem
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/forward_list
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/functional
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/internet
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/io_context
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/iterator
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/list
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/map
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/memory
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/memory_resource
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/net
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/netfwd
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/numeric
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/optional
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/propagate_const
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/random
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/ratio
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/regex
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/set
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/simd
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/socket
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/source_location
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/string
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/string_view
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/system_error
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/timer
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/tuple
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/type_traits
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/unordered_map
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/unordered_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/utility
+-rw-r--r-- root/root usr/include/c++/11.2.0/experimental/vector
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/algorithm
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/aligned_buffer.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/alloc_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/atomicity.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/bitmap_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/cast.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/cmath
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/codecvt_specializations.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/concurrence.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/debug_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/enc_filebuf.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/extptr_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/functional
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/hash_map
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/hash_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/iterator
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/malloc_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/memory
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/mt_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/new_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/numeric
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/numeric_traits.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/assoc_container.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/point_const_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/branch_policy/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/branch_policy/branch_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/branch_policy/null_node_metadata.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/branch_policy/traits.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/cond_dealtor.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/container_base_dispatch.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/debug_map_base.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/eq_fn/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/point_const_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_policy/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_policy/lu_counter_metadata.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/traits.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/node.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/node.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/splay_tree_/traits.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/standard_policies.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/tree_policy/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/tree_trace_base.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/sample_trie_access_traits.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/trie_policy/trie_string_access_traits_imp.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/type_utils.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/types_traits.hpp
+drwxr-xr-x root/root usr/include/c++/11.2.0/ext/pb_ds/detail/unordered_iterator/
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/unordered_iterator/iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/unordered_iterator/point_const_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/exception.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/hash_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/list_update_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/priority_queue.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/tag_and_trait.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/tree_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pb_ds/trie_policy.hpp
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pod_char_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pointer.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/pool_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/random
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/random.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/rb_tree
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/rc_string_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/rope
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/ropeimpl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/slist
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/sso_string_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/stdio_filebuf.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/stdio_sync_filebuf.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/string_conversions.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/throw_allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/type_traits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/typelist.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/vstring.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/vstring.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/vstring_fwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/ext/vstring_util.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/fenv.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/filesystem
+-rw-r--r-- root/root usr/include/c++/11.2.0/forward_list
+-rw-r--r-- root/root usr/include/c++/11.2.0/fstream
+-rw-r--r-- root/root usr/include/c++/11.2.0/functional
+-rw-r--r-- root/root usr/include/c++/11.2.0/future
+-rw-r--r-- root/root usr/include/c++/11.2.0/initializer_list
+-rw-r--r-- root/root usr/include/c++/11.2.0/iomanip
+-rw-r--r-- root/root usr/include/c++/11.2.0/ios
+-rw-r--r-- root/root usr/include/c++/11.2.0/iosfwd
+-rw-r--r-- root/root usr/include/c++/11.2.0/iostream
+-rw-r--r-- root/root usr/include/c++/11.2.0/istream
+-rw-r--r-- root/root usr/include/c++/11.2.0/iterator
+-rw-r--r-- root/root usr/include/c++/11.2.0/latch
+-rw-r--r-- root/root usr/include/c++/11.2.0/limits
+-rw-r--r-- root/root usr/include/c++/11.2.0/list
+-rw-r--r-- root/root usr/include/c++/11.2.0/locale
+-rw-r--r-- root/root usr/include/c++/11.2.0/map
+-rw-r--r-- root/root usr/include/c++/11.2.0/math.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/memory
+-rw-r--r-- root/root usr/include/c++/11.2.0/memory_resource
+-rw-r--r-- root/root usr/include/c++/11.2.0/mutex
+-rw-r--r-- root/root usr/include/c++/11.2.0/new
+-rw-r--r-- root/root usr/include/c++/11.2.0/numbers
+-rw-r--r-- root/root usr/include/c++/11.2.0/numeric
+-rw-r--r-- root/root usr/include/c++/11.2.0/optional
+-rw-r--r-- root/root usr/include/c++/11.2.0/ostream
+drwxr-xr-x root/root usr/include/c++/11.2.0/parallel/
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/algo.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/algobase.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/algorithm
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/algorithmfwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/balanced_quicksort.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/basic_iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/checkers.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/compatibility.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/compiletime_settings.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/equally_split.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/features.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/find.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/find_selectors.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/for_each.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/for_each_selectors.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/iterator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/list_partition.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/losertree.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/merge.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/multiseq_selection.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/multiway_merge.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/multiway_mergesort.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/numeric
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/numericfwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/omp_loop.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/omp_loop_static.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/par_loop.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/parallel.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/partial_sum.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/partition.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/queue.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/quicksort.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/random_number.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/random_shuffle.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/search.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/set_operations.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/settings.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/sort.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/tags.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/types.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/unique_copy.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/parallel/workstealing.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/pstl/
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/algorithm_fwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/algorithm_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/execution_defs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/execution_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_algorithm_defs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_algorithm_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_execution_defs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_memory_defs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_memory_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_numeric_defs.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/glue_numeric_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/memory_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/numeric_fwd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/numeric_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/parallel_backend.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/parallel_backend_serial.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/parallel_backend_tbb.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/parallel_backend_utils.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/parallel_impl.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/pstl_config.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/unseq_backend_simd.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/pstl/utils.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/queue
+-rw-r--r-- root/root usr/include/c++/11.2.0/random
+-rw-r--r-- root/root usr/include/c++/11.2.0/ranges
+-rw-r--r-- root/root usr/include/c++/11.2.0/ratio
+-rw-r--r-- root/root usr/include/c++/11.2.0/regex
+-rw-r--r-- root/root usr/include/c++/11.2.0/scoped_allocator
+-rw-r--r-- root/root usr/include/c++/11.2.0/semaphore
+-rw-r--r-- root/root usr/include/c++/11.2.0/set
+-rw-r--r-- root/root usr/include/c++/11.2.0/shared_mutex
+-rw-r--r-- root/root usr/include/c++/11.2.0/source_location
+-rw-r--r-- root/root usr/include/c++/11.2.0/span
+-rw-r--r-- root/root usr/include/c++/11.2.0/sstream
+-rw-r--r-- root/root usr/include/c++/11.2.0/stack
+-rw-r--r-- root/root usr/include/c++/11.2.0/stdexcept
+-rw-r--r-- root/root usr/include/c++/11.2.0/stdlib.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/stop_token
+-rw-r--r-- root/root usr/include/c++/11.2.0/streambuf
+-rw-r--r-- root/root usr/include/c++/11.2.0/string
+-rw-r--r-- root/root usr/include/c++/11.2.0/string_view
+-rw-r--r-- root/root usr/include/c++/11.2.0/syncstream
+-rw-r--r-- root/root usr/include/c++/11.2.0/system_error
+-rw-r--r-- root/root usr/include/c++/11.2.0/tgmath.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/thread
+drwxr-xr-x root/root usr/include/c++/11.2.0/tr1/
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/array
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/bessel_function.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/beta_function.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/ccomplex
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cctype
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cfenv
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cfloat
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cinttypes
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/climits
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cmath
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/complex
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/complex.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cstdarg
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cstdbool
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cstdint
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cstdio
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cstdlib
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/ctgmath
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/ctime
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/ctype.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cwchar
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/cwctype
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/ell_integral.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/exp_integral.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/fenv.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/float.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/functional
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/functional_hash.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/gamma.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/hashtable.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/hashtable_policy.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/hypergeometric.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/inttypes.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/legendre_function.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/limits.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/math.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/memory
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/modified_bessel_func.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/poly_hermite.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/poly_laguerre.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/random
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/random.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/random.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/regex
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/riemann_zeta.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/shared_ptr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/special_function_util.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/stdarg.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/stdbool.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/stdint.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/stdio.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/stdlib.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/tgmath.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/tuple
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/type_traits
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/unordered_map
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/unordered_map.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/unordered_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/unordered_set.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/utility
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/wchar.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr1/wctype.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/tr2/
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr2/bool_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr2/bool_set.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr2/dynamic_bitset
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr2/dynamic_bitset.tcc
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr2/ratio
+-rw-r--r-- root/root usr/include/c++/11.2.0/tr2/type_traits
+-rw-r--r-- root/root usr/include/c++/11.2.0/tuple
+-rw-r--r-- root/root usr/include/c++/11.2.0/type_traits
+-rw-r--r-- root/root usr/include/c++/11.2.0/typeindex
+-rw-r--r-- root/root usr/include/c++/11.2.0/typeinfo
+-rw-r--r-- root/root usr/include/c++/11.2.0/unordered_map
+-rw-r--r-- root/root usr/include/c++/11.2.0/unordered_set
+-rw-r--r-- root/root usr/include/c++/11.2.0/utility
+-rw-r--r-- root/root usr/include/c++/11.2.0/valarray
+-rw-r--r-- root/root usr/include/c++/11.2.0/variant
+-rw-r--r-- root/root usr/include/c++/11.2.0/vector
+-rw-r--r-- root/root usr/include/c++/11.2.0/version
+drwxr-xr-x root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/
+drwxr-xr-x root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/
+drwxr-xr-x root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/atomic_word.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/basic_file.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/c++allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/c++config.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/c++io.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/c++locale.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/cpu_defines.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/ctype_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/ctype_inline.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/cxxabi_tweaks.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/error_constants.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/extc++.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/gthr-default.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/gthr-posix.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/gthr-single.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/gthr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/messages_members.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/opt_random.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/os_defines.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/stdc++.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/stdtr1c++.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/bits/time_members.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/ext/
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/32/ext/opt_random.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/atomic_word.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/basic_file.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/c++allocator.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/c++config.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/c++io.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/c++locale.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/cpu_defines.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/ctype_base.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/ctype_inline.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/cxxabi_tweaks.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/error_constants.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/extc++.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/gthr-default.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/gthr-posix.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/gthr-single.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/gthr.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/messages_members.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/opt_random.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/os_defines.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/stdc++.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/stdtr1c++.h
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/bits/time_members.h
+drwxr-xr-x root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/ext/
+-rw-r--r-- root/root usr/include/c++/11.2.0/x86_64-pc-linux-gnu/ext/opt_random.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/gcc/
drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtbegin.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtbeginS.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtbeginT.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtend.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtendS.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtfastmath.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtprec32.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtprec64.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/crtprec80.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/libgcc.a
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/libgcc_eh.a
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/32/libgcov.a
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/cc1
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/cc1obj
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/cc1plus
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/collect2
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtbegin.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtbeginS.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtbeginT.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtend.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtendS.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtfastmath.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtprec32.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtprec64.o
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/crtprec80.o
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/acc_prof.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/adxintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ammintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx2intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx5124fmapsintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx5124vnniwintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512bf16intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512bf16vlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512bitalgintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512bwintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512cdintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512dqintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512erintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512fintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512ifmaintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512ifmavlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512pfintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vbmi2intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vbmi2vlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vbmiintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vbmivlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vlbwintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vldqintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vnniintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vnnivlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vp2intersectintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vp2intersectvlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vpopcntdqintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avx512vpopcntdqvlintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/avxintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/bmi2intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/bmiintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/bmmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/cet.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/cetintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/cldemoteintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/clflushoptintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/clwbintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/clzerointrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/cpuid.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/cross-stdarg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/emmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/enqcmdintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/f16cintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/float.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/fma4intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/fmaintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/fxsrintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/gcov.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/gfniintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ia32intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/immintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/iso646.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/limits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/lwpintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/lzcntintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/mm3dnow.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/mm_malloc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/mmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/movdirintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/mwaitxintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/nmmintrin.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/NXConstStr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/Object.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/Protocol.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/message.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/objc-decls.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/objc-exception.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/objc-sync.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/objc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/runtime.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/objc/thr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/omp.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/openacc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/pconfigintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/pkuintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/pmmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/popcntintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/prfchwintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/quadmath.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/quadmath_weak.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/rdseedintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/rtmintrin.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/sanitizer/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/sanitizer/asan_interface.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/sanitizer/common_interface_defs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/sanitizer/lsan_interface.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/sanitizer/tsan_interface.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/sgxintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/shaintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/smmintrin.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ssp/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ssp/ssp.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ssp/stdio.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ssp/string.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/ssp/unistd.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdalign.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdarg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdatomic.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdbool.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stddef.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdfix.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdint-gcc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdint.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/stdnoreturn.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/syslimits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/tbmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/tmmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/unwind.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/vaesintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/varargs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/vpclmulqdqintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/waitpkgintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/wbnoinvdintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/wmmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/x86intrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xmmintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xopintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xsavecintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xsaveintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xsaveoptintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xsavesintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/include/xtestintrin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/libgcc.a
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/libgcc_eh.a
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/libgcov.a
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/liblto_plugin.la
-lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/liblto_plugin.so -> liblto_plugin.so.0.0.0
-lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/liblto_plugin.so.0 -> liblto_plugin.so.0.0.0
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/liblto_plugin.so.0.0.0
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/lto-wrapper
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/lto1
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/gengtype
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/gtype.state
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ada/
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ada/gcc-interface/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ada/gcc-interface/ada-tree.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/addresses.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/alias.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/align.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/all-tree.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/alloc-pool.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ansidecl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/array-traits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/asan.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/attribs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/auto-host.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/auto-profile.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/b-header-vars
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/backend.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/basic-block.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/bb-reorder.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/bitmap.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/brig-builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/builtin-attrs.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/builtin-types.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/builtins.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/bversion.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-family/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-family/c-common.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-family/c-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-family/c-objc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-family/c-pragma.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-family/c-pretty-print.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/c-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/calls.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ccmp.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfg-flags.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfganal.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfgbuild.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfgcleanup.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfgexpand.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfghooks.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfgloop.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfgloopmanip.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cfgrtl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cgraph.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cif-code.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/collect-utils.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/collect2-aix.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/collect2.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/color-macros.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/common/
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/common/config/
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/common/config/i386/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/common/config/i386/i386-cpuinfo.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/conditions.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/dbxelf.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/elfos.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/glibc-stdint.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/gnu-user.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/att.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/biarch64.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/gnu-user-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/gnu-user64.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/i386-opts.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/i386-protos.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/i386.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/linux-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/linux64.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/stringop.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/unix.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/x86-64.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/i386/x86-tune.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/initfini-array.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/linux-android.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/linux-protos.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/linux.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/config/vxworks-dummy.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/configargs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/context.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/convert.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/coretypes.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/coroutine-builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/coverage.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/cp-tree.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/cp-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/cxx-pretty-print.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/name-lookup.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/operators.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cp/type-utils.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cppbuiltin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cppdefault.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cpplib.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/cselib.h
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/d/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/d/d-tree.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/data-streamer.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dbgcnt.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dbgcnt.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dbxout.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dce.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ddg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/debug.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/defaults.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/df.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dfp.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic-color.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic-core.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic-event-id.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic-metadata.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic-path.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic-url.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/diagnostic.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/digraph.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dojump.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dominance.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/domwalk.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/double-int.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dump-context.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dumpfile.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dwarf2asm.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/dwarf2out.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/edit-context.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/emit-rtl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/errors.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/escaped_string.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/et-forest.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/except.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/explow.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/expmed.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/expr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/fibonacci_heap.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/file-find.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/file-prefix-map.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/filenames.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/fixed-value.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/flag-types.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/flags.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/fold-const-call.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/fold-const.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/function-abi.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/function.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcc-plugin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcc-rich-location.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcc-symtab.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcov-counter.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcov-io.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcse-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gcse.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/generic-match.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gengtype.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/genrtl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gensupport.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ggc-internal.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ggc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-builder.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-expr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-fold.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-iterator.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-low.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-match.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-predict.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-pretty-print.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-ssa-evrp-analyze.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-ssa-warn-restrict.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-ssa.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-streamer.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple-walk.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimple.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimplify-me.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gimplify.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/glimits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gomp-constants.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/graph.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/graphds.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/graphite.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/graphviz.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gsstruct.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gstab.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gsyms.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gsyslimits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gtm-builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/gtype-desc.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hard-reg-set.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hash-map-traits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hash-map.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hash-set.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hash-table.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hash-traits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hashtab.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/highlev-plugin-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hooks.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hosthooks-def.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hosthooks.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hsa-brig-format.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hsa-builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hsa-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hw-doloop.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/hwint.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ifcvt.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/inchash.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/incpath.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/input.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-addr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-attr-common.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-attr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-codes.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-config.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-constants.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-flags.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-modes-inline.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-modes.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/insn-notes.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/int-vector-builder.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/internal-fn.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/internal-fn.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/intl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-fnsummary.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-icf-gimple.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-icf.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-inline.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-param-manipulation.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-predicate.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-prop.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-ref.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-reference.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ipa-utils.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ira-int.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ira.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/is-a.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/json.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/langhooks-def.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/langhooks.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lcm.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/libfuncs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/libiberty.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/limitx.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/limity.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/line-map.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/loop-unroll.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lower-subreg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lra-int.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lra.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lto-compress.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lto-section-names.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/lto-streamer.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/machmode.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/machmode.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/md5.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/mem-stats-traits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/mem-stats.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/memmodel.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/memory-block.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/mode-classes.def
-drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/objc/
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/objc/objc-tree.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/obstack.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-expand.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-general.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-grid.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-low.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-offload.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/omp-simd-clone.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/opt-problem.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/opt-suggestions.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optabs-libfuncs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optabs-query.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optabs-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optabs.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optabs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optinfo-emit-json.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/optinfo.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/options.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/opts-diagnostic.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/opts.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ordered-hash-map.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/output.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/pass-instances.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/pass_manager.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/passes.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/plugin-api.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/plugin-version.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/plugin.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/plugin.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/poly-int-types.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/poly-int.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/predict.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/predict.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/prefix.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/pretty-print.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/print-rtl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/print-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/profile-count.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/profile.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/range-op.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/range.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/read-md.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/read-rtl-function.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/real.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/realmpfr.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/recog.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/reg-notes.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/regcprop.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/regrename.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/regs.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/regset.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/reload.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/resource.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtl-error.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtl-iter.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtl.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtlhash.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtlhooks-def.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/rtx-vector-builder.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/run-rtl-passes.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/safe-ctype.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sanitizer.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sbitmap.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sched-int.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sel-sched-dump.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sel-sched-ir.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sel-sched.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/selftest-diagnostic.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/selftest-rtl.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/selftest.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sese.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/shortest-paths.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/shrink-wrap.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/signop.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sparseset.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/spellcheck-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/spellcheck.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/splay-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sreal.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ssa-iterators.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ssa.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/stab.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/statistics.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/stmt.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/stor-layout.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/streamer-hooks.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/stringpool.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/substring-locations.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/symbol-summary.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/symtab.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/sync-builtins.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/system.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/target-def.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/target-globals.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/target-hooks-macros.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/target-insns.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/target.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/target.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/targhooks.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/timevar.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/timevar.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tm-preds.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tm.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tm_p.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/toplev.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tracer.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/trans-mem.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-affine.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-cfg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-cfgcleanup.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-check.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-chrec.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-core.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-data-ref.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-dfa.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-diagnostic.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-dump.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-eh.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-hash-traits.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-hasher.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-if-conv.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-inline.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-into-ssa.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-iterator.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-nested.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-object-size.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-outof-ssa.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-parloops.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-pass.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-phinodes.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-pretty-print.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-scalar-evolution.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-sra.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-address.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-alias.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-ccp.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-coalesce.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-dce.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-dom.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-dse.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-live.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-loop-ivopts.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-loop-manip.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-loop-niter.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-loop.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-operands.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-propagate.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-sccvn.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-scopedtables.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-strlen.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-ter.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-threadedge.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa-threadupdate.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssa.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-ssanames.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-stdarg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-streamer.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-switch-conversion.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-vector-builder.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-vectorizer.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree-vrp.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/treestruct.def
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tristate.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tsan.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/tsystem.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/typeclass.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/typed-splay-tree.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/ubsan.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/valtrack.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/value-prof.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/value-range.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/varasm.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/vec-perm-indices.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/vec.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/vector-builder.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/version.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/vmsdbg.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/vr-values.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/vtable-verify.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/wide-int-bitmask.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/wide-int-print.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/wide-int.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/xcoff.h
--rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/include/xcoffout.h
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcc1plugin.la
-lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcc1plugin.so -> libcc1plugin.so.0.0.0
-lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcc1plugin.so.0 -> libcc1plugin.so.0.0.0
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcc1plugin.so.0.0.0
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcp1plugin.la
-lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcp1plugin.so -> libcp1plugin.so.0.0.0
-lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcp1plugin.so.0 -> libcp1plugin.so.0.0.0
--rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/10.3.0/plugin/libcp1plugin.so.0.0.0
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtbegin.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtbeginS.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtbeginT.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtend.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtendS.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtfastmath.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtprec32.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtprec64.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/crtprec80.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/libgcc.a
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/libgcc_eh.a
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/32/libgcov.a
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/cc1
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/cc1plus
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/collect2
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtbegin.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtbeginS.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtbeginT.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtend.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtendS.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtfastmath.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtprec32.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtprec64.o
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/crtprec80.o
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/g++-mapper-server
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/acc_prof.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/adxintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ammintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/amxbf16intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/amxint8intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/amxtileintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx2intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx5124fmapsintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx5124vnniwintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512bf16intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512bf16vlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512bitalgintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512bwintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512cdintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512dqintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512erintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512fintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512ifmaintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512ifmavlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512pfintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vbmi2intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vbmi2vlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vbmiintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vbmivlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vlbwintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vldqintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vnniintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vnnivlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vp2intersectintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vp2intersectvlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vpopcntdqintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avx512vpopcntdqvlintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avxintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/avxvnniintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/bmi2intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/bmiintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/bmmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/cet.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/cetintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/cldemoteintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/clflushoptintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/clwbintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/clzerointrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/cpuid.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/cross-stdarg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/emmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/enqcmdintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/f16cintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/float.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/fma4intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/fmaintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/fxsrintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/gcov.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/gfniintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/hresetintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ia32intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/immintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/iso646.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/keylockerintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/limits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/lwpintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/lzcntintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/mm3dnow.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/mm_malloc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/mmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/movdirintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/mwaitxintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/nmmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/omp.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/openacc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/pconfigintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/pkuintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/pmmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/popcntintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/prfchwintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/quadmath.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/quadmath_weak.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/rdseedintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/rtmintrin.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sanitizer/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sanitizer/asan_interface.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sanitizer/common_interface_defs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sanitizer/hwasan_interface.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sanitizer/lsan_interface.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sanitizer/tsan_interface.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/serializeintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/sgxintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/shaintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/smmintrin.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ssp/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ssp/ssp.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ssp/stdio.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ssp/string.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/ssp/unistd.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdalign.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdarg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdatomic.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdbool.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stddef.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdfix.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdint-gcc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdint.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/stdnoreturn.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/syslimits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/tbmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/tmmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/tsxldtrkintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/uintrintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/unwind.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/vaesintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/varargs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/vpclmulqdqintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/waitpkgintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/wbnoinvdintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/wmmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/x86gprintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/x86intrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xmmintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xopintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xsavecintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xsaveintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xsaveoptintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xsavesintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/include/xtestintrin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/libgcc.a
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/libgcc_eh.a
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/libgcov.a
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/liblto_plugin.la
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/liblto_plugin.so
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/lto-wrapper
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/lto1
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/gengtype
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/gtype.state
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ada/
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ada/gcc-interface/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ada/gcc-interface/ada-tree.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/addresses.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/alias.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/align.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/all-tree.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/alloc-pool.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ansidecl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/array-traits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/asan.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/attr-fnspec.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/attribs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/auto-host.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/auto-profile.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/b-header-vars
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/backend.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/basic-block.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/bb-reorder.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/bitmap.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/brig-builtins.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/builtin-attrs.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/builtin-types.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/builtins.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/builtins.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/bversion.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-family/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-family/c-common.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-family/c-common.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-family/c-objc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-family/c-pragma.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-family/c-pretty-print.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/c-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/calls.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ccmp.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfg-flags.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfganal.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfgbuild.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfgcleanup.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfgexpand.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfghooks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfgloop.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfgloopmanip.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cfgrtl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cgraph.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cif-code.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/collect-utils.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/collect2-aix.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/collect2.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/color-macros.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/common/
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/common/config/
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/common/config/i386/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/common/config/i386/i386-cpuinfo.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/conditions.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/dbxelf.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/elfos.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/glibc-stdint.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/gnu-user.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/att.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/biarch64.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/gnu-user-common.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/gnu-user64.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/i386-opts.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/i386-protos.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/i386.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/linux-common.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/linux64.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/stringop.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/unix.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/x86-64.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/i386/x86-tune.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/initfini-array.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/linux-android.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/linux-protos.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/linux.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/config/vxworks-dummy.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/configargs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/context.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/convert.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/coretypes.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/coroutine-builtins.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/coverage.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/cp-tree.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/cp-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/cxx-pretty-print.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/name-lookup.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/operators.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cp/type-utils.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cppbuiltin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cppdefault.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cpplib.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/cselib.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/d/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/d/d-tree.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/data-streamer.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dbgcnt.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dbgcnt.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dbxout.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dce.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ddg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/debug.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/defaults.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/df.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dfp.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic-color.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic-core.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic-event-id.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic-metadata.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic-path.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic-url.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/diagnostic.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/digraph.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dojump.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dominance.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/domwalk.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/double-int.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dump-context.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dumpfile.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dwarf2asm.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/dwarf2out.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/edit-context.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/emit-rtl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/errors.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/escaped_string.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/et-forest.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/except.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/explow.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/expmed.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/expr.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/fibonacci_heap.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/file-find.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/file-prefix-map.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/filenames.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/fixed-value.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/flag-types.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/flags.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/fold-const-call.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/fold-const.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/function-abi.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/function.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcc-plugin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcc-rich-location.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcc-symtab.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcov-counter.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcov-io.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcse-common.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gcse.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/generic-match.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gengtype.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/genrtl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gensupport.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ggc-internal.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ggc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-array-bounds.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-builder.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-expr.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-fold.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-iterator.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-low.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-match.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-predict.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-pretty-print.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-range-cache.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-range-edge.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-range-gori.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-range.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-ssa-evrp-analyze.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-ssa-warn-restrict.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-ssa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-streamer.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple-walk.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimple.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimplify-me.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gimplify.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/glimits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gomp-constants.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/graph.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/graphds.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/graphite.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/graphviz.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gsstruct.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gstab.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gsyms.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gsyslimits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gtm-builtins.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/gtype-desc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hard-reg-set.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hash-map-traits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hash-map.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hash-set.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hash-table.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hash-traits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hashtab.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/highlev-plugin-common.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hooks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hosthooks-def.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hosthooks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hw-doloop.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/hwint.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ifcvt.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/inchash.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/incpath.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/input.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-addr.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-attr-common.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-attr.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-codes.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-config.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-constants.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-flags.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-modes-inline.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-modes.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/insn-notes.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/int-vector-builder.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/internal-fn.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/internal-fn.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/intl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-fnsummary.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-icf-gimple.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-icf.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-inline.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-modref-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-modref.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-param-manipulation.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-predicate.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-prop.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-ref.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-reference.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ipa-utils.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ira-int.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ira.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/is-a.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/iterator-utils.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/json.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/langhooks-def.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/langhooks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lcm.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/libfuncs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/libiberty.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/limitx.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/limity.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/line-map.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/loop-unroll.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lower-subreg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lra-int.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lra.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lto-compress.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lto-section-names.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/lto-streamer.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/machmode.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/machmode.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/md5.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/mem-stats-traits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/mem-stats.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/memmodel.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/memory-block.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/mode-classes.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/mux-utils.h
+drwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/objc/
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/objc/objc-tree.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/obstack-utils.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/obstack.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/omp-builtins.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/omp-expand.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/omp-general.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/omp-low.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/omp-offload.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/omp-simd-clone.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/opt-problem.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/opt-suggestions.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optabs-libfuncs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optabs-query.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optabs-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optabs.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optabs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optinfo-emit-json.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/optinfo.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/options.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/opts-diagnostic.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/opts.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ordered-hash-map.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/output.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/pass-instances.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/pass_manager.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/passes.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/plugin-api.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/plugin-version.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/plugin.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/plugin.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/poly-int-types.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/poly-int.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/predict.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/predict.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/prefix.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/pretty-print.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/print-rtl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/print-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/profile-count.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/profile.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/range-op.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/range.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/read-md.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/read-rtl-function.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/real.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/realmpfr.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/recog.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/reg-notes.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/regcprop.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/regrename.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/regs.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/regset.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/reload.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/resource.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtl-error.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtl-iter.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtl-ssa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtl.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtlanal.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtlhash.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtlhooks-def.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/rtx-vector-builder.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/run-rtl-passes.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/safe-ctype.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sanitizer.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sbitmap.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sched-int.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sel-sched-dump.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sel-sched-ir.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sel-sched.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/selftest-diagnostic.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/selftest-rtl.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/selftest.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sese.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/shortest-paths.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/shrink-wrap.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/signop.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sparseset.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/spellcheck-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/spellcheck.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/splay-tree-utils.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/splay-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sreal.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ssa-iterators.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ssa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/stab.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/statistics.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/stmt.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/stor-layout.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/streamer-hooks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/stringpool.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/substring-locations.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/symbol-summary.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/symtab-clones.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/symtab-thunks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/symtab.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/sync-builtins.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/system.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/target-def.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/target-globals.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/target-hooks-macros.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/target-insns.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/target.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/target.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/targhooks.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/timevar.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/timevar.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tm-preds.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tm.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tm_p.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/toplev.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tracer.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/trans-mem.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-affine.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-cfg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-cfgcleanup.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-check.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-chrec.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-core.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-data-ref.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-dfa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-diagnostic.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-dump.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-eh.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-hash-traits.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-hasher.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-if-conv.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-inline.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-into-ssa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-iterator.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-nested.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-object-size.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-outof-ssa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-parloops.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-pass.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-phinodes.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-pretty-print.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-scalar-evolution.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-sra.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-address.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-alias-compare.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-alias.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-ccp.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-coalesce.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-dce.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-dom.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-dse.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-live.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-loop-ivopts.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-loop-manip.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-loop-niter.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-loop.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-math-opts.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-operands.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-propagate.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-reassoc.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-sccvn.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-scopedtables.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-strlen.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-ter.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-threadedge.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa-threadupdate.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssa.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-ssanames.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-stdarg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-streamer.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-switch-conversion.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-vector-builder.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-vectorizer.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree-vrp.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/treestruct.def
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tristate.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tsan.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/tsystem.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/typeclass.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/typed-splay-tree.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/ubsan.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/valtrack.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/value-prof.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/value-query.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/value-range-equiv.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/value-range.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/varasm.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/vec-perm-indices.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/vec.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/vector-builder.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/version.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/vmsdbg.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/vr-values.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/vtable-verify.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/wide-int-bitmask.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/wide-int-print.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/wide-int.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/xcoff.h
+-rw-r--r-- root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/include/xcoffout.h
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcc1plugin.la
+lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcc1plugin.so -> libcc1plugin.so.0.0.0
+lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcc1plugin.so.0 -> libcc1plugin.so.0.0.0
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcc1plugin.so.0.0.0
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcp1plugin.la
+lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcp1plugin.so -> libcp1plugin.so.0.0.0
+lrwxrwxrwx root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcp1plugin.so.0 -> libcp1plugin.so.0.0.0
+-rwxr-xr-x root/root usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/plugin/libcp1plugin.so.0.0.0
-rw-r--r-- root/root usr/lib/libasan.a
-rwxr-xr-x root/root usr/lib/libasan.la
lrwxrwxrwx root/root usr/lib/libasan.so -> libasan.so.6.0.0
@@ -1512,11 +1554,6 @@ lrwxrwxrwx root/root usr/lib/liblsan.so -> liblsan.so.0.0.0
lrwxrwxrwx root/root usr/lib/liblsan.so.0 -> liblsan.so.0.0.0
-rwxr-xr-x root/root usr/lib/liblsan.so.0.0.0
-rw-r--r-- root/root usr/lib/liblsan_preinit.o
--rw-r--r-- root/root usr/lib/libobjc.a
--rwxr-xr-x root/root usr/lib/libobjc.la
-lrwxrwxrwx root/root usr/lib/libobjc.so -> libobjc.so.4.0.0
-lrwxrwxrwx root/root usr/lib/libobjc.so.4 -> libobjc.so.4.0.0
--rwxr-xr-x root/root usr/lib/libobjc.so.4.0.0
-rw-r--r-- root/root usr/lib/libquadmath.a
-rwxr-xr-x root/root usr/lib/libquadmath.la
lrwxrwxrwx root/root usr/lib/libquadmath.so -> libquadmath.so.0.0.0
@@ -1532,9 +1569,9 @@ lrwxrwxrwx root/root usr/lib/libssp.so.0 -> libssp.so.0.0.0
-rwxr-xr-x root/root usr/lib/libssp_nonshared.la
-rw-r--r-- root/root usr/lib/libstdc++.a
-rwxr-xr-x root/root usr/lib/libstdc++.la
-lrwxrwxrwx root/root usr/lib/libstdc++.so -> libstdc++.so.6.0.28
-lrwxrwxrwx root/root usr/lib/libstdc++.so.6 -> libstdc++.so.6.0.28
--rwxr-xr-x root/root usr/lib/libstdc++.so.6.0.28
+lrwxrwxrwx root/root usr/lib/libstdc++.so -> libstdc++.so.6.0.29
+lrwxrwxrwx root/root usr/lib/libstdc++.so.6 -> libstdc++.so.6.0.29
+-rwxr-xr-x root/root usr/lib/libstdc++.so.6.0.29
-rw-r--r-- root/root usr/lib/libstdc++fs.a
-rwxr-xr-x root/root usr/lib/libstdc++fs.la
-rw-r--r-- root/root usr/lib/libsupc++.a
@@ -1576,11 +1613,6 @@ lrwxrwxrwx root/root usr/lib32/libitm.so -> libitm.so.1.0.0
lrwxrwxrwx root/root usr/lib32/libitm.so.1 -> libitm.so.1.0.0
-rwxr-xr-x root/root usr/lib32/libitm.so.1.0.0
-rw-r--r-- root/root usr/lib32/libitm.spec
--rw-r--r-- root/root usr/lib32/libobjc.a
--rwxr-xr-x root/root usr/lib32/libobjc.la
-lrwxrwxrwx root/root usr/lib32/libobjc.so -> libobjc.so.4.0.0
-lrwxrwxrwx root/root usr/lib32/libobjc.so.4 -> libobjc.so.4.0.0
--rwxr-xr-x root/root usr/lib32/libobjc.so.4.0.0
-rw-r--r-- root/root usr/lib32/libquadmath.a
-rwxr-xr-x root/root usr/lib32/libquadmath.la
lrwxrwxrwx root/root usr/lib32/libquadmath.so -> libquadmath.so.0.0.0
@@ -1596,9 +1628,9 @@ lrwxrwxrwx root/root usr/lib32/libssp.so.0 -> libssp.so.0.0.0
-rwxr-xr-x root/root usr/lib32/libssp_nonshared.la
-rw-r--r-- root/root usr/lib32/libstdc++.a
-rwxr-xr-x root/root usr/lib32/libstdc++.la
-lrwxrwxrwx root/root usr/lib32/libstdc++.so -> libstdc++.so.6.0.28
-lrwxrwxrwx root/root usr/lib32/libstdc++.so.6 -> libstdc++.so.6.0.28
--rwxr-xr-x root/root usr/lib32/libstdc++.so.6.0.28
+lrwxrwxrwx root/root usr/lib32/libstdc++.so -> libstdc++.so.6.0.29
+lrwxrwxrwx root/root usr/lib32/libstdc++.so.6 -> libstdc++.so.6.0.29
+-rwxr-xr-x root/root usr/lib32/libstdc++.so.6.0.29
-rw-r--r-- root/root usr/lib32/libstdc++fs.a
-rwxr-xr-x root/root usr/lib32/libstdc++fs.la
-rw-r--r-- root/root usr/lib32/libsupc++.a
@@ -1613,9 +1645,9 @@ drwxr-xr-x root/root usr/share/gdb/
drwxr-xr-x root/root usr/share/gdb/auto-load/
drwxr-xr-x root/root usr/share/gdb/auto-load/usr/
drwxr-xr-x root/root usr/share/gdb/auto-load/usr/lib/
--rw-r--r-- root/root usr/share/gdb/auto-load/usr/lib/libstdc++.so.6.0.28-gdb.py
+-rw-r--r-- root/root usr/share/gdb/auto-load/usr/lib/libstdc++.so.6.0.29-gdb.py
drwxr-xr-x root/root usr/share/gdb/auto-load/usr/lib32/
--rw-r--r-- root/root usr/share/gdb/auto-load/usr/lib32/libstdc++.so.6.0.28-gdb.py
+-rw-r--r-- root/root usr/share/gdb/auto-load/usr/lib32/libstdc++.so.6.0.29-gdb.py
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/cpp.1.gz
diff --git a/gcc/.signature b/gcc/.signature
index d72c74d6..8999cdca 100644
--- a/gcc/.signature
+++ b/gcc/.signature
@@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqqgjsJUC4lChIzSFru1iE8fJ5EKqr7zVZWVkYVNjbsJQVx/f+EMtIIJ9gbaabiHC/qycnSOahmsYgZk5Ri4pQgw=
-SHA256 (Pkgfile) = 9ab3e3a74da685a2539e021d2443a7f282ff4e47504a7ff9b86a75bcea311327
-SHA256 (.footprint) = 9eb4640415822db0988891e34f931e78f7366abcda21339cdea2e03b98879561
-SHA256 (gcc-10.3.0.tar.xz) = 64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344
+RWRJc1FUaeVeqvgEiPd62tBrQUsx44MtnU45Zi5us1zE/Off/jjuSpzMxtN81QIS34TJjxlhHTVVxA//cVgKHoo9iSPt6EQQxw4=
+SHA256 (Pkgfile) = f62bac88bea515733752a0c3c169e8b07b1cccb19cace159fa778d17236c9893
+SHA256 (.footprint) = 0ef47247dcb35c845297174e335713879b5ea8a6f4183622e5aa2f702f897d78
+SHA256 (gcc-11.2.0.tar.xz) = d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b
SHA256 (gcc-nocheck-fixincludes.patch) = 850a71d2c64b9f2bec31821bd972bf89c2d57764faf64948100eaf474fd63bbb
SHA256 (gcc-4.7.3-multilib-dirs.patch) = 149b151999d0afad909ca0d1eaf1f9a81c9cd6499e56989ec4fc574d108eeef6
diff --git a/gcc/Pkgfile b/gcc/Pkgfile
index 8897d2db..1244429f 100644
--- a/gcc/Pkgfile
+++ b/gcc/Pkgfile
@@ -4,30 +4,40 @@
# Depends on: zlib libmpc zstd
name=gcc
-version=10.3.0
+version=11.2.0
release=1
source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-$version/$name-$version.tar.… \
$name-nocheck-fixincludes.patch $name-4.7.3-multilib-dirs.patch)
-
build() {
+ # fix libasan.a
+ sed -e '/static.*SIGSTKSZ/d' \
+ -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
+ -i $name-$version/libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp
+
patch -d $name-$version -p1 -i $SRC/$name-nocheck-fixincludes.patch
patch -d $name-$version -p1 -i $SRC/$name-4.7.3-multilib-dirs.patch
+ # pipe fails tests
+ CFLAGS=${CFLAGS/-pipe/}
+ CXXFLAGS=${CXXFLAGS/-pipe/}
+
mkdir build
cd build
../$name-$version/configure \
--prefix=/usr \
--libexecdir=/usr/lib \
- --enable-languages=c,c++,objc \
+ --enable-languages=c,c++,lto \
--enable-threads=posix \
--enable-__cxa_atexit \
--enable-clocale=gnu \
--enable-shared \
+ --enable-lto \
--disable-nls \
--with-x=no \
--with-system-zlib \
--enable-multilib \
+ --enable-plugin \
--enable-default-pie \
--enable-default-ssp \
--with-pkgversion="CRUX-x86_64-multilib"
@@ -40,9 +50,9 @@ build() {
ln -sf g++ $PKG/usr/bin/c++
mv $PKG/usr/lib/gcc/*/$version/include-fixed/{limits.h,syslimits.h} $PKG/usr/lib/gcc/*/$version/include/
- rm -r $PKG/usr/share/{info,$name-$version}
+ rm -r $PKG/usr/share/{info,$name-$version}
rm -r $PKG/usr/bin/*-linux-gnu-*
- rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
+ rm -r $PKG/usr/lib/gcc/*/$version/{install-tools,include-fixed}
for D in lib{,32}; do
install -d -m 0755 $PKG/usr/share/gdb/auto-load/usr/${D}
1
0
commit 514d0626937dc4ecd30a2384748b713db48214ef
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:32:36 2021 +0100
glibc: 2.32 -> 2.34
diff --git a/glibc/.footprint b/glibc/.footprint
index 35a4f7aa..5ace6712 100644
--- a/glibc/.footprint
+++ b/glibc/.footprint
@@ -10,47 +10,29 @@ lrwxrwxrwx root/root etc/localtime -> ../usr/share/zoneinfo/UTC
-rw-r--r-- root/root etc/resolv.conf
-rw-r--r-- root/root etc/rpc
drwxr-xr-x root/root lib/
--rwxr-xr-x root/root lib/ld-2.32.so
-lrwxrwxrwx root/root lib/ld-linux-x86-64.so.2 -> ld-2.32.so
--rwxr-xr-x root/root lib/libBrokenLocale-2.32.so
-lrwxrwxrwx root/root lib/libBrokenLocale.so.1 -> libBrokenLocale-2.32.so
+-rwxr-xr-x root/root lib/ld-linux-x86-64.so.2
+-rwxr-xr-x root/root lib/libBrokenLocale.so.1
-rwxr-xr-x root/root lib/libSegFault.so
--rwxr-xr-x root/root lib/libanl-2.32.so
-lrwxrwxrwx root/root lib/libanl.so.1 -> libanl-2.32.so
--rwxr-xr-x root/root lib/libc-2.32.so
-lrwxrwxrwx root/root lib/libc.so.6 -> libc-2.32.so
--rwxr-xr-x root/root lib/libcrypt-2.32.so
-lrwxrwxrwx root/root lib/libcrypt.so.1 -> libcrypt-2.32.so
--rwxr-xr-x root/root lib/libdl-2.32.so
-lrwxrwxrwx root/root lib/libdl.so.2 -> libdl-2.32.so
--rwxr-xr-x root/root lib/libm-2.32.so
-lrwxrwxrwx root/root lib/libm.so.6 -> libm-2.32.so
+-rwxr-xr-x root/root lib/libanl.so.1
+-rwxr-xr-x root/root lib/libc.so.6
+-rwxr-xr-x root/root lib/libc_malloc_debug.so.0
+-rwxr-xr-x root/root lib/libcrypt.so.1
+-rwxr-xr-x root/root lib/libdl.so.2
+-rwxr-xr-x root/root lib/libm.so.6
-rwxr-xr-x root/root lib/libmemusage.so
--rwxr-xr-x root/root lib/libmvec-2.32.so
-lrwxrwxrwx root/root lib/libmvec.so.1 -> libmvec-2.32.so
--rwxr-xr-x root/root lib/libnsl-2.32.so
-lrwxrwxrwx root/root lib/libnsl.so.1 -> libnsl-2.32.so
--rwxr-xr-x root/root lib/libnss_compat-2.32.so
-lrwxrwxrwx root/root lib/libnss_compat.so.2 -> libnss_compat-2.32.so
--rwxr-xr-x root/root lib/libnss_db-2.32.so
-lrwxrwxrwx root/root lib/libnss_db.so.2 -> libnss_db-2.32.so
--rwxr-xr-x root/root lib/libnss_dns-2.32.so
-lrwxrwxrwx root/root lib/libnss_dns.so.2 -> libnss_dns-2.32.so
--rwxr-xr-x root/root lib/libnss_files-2.32.so
-lrwxrwxrwx root/root lib/libnss_files.so.2 -> libnss_files-2.32.so
--rwxr-xr-x root/root lib/libnss_hesiod-2.32.so
-lrwxrwxrwx root/root lib/libnss_hesiod.so.2 -> libnss_hesiod-2.32.so
+-rwxr-xr-x root/root lib/libmvec.so.1
+-rwxr-xr-x root/root lib/libnsl.so.1
+-rwxr-xr-x root/root lib/libnss_compat.so.2
+-rwxr-xr-x root/root lib/libnss_db.so.2
+-rwxr-xr-x root/root lib/libnss_dns.so.2
+-rwxr-xr-x root/root lib/libnss_files.so.2
+-rwxr-xr-x root/root lib/libnss_hesiod.so.2
-rwxr-xr-x root/root lib/libpcprofile.so
--rwxr-xr-x root/root lib/libpthread-2.32.so
-lrwxrwxrwx root/root lib/libpthread.so.0 -> libpthread-2.32.so
--rwxr-xr-x root/root lib/libresolv-2.32.so
-lrwxrwxrwx root/root lib/libresolv.so.2 -> libresolv-2.32.so
--rwxr-xr-x root/root lib/librt-2.32.so
-lrwxrwxrwx root/root lib/librt.so.1 -> librt-2.32.so
--rwxr-xr-x root/root lib/libthread_db-1.0.so
-lrwxrwxrwx root/root lib/libthread_db.so.1 -> libthread_db-1.0.so
--rwxr-xr-x root/root lib/libutil-2.32.so
-lrwxrwxrwx root/root lib/libutil.so.1 -> libutil-2.32.so
+-rwxr-xr-x root/root lib/libpthread.so.0
+-rwxr-xr-x root/root lib/libresolv.so.2
+-rwxr-xr-x root/root lib/librt.so.1
+-rwxr-xr-x root/root lib/libthread_db.so.1
+-rwxr-xr-x root/root lib/libutil.so.1
drwxr-xr-x root/root sbin/
-rwxr-xr-x root/root sbin/ldconfig
-rwxr-xr-x root/root sbin/sln
@@ -251,6 +233,8 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/msq.h
-rw-r--r-- root/root usr/include/bits/netdb.h
-rw-r--r-- root/root usr/include/bits/param.h
+drwxr-xr-x root/root usr/include/bits/platform/
+-rw-r--r-- root/root usr/include/bits/platform/x86.h
-rw-r--r-- root/root usr/include/bits/poll.h
-rw-r--r-- root/root usr/include/bits/poll2.h
-rw-r--r-- root/root usr/include/bits/posix1_lim.h
@@ -261,6 +245,8 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/procfs-id.h
-rw-r--r-- root/root usr/include/bits/procfs-prregset.h
-rw-r--r-- root/root usr/include/bits/procfs.h
+-rw-r--r-- root/root usr/include/bits/pthread_stack_min-dynamic.h
+-rw-r--r-- root/root usr/include/bits/pthread_stack_min.h
-rw-r--r-- root/root usr/include/bits/pthreadtypes-arch.h
-rw-r--r-- root/root usr/include/bits/pthreadtypes.h
-rw-r--r-- root/root usr/include/bits/ptrace-shared.h
@@ -285,6 +271,7 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/signum-arch.h
-rw-r--r-- root/root usr/include/bits/signum-generic.h
-rw-r--r-- root/root usr/include/bits/sigstack.h
+-rw-r--r-- root/root usr/include/bits/sigstksz.h
-rw-r--r-- root/root usr/include/bits/sigthread.h
-rw-r--r-- root/root usr/include/bits/sockaddr.h
-rw-r--r-- root/root usr/include/bits/socket-constants.h
@@ -312,6 +299,8 @@ drwxr-xr-x root/root usr/include/bits/
-rw-r--r-- root/root usr/include/bits/strings_fortified.h
-rw-r--r-- root/root usr/include/bits/struct_mutex.h
-rw-r--r-- root/root usr/include/bits/struct_rwlock.h
+-rw-r--r-- root/root usr/include/bits/struct_stat.h
+-rw-r--r-- root/root usr/include/bits/struct_stat_time64_helper.h
-rw-r--r-- root/root usr/include/bits/syscall.h
-rw-r--r-- root/root usr/include/bits/syslog-ldbl.h
-rw-r--r-- root/root usr/include/bits/syslog-path.h
@@ -357,17 +346,25 @@ drwxr-xr-x root/root usr/include/bits/types/
-rw-r--r-- root/root usr/include/bits/types/sigval_t.h
-rw-r--r-- root/root usr/include/bits/types/stack_t.h
-rw-r--r-- root/root usr/include/bits/types/struct_FILE.h
+-rw-r--r-- root/root usr/include/bits/types/struct___jmp_buf_tag.h
-rw-r--r-- root/root usr/include/bits/types/struct_iovec.h
-rw-r--r-- root/root usr/include/bits/types/struct_itimerspec.h
+-rw-r--r-- root/root usr/include/bits/types/struct_msqid64_ds.h
+-rw-r--r-- root/root usr/include/bits/types/struct_msqid64_ds_helper.h
-rw-r--r-- root/root usr/include/bits/types/struct_msqid_ds.h
-rw-r--r-- root/root usr/include/bits/types/struct_osockaddr.h
-rw-r--r-- root/root usr/include/bits/types/struct_rusage.h
-rw-r--r-- root/root usr/include/bits/types/struct_sched_param.h
+-rw-r--r-- root/root usr/include/bits/types/struct_semid64_ds.h
+-rw-r--r-- root/root usr/include/bits/types/struct_semid64_ds_helper.h
-rw-r--r-- root/root usr/include/bits/types/struct_semid_ds.h
+-rw-r--r-- root/root usr/include/bits/types/struct_shmid64_ds.h
+-rw-r--r-- root/root usr/include/bits/types/struct_shmid64_ds_helper.h
-rw-r--r-- root/root usr/include/bits/types/struct_shmid_ds.h
-rw-r--r-- root/root usr/include/bits/types/struct_sigstack.h
-rw-r--r-- root/root usr/include/bits/types/struct_statx.h
-rw-r--r-- root/root usr/include/bits/types/struct_statx_timestamp.h
+-rw-r--r-- root/root usr/include/bits/types/struct_timeb.h
-rw-r--r-- root/root usr/include/bits/types/struct_timespec.h
-rw-r--r-- root/root usr/include/bits/types/struct_timeval.h
-rw-r--r-- root/root usr/include/bits/types/struct_tm.h
@@ -435,6 +432,7 @@ drwxr-xr-x root/root usr/include/drm/
-rw-r--r-- root/root usr/include/error.h
-rw-r--r-- root/root usr/include/execinfo.h
-rw-r--r-- root/root usr/include/fcntl.h
+-rw-r--r-- root/root usr/include/features-time64.h
-rw-r--r-- root/root usr/include/features.h
-rw-r--r-- root/root usr/include/fenv.h
drwxr-xr-x root/root usr/include/finclude/
@@ -509,7 +507,6 @@ drwxr-xr-x root/root usr/include/linux/android/
-rw-r--r-- root/root usr/include/linux/auto_fs4.h
-rw-r--r-- root/root usr/include/linux/auxvec.h
-rw-r--r-- root/root usr/include/linux/ax25.h
--rw-r--r-- root/root usr/include/linux/b1lli.h
-rw-r--r-- root/root usr/include/linux/batadv_packet.h
-rw-r--r-- root/root usr/include/linux/batman_adv.h
-rw-r--r-- root/root usr/include/linux/baycom.h
@@ -541,6 +538,7 @@ drwxr-xr-x root/root usr/include/linux/can/
-rw-r--r-- root/root usr/include/linux/can/bcm.h
-rw-r--r-- root/root usr/include/linux/can/error.h
-rw-r--r-- root/root usr/include/linux/can/gw.h
+-rw-r--r-- root/root usr/include/linux/can/isotp.h
-rw-r--r-- root/root usr/include/linux/can/j1939.h
-rw-r--r-- root/root usr/include/linux/can/netlink.h
-rw-r--r-- root/root usr/include/linux/can/raw.h
@@ -556,6 +554,7 @@ drwxr-xr-x root/root usr/include/linux/can/
-rw-r--r-- root/root usr/include/linux/chio.h
drwxr-xr-x root/root usr/include/linux/cifs/
-rw-r--r-- root/root usr/include/linux/cifs/cifs_mount.h
+-rw-r--r-- root/root usr/include/linux/close_range.h
-rw-r--r-- root/root usr/include/linux/cm4000_cs.h
-rw-r--r-- root/root usr/include/linux/cn_proc.h
-rw-r--r-- root/root usr/include/linux/coda.h
@@ -579,6 +578,7 @@ drwxr-xr-x root/root usr/include/linux/cifs/
-rw-r--r-- root/root usr/include/linux/dm-ioctl.h
-rw-r--r-- root/root usr/include/linux/dm-log-userspace.h
-rw-r--r-- root/root usr/include/linux/dma-buf.h
+-rw-r--r-- root/root usr/include/linux/dma-heap.h
-rw-r--r-- root/root usr/include/linux/dn.h
-rw-r--r-- root/root usr/include/linux/dns_resolver.h
-rw-r--r-- root/root usr/include/linux/dqblk_xfs.h
@@ -596,11 +596,11 @@ drwxr-xr-x root/root usr/include/linux/dvb/
-rw-r--r-- root/root usr/include/linux/elf-em.h
-rw-r--r-- root/root usr/include/linux/elf-fdpic.h
-rw-r--r-- root/root usr/include/linux/elf.h
--rw-r--r-- root/root usr/include/linux/elfcore.h
-rw-r--r-- root/root usr/include/linux/errno.h
-rw-r--r-- root/root usr/include/linux/errqueue.h
-rw-r--r-- root/root usr/include/linux/erspan.h
-rw-r--r-- root/root usr/include/linux/ethtool.h
+-rw-r--r-- root/root usr/include/linux/ethtool_netlink.h
-rw-r--r-- root/root usr/include/linux/eventpoll.h
-rw-r--r-- root/root usr/include/linux/fadvise.h
-rw-r--r-- root/root usr/include/linux/falloc.h
@@ -630,7 +630,6 @@ drwxr-xr-x root/root usr/include/linux/dvb/
drwxr-xr-x root/root usr/include/linux/genwqe/
-rw-r--r-- root/root usr/include/linux/genwqe/genwqe_card.h
-rw-r--r-- root/root usr/include/linux/gfs2_ondisk.h
--rw-r--r-- root/root usr/include/linux/gigaset_dev.h
-rw-r--r-- root/root usr/include/linux/gpio.h
-rw-r--r-- root/root usr/include/linux/gsmmux.h
-rw-r--r-- root/root usr/include/linux/gtp.h
@@ -650,13 +649,13 @@ drwxr-xr-x root/root usr/include/linux/hsi/
-rw-r--r-- root/root usr/include/linux/hsr_netlink.h
-rw-r--r-- root/root usr/include/linux/hw_breakpoint.h
-rw-r--r-- root/root usr/include/linux/hyperv.h
--rw-r--r-- root/root usr/include/linux/hysdn_if.h
-rw-r--r-- root/root usr/include/linux/i2c-dev.h
-rw-r--r-- root/root usr/include/linux/i2c.h
-rw-r--r-- root/root usr/include/linux/i2o-dev.h
-rw-r--r-- root/root usr/include/linux/i8k.h
-rw-r--r-- root/root usr/include/linux/icmp.h
-rw-r--r-- root/root usr/include/linux/icmpv6.h
+-rw-r--r-- root/root usr/include/linux/idxd.h
-rw-r--r-- root/root usr/include/linux/if.h
-rw-r--r-- root/root usr/include/linux/if_addr.h
-rw-r--r-- root/root usr/include/linux/if_addrlabel.h
@@ -761,8 +760,6 @@ drwxr-xr-x root/root usr/include/linux/isdn/
-rw-r--r-- root/root usr/include/linux/memfd.h
-rw-r--r-- root/root usr/include/linux/mempolicy.h
-rw-r--r-- root/root usr/include/linux/meye.h
--rw-r--r-- root/root usr/include/linux/mic_common.h
--rw-r--r-- root/root usr/include/linux/mic_ioctl.h
-rw-r--r-- root/root usr/include/linux/mii.h
-rw-r--r-- root/root usr/include/linux/minix_fs.h
-rw-r--r-- root/root usr/include/linux/mman.h
@@ -773,9 +770,11 @@ drwxr-xr-x root/root usr/include/linux/mmc/
-rw-r--r-- root/root usr/include/linux/mount.h
-rw-r--r-- root/root usr/include/linux/mpls.h
-rw-r--r-- root/root usr/include/linux/mpls_iptunnel.h
+-rw-r--r-- root/root usr/include/linux/mptcp.h
-rw-r--r-- root/root usr/include/linux/mqueue.h
-rw-r--r-- root/root usr/include/linux/mroute.h
-rw-r--r-- root/root usr/include/linux/mroute6.h
+-rw-r--r-- root/root usr/include/linux/mrp_bridge.h
-rw-r--r-- root/root usr/include/linux/msdos_fs.h
-rw-r--r-- root/root usr/include/linux/msg.h
-rw-r--r-- root/root usr/include/linux/mtio.h
@@ -959,6 +958,7 @@ drwxr-xr-x root/root usr/include/linux/nfsd/
-rw-r--r-- root/root usr/include/linux/nfsd/stats.h
-rw-r--r-- root/root usr/include/linux/nilfs2_api.h
-rw-r--r-- root/root usr/include/linux/nilfs2_ondisk.h
+-rw-r--r-- root/root usr/include/linux/nitro_enclaves.h
-rw-r--r-- root/root usr/include/linux/nl80211.h
-rw-r--r-- root/root usr/include/linux/nsfs.h
-rw-r--r-- root/root usr/include/linux/nubus.h
@@ -967,6 +967,7 @@ drwxr-xr-x root/root usr/include/linux/nfsd/
-rw-r--r-- root/root usr/include/linux/omap3isp.h
-rw-r--r-- root/root usr/include/linux/omapfb.h
-rw-r--r-- root/root usr/include/linux/oom.h
+-rw-r--r-- root/root usr/include/linux/openat2.h
-rw-r--r-- root/root usr/include/linux/openvswitch.h
-rw-r--r-- root/root usr/include/linux/packet_diag.h
-rw-r--r-- root/root usr/include/linux/param.h
@@ -981,6 +982,7 @@ drwxr-xr-x root/root usr/include/linux/nfsd/
-rw-r--r-- root/root usr/include/linux/pg.h
-rw-r--r-- root/root usr/include/linux/phantom.h
-rw-r--r-- root/root usr/include/linux/phonet.h
+-rw-r--r-- root/root usr/include/linux/pidfd.h
-rw-r--r-- root/root usr/include/linux/pkt_cls.h
-rw-r--r-- root/root usr/include/linux/pkt_sched.h
-rw-r--r-- root/root usr/include/linux/pktcdvd.h
@@ -1016,6 +1018,7 @@ drwxr-xr-x root/root usr/include/linux/raid/
-rw-r--r-- root/root usr/include/linux/reboot.h
-rw-r--r-- root/root usr/include/linux/reiserfs_fs.h
-rw-r--r-- root/root usr/include/linux/reiserfs_xattr.h
+-rw-r--r-- root/root usr/include/linux/remoteproc_cdev.h
-rw-r--r-- root/root usr/include/linux/resource.h
-rw-r--r-- root/root usr/include/linux/rfkill.h
-rw-r--r-- root/root usr/include/linux/rio_cm_cdev.h
@@ -1023,6 +1026,8 @@ drwxr-xr-x root/root usr/include/linux/raid/
-rw-r--r-- root/root usr/include/linux/romfs_fs.h
-rw-r--r-- root/root usr/include/linux/rose.h
-rw-r--r-- root/root usr/include/linux/route.h
+-rw-r--r-- root/root usr/include/linux/rpl.h
+-rw-r--r-- root/root usr/include/linux/rpl_iptunnel.h
-rw-r--r-- root/root usr/include/linux/rpmsg.h
-rw-r--r-- root/root usr/include/linux/rseq.h
-rw-r--r-- root/root usr/include/linux/rtc.h
@@ -1089,6 +1094,7 @@ drwxr-xr-x root/root usr/include/linux/tc_act/
-rw-r--r-- root/root usr/include/linux/tc_act/tc_ctinfo.h
-rw-r--r-- root/root usr/include/linux/tc_act/tc_defact.h
-rw-r--r-- root/root usr/include/linux/tc_act/tc_gact.h
+-rw-r--r-- root/root usr/include/linux/tc_act/tc_gate.h
-rw-r--r-- root/root usr/include/linux/tc_act/tc_ife.h
-rw-r--r-- root/root usr/include/linux/tc_act/tc_ipt.h
-rw-r--r-- root/root usr/include/linux/tc_act/tc_mirred.h
@@ -1134,6 +1140,7 @@ drwxr-xr-x root/root usr/include/linux/tc_ematch/
-rw-r--r-- root/root usr/include/linux/uio.h
-rw-r--r-- root/root usr/include/linux/uleds.h
-rw-r--r-- root/root usr/include/linux/ultrasound.h
+-rw-r--r-- root/root usr/include/linux/um_timetravel.h
-rw-r--r-- root/root usr/include/linux/un.h
-rw-r--r-- root/root usr/include/linux/unistd.h
-rw-r--r-- root/root usr/include/linux/unix_diag.h
@@ -1149,6 +1156,7 @@ drwxr-xr-x root/root usr/include/linux/usb/
-rw-r--r-- root/root usr/include/linux/usb/g_uvc.h
-rw-r--r-- root/root usr/include/linux/usb/gadgetfs.h
-rw-r--r-- root/root usr/include/linux/usb/midi.h
+-rw-r--r-- root/root usr/include/linux/usb/raw_gadget.h
-rw-r--r-- root/root usr/include/linux/usb/tmc.h
-rw-r--r-- root/root usr/include/linux/usb/video.h
-rw-r--r-- root/root usr/include/linux/usbdevice_fs.h
@@ -1171,6 +1179,7 @@ drwxr-xr-x root/root usr/include/linux/usb/
-rw-r--r-- root/root usr/include/linux/veth.h
-rw-r--r-- root/root usr/include/linux/vfio.h
-rw-r--r-- root/root usr/include/linux/vfio_ccw.h
+-rw-r--r-- root/root usr/include/linux/vfio_zdev.h
-rw-r--r-- root/root usr/include/linux/vhost.h
-rw-r--r-- root/root usr/include/linux/vhost_types.h
-rw-r--r-- root/root usr/include/linux/videodev2.h
@@ -1185,6 +1194,7 @@ drwxr-xr-x root/root usr/include/linux/usb/
-rw-r--r-- root/root usr/include/linux/virtio_ids.h
-rw-r--r-- root/root usr/include/linux/virtio_input.h
-rw-r--r-- root/root usr/include/linux/virtio_iommu.h
+-rw-r--r-- root/root usr/include/linux/virtio_mem.h
-rw-r--r-- root/root usr/include/linux/virtio_mmio.h
-rw-r--r-- root/root usr/include/linux/virtio_net.h
-rw-r--r-- root/root usr/include/linux/virtio_pci.h
@@ -1201,10 +1211,12 @@ drwxr-xr-x root/root usr/include/linux/usb/
-rw-r--r-- root/root usr/include/linux/vt.h
-rw-r--r-- root/root usr/include/linux/vtpm_proxy.h
-rw-r--r-- root/root usr/include/linux/wait.h
+-rw-r--r-- root/root usr/include/linux/watch_queue.h
-rw-r--r-- root/root usr/include/linux/watchdog.h
-rw-r--r-- root/root usr/include/linux/wimax.h
drwxr-xr-x root/root usr/include/linux/wimax/
-rw-r--r-- root/root usr/include/linux/wimax/i2400m.h
+-rw-r--r-- root/root usr/include/linux/wireguard.h
-rw-r--r-- root/root usr/include/linux/wireless.h
-rw-r--r-- root/root usr/include/linux/wmi.h
-rw-r--r-- root/root usr/include/linux/x25.h
@@ -1224,6 +1236,10 @@ drwxr-xr-x root/root usr/include/misc/
-rw-r--r-- root/root usr/include/misc/fastrpc.h
-rw-r--r-- root/root usr/include/misc/habanalabs.h
-rw-r--r-- root/root usr/include/misc/ocxl.h
+-rw-r--r-- root/root usr/include/misc/pvpanic.h
+drwxr-xr-x root/root usr/include/misc/uacce/
+-rw-r--r-- root/root usr/include/misc/uacce/hisi_qm.h
+-rw-r--r-- root/root usr/include/misc/uacce/uacce.h
-rw-r--r-- root/root usr/include/misc/xilinx_sdfec.h
-rw-r--r-- root/root usr/include/mntent.h
-rw-r--r-- root/root usr/include/monetary.h
@@ -1297,7 +1313,6 @@ drwxr-xr-x root/root usr/include/protocols/
-rw-r--r-- root/root usr/include/pwd.h
drwxr-xr-x root/root usr/include/rdma/
-rw-r--r-- root/root usr/include/rdma/bnxt_re-abi.h
--rw-r--r-- root/root usr/include/rdma/cxgb3-abi.h
-rw-r--r-- root/root usr/include/rdma/cxgb4-abi.h
-rw-r--r-- root/root usr/include/rdma/efa-abi.h
drwxr-xr-x root/root usr/include/rdma/hfi/
@@ -1414,6 +1429,8 @@ drwxr-xr-x root/root usr/include/sys/
-rw-r--r-- root/root usr/include/sys/pci.h
-rw-r--r-- root/root usr/include/sys/perm.h
-rw-r--r-- root/root usr/include/sys/personality.h
+drwxr-xr-x root/root usr/include/sys/platform/
+-rw-r--r-- root/root usr/include/sys/platform/x86.h
-rw-r--r-- root/root usr/include/sys/poll.h
-rw-r--r-- root/root usr/include/sys/prctl.h
-rw-r--r-- root/root usr/include/sys/procfs.h
@@ -1463,7 +1480,6 @@ drwxr-xr-x root/root usr/include/sys/
-rw-r--r-- root/root usr/include/sys/vlimit.h
-rw-r--r-- root/root usr/include/sys/vm86.h
-rw-r--r-- root/root usr/include/sys/vt.h
--rw-r--r-- root/root usr/include/sys/vtimes.h
-rw-r--r-- root/root usr/include/sys/wait.h
-rw-r--r-- root/root usr/include/sys/xattr.h
-rw-r--r-- root/root usr/include/syscall.h
@@ -1755,6 +1771,8 @@ drwxr-xr-x root/root usr/lib/gconv/
-rwxr-xr-x root/root usr/lib/gconv/UTF-7.so
-rwxr-xr-x root/root usr/lib/gconv/VISCII.so
-rw-r--r-- root/root usr/lib/gconv/gconv-modules
+drwxr-xr-x root/root usr/lib/gconv/gconv-modules.d/
+-rw-r--r-- root/root usr/lib/gconv/gconv-modules.d/gconv-modules-extra.conf
-rwxr-xr-x root/root usr/lib/gconv/libCNS.so
-rwxr-xr-x root/root usr/lib/gconv/libGB.so
-rwxr-xr-x root/root usr/lib/gconv/libISOIR165.so
@@ -1766,19 +1784,20 @@ drwxr-xr-x root/root usr/lib/getconf/
-rwxr-xr-x root/root usr/lib/getconf/POSIX_V6_LP64_OFF64
-rwxr-xr-x root/root usr/lib/getconf/POSIX_V7_LP64_OFF64
-rwxr-xr-x root/root usr/lib/getconf/XBS5_LP64_OFF64
+-rw-r--r-- root/root usr/lib/grcrt1.o
-rw-r--r-- root/root usr/lib/libBrokenLocale.a
lrwxrwxrwx root/root usr/lib/libBrokenLocale.so -> ../../lib/libBrokenLocale.so.1
-rw-r--r-- root/root usr/lib/libanl.a
lrwxrwxrwx root/root usr/lib/libanl.so -> ../../lib/libanl.so.1
-rw-r--r-- root/root usr/lib/libc.a
-rw-r--r-- root/root usr/lib/libc.so
+lrwxrwxrwx root/root usr/lib/libc_malloc_debug.so -> ../../lib/libc_malloc_debug.so.0
-rw-r--r-- root/root usr/lib/libc_nonshared.a
-rw-r--r-- root/root usr/lib/libcrypt.a
lrwxrwxrwx root/root usr/lib/libcrypt.so -> ../../lib/libcrypt.so.1
-rw-r--r-- root/root usr/lib/libdl.a
-lrwxrwxrwx root/root usr/lib/libdl.so -> ../../lib/libdl.so.2
-rw-r--r-- root/root usr/lib/libg.a
--rw-r--r-- root/root usr/lib/libm-2.32.a
+-rw-r--r-- root/root usr/lib/libm-2.34.a
-rw-r--r-- root/root usr/lib/libm.a
-rw-r--r-- root/root usr/lib/libm.so
-rw-r--r-- root/root usr/lib/libmcheck.a
@@ -1786,19 +1805,16 @@ lrwxrwxrwx root/root usr/lib/libdl.so -> ../../lib/libdl.so.2
lrwxrwxrwx root/root usr/lib/libmvec.so -> ../../lib/libmvec.so.1
lrwxrwxrwx root/root usr/lib/libnss_compat.so -> ../../lib/libnss_compat.so.2
lrwxrwxrwx root/root usr/lib/libnss_db.so -> ../../lib/libnss_db.so.2
-lrwxrwxrwx root/root usr/lib/libnss_dns.so -> ../../lib/libnss_dns.so.2
-lrwxrwxrwx root/root usr/lib/libnss_files.so -> ../../lib/libnss_files.so.2
lrwxrwxrwx root/root usr/lib/libnss_hesiod.so -> ../../lib/libnss_hesiod.so.2
-rw-r--r-- root/root usr/lib/libpthread.a
-lrwxrwxrwx root/root usr/lib/libpthread.so -> ../../lib/libpthread.so.0
-rw-r--r-- root/root usr/lib/libresolv.a
lrwxrwxrwx root/root usr/lib/libresolv.so -> ../../lib/libresolv.so.2
-rw-r--r-- root/root usr/lib/librt.a
-lrwxrwxrwx root/root usr/lib/librt.so -> ../../lib/librt.so.1
lrwxrwxrwx root/root usr/lib/libthread_db.so -> ../../lib/libthread_db.so.1
-rw-r--r-- root/root usr/lib/libutil.a
-lrwxrwxrwx root/root usr/lib/libutil.so -> ../../lib/libutil.so.1
drwxr-xr-x root/root usr/lib/locale/
+-rw-r--r-- root/root usr/lib/locale/locale-archive
+-rw-r--r-- root/root usr/lib/rcrt1.o
drwxr-xr-x root/root usr/sbin/
-rwxr-xr-x root/root usr/sbin/iconvconfig
-rwxr-xr-x root/root usr/sbin/nscd
@@ -2039,6 +2055,7 @@ drwxr-xr-x root/root usr/share/i18n/charmaps/
-rw-r--r-- root/root usr/share/i18n/charmaps/VISCII.gz
-rw-r--r-- root/root usr/share/i18n/charmaps/WINDOWS-31J.gz
drwxr-xr-x root/root usr/share/i18n/locales/
+-rw-r--r-- root/root usr/share/i18n/locales/C
-rw-r--r-- root/root usr/share/i18n/locales/POSIX
-rw-r--r-- root/root usr/share/i18n/locales/aa_DJ
-rw-r--r-- root/root usr/share/i18n/locales/aa_ER
diff --git a/glibc/.signature b/glibc/.signature
index f0d0d455..8de98650 100644
--- a/glibc/.signature
+++ b/glibc/.signature
@@ -1,10 +1,13 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqkRgbm9Tt3SQmNdovthr26upk4hKJQ4CQPSGukiLSmbpEZl3y+YG1MT4883f5lEsDs2fsDBSvRPBxj19tyXKhws=
-SHA256 (Pkgfile) = 83be9dd155cdb0c9e8ef7fcecdfafe55959214ac55f2b0f3c7875b9818481505
-SHA256 (.footprint) = aa29daaba0d990bb954964b7605cf132588bcb5ee9cf56d219f2ed26e60eba7b
-SHA256 (glibc-2.32.tar.xz) = 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
-SHA256 (linux-5.4.72.tar.xz) = 0e24645bd56fe5b55a7a662895f5562c103d71b54d097281f0c9c71ff22c1172
-SHA256 (glibc-2.32-5.patch) = 195b66ab42fd8fa82119b720e0432faebac2087cd16943d230d4839e4d308dcf
+RWRJc1FUaeVeqvKhXIzyuug5zMxiqQzi5AB959uIdPTkaIOfxi4NPS1TMt+DakFGiZokfW7j+0f9rCTS8hG2gC7SLY4p90cerw8=
+SHA256 (Pkgfile) = 28b166045febad3ccd774d1e6fa76090e13e13dd9b6deb8f843363e82df27135
+SHA256 (.footprint) = bf89f76f349c6872809f814548b0e58b1ef67fe374f6ec9c17a99dbe64c1fa1f
+SHA256 (glibc-2.34.tar.xz) = 44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2
+SHA256 (linux-5.10.tar.xz) = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
+SHA256 (bz27343.patch) = 1caa9946bb15f6a84193a7a6ed4e4a77006085ef6728de7ede8cc9694534c24e
+SHA256 (glibc-python3.patch) = 4a6511436c8abb708f5cb7e9baaf9812f2dc4bb5665a9376c1e270eae4f8b14f
+SHA256 (glibc-c-utf8-locale-1.patch) = c48c306658ede269fb4a43140d41a3f609bffd17a8f661127e3e4dde48b85cd4
+SHA256 (glibc-c-utf8-locale-2.patch) = a9d3c0660e6a48bb22dc77afbc7bb47ce79ca0d8c2ee8ebee4228d8d4952214e
SHA256 (hosts) = 5c02b256c105f1d4a12fb738d71c1bab9eb126533074d7a0c8a14b92670c9431
SHA256 (resolv.conf) = 72ccb58768a72a771ec37142bc361a18478a07ec9de6e925a20760794389bf51
SHA256 (nsswitch.conf) = 859b8984e5e90aff3cce8f9779996ae4033b280d2122840e9411e2f44a1c2e61
diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index c6a6b4f3..505d9220 100644
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -1,44 +1,60 @@
# Description: The C library used in the GNU system
-# URL: http://www.gnu.org/software/libc/
-# Maintainer: CRUX System Team, core-ports at crux dot nu
+# URL: http://www.gnu.org/software/libc/
+# Maintainer:
name=glibc
-version=2.32
-release=5
-source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
- https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.tar.xz \
- glibc-$version-5.patch \
- hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
+version=2.34
+release=1
+source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz
+ https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+ bz27343.patch glibc-python3.patch
+ glibc-c-utf8-locale-1.patch glibc-c-utf8-locale-2.patch
+ hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
build() {
# install kernel headers
- cd linux-5.4.72
- make mrproper
- make headers_check
- make INSTALL_HDR_PATH=$PKG/usr headers_install
+ #cd linux-5.10
+ make -C $SRC/linux-5.10 mrproper
+ make -C $SRC/linux-5.10 headers_check
+ make -C $SRC/linux-5.10 INSTALL_HDR_PATH=$PKG/usr headers_install
chown root:root $PKG/usr
- patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-5.patch
+ patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-python3.patch
+ patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-c-utf8-locale-1.patch
+ patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-c-utf8-locale-2.patch
mkdir $SRC/build
cd $SRC/build
- ../$name-${version}/configure \
+
+ echo "slibdir=/lib" >> configparms
+ echo "rtlddir=/lib" >> configparms
+ echo "sbindir=/usr/sbin" >> configparms
+ echo "rootsbindir=/sbin" >> configparms
+
+ $SRC/$name-${version}/configure \
--prefix=/usr \
+ --libdir=/usr/lib \
--libexecdir=/usr/lib \
--with-headers=$PKG/usr/include \
+ --with-pkgversion="$version-$release" \
+ --with-bugurl='https://crux.nu/bugs' \
--enable-kernel=4.9 \
--enable-add-ons \
- --enable-static-nss \
+ --enable-lock-elision \
+ --enable-bind-now \
+ --enable-static-pie \
--enable-stack-protector=strong \
+ --enable-stackguard-randomization \
+ --enable-multi-arch \
+ --without-gd \
--disable-profile \
--disable-werror \
- --without-gd \
- --enable-multi-arch
- make
+ libc_cv_slibdir=/lib
+ make
#make check
make install_root=$PKG install
- install -m 0644 $SRC/$name-${version:0:4}/nscd/nscd.conf $PKG/etc
+ install -m 0644 $SRC/$name-${version:0:4}/nscd/nscd.conf $PKG/etc
install -d $PKG/var/{db,run}/nscd
install -m 0644 $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc
@@ -47,9 +63,13 @@ build() {
install -d $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale
touch $PKG/etc/ld.so.cache
+ # to be used with pkgmk
+ $PKG/usr/bin/localedef --prefix "$PKG" -i C -f UTF-8 C.UTF-8
+
rm -rf $PKG/usr/share/{info,locale} \
$PKG/usr/bin/tzselect \
$PKG/usr/sbin/z{dump,ic}
find $PKG -name "*install.cmd" -delete
find $PKG -name ".\install" -delete
+ rm -r $PKG/usr/bin/zdump
}
diff --git a/glibc/bz27343.patch b/glibc/bz27343.patch
new file mode 100644
index 00000000..3db6a944
--- /dev/null
+++ b/glibc/bz27343.patch
@@ -0,0 +1,48 @@
+From c3479fb7939898ec22c655c383454d6e8b982a67 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox(a)gentoo.org>
+Date: Fri, 5 Feb 2021 07:32:18 +0000
+Subject: [PATCH] nsswitch: return result when nss database is locked [BZ
+ #27343]
+
+Before the change nss_database_check_reload_and_get() did not populate
+the '*result' value when it returned success in a case of chroot
+detection. This caused initgroups() to use garage pointer in the
+following test (extracted from unbound):
+
+```
+
+int main() {
+ // load some NSS modules
+ struct passwd * pw = getpwnam("root");
+
+ chdir("/tmp");
+ chroot("/tmp");
+ chdir("/");
+ // access nsswitch.conf in a chroot
+ initgroups("root", 0);
+}
+```
+
+Reviewed-by: DJ Delorie <dj(a)redhat.com>
+---
+ nss/nss_database.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/nss/nss_database.c b/nss/nss_database.c
+index cf0306adc4..e1bef6bd75 100644
+--- a/nss/nss_database.c
++++ b/nss/nss_database.c
+@@ -398,8 +398,9 @@ nss_database_check_reload_and_get (struct nss_database_state *local,
+ && (str.st_ino != local->root_ino
+ || str.st_dev != local->root_dev)))
+ {
+- /* Change detected; disable reloading. */
++ /* Change detected; disable reloading and return current state. */
+ atomic_store_release (&local->data.reload_disabled, 1);
++ *result = local->data.services[database_index];
+ __libc_lock_unlock (local->lock);
+ __nss_module_disable_loading ();
+ return true;
+--
+2.27.0
+
diff --git a/glibc/glibc-2.32-5.patch b/glibc/glibc-2.32-5.patch
deleted file mode 100644
index b08b1624..00000000
--- a/glibc/glibc-2.32-5.patch
+++ /dev/null
@@ -1,6165 +0,0 @@
-diff -pruN glibc-2.32.orig/debug/Makefile glibc-2.32/debug/Makefile
---- glibc-2.32.orig/debug/Makefile 2021-09-18 21:02:32.642182626 +1000
-+++ glibc-2.32/debug/Makefile 2021-09-18 21:03:05.310302219 +1000
-@@ -51,7 +51,7 @@ routines = backtrace backtracesyms back
- explicit_bzero_chk \
- stack_chk_fail fortify_fail \
- $(static-only-routines)
--static-only-routines := warning-nop stack_chk_fail_local
-+static-only-routines := stack_chk_fail_local
-
- # Don't add stack_chk_fail_local.o to libc.a since __stack_chk_fail_local
- # is an alias of __stack_chk_fail in stack_chk_fail.o.
-diff -pruN glibc-2.32.orig/debug/warning-nop.c glibc-2.32/debug/warning-nop.c
---- glibc-2.32.orig/debug/warning-nop.c 2021-09-18 21:02:32.642182626 +1000
-+++ glibc-2.32/debug/warning-nop.c 1970-01-01 10:00:00.000000000 +1000
-@@ -1,70 +0,0 @@
--/* Dummy nop functions to elicit link-time warnings.
-- Copyright (C) 2005-2020 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- In addition to the permissions in the GNU Lesser General Public
-- License, the Free Software Foundation gives you unlimited
-- permission to link the compiled version of this file with other
-- programs, and to distribute those programs without any restriction
-- coming from the use of this file. (The GNU Lesser General Public
-- License restrictions do apply in other respects; for example, they
-- cover modification of the file, and distribution when not linked
-- into another program.)
--
-- Note that people who make modified versions of this file are not
-- obligated to grant this special exception for their modified
-- versions; it is their choice whether to do so. The GNU Lesser
-- General Public License gives permission to release a modified
-- version without this exception; this exception also makes it
-- possible to release a modified version which carries forward this
-- exception.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, see
-- <https://www.gnu.org/licenses/>. */
--
--#include <sys/cdefs.h>
--
--static void
--__attribute__ ((used))
--nop (void)
--{
--}
--
--/* Don't insert any other #include's before this #undef! */
--
--#undef __warndecl
--#define __warndecl(name, msg) \
-- extern void name (void) __attribute__ ((alias ("nop"))) attribute_hidden; \
-- link_warning (name, msg)
--
--#undef __USE_FORTIFY_LEVEL
--#define __USE_FORTIFY_LEVEL 99
--
--/* Following here we need an #include for each public header file
-- that uses __warndecl. */
--
--/* Define away to avoid warnings with compilers that do not have these
-- builtins. */
--#define __builtin___memcpy_chk(dest, src, len, bos) NULL
--#define __builtin___memmove_chk(dest, src, len, bos) NULL
--#define __builtin___mempcpy_chk(dest, src, len, bos) NULL
--#define __builtin___memset_chk(dest, ch, len, bos) NULL
--#define __builtin___stpcpy_chk(dest, src, bos) NULL
--#define __builtin___strcat_chk(dest, src, bos) NULL
--#define __builtin___strcpy_chk(dest, src, bos) NULL
--#define __builtin___strncat_chk(dest, src, len, bos) NULL
--#define __builtin___strncpy_chk(dest, src, len, bos) NULL
--#define __builtin_object_size(bos, level) 0
--
--#include <string.h>
-diff -pruN glibc-2.32.orig/elf/dl-load.c glibc-2.32/elf/dl-load.c
---- glibc-2.32.orig/elf/dl-load.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/dl-load.c 2021-09-18 21:03:05.311302253 +1000
-@@ -855,10 +855,12 @@ lose (int code, int fd, const char *name
-
- /* Process PT_GNU_PROPERTY program header PH in module L after
- PT_LOAD segments are mapped. Only one NT_GNU_PROPERTY_TYPE_0
-- note is handled which contains processor specific properties. */
-+ note is handled which contains processor specific properties.
-+ FD is -1 for the kernel mapped main executable otherwise it is
-+ the fd used for loading module L. */
-
- void
--_dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr);
- const ElfW(Addr) size = ph->p_memsz;
-@@ -905,7 +907,7 @@ _dl_process_pt_gnu_property (struct link
- last_type = type;
-
- /* Target specific property processing. */
-- if (_dl_process_gnu_property (l, type, datasz, ptr) == 0)
-+ if (_dl_process_gnu_property (l, fd, type, datasz, ptr) == 0)
- return;
-
- /* Check the next property item. */
-@@ -1251,21 +1253,6 @@ _dl_map_object_from_fd (const char *name
- maplength, has_holes, loader);
- if (__glibc_unlikely (errstring != NULL))
- goto call_lose;
--
-- /* Process program headers again after load segments are mapped in
-- case processing requires accessing those segments. Scan program
-- headers backward so that PT_NOTE can be skipped if PT_GNU_PROPERTY
-- exits. */
-- for (ph = &phdr[l->l_phnum]; ph != phdr; --ph)
-- switch (ph[-1].p_type)
-- {
-- case PT_NOTE:
-- _dl_process_pt_note (l, &ph[-1]);
-- break;
-- case PT_GNU_PROPERTY:
-- _dl_process_pt_gnu_property (l, &ph[-1]);
-- break;
-- }
- }
-
- if (l->l_ld == 0)
-@@ -1377,6 +1364,21 @@ cannot enable executable stack as shared
- if (l->l_tls_initimage != NULL)
- l->l_tls_initimage = (char *) l->l_tls_initimage + l->l_addr;
-
-+ /* Process program headers again after load segments are mapped in
-+ case processing requires accessing those segments. Scan program
-+ headers backward so that PT_NOTE can be skipped if PT_GNU_PROPERTY
-+ exits. */
-+ for (ph = &l->l_phdr[l->l_phnum]; ph != l->l_phdr; --ph)
-+ switch (ph[-1].p_type)
-+ {
-+ case PT_NOTE:
-+ _dl_process_pt_note (l, fd, &ph[-1]);
-+ break;
-+ case PT_GNU_PROPERTY:
-+ _dl_process_pt_gnu_property (l, fd, &ph[-1]);
-+ break;
-+ }
-+
- /* We are done mapping in the file. We no longer need the descriptor. */
- if (__glibc_unlikely (__close_nocancel (fd) != 0))
- {
-diff -pruN glibc-2.32.orig/elf/dl-tunables.c glibc-2.32/elf/dl-tunables.c
---- glibc-2.32.orig/elf/dl-tunables.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/dl-tunables.c 2021-09-18 21:03:05.311302253 +1000
-@@ -177,6 +177,7 @@ parse_tunables (char *tunestr, char *val
- return;
-
- char *p = tunestr;
-+ size_t off = 0;
-
- while (true)
- {
-@@ -190,7 +191,11 @@ parse_tunables (char *tunestr, char *val
- /* If we reach the end of the string before getting a valid name-value
- pair, bail out. */
- if (p[len] == '\0')
-- return;
-+ {
-+ if (__libc_enable_secure)
-+ tunestr[off] = '\0';
-+ return;
-+ }
-
- /* We did not find a valid name-value pair before encountering the
- colon. */
-@@ -216,35 +221,28 @@ parse_tunables (char *tunestr, char *val
-
- if (tunable_is_name (cur->name, name))
- {
-- /* If we are in a secure context (AT_SECURE) then ignore the tunable
-- unless it is explicitly marked as secure. Tunable values take
-- precedence over their envvar aliases. */
-+ /* If we are in a secure context (AT_SECURE) then ignore the
-+ tunable unless it is explicitly marked as secure. Tunable
-+ values take precedence over their envvar aliases. We write
-+ the tunables that are not SXID_ERASE back to TUNESTR, thus
-+ dropping all SXID_ERASE tunables and any invalid or
-+ unrecognized tunables. */
- if (__libc_enable_secure)
- {
-- if (cur->security_level == TUNABLE_SECLEVEL_SXID_ERASE)
-+ if (cur->security_level != TUNABLE_SECLEVEL_SXID_ERASE)
- {
-- if (p[len] == '\0')
-- {
-- /* Last tunable in the valstring. Null-terminate and
-- return. */
-- *name = '\0';
-- return;
-- }
-- else
-- {
-- /* Remove the current tunable from the string. We do
-- this by overwriting the string starting from NAME
-- (which is where the current tunable begins) with
-- the remainder of the string. We then have P point
-- to NAME so that we continue in the correct
-- position in the valstring. */
-- char *q = &p[len + 1];
-- p = name;
-- while (*q != '\0')
-- *name++ = *q++;
-- name[0] = '\0';
-- len = 0;
-- }
-+ if (off > 0)
-+ tunestr[off++] = ':';
-+
-+ const char *n = cur->name;
-+
-+ while (*n != '\0')
-+ tunestr[off++] = *n++;
-+
-+ tunestr[off++] = '=';
-+
-+ for (size_t j = 0; j < len; j++)
-+ tunestr[off++] = value[j];
- }
-
- if (cur->security_level != TUNABLE_SECLEVEL_NONE)
-@@ -257,9 +255,7 @@ parse_tunables (char *tunestr, char *val
- }
- }
-
-- if (p[len] == '\0')
-- return;
-- else
-+ if (p[len] != '\0')
- p += len + 1;
- }
- }
-diff -pruN glibc-2.32.orig/elf/ifuncmain6pie.c glibc-2.32/elf/ifuncmain6pie.c
---- glibc-2.32.orig/elf/ifuncmain6pie.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/ifuncmain6pie.c 2021-09-18 21:03:05.311302253 +1000
-@@ -9,7 +9,6 @@
- #include "ifunc-sel.h"
-
- typedef int (*foo_p) (void);
--extern foo_p foo_ptr;
-
- static int
- one (void)
-@@ -28,20 +27,17 @@ foo_ifunc (void)
- }
-
- extern int foo (void);
--extern foo_p get_foo (void);
-+extern int call_foo (void);
- extern foo_p get_foo_p (void);
-
--foo_p my_foo_ptr = foo;
-+foo_p foo_ptr = foo;
-
- int
- main (void)
- {
- foo_p p;
-
-- p = get_foo ();
-- if (p != foo)
-- abort ();
-- if ((*p) () != -30)
-+ if (call_foo () != -30)
- abort ();
-
- p = get_foo_p ();
-@@ -52,12 +48,8 @@ main (void)
-
- if (foo_ptr != foo)
- abort ();
-- if (my_foo_ptr != foo)
-- abort ();
- if ((*foo_ptr) () != -30)
- abort ();
-- if ((*my_foo_ptr) () != -30)
-- abort ();
- if (foo () != -30)
- abort ();
-
-diff -pruN glibc-2.32.orig/elf/ifuncmod6.c glibc-2.32/elf/ifuncmod6.c
---- glibc-2.32.orig/elf/ifuncmod6.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/ifuncmod6.c 2021-09-18 21:03:05.311302253 +1000
-@@ -4,7 +4,7 @@ extern int foo (void);
-
- typedef int (*foo_p) (void);
-
--foo_p foo_ptr = foo;
-+extern foo_p foo_ptr;
-
- foo_p
- get_foo_p (void)
-@@ -12,8 +12,8 @@ get_foo_p (void)
- return foo_ptr;
- }
-
--foo_p
--get_foo (void)
-+int
-+call_foo (void)
- {
-- return foo;
-+ return foo ();
- }
-diff -pruN glibc-2.32.orig/elf/Makefile glibc-2.32/elf/Makefile
---- glibc-2.32.orig/elf/Makefile 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/Makefile 2021-09-18 21:03:05.311302253 +1000
-@@ -1381,6 +1381,8 @@ CFLAGS-ifuncmain7pie.c += $(pie-ccflag)
- CFLAGS-ifuncmain9pie.c += $(pie-ccflag)
- CFLAGS-tst-ifunc-textrel.c += $(pic-ccflag)
-
-+LDFLAGS-ifuncmain6pie = -Wl,-z,lazy
-+
- $(objpfx)ifuncmain1pie: $(objpfx)ifuncmod1.so
- $(objpfx)ifuncmain1staticpie: $(objpfx)ifuncdep1pic.o
- $(objpfx)ifuncmain1vispie: $(objpfx)ifuncmod1.so
-@@ -1630,8 +1632,6 @@ $(objpfx)tst-nodelete-dlclose.out: $(obj
-
- tst-env-setuid-ENV = MALLOC_CHECK_=2 MALLOC_MMAP_THRESHOLD_=4096 \
- LD_HWCAP_MASK=0x1
--tst-env-setuid-tunables-ENV = \
-- GLIBC_TUNABLES=glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096
-
- $(objpfx)tst-debug1: $(libdl)
- $(objpfx)tst-debug1.out: $(objpfx)tst-debug1mod1.so
-diff -pruN glibc-2.32.orig/elf/rtld.c glibc-2.32/elf/rtld.c
---- glibc-2.32.orig/elf/rtld.c 2021-09-18 21:02:32.644182694 +1000
-+++ glibc-2.32/elf/rtld.c 2021-09-18 21:03:05.311302253 +1000
-@@ -1534,10 +1534,10 @@ of this helper program; chances are you
- switch (ph[-1].p_type)
- {
- case PT_NOTE:
-- _dl_process_pt_note (main_map, &ph[-1]);
-+ _dl_process_pt_note (main_map, -1, &ph[-1]);
- break;
- case PT_GNU_PROPERTY:
-- _dl_process_pt_gnu_property (main_map, &ph[-1]);
-+ _dl_process_pt_gnu_property (main_map, -1, &ph[-1]);
- break;
- }
-
-diff -pruN glibc-2.32.orig/elf/tst-env-setuid.c glibc-2.32/elf/tst-env-setuid.c
---- glibc-2.32.orig/elf/tst-env-setuid.c 2021-09-18 21:02:32.644182694 +1000
-+++ glibc-2.32/elf/tst-env-setuid.c 2021-09-18 21:03:05.311302253 +1000
-@@ -29,173 +29,12 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
-+#include <support/check.h>
- #include <support/support.h>
- #include <support/test-driver.h>
-+#include <support/capture_subprocess.h>
-
- static char SETGID_CHILD[] = "setgid-child";
--#define CHILD_STATUS 42
--
--/* Return a GID which is not our current GID, but is present in the
-- supplementary group list. */
--static gid_t
--choose_gid (void)
--{
-- const int count = 64;
-- gid_t groups[count];
-- int ret = getgroups (count, groups);
-- if (ret < 0)
-- {
-- printf ("getgroups: %m\n");
-- exit (1);
-- }
-- gid_t current = getgid ();
-- for (int i = 0; i < ret; ++i)
-- {
-- if (groups[i] != current)
-- return groups[i];
-- }
-- return 0;
--}
--
--/* Spawn and execute a program and verify that it returns the CHILD_STATUS. */
--static pid_t
--do_execve (char **args)
--{
-- pid_t kid = vfork ();
--
-- if (kid < 0)
-- {
-- printf ("vfork: %m\n");
-- return -1;
-- }
--
-- if (kid == 0)
-- {
-- /* Child process. */
-- execve (args[0], args, environ);
-- _exit (-errno);
-- }
--
-- if (kid < 0)
-- return 1;
--
-- int status;
--
-- if (waitpid (kid, &status, 0) < 0)
-- {
-- printf ("waitpid: %m\n");
-- return 1;
-- }
--
-- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-- return EXIT_UNSUPPORTED;
--
-- if (!WIFEXITED (status) || WEXITSTATUS (status) != CHILD_STATUS)
-- {
-- printf ("Unexpected exit status %d from child process\n",
-- WEXITSTATUS (status));
-- return 1;
-- }
-- return 0;
--}
--
--/* Copies the executable into a restricted directory, so that we can
-- safely make it SGID with the TARGET group ID. Then runs the
-- executable. */
--static int
--run_executable_sgid (gid_t target)
--{
-- char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
-- test_dir, (intmax_t) getpid ());
-- char *execname = xasprintf ("%s/bin", dirname);
-- int infd = -1;
-- int outfd = -1;
-- int ret = 0;
-- if (mkdir (dirname, 0700) < 0)
-- {
-- printf ("mkdir: %m\n");
-- goto err;
-- }
-- infd = open ("/proc/self/exe", O_RDONLY);
-- if (infd < 0)
-- {
-- printf ("open (/proc/self/exe): %m\n");
-- goto err;
-- }
-- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
-- if (outfd < 0)
-- {
-- printf ("open (%s): %m\n", execname);
-- goto err;
-- }
-- char buf[4096];
-- for (;;)
-- {
-- ssize_t rdcount = read (infd, buf, sizeof (buf));
-- if (rdcount < 0)
-- {
-- printf ("read: %m\n");
-- goto err;
-- }
-- if (rdcount == 0)
-- break;
-- char *p = buf;
-- char *end = buf + rdcount;
-- while (p != end)
-- {
-- ssize_t wrcount = write (outfd, buf, end - p);
-- if (wrcount == 0)
-- errno = ENOSPC;
-- if (wrcount <= 0)
-- {
-- printf ("write: %m\n");
-- goto err;
-- }
-- p += wrcount;
-- }
-- }
-- if (fchown (outfd, getuid (), target) < 0)
-- {
-- printf ("fchown (%s): %m\n", execname);
-- goto err;
-- }
-- if (fchmod (outfd, 02750) < 0)
-- {
-- printf ("fchmod (%s): %m\n", execname);
-- goto err;
-- }
-- if (close (outfd) < 0)
-- {
-- printf ("close (outfd): %m\n");
-- goto err;
-- }
-- if (close (infd) < 0)
-- {
-- printf ("close (infd): %m\n");
-- goto err;
-- }
--
-- char *args[] = {execname, SETGID_CHILD, NULL};
--
-- ret = do_execve (args);
--
--err:
-- if (outfd >= 0)
-- close (outfd);
-- if (infd >= 0)
-- close (infd);
-- if (execname)
-- {
-- unlink (execname);
-- free (execname);
-- }
-- if (dirname)
-- {
-- rmdir (dirname);
-- free (dirname);
-- }
-- return ret;
--}
-
- #ifndef test_child
- static int
-@@ -256,40 +95,32 @@ do_test (int argc, char **argv)
- if (argc == 2 && strcmp (argv[1], SETGID_CHILD) == 0)
- {
- if (getgid () == getegid ())
-- {
-- /* This can happen if the file system is mounted nosuid. */
-- fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n",
-- (intmax_t) getgid ());
-- exit (EXIT_UNSUPPORTED);
-- }
-+ /* This can happen if the file system is mounted nosuid. */
-+ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
-+ (intmax_t) getgid ());
-
- int ret = test_child ();
-
- if (ret != 0)
- exit (1);
-
-- exit (CHILD_STATUS);
-+ exit (EXIT_SUCCESS);
- }
- else
- {
- if (test_parent () != 0)
- exit (1);
-
-- /* Try running a setgid program. */
-- gid_t target = choose_gid ();
-- if (target == 0)
-- {
-- fprintf (stderr,
-- "Could not find a suitable GID for user %jd, skipping test\n",
-- (intmax_t) getuid ());
-- exit (0);
-- }
-+ int status = support_capture_subprogram_self_sgid (SETGID_CHILD);
-
-- return run_executable_sgid (target);
-- }
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ if (!WIFEXITED (status))
-+ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
-
-- /* Something went wrong and our argv was corrupted. */
-- _exit (1);
-+ return 0;
-+ }
- }
-
- #define TEST_FUNCTION_ARGV do_test
-diff -pruN glibc-2.32.orig/elf/tst-env-setuid-tunables.c glibc-2.32/elf/tst-env-setuid-tunables.c
---- glibc-2.32.orig/elf/tst-env-setuid-tunables.c 2021-09-18 21:02:32.644182694 +1000
-+++ glibc-2.32/elf/tst-env-setuid-tunables.c 2021-09-18 21:03:05.311302253 +1000
-@@ -25,35 +25,76 @@
- #include "config.h"
- #undef _LIBC
-
--#define test_parent test_parent_tunables
--#define test_child test_child_tunables
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
-+#include <intprops.h>
-+#include <array_length.h>
-+
-+#include <support/check.h>
-+#include <support/support.h>
-+#include <support/test-driver.h>
-+#include <support/capture_subprocess.h>
-
--static int test_child_tunables (void);
--static int test_parent_tunables (void);
--
--#include "tst-env-setuid.c"
-+const char *teststrings[] =
-+{
-+ "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.check=2:glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096:glibc.malloc.check=2",
-+ "glibc.malloc.perturb=0x800",
-+ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.perturb=0x800:not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.not_valid.check=2:glibc.malloc.mmap_threshold=4096",
-+ "not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096:glibc.malloc.check=2",
-+ "glibc.malloc.check=4:glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096",
-+ ":glibc.malloc.garbage=2:glibc.malloc.check=1",
-+ "glibc.malloc.check=1:glibc.malloc.check=2",
-+ "not_valid.malloc.check=2",
-+ "glibc.not_valid.check=2",
-+};
-
--#define CHILD_VALSTRING_VALUE "glibc.malloc.mmap_threshold=4096"
--#define PARENT_VALSTRING_VALUE \
-- "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096"
-+const char *resultstrings[] =
-+{
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.perturb=0x800",
-+ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+};
-
- static int
--test_child_tunables (void)
-+test_child (int off)
- {
- const char *val = getenv ("GLIBC_TUNABLES");
-
- #if HAVE_TUNABLES
-- if (val != NULL && strcmp (val, CHILD_VALSTRING_VALUE) == 0)
-+ if (val != NULL && strcmp (val, resultstrings[off]) == 0)
- return 0;
-
- if (val != NULL)
-- printf ("Unexpected GLIBC_TUNABLES VALUE %s\n", val);
-+ printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val);
-
- return 1;
- #else
- if (val != NULL)
- {
-- printf ("GLIBC_TUNABLES not cleared\n");
-+ printf ("[%d] GLIBC_TUNABLES not cleared\n", off);
- return 1;
- }
- return 0;
-@@ -61,15 +102,48 @@ test_child_tunables (void)
- }
-
- static int
--test_parent_tunables (void)
-+do_test (int argc, char **argv)
- {
-- const char *val = getenv ("GLIBC_TUNABLES");
-+ /* Setgid child process. */
-+ if (argc == 2)
-+ {
-+ if (getgid () == getegid ())
-+ /* This can happen if the file system is mounted nosuid. */
-+ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
-+ (intmax_t) getgid ());
-
-- if (val != NULL && strcmp (val, PARENT_VALSTRING_VALUE) == 0)
-- return 0;
-+ int ret = test_child (atoi (argv[1]));
-
-- if (val != NULL)
-- printf ("Unexpected GLIBC_TUNABLES VALUE %s\n", val);
-+ if (ret != 0)
-+ exit (1);
-
-- return 1;
-+ exit (EXIT_SUCCESS);
-+ }
-+ else
-+ {
-+ int ret = 0;
-+
-+ /* Spawn tests. */
-+ for (int i = 0; i < array_length (teststrings); i++)
-+ {
-+ char buf[INT_BUFSIZE_BOUND (int)];
-+
-+ printf ("Spawned test for %s (%d)\n", teststrings[i], i);
-+ snprintf (buf, sizeof (buf), "%d\n", i);
-+ if (setenv ("GLIBC_TUNABLES", teststrings[i], 1) != 0)
-+ exit (1);
-+
-+ int status = support_capture_subprogram_self_sgid (buf);
-+
-+ /* Bail out early if unsupported. */
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ ret |= status;
-+ }
-+ return ret;
-+ }
- }
-+
-+#define TEST_FUNCTION_ARGV do_test
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/iconv/gconv_charset.c glibc-2.32/iconv/gconv_charset.c
---- glibc-2.32.orig/iconv/gconv_charset.c 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/gconv_charset.c 2021-09-18 21:03:05.311302253 +1000
-@@ -216,3 +216,13 @@ out:
- return ret;
- }
- libc_hidden_def (__gconv_create_spec)
-+
-+
-+void
-+__gconv_destroy_spec (struct gconv_spec *conv_spec)
-+{
-+ free (conv_spec->fromcode);
-+ free (conv_spec->tocode);
-+ return;
-+}
-+libc_hidden_def (__gconv_destroy_spec)
-diff -pruN glibc-2.32.orig/iconv/gconv_charset.h glibc-2.32/iconv/gconv_charset.h
---- glibc-2.32.orig/iconv/gconv_charset.h 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/gconv_charset.h 2021-09-18 21:03:05.311302253 +1000
-@@ -48,33 +48,6 @@
- #define GCONV_IGNORE_ERRORS_SUFFIX "IGNORE"
-
-
--/* This function accepts the charset names of the source and destination of the
-- conversion and populates *conv_spec with an equivalent conversion
-- specification that may later be used by __gconv_open. The charset names
-- might contain options in the form of suffixes that alter the conversion,
-- e.g. "ISO-10646/UTF-8/TRANSLIT". It processes the charset names, ignoring
-- and truncating any suffix options in fromcode, and processing and truncating
-- any suffix options in tocode. Supported suffix options ("TRANSLIT" or
-- "IGNORE") when found in tocode lead to the corresponding flag in *conv_spec
-- to be set to true. Unrecognized suffix options are silently discarded. If
-- the function succeeds, it returns conv_spec back to the caller. It returns
-- NULL upon failure. */
--struct gconv_spec *
--__gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
-- const char *tocode);
--libc_hidden_proto (__gconv_create_spec)
--
--
--/* This function frees all heap memory allocated by __gconv_create_spec. */
--static void __attribute__ ((unused))
--gconv_destroy_spec (struct gconv_spec *conv_spec)
--{
-- free (conv_spec->fromcode);
-- free (conv_spec->tocode);
-- return;
--}
--
--
- /* This function copies in-order, characters from the source 's' that are
- either alpha-numeric or one in one of these: "_-.,:/" - into the destination
- 'wp' while dropping all other characters. In the process, it converts all
-diff -pruN glibc-2.32.orig/iconv/gconv_int.h glibc-2.32/iconv/gconv_int.h
---- glibc-2.32.orig/iconv/gconv_int.h 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/gconv_int.h 2021-09-18 21:03:05.311302253 +1000
-@@ -152,6 +152,27 @@ extern int __gconv_open (struct gconv_sp
- __gconv_t *handle, int flags);
- libc_hidden_proto (__gconv_open)
-
-+/* This function accepts the charset names of the source and destination of the
-+ conversion and populates *conv_spec with an equivalent conversion
-+ specification that may later be used by __gconv_open. The charset names
-+ might contain options in the form of suffixes that alter the conversion,
-+ e.g. "ISO-10646/UTF-8/TRANSLIT". It processes the charset names, ignoring
-+ and truncating any suffix options in fromcode, and processing and truncating
-+ any suffix options in tocode. Supported suffix options ("TRANSLIT" or
-+ "IGNORE") when found in tocode lead to the corresponding flag in *conv_spec
-+ to be set to true. Unrecognized suffix options are silently discarded. If
-+ the function succeeds, it returns conv_spec back to the caller. It returns
-+ NULL upon failure. */
-+extern struct gconv_spec *
-+__gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
-+ const char *tocode);
-+libc_hidden_proto (__gconv_create_spec)
-+
-+/* This function frees all heap memory allocated by __gconv_create_spec. */
-+extern void
-+__gconv_destroy_spec (struct gconv_spec *conv_spec);
-+libc_hidden_proto (__gconv_destroy_spec)
-+
- /* Free resources associated with transformation descriptor CD. */
- extern int __gconv_close (__gconv_t cd)
- attribute_hidden;
-diff -pruN glibc-2.32.orig/iconv/iconv_open.c glibc-2.32/iconv/iconv_open.c
---- glibc-2.32.orig/iconv/iconv_open.c 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/iconv_open.c 2021-09-18 21:03:05.311302253 +1000
-@@ -39,7 +39,7 @@ iconv_open (const char *tocode, const ch
-
- int res = __gconv_open (&conv_spec, &cd, 0);
-
-- gconv_destroy_spec (&conv_spec);
-+ __gconv_destroy_spec (&conv_spec);
-
- if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
- {
-diff -pruN glibc-2.32.orig/iconv/iconv_prog.c glibc-2.32/iconv/iconv_prog.c
---- glibc-2.32.orig/iconv/iconv_prog.c 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/iconv_prog.c 2021-09-18 21:03:05.311302253 +1000
-@@ -184,7 +184,7 @@ main (int argc, char *argv[])
- /* Let's see whether we have these coded character sets. */
- res = __gconv_open (&conv_spec, &cd, 0);
-
-- gconv_destroy_spec (&conv_spec);
-+ __gconv_destroy_spec (&conv_spec);
-
- if (res != __GCONV_OK)
- {
-diff -pruN glibc-2.32.orig/iconv/tst-iconv_prog.sh glibc-2.32/iconv/tst-iconv_prog.sh
---- glibc-2.32.orig/iconv/tst-iconv_prog.sh 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/tst-iconv_prog.sh 2021-09-18 21:03:05.311302253 +1000
-@@ -102,12 +102,16 @@ hangarray=(
- "\x00\x80;-c;IBM1161;UTF-8//TRANSLIT//IGNORE"
- "\x00\xdb;-c;IBM1162;UTF-8//TRANSLIT//IGNORE"
- "\x00\x70;-c;IBM12712;UTF-8//TRANSLIT//IGNORE"
--# These are known hangs that are yet to be fixed:
--# "\x00\x0f;-c;IBM1364;UTF-8"
--# "\x00\x0f;-c;IBM1371;UTF-8"
--# "\x00\x0f;-c;IBM1388;UTF-8"
--# "\x00\x0f;-c;IBM1390;UTF-8"
--# "\x00\x0f;-c;IBM1399;UTF-8"
-+"\x00\x0f;-c;IBM1364;UTF-8"
-+"\x0e\x0e;-c;IBM1364;UTF-8"
-+"\x00\x0f;-c;IBM1371;UTF-8"
-+"\x0e\x0e;-c;IBM1371;UTF-8"
-+"\x00\x0f;-c;IBM1388;UTF-8"
-+"\x0e\x0e;-c;IBM1388;UTF-8"
-+"\x00\x0f;-c;IBM1390;UTF-8"
-+"\x0e\x0e;-c;IBM1390;UTF-8"
-+"\x00\x0f;-c;IBM1399;UTF-8"
-+"\x0e\x0e;-c;IBM1399;UTF-8"
- "\x00\x53;-c;IBM16804;UTF-8//TRANSLIT//IGNORE"
- "\x00\x41;-c;IBM274;UTF-8//TRANSLIT//IGNORE"
- "\x00\x41;-c;IBM275;UTF-8//TRANSLIT//IGNORE"
-diff -pruN glibc-2.32.orig/iconv/Versions glibc-2.32/iconv/Versions
---- glibc-2.32.orig/iconv/Versions 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/Versions 2021-09-18 21:03:05.311302253 +1000
-@@ -6,7 +6,9 @@ libc {
- GLIBC_PRIVATE {
- # functions shared with iconv program
- __gconv_get_alias_db; __gconv_get_cache; __gconv_get_modules_db;
-- __gconv_open; __gconv_create_spec;
-+
-+ # functions used elsewhere in glibc
-+ __gconv_open; __gconv_create_spec; __gconv_destroy_spec;
-
- # function used by the gconv modules
- __gconv_transliterate;
-diff -pruN glibc-2.32.orig/iconvdata/bug-iconv13.c glibc-2.32/iconvdata/bug-iconv13.c
---- glibc-2.32.orig/iconvdata/bug-iconv13.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/iconvdata/bug-iconv13.c 2021-09-18 21:03:05.311302253 +1000
-@@ -0,0 +1,53 @@
-+/* bug 24973: Test EUC-KR module
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <errno.h>
-+#include <iconv.h>
-+#include <stdio.h>
-+#include <support/check.h>
-+
-+static int
-+do_test (void)
-+{
-+ iconv_t cd = iconv_open ("UTF-8//IGNORE", "EUC-KR");
-+ TEST_VERIFY_EXIT (cd != (iconv_t) -1);
-+
-+ /* 0xfe (->0x7e : row 94) and 0xc9 (->0x49 : row 41) are user-defined
-+ areas, which are not allowed and should be skipped over due to
-+ //IGNORE. The trailing 0xfe also is an incomplete sequence, which
-+ should be checked first. */
-+ char input[4] = { '\xc9', '\xa1', '\0', '\xfe' };
-+ char *inptr = input;
-+ size_t insize = sizeof (input);
-+ char output[4];
-+ char *outptr = output;
-+ size_t outsize = sizeof (output);
-+
-+ /* This used to crash due to buffer overrun. */
-+ TEST_VERIFY (iconv (cd, &inptr, &insize, &outptr, &outsize) == (size_t) -1);
-+ TEST_VERIFY (errno == EINVAL);
-+ /* The conversion should produce one character, the converted null
-+ character. */
-+ TEST_VERIFY (sizeof (output) - outsize == 1);
-+
-+ TEST_VERIFY_EXIT (iconv_close (cd) != -1);
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/iconvdata/bug-iconv14.c glibc-2.32/iconvdata/bug-iconv14.c
---- glibc-2.32.orig/iconvdata/bug-iconv14.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/iconvdata/bug-iconv14.c 2021-09-18 21:03:05.311302253 +1000
-@@ -0,0 +1,127 @@
-+/* Assertion in ISO-2022-JP-3 due to two-character sequence (bug 27256).
-+ Copyright (C) 2021 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <iconv.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <support/check.h>
-+
-+/* Use an escape sequence to return to the initial state. */
-+static void
-+with_escape_sequence (void)
-+{
-+ iconv_t c = iconv_open ("UTF-8", "ISO-2022-JP-3");
-+ TEST_VERIFY_EXIT (c != (iconv_t) -1);
-+
-+ char in[] = "\e$(O+D\e(B";
-+ char *inbuf = in;
-+ size_t inleft = strlen (in);
-+ char out[3]; /* Space for one output character. */
-+ char *outbuf;
-+ size_t outleft;
-+
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, &inbuf, &inleft, &outbuf, &outleft), (size_t) -1);
-+ TEST_COMPARE (errno, E2BIG);
-+ TEST_COMPARE (inleft, 3);
-+ TEST_COMPARE (inbuf - in, strlen (in) - 3);
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xc3);
-+ TEST_COMPARE (out[1] & 0xff, 0xa6);
-+
-+ /* Return to the initial shift state, producing the pending
-+ character. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, &inbuf, &inleft, &outbuf, &outleft), 0);
-+ TEST_COMPARE (inleft, 0);
-+ TEST_COMPARE (inbuf - in, strlen (in));
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ /* Nothing should be flushed the second time. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, NULL, 0, &outbuf, &outleft), 0);
-+ TEST_COMPARE (outleft, sizeof (out));
-+ TEST_COMPARE (outbuf - out, 0);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ TEST_COMPARE (iconv_close (c), 0);
-+}
-+
-+/* Use an explicit flush to return to the initial state. */
-+static void
-+with_flush (void)
-+{
-+ iconv_t c = iconv_open ("UTF-8", "ISO-2022-JP-3");
-+ TEST_VERIFY_EXIT (c != (iconv_t) -1);
-+
-+ char in[] = "\e$(O+D";
-+ char *inbuf = in;
-+ size_t inleft = strlen (in);
-+ char out[3]; /* Space for one output character. */
-+ char *outbuf;
-+ size_t outleft;
-+
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, &inbuf, &inleft, &outbuf, &outleft), (size_t) -1);
-+ TEST_COMPARE (errno, E2BIG);
-+ TEST_COMPARE (inleft, 0);
-+ TEST_COMPARE (inbuf - in, strlen (in));
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xc3);
-+ TEST_COMPARE (out[1] & 0xff, 0xa6);
-+
-+ /* Flush the pending character. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, NULL, 0, &outbuf, &outleft), 0);
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ /* Nothing should be flushed the second time. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, NULL, 0, &outbuf, &outleft), 0);
-+ TEST_COMPARE (outleft, sizeof (out));
-+ TEST_COMPARE (outbuf - out, 0);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ TEST_COMPARE (iconv_close (c), 0);
-+}
-+
-+static int
-+do_test (void)
-+{
-+ with_escape_sequence ();
-+ with_flush ();
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/iconvdata/euc-kr.c glibc-2.32/iconvdata/euc-kr.c
---- glibc-2.32.orig/iconvdata/euc-kr.c 2021-09-18 21:02:32.648182831 +1000
-+++ glibc-2.32/iconvdata/euc-kr.c 2021-09-18 21:03:05.311302253 +1000
-@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned c
- \
- if (ch <= 0x9f) \
- ++inptr; \
-- /* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are \
-- user-defined areas. */ \
-- else if (__builtin_expect (ch == 0xa0, 0) \
-- || __builtin_expect (ch > 0xfe, 0) \
-- || __builtin_expect (ch == 0xc9, 0)) \
-+ else if (__glibc_unlikely (ch == 0xa0)) \
- { \
- /* This is illegal. */ \
- STANDARD_FROM_LOOP_ERR_HANDLER (1); \
-diff -pruN glibc-2.32.orig/iconvdata/ibm1364.c glibc-2.32/iconvdata/ibm1364.c
---- glibc-2.32.orig/iconvdata/ibm1364.c 2021-09-18 21:02:32.649182866 +1000
-+++ glibc-2.32/iconvdata/ibm1364.c 2021-09-18 21:03:05.311302253 +1000
-@@ -158,24 +158,14 @@ enum
- \
- if (__builtin_expect (ch, 0) == SO) \
- { \
-- /* Shift OUT, change to DBCS converter. */ \
-- if (curcs == db) \
-- { \
-- result = __GCONV_ILLEGAL_INPUT; \
-- break; \
-- } \
-+ /* Shift OUT, change to DBCS converter (redundant escape okay). */ \
- curcs = db; \
- ++inptr; \
- continue; \
- } \
- if (__builtin_expect (ch, 0) == SI) \
- { \
-- /* Shift IN, change to SBCS converter. */ \
-- if (curcs == sb) \
-- { \
-- result = __GCONV_ILLEGAL_INPUT; \
-- break; \
-- } \
-+ /* Shift IN, change to SBCS converter (redundant escape okay). */ \
- curcs = sb; \
- ++inptr; \
- continue; \
-diff -pruN glibc-2.32.orig/iconvdata/iso-2022-jp-3.c glibc-2.32/iconvdata/iso-2022-jp-3.c
---- glibc-2.32.orig/iconvdata/iso-2022-jp-3.c 2021-09-18 21:02:32.651182934 +1000
-+++ glibc-2.32/iconvdata/iso-2022-jp-3.c 2021-09-18 21:03:05.311302253 +1000
-@@ -67,23 +67,34 @@ enum
- CURRENT_SEL_MASK = 7 << 3
- };
-
--/* During UCS-4 to ISO-2022-JP-3 conversion, the COUNT element of the state
-- also contains the last two bytes to be output, shifted by 6 bits, and a
-- one-bit indicator whether they must be preceded by the shift sequence,
-- in bit 22. */
-+/* During UCS-4 to ISO-2022-JP-3 conversion, the COUNT element of the
-+ state also contains the last two bytes to be output, shifted by 6
-+ bits, and a one-bit indicator whether they must be preceded by the
-+ shift sequence, in bit 22. During ISO-2022-JP-3 to UCS-4
-+ conversion, COUNT may also contain a non-zero pending wide
-+ character, shifted by six bits. This happens for certain inputs in
-+ JISX0213_1_2004_set and JISX0213_2_set if the second wide character
-+ in a combining sequence cannot be written because the buffer is
-+ full. */
-
- /* Since this is a stateful encoding we have to provide code which resets
- the output state to the initial state. This has to be done during the
- flushing. */
- #define EMIT_SHIFT_TO_INIT \
-- if ((data->__statep->__count & ~7) != ASCII_set) \
-+ if (data->__statep->__count != ASCII_set) \
- { \
- if (FROM_DIRECTION) \
- { \
-- /* It's easy, we don't have to emit anything, we just reset the \
-- state for the input. */ \
-- data->__statep->__count &= 7; \
-- data->__statep->__count |= ASCII_set; \
-+ if (__glibc_likely (outbuf + 4 <= outend)) \
-+ { \
-+ /* Write out the last character. */ \
-+ *((uint32_t *) outbuf) = data->__statep->__count >> 6; \
-+ outbuf += sizeof (uint32_t); \
-+ data->__statep->__count = ASCII_set; \
-+ } \
-+ else \
-+ /* We don't have enough room in the output buffer. */ \
-+ status = __GCONV_FULL_OUTPUT; \
- } \
- else \
- { \
-@@ -151,7 +162,21 @@ enum
- #define LOOPFCT FROM_LOOP
- #define BODY \
- { \
-- uint32_t ch = *inptr; \
-+ uint32_t ch; \
-+ \
-+ /* Output any pending character. */ \
-+ ch = set >> 6; \
-+ if (__glibc_unlikely (ch != 0)) \
-+ { \
-+ put32 (outptr, ch); \
-+ outptr += 4; \
-+ /* Remove the pending character, but preserve state bits. */ \
-+ set &= (1 << 6) - 1; \
-+ continue; \
-+ } \
-+ \
-+ /* Otherwise read the next input byte. */ \
-+ ch = *inptr; \
- \
- /* Recognize escape sequences. */ \
- if (__glibc_unlikely (ch == ESC)) \
-@@ -297,21 +322,25 @@ enum
- uint32_t u1 = __jisx0213_to_ucs_combining[ch - 1][0]; \
- uint32_t u2 = __jisx0213_to_ucs_combining[ch - 1][1]; \
- \
-+ inptr += 2; \
-+ \
-+ put32 (outptr, u1); \
-+ outptr += 4; \
-+ \
- /* See whether we have room for two characters. */ \
-- if (outptr + 8 <= outend) \
-+ if (outptr + 4 <= outend) \
- { \
-- inptr += 2; \
-- put32 (outptr, u1); \
-- outptr += 4; \
- put32 (outptr, u2); \
- outptr += 4; \
- continue; \
- } \
-- else \
-- { \
-- result = __GCONV_FULL_OUTPUT; \
-- break; \
-- } \
-+ \
-+ /* Otherwise store only the first character now, and \
-+ put the second one into the queue. */ \
-+ set |= u2 << 6; \
-+ /* Tell the caller why we terminate the loop. */ \
-+ result = __GCONV_FULL_OUTPUT; \
-+ break; \
- } \
- \
- inptr += 2; \
-diff -pruN glibc-2.32.orig/iconvdata/ksc5601.h glibc-2.32/iconvdata/ksc5601.h
---- glibc-2.32.orig/iconvdata/ksc5601.h 2021-09-18 21:02:32.652182968 +1000
-+++ glibc-2.32/iconvdata/ksc5601.h 2021-09-18 21:03:05.311302253 +1000
-@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s
- unsigned char ch2;
- int idx;
-
-+ if (avail < 2)
-+ return 0;
-+
- /* row 94(0x7e) and row 41(0x49) are user-defined area in KS C 5601 */
-
- if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) >= 0x7e
- || (ch - offset) == 0x49)
- return __UNKNOWN_10646_CHAR;
-
-- if (avail < 2)
-- return 0;
--
- ch2 = (*s)[1];
- if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
- return __UNKNOWN_10646_CHAR;
-diff -pruN glibc-2.32.orig/iconvdata/Makefile glibc-2.32/iconvdata/Makefile
---- glibc-2.32.orig/iconvdata/Makefile 2021-09-18 21:02:32.647182797 +1000
-+++ glibc-2.32/iconvdata/Makefile 2021-09-18 21:03:05.311302253 +1000
-@@ -73,7 +73,8 @@ modules.so := $(addsuffix .so, $(modules
- ifeq (yes,$(build-shared))
- tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
- tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
-- bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4
-+ bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
-+ bug-iconv13 bug-iconv14
- ifeq ($(have-thread-library),yes)
- tests += bug-iconv3
- endif
-@@ -321,6 +322,8 @@ $(objpfx)bug-iconv10.out: $(objpfx)gconv
- $(addprefix $(objpfx),$(modules.so))
- $(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \
- $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv14.out: $(objpfx)gconv-modules \
-+ $(addprefix $(objpfx),$(modules.so))
-
- $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
- $(addprefix $(objpfx),$(modules.so)) \
-diff -pruN glibc-2.32.orig/intl/dcigettext.c glibc-2.32/intl/dcigettext.c
---- glibc-2.32.orig/intl/dcigettext.c 2021-09-18 21:02:32.656183106 +1000
-+++ glibc-2.32/intl/dcigettext.c 2021-09-18 21:03:05.311302253 +1000
-@@ -1120,15 +1120,18 @@ _nl_find_msg (struct loaded_l10nfile *do
-
- # ifdef _LIBC
-
-- struct gconv_spec conv_spec
-- = { .fromcode = norm_add_slashes (charset, ""),
-- .tocode = norm_add_slashes (outcharset, ""),
-- /* We always want to use transliteration. */
-- .translit = true,
-- .ignore = false
-- };
-+ struct gconv_spec conv_spec;
-+
-+ __gconv_create_spec (&conv_spec, charset, outcharset);
-+
-+ /* We always want to use transliteration. */
-+ conv_spec.translit = true;
-+
- int r = __gconv_open (&conv_spec, &convd->conv,
- GCONV_AVOID_NOCONV);
-+
-+ __gconv_destroy_spec (&conv_spec);
-+
- if (__builtin_expect (r != __GCONV_OK, 0))
- {
- /* If the output encoding is the same there is
-diff -pruN glibc-2.32.orig/intl/tst-codeset.c glibc-2.32/intl/tst-codeset.c
---- glibc-2.32.orig/intl/tst-codeset.c 2021-09-18 21:02:32.656183106 +1000
-+++ glibc-2.32/intl/tst-codeset.c 2021-09-18 21:03:05.311302253 +1000
-@@ -22,13 +22,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <support/check.h>
-
- static int
- do_test (void)
- {
-- char *s;
-- int result = 0;
--
- unsetenv ("LANGUAGE");
- unsetenv ("OUTPUT_CHARSET");
- setlocale (LC_ALL, "de_DE.ISO-8859-1");
-@@ -36,25 +34,21 @@ do_test (void)
- bindtextdomain ("codeset", OBJPFX "domaindir");
-
- /* Here we expect output in ISO-8859-1. */
-- s = gettext ("cheese");
-- if (strcmp (s, "K\344se"))
-- {
-- printf ("call 1 returned: %s\n", s);
-- result = 1;
-- }
-+ TEST_COMPARE_STRING (gettext ("cheese"), "K\344se");
-
-+ /* Here we expect output in UTF-8. */
- bind_textdomain_codeset ("codeset", "UTF-8");
-+ TEST_COMPARE_STRING (gettext ("cheese"), "K\303\244se");
-
-- /* Here we expect output in UTF-8. */
-- s = gettext ("cheese");
-- if (strcmp (s, "K\303\244se"))
-- {
-- printf ("call 2 returned: %s\n", s);
-- result = 1;
-- }
-+ /* `a with umlaut' is transliterated to `ae'. */
-+ bind_textdomain_codeset ("codeset", "ASCII//TRANSLIT");
-+ TEST_COMPARE_STRING (gettext ("cheese"), "Kaese");
-+
-+ /* Transliteration also works by default even if not set. */
-+ bind_textdomain_codeset ("codeset", "ASCII");
-+ TEST_COMPARE_STRING (gettext ("cheese"), "Kaese");
-
-- return result;
-+ return 0;
- }
-
--#define TEST_FUNCTION do_test ()
--#include "../test-skeleton.c"
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/malloc/Makefile glibc-2.32/malloc/Makefile
---- glibc-2.32.orig/malloc/Makefile 2021-09-18 21:02:32.670183585 +1000
-+++ glibc-2.32/malloc/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -62,6 +62,16 @@ endif
- tests += $(tests-static)
- test-srcs = tst-mtrace
-
-+# These tests either are run with MALLOC_CHECK_=3 by default or do not work
-+# with MALLOC_CHECK_=3 because they expect a specific failure.
-+tests-exclude-mcheck = tst-mcheck tst-malloc-usable \
-+ tst-interpose-nothread tst-interpose-static-nothread \
-+ tst-interpose-static-thread tst-malloc-too-large \
-+ tst-mxfast tst-safe-linking
-+
-+# Run all tests with MALLOC_CHECK_=3
-+tests-mcheck = $(filter-out $(tests-exclude-mcheck),$(tests))
-+
- routines = malloc morecore mcheck mtrace obstack reallocarray \
- scratch_buffer_grow scratch_buffer_grow_preserve \
- scratch_buffer_set_array_size \
-@@ -100,6 +110,11 @@ $(objpfx)tst-malloc-thread-exit: $(share
- $(objpfx)tst-malloc-thread-fail: $(shared-thread-library)
- $(objpfx)tst-malloc-fork-deadlock: $(shared-thread-library)
- $(objpfx)tst-malloc-stats-cancellation: $(shared-thread-library)
-+$(objpfx)tst-malloc-backtrace-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-thread-exit-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-thread-fail-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-fork-deadlock-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-stats-cancellation-mcheck: $(shared-thread-library)
-
- # Export the __malloc_initialize_hook variable to libc.so.
- LDFLAGS-tst-mallocstate = -rdynamic
-@@ -239,6 +254,8 @@ $(tests:%=$(objpfx)%.o): CPPFLAGS += -DT
- $(objpfx)tst-interpose-nothread: $(objpfx)tst-interpose-aux-nothread.o
- $(objpfx)tst-interpose-thread: \
- $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library)
-+$(objpfx)tst-interpose-thread-mcheck: \
-+ $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library)
- $(objpfx)tst-interpose-static-nothread: $(objpfx)tst-interpose-aux-nothread.o
- $(objpfx)tst-interpose-static-thread: \
- $(objpfx)tst-interpose-aux-thread.o $(static-thread-library)
-@@ -256,3 +273,6 @@ $(objpfx)tst-dynarray-fail-mem.out: $(ob
- $(objpfx)tst-malloc-tcache-leak: $(shared-thread-library)
- $(objpfx)tst-malloc_info: $(shared-thread-library)
- $(objpfx)tst-mallocfork2: $(shared-thread-library)
-+$(objpfx)tst-malloc-tcache-leak-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc_info-mcheck: $(shared-thread-library)
-+$(objpfx)tst-mallocfork2-mcheck: $(shared-thread-library)
-diff -pruN glibc-2.32.orig/manual/tunables.texi glibc-2.32/manual/tunables.texi
---- glibc-2.32.orig/manual/tunables.texi 2021-09-18 21:02:32.672183654 +1000
-+++ glibc-2.32/manual/tunables.texi 2021-09-18 21:03:05.312302287 +1000
-@@ -432,7 +432,11 @@ set shared cache size in bytes for use i
-
- @deftp Tunable glibc.cpu.x86_non_temporal_threshold
- The @code{glibc.cpu.x86_non_temporal_threshold} tunable allows the user
--to set threshold in bytes for non temporal store.
-+to set threshold in bytes for non temporal store. Non temporal stores
-+give a hint to the hardware to move data directly to memory without
-+displacing other data from the cache. This tunable is used by some
-+platforms to determine when to use non temporal stores in operations
-+like memmove and memcpy.
-
- This tunable is specific to i386 and x86-64.
- @end deftp
-diff -pruN glibc-2.32.orig/misc/sys/cdefs.h glibc-2.32/misc/sys/cdefs.h
---- glibc-2.32.orig/misc/sys/cdefs.h 2021-09-18 21:02:32.690184271 +1000
-+++ glibc-2.32/misc/sys/cdefs.h 2021-09-18 21:03:05.312302287 +1000
-@@ -124,13 +124,10 @@
- #define __bos0(ptr) __builtin_object_size (ptr, 0)
-
- #if __GNUC_PREREQ (4,3)
--# define __warndecl(name, msg) \
-- extern void name (void) __attribute__((__warning__ (msg)))
- # define __warnattr(msg) __attribute__((__warning__ (msg)))
- # define __errordecl(name, msg) \
- extern void name (void) __attribute__((__error__ (msg)))
- #else
--# define __warndecl(name, msg) extern void name (void)
- # define __warnattr(msg)
- # define __errordecl(name, msg) extern void name (void)
- #endif
-diff -pruN glibc-2.32.orig/NEWS glibc-2.32/NEWS
---- glibc-2.32.orig/NEWS 2021-09-18 21:02:32.639182523 +1000
-+++ glibc-2.32/NEWS 2021-09-18 21:30:11.284117111 +1000
-@@ -5,6 +5,33 @@ See the end for copying conditions.
- Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
- using `glibc' in the "product" field.
-
-+The following bugs are resolved with this release:
-+
-+ [20019] NULL pointer dereference in libc.so.6 IFUNC due to uninitialized GOT
-+ [25399] Remove __warn_memset_zero_len
-+ [26224] iconv hangs when converting some invalid inputs from several IBM
-+ character sets (CVE-2020-27618)
-+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
-+ system
-+ [26555] string: strerrorname_np does not return the documented value
-+ [26600] Transaction ID collisions cause slow DNS lookups in getaddrinfo
-+ [26636] libc: 32-bit shmctl(IPC_INFO) crashes when shminfo struct is
-+ at the end of a memory mapping
-+ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
-+ by the caller to the kernel
-+ [26639] libc: msgctl IPC_INFO and MSG_INFO return garbage
-+ [26690] __vfscanf_internal: fix aliasing violation
-+ [26853] aarch64: Missing unwind information in statically linked startup code
-+ [26932] libc: sh: Multiple floating point functions defined as stubs only
-+ [27024] posix: Correct attribute access mode on readlinkat
-+ [27130] "rep movsb" performance issue
-+ [27177] GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on doesn't work
-+ [27256] gconv: Fix assertion failure in ISO-2022-JP-3 module
-+ [27462] nscd: Fix double free in netgroupcache
-+ [27471] Fix SXID_ERASE behavior in setuid programs
-+ [27896] Use __pthread_attr_copy in mq_notify (CVE-2021-33574)
-+ [28213] librt: fix NULL pointer dereference
-+
- Version 2.32
-
- Major new features:
-@@ -185,6 +212,14 @@ Security related changes:
- Dytrych of the Cisco Security Assessment and Penetration Team (See
- TALOS-2020-1019).
-
-+ CVE-2020-27618: An infinite loop has been fixed in the iconv program when
-+ invoked with input containing redundant shift sequences in the IBM1364,
-+ IBM1371, IBM1388, IBM1390, or IBM1399 character sets.
-+
-+ CVE-2021-33574: The mq_notify function has a potential use-after-free
-+ issue when using a notification type of SIGEV_THREAD and a thread
-+ attribute with a non-default affinity mask.
-+
- The following bugs are resolved with this release:
-
- [9809] localedata: ckb_IQ: new Kurdish Sorani locale
-diff -pruN glibc-2.32.orig/nscd/netgroupcache.c glibc-2.32/nscd/netgroupcache.c
---- glibc-2.32.orig/nscd/netgroupcache.c 2021-09-18 21:02:32.692184339 +1000
-+++ glibc-2.32/nscd/netgroupcache.c 2021-09-18 21:03:05.312302287 +1000
-@@ -248,7 +248,7 @@ addgetnetgrentX (struct database_dyn *db
- : NULL);
- ndomain = (ndomain ? newbuf + ndomaindiff
- : NULL);
-- buffer = newbuf;
-+ *tofreep = buffer = newbuf;
- }
-
- nhost = memcpy (buffer + bufused,
-@@ -319,7 +319,7 @@ addgetnetgrentX (struct database_dyn *db
- else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE)
- {
- buflen *= 2;
-- buffer = xrealloc (buffer, buflen);
-+ *tofreep = buffer = xrealloc (buffer, buflen);
- }
- else if (status == NSS_STATUS_RETURN
- || status == NSS_STATUS_NOTFOUND
-diff -pruN glibc-2.32.orig/posix/unistd.h glibc-2.32/posix/unistd.h
---- glibc-2.32.orig/posix/unistd.h 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/posix/unistd.h 2021-09-18 21:04:13.411636170 +1000
-@@ -831,7 +831,7 @@ extern int symlinkat (const char *__from
- /* Like readlink but a relative PATH is interpreted relative to FD. */
- extern ssize_t readlinkat (int __fd, const char *__restrict __path,
- char *__restrict __buf, size_t __len)
-- __THROW __nonnull ((2, 3)) __wur __attr_access ((__read_only__, 3, 4));
-+ __THROW __nonnull ((2, 3)) __wur __attr_access ((__write_only__, 3, 4));
- #endif
-
- /* Remove the link NAME. */
-diff -pruN glibc-2.32.orig/posix/wordexp.c glibc-2.32/posix/wordexp.c
---- glibc-2.32.orig/posix/wordexp.c 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/posix/wordexp.c 2021-09-18 21:03:05.312302287 +1000
-@@ -1399,7 +1399,7 @@ envsubst:
- /* Is it a numeric parameter? */
- else if (isdigit (env[0]))
- {
-- int n = atoi (env);
-+ unsigned long n = strtoul (env, NULL, 10);
-
- if (n >= __libc_argc)
- /* Substitute NULL. */
-diff -pruN glibc-2.32.orig/posix/wordexp-test.c glibc-2.32/posix/wordexp-test.c
---- glibc-2.32.orig/posix/wordexp-test.c 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/posix/wordexp-test.c 2021-09-18 21:03:05.312302287 +1000
-@@ -183,6 +183,7 @@ struct test_case_struct
- { 0, NULL, "$var", 0, 0, { NULL, }, IFS },
- { 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS },
- { 0, NULL, "", 0, 0, { NULL, }, IFS },
-+ { 0, NULL, "${1234567890123456789012}", 0, 0, { NULL, }, IFS },
-
- /* Flags not already covered (testit() has special handling for these) */
- { 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS },
-diff -pruN glibc-2.32.orig/resolv/Makefile glibc-2.32/resolv/Makefile
---- glibc-2.32.orig/resolv/Makefile 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/resolv/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -61,6 +61,11 @@ tests += \
- tst-resolv-search \
- tst-resolv-trailing \
-
-+# This test calls __res_context_send directly, which is not exported
-+# from libresolv.
-+tests-internal += tst-resolv-txnid-collision
-+tests-static += tst-resolv-txnid-collision
-+
- # These tests need libdl.
- ifeq (yes,$(build-shared))
- tests += \
-@@ -191,6 +196,8 @@ $(objpfx)tst-resolv-search: $(objpfx)lib
- $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-threads: \
- $(libdl) $(objpfx)libresolv.so $(shared-thread-library)
-+$(objpfx)tst-resolv-txnid-collision: $(objpfx)libresolv.a \
-+ $(static-thread-library)
- $(objpfx)tst-resolv-canonname: \
- $(libdl) $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-trustad: $(objpfx)libresolv.so $(shared-thread-library)
-diff -pruN glibc-2.32.orig/resolv/res_send.c glibc-2.32/resolv/res_send.c
---- glibc-2.32.orig/resolv/res_send.c 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/resolv/res_send.c 2021-09-18 21:03:05.312302287 +1000
-@@ -1342,15 +1342,6 @@ send_dg(res_state statp,
- *terrno = EMSGSIZE;
- return close_and_return_error (statp, resplen2);
- }
-- if ((recvresp1 || hp->id != anhp->id)
-- && (recvresp2 || hp2->id != anhp->id)) {
-- /*
-- * response from old query, ignore it.
-- * XXX - potential security hazard could
-- * be detected here.
-- */
-- goto wait;
-- }
-
- /* Paranoia check. Due to the connected UDP socket,
- the kernel has already filtered invalid addresses
-@@ -1360,15 +1351,24 @@ send_dg(res_state statp,
-
- /* Check for the correct header layout and a matching
- question. */
-- if ((recvresp1 || !res_queriesmatch(buf, buf + buflen,
-- *thisansp,
-- *thisansp
-- + *thisanssizp))
-- && (recvresp2 || !res_queriesmatch(buf2, buf2 + buflen2,
-- *thisansp,
-- *thisansp
-- + *thisanssizp)))
-- goto wait;
-+ int matching_query = 0; /* Default to no matching query. */
-+ if (!recvresp1
-+ && anhp->id == hp->id
-+ && res_queriesmatch (buf, buf + buflen,
-+ *thisansp, *thisansp + *thisanssizp))
-+ matching_query = 1;
-+ if (!recvresp2
-+ && anhp->id == hp2->id
-+ && res_queriesmatch (buf2, buf2 + buflen2,
-+ *thisansp, *thisansp + *thisanssizp))
-+ matching_query = 2;
-+ if (matching_query == 0)
-+ /* Spurious UDP packet. Drop it and continue
-+ waiting. */
-+ {
-+ need_recompute = 1;
-+ goto wait;
-+ }
-
- if (anhp->rcode == SERVFAIL ||
- anhp->rcode == NOTIMP ||
-@@ -1383,7 +1383,7 @@ send_dg(res_state statp,
- /* No data from the first reply. */
- resplen = 0;
- /* We are waiting for a possible second reply. */
-- if (hp->id == anhp->id)
-+ if (matching_query == 1)
- recvresp1 = 1;
- else
- recvresp2 = 1;
-@@ -1414,7 +1414,7 @@ send_dg(res_state statp,
- return (1);
- }
- /* Mark which reply we received. */
-- if (recvresp1 == 0 && hp->id == anhp->id)
-+ if (matching_query == 1)
- recvresp1 = 1;
- else
- recvresp2 = 1;
-diff -pruN glibc-2.32.orig/resolv/tst-resolv-txnid-collision.c glibc-2.32/resolv/tst-resolv-txnid-collision.c
---- glibc-2.32.orig/resolv/tst-resolv-txnid-collision.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/resolv/tst-resolv-txnid-collision.c 2021-09-18 21:03:05.312302287 +1000
-@@ -0,0 +1,334 @@
-+/* Test parallel queries with transaction ID collisions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <arpa/nameser.h>
-+#include <array_length.h>
-+#include <resolv-internal.h>
-+#include <resolv_context.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <support/check.h>
-+#include <support/check_nss.h>
-+#include <support/resolv_test.h>
-+#include <support/support.h>
-+#include <support/test-driver.h>
-+
-+/* Result of parsing a DNS question name.
-+
-+ A question name has the form reorder-N-M-rcode-C.example.net, where
-+ N and M are either 0 and 1, corresponding to the reorder member,
-+ and C is a number that will be stored in the rcode field.
-+
-+ Also see parse_qname below. */
-+struct parsed_qname
-+{
-+ /* The DNS response code requested from the first server. The
-+ second server always responds with RCODE zero. */
-+ int rcode;
-+
-+ /* Indicates whether to perform reordering in the responses from the
-+ respective server. */
-+ bool reorder[2];
-+};
-+
-+/* Fills *PARSED based on QNAME. */
-+static void
-+parse_qname (struct parsed_qname *parsed, const char *qname)
-+{
-+ int reorder0;
-+ int reorder1;
-+ int rcode;
-+ char *suffix;
-+ if (sscanf (qname, "reorder-%d-%d.rcode-%d.%ms",
-+ &reorder0, &reorder1, &rcode, &suffix) == 4)
-+ {
-+ if (reorder0 != 0)
-+ TEST_COMPARE (reorder0, 1);
-+ if (reorder1 != 0)
-+ TEST_COMPARE (reorder1, 1);
-+ TEST_VERIFY (rcode >= 0 && rcode <= 15);
-+ TEST_COMPARE_STRING (suffix, "example.net");
-+ free (suffix);
-+
-+ parsed->rcode = rcode;
-+ parsed->reorder[0] = reorder0;
-+ parsed->reorder[1] = reorder1;
-+ }
-+ else
-+ FAIL_EXIT1 ("unexpected query: %s", qname);
-+}
-+
-+/* Used to construct a response. The first server responds with an
-+ error, the second server succeeds. */
-+static void
-+build_response (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b,
-+ const char *qname, uint16_t qclass, uint16_t qtype)
-+{
-+ struct parsed_qname parsed;
-+ parse_qname (&parsed, qname);
-+
-+ switch (ctx->server_index)
-+ {
-+ case 0:
-+ {
-+ struct resolv_response_flags flags = { 0 };
-+ if (parsed.rcode == 0)
-+ /* Simulate a delegation in case a NODATA (RCODE zero)
-+ response is requested. */
-+ flags.clear_ra = true;
-+ else
-+ flags.rcode = parsed.rcode;
-+
-+ resolv_response_init (b, flags);
-+ resolv_response_add_question (b, qname, qclass, qtype);
-+ }
-+ break;
-+
-+ case 1:
-+ {
-+ struct resolv_response_flags flags = { 0, };
-+ resolv_response_init (b, flags);
-+ resolv_response_add_question (b, qname, qclass, qtype);
-+
-+ resolv_response_section (b, ns_s_an);
-+ resolv_response_open_record (b, qname, qclass, qtype, 0);
-+ if (qtype == T_A)
-+ {
-+ char ipv4[4] = { 192, 0, 2, 1 };
-+ resolv_response_add_data (b, &ipv4, sizeof (ipv4));
-+ }
-+ else
-+ {
-+ char ipv6[16]
-+ = { 0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
-+ resolv_response_add_data (b, &ipv6, sizeof (ipv6));
-+ }
-+ resolv_response_close_record (b);
-+ }
-+ break;
-+ }
-+}
-+
-+/* Used to reorder responses. */
-+struct resolv_response_context *previous_query;
-+
-+/* Used to keep track of the queries received. */
-+static int previous_server_index = -1;
-+static uint16_t previous_qtype;
-+
-+/* For each server, buffer the first query and then send both answers
-+ to the second query, reordered if requested. */
-+static void
-+response (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b,
-+ const char *qname, uint16_t qclass, uint16_t qtype)
-+{
-+ TEST_VERIFY (qtype == T_A || qtype == T_AAAA);
-+ if (ctx->server_index != 0)
-+ TEST_COMPARE (ctx->server_index, 1);
-+
-+ struct parsed_qname parsed;
-+ parse_qname (&parsed, qname);
-+
-+ if (previous_query == NULL)
-+ {
-+ /* No buffered query. Record this query and do not send a
-+ response. */
-+ TEST_COMPARE (previous_qtype, 0);
-+ previous_query = resolv_response_context_duplicate (ctx);
-+ previous_qtype = qtype;
-+ resolv_response_drop (b);
-+ previous_server_index = ctx->server_index;
-+
-+ if (test_verbose)
-+ printf ("info: buffering first query for: %s\n", qname);
-+ }
-+ else
-+ {
-+ TEST_VERIFY (previous_query != 0);
-+ TEST_COMPARE (ctx->server_index, previous_server_index);
-+ TEST_VERIFY (previous_qtype != qtype); /* Not a duplicate. */
-+
-+ /* If reordering, send a response for this query explicitly, and
-+ then skip the implicit send. */
-+ if (parsed.reorder[ctx->server_index])
-+ {
-+ if (test_verbose)
-+ printf ("info: sending reordered second response for: %s\n",
-+ qname);
-+ build_response (ctx, b, qname, qclass, qtype);
-+ resolv_response_send_udp (ctx, b);
-+ resolv_response_drop (b);
-+ }
-+
-+ /* Build a response for the previous query and send it, thus
-+ reordering the two responses. */
-+ {
-+ if (test_verbose)
-+ printf ("info: sending first response for: %s\n", qname);
-+ struct resolv_response_builder *btmp
-+ = resolv_response_builder_allocate (previous_query->query_buffer,
-+ previous_query->query_length);
-+ build_response (ctx, btmp, qname, qclass, previous_qtype);
-+ resolv_response_send_udp (ctx, btmp);
-+ resolv_response_builder_free (btmp);
-+ }
-+
-+ /* If not reordering, send the reply as usual. */
-+ if (!parsed.reorder[ctx->server_index])
-+ {
-+ if (test_verbose)
-+ printf ("info: sending non-reordered second response for: %s\n",
-+ qname);
-+ build_response (ctx, b, qname, qclass, qtype);
-+ }
-+
-+ /* Unbuffer the response and prepare for the next query. */
-+ resolv_response_context_free (previous_query);
-+ previous_query = NULL;
-+ previous_qtype = 0;
-+ previous_server_index = -1;
-+ }
-+}
-+
-+/* Runs a query for QNAME and checks for the expected reply. See
-+ struct parsed_qname for the expected format for QNAME. */
-+static void
-+test_qname (const char *qname, int rcode)
-+{
-+ struct resolv_context *ctx = __resolv_context_get ();
-+ TEST_VERIFY_EXIT (ctx != NULL);
-+
-+ unsigned char q1[512];
-+ int q1len = res_mkquery (QUERY, qname, C_IN, T_A, NULL, 0, NULL,
-+ q1, sizeof (q1));
-+ TEST_VERIFY_EXIT (q1len > 12);
-+
-+ unsigned char q2[512];
-+ int q2len = res_mkquery (QUERY, qname, C_IN, T_AAAA, NULL, 0, NULL,
-+ q2, sizeof (q2));
-+ TEST_VERIFY_EXIT (q2len > 12);
-+
-+ /* Produce a transaction ID collision. */
-+ memcpy (q2, q1, 2);
-+
-+ unsigned char ans1[512];
-+ unsigned char *ans1p = ans1;
-+ unsigned char *ans2p = NULL;
-+ int nans2p = 0;
-+ int resplen2 = 0;
-+ int ans2p_malloced = 0;
-+
-+ /* Perform a parallel A/AAAA query. */
-+ int resplen1 = __res_context_send (ctx, q1, q1len, q2, q2len,
-+ ans1, sizeof (ans1), &ans1p,
-+ &ans2p, &nans2p,
-+ &resplen2, &ans2p_malloced);
-+
-+ TEST_VERIFY (resplen1 > 12);
-+ TEST_VERIFY (resplen2 > 12);
-+ if (resplen1 <= 12 || resplen2 <= 12)
-+ return;
-+
-+ if (rcode == 1 || rcode == 3)
-+ {
-+ /* Format Error and Name Error responses does not trigger
-+ switching to the next server. */
-+ TEST_COMPARE (ans1p[3] & 0x0f, rcode);
-+ TEST_COMPARE (ans2p[3] & 0x0f, rcode);
-+ return;
-+ }
-+
-+ /* The response should be successful. */
-+ TEST_COMPARE (ans1p[3] & 0x0f, 0);
-+ TEST_COMPARE (ans2p[3] & 0x0f, 0);
-+
-+ /* Due to bug 19691, the answer may not be in the slot matching the
-+ query. Assume that the AAAA response is the longer one. */
-+ unsigned char *a_answer;
-+ int a_answer_length;
-+ unsigned char *aaaa_answer;
-+ int aaaa_answer_length;
-+ if (resplen2 > resplen1)
-+ {
-+ a_answer = ans1p;
-+ a_answer_length = resplen1;
-+ aaaa_answer = ans2p;
-+ aaaa_answer_length = resplen2;
-+ }
-+ else
-+ {
-+ a_answer = ans2p;
-+ a_answer_length = resplen2;
-+ aaaa_answer = ans1p;
-+ aaaa_answer_length = resplen1;
-+ }
-+
-+ {
-+ char *expected = xasprintf ("name: %s\n"
-+ "address: 192.0.2.1\n",
-+ qname);
-+ check_dns_packet (qname, a_answer, a_answer_length, expected);
-+ free (expected);
-+ }
-+ {
-+ char *expected = xasprintf ("name: %s\n"
-+ "address: 2001:db8::1\n",
-+ qname);
-+ check_dns_packet (qname, aaaa_answer, aaaa_answer_length, expected);
-+ free (expected);
-+ }
-+
-+ if (ans2p_malloced)
-+ free (ans2p);
-+
-+ __resolv_context_put (ctx);
-+}
-+
-+static int
-+do_test (void)
-+{
-+ struct resolv_test *aux = resolv_test_start
-+ ((struct resolv_redirect_config)
-+ {
-+ .response_callback = response,
-+
-+ /* The response callback use global state (the previous_*
-+ variables), and query processing must therefore be
-+ serialized. */
-+ .single_thread_udp = true,
-+ });
-+
-+ for (int rcode = 0; rcode <= 5; ++rcode)
-+ for (int do_reorder_0 = 0; do_reorder_0 < 2; ++do_reorder_0)
-+ for (int do_reorder_1 = 0; do_reorder_1 < 2; ++do_reorder_1)
-+ {
-+ char *qname = xasprintf ("reorder-%d-%d.rcode-%d.example.net",
-+ do_reorder_0, do_reorder_1, rcode);
-+ test_qname (qname, rcode);
-+ free (qname);
-+ }
-+
-+ resolv_test_end (aux);
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/Rules glibc-2.32/Rules
---- glibc-2.32.orig/Rules 2021-09-18 21:02:32.639182523 +1000
-+++ glibc-2.32/Rules 2021-09-18 21:03:05.310302219 +1000
-@@ -155,6 +155,7 @@ xtests: tests $(xtests-special)
- else
- tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \
- $(tests-container:%=$(objpfx)%.out) \
-+ $(tests-mcheck:%=$(objpfx)%-mcheck.out) \
- $(tests-special) $(tests-printers-out)
- xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
- endif
-@@ -165,7 +166,7 @@ ifeq ($(run-built-tests),no)
- tests-expected =
- else
- tests-expected = $(tests) $(tests-internal) $(tests-printers) \
-- $(tests-container)
-+ $(tests-container) $(tests-mcheck:%=%-mcheck)
- endif
- tests:
- $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
-@@ -191,6 +192,7 @@ else
- binaries-pie-tests =
- binaries-pie-notests =
- endif
-+binaries-mcheck-tests = $(tests-mcheck:%=%-mcheck)
- else
- binaries-all-notests =
- binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs)
-@@ -200,6 +202,7 @@ binaries-static-tests =
- binaries-static =
- binaries-pie-tests =
- binaries-pie-notests =
-+binaries-mcheck-tests =
- endif
-
- binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
-@@ -223,6 +226,14 @@ $(addprefix $(objpfx),$(binaries-shared-
- $(+link-tests)
- endif
-
-+ifneq "$(strip $(binaries-mcheck-tests))" ""
-+$(addprefix $(objpfx),$(binaries-mcheck-tests)): %-mcheck: %.o \
-+ $(link-extra-libs-tests) \
-+ $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
-+ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
-+ $(+link-tests)
-+endif
-+
- ifneq "$(strip $(binaries-pie-tests))" ""
- $(addprefix $(objpfx),$(binaries-pie-tests)): %: %.o \
- $(link-extra-libs-tests) \
-@@ -253,6 +264,12 @@ $(addprefix $(objpfx),$(binaries-static-
- $(+link-static-tests)
- endif
-
-+# All mcheck tests will be run with MALLOC_CHECK_=3
-+define mcheck-ENVS
-+$(1)-mcheck-ENV = MALLOC_CHECK_=3
-+endef
-+$(foreach t,$(tests-mcheck),$(eval $(call mcheck-ENVS,$(t))))
-+
- ifneq "$(strip $(tests) $(tests-internal) $(xtests) $(test-srcs))" ""
- # These are the implicit rules for making test outputs
- # from the test programs and whatever input files are present.
-diff -pruN glibc-2.32.orig/stdio-common/errlist.c glibc-2.32/stdio-common/errlist.c
---- glibc-2.32.orig/stdio-common/errlist.c 2021-09-18 21:02:32.698184545 +1000
-+++ glibc-2.32/stdio-common/errlist.c 2021-09-18 21:03:05.312302287 +1000
-@@ -20,9 +20,13 @@
- #include <libintl.h>
- #include <array_length.h>
-
-+#ifndef ERR_MAP
-+# define ERR_MAP(n) n
-+#endif
-+
- const char *const _sys_errlist_internal[] =
- {
--#define _S(n, str) [n] = str,
-+#define _S(n, str) [ERR_MAP(n)] = str,
- #include <errlist.h>
- #undef _S
- };
-@@ -41,20 +45,21 @@ static const union sys_errname_t
- {
- #define MSGSTRFIELD1(line) str##line
- #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
--#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(str)];
-+#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)];
- #include <errlist.h>
- #undef _S
- };
- char str[0];
- } _sys_errname = { {
--#define _S(n, s) s,
-+#define _S(n, s) #n,
- #include <errlist.h>
- #undef _S
- } };
-
- static const unsigned short _sys_errnameidx[] =
- {
--#define _S(n, s) [n] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
-+#define _S(n, s) \
-+ [ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
- #include <errlist.h>
- #undef _S
- };
-diff -pruN glibc-2.32.orig/stdio-common/Makefile glibc-2.32/stdio-common/Makefile
---- glibc-2.32.orig/stdio-common/Makefile 2021-09-18 21:02:32.698184545 +1000
-+++ glibc-2.32/stdio-common/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -69,7 +69,8 @@ tests := tstscanf test_rdwr test-popen t
- tst-printf-bz25691 \
- tst-vfprintf-width-prec-alloc \
- tst-printf-fp-free \
-- tst-printf-fp-leak
-+ tst-printf-fp-leak \
-+ test-strerr
-
-
- test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble
-diff -pruN glibc-2.32.orig/stdio-common/test-strerr.c glibc-2.32/stdio-common/test-strerr.c
---- glibc-2.32.orig/stdio-common/test-strerr.c 2021-09-18 21:02:32.698184545 +1000
-+++ glibc-2.32/stdio-common/test-strerr.c 2021-09-18 21:03:05.312302287 +1000
-@@ -18,46 +18,672 @@
-
- #include <string.h>
- #include <errno.h>
--#include <array_length.h>
-
- #include <support/support.h>
- #include <support/check.h>
-
--#define N_(name) name
--
--static const char *const errlist[] =
-- {
--/* This file is auto-generated from errlist.def. */
--#include <errlist.h>
-- };
--
--#define MSGSTR_T errname_t
--#define MSGSTR errname
--#define MSGIDX errnameidx
--#include <errlist-name.h>
--#undef MSGSTR
--#undef MSGIDX
--
- static int
- do_test (void)
- {
-- TEST_VERIFY (strerrordesc_np (-1) == NULL);
-- TEST_VERIFY (strerrordesc_np (array_length (errlist)) == NULL);
-- for (size_t i = 0; i < array_length (errlist); i++)
-- {
-- if (errlist[i] == NULL)
-- continue;
-- TEST_COMPARE_STRING (strerrordesc_np (i), errlist[i]);
-- }
-+ TEST_COMPARE_STRING (strerrordesc_np (0), "Success");
-+ TEST_COMPARE_STRING (strerrorname_np (0), "0");
-
-- TEST_VERIFY (strerrorname_np (-1) == NULL);
-- TEST_VERIFY (strerrorname_np (array_length (errlist)) == NULL);
-- for (size_t i = 0; i < array_length (errlist); i++)
-- {
-- if (errlist[i] == NULL)
-- continue;
-- TEST_COMPARE_STRING (strerrorname_np (i), errname.str + errnameidx[i]);
-- }
-+#ifdef EPERM
-+ TEST_COMPARE_STRING (strerrordesc_np (EPERM), "Operation not permitted");
-+ TEST_COMPARE_STRING (strerrorname_np (EPERM), "EPERM");
-+#endif
-+#ifdef ENOENT
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOENT),
-+ "No such file or directory");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOENT), "ENOENT");
-+#endif
-+#ifdef ESRCH
-+ TEST_COMPARE_STRING (strerrordesc_np (ESRCH), "No such process");
-+ TEST_COMPARE_STRING (strerrorname_np (ESRCH), "ESRCH");
-+#endif
-+#ifdef EINTR
-+ TEST_COMPARE_STRING (strerrordesc_np (EINTR), "Interrupted system call");
-+ TEST_COMPARE_STRING (strerrorname_np (EINTR), "EINTR");
-+#endif
-+#ifdef EIO
-+ TEST_COMPARE_STRING (strerrordesc_np (EIO), "Input/output error");
-+ TEST_COMPARE_STRING (strerrorname_np (EIO), "EIO");
-+#endif
-+#ifdef ENXIO
-+ TEST_COMPARE_STRING (strerrordesc_np (ENXIO), "No such device or address");
-+ TEST_COMPARE_STRING (strerrorname_np (ENXIO), "ENXIO");
-+#endif
-+#ifdef E2BIG
-+ TEST_COMPARE_STRING (strerrordesc_np (E2BIG), "Argument list too long");
-+ TEST_COMPARE_STRING (strerrorname_np (E2BIG), "E2BIG");
-+#endif
-+#ifdef ENOEXEC
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOEXEC), "Exec format error");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOEXEC), "ENOEXEC");
-+#endif
-+#ifdef EBADF
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADF), "Bad file descriptor");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADF), "EBADF");
-+#endif
-+#ifdef ECHILD
-+ TEST_COMPARE_STRING (strerrordesc_np (ECHILD), "No child processes");
-+ TEST_COMPARE_STRING (strerrorname_np (ECHILD), "ECHILD");
-+#endif
-+#ifdef EDEADLK
-+ TEST_COMPARE_STRING (strerrordesc_np (EDEADLK),
-+ "Resource deadlock avoided");
-+ TEST_COMPARE_STRING (strerrorname_np (EDEADLK), "EDEADLK");
-+#endif
-+#ifdef ENOMEM
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOMEM), "Cannot allocate memory");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOMEM), "ENOMEM");
-+#endif
-+#ifdef EACCES
-+ TEST_COMPARE_STRING (strerrordesc_np (EACCES), "Permission denied");
-+ TEST_COMPARE_STRING (strerrorname_np (EACCES), "EACCES");
-+#endif
-+#ifdef EFAULT
-+ TEST_COMPARE_STRING (strerrordesc_np (EFAULT), "Bad address");
-+ TEST_COMPARE_STRING (strerrorname_np (EFAULT), "EFAULT");
-+#endif
-+#ifdef ENOTBLK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTBLK), "Block device required");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTBLK), "ENOTBLK");
-+#endif
-+#ifdef EBUSY
-+ TEST_COMPARE_STRING (strerrordesc_np (EBUSY), "Device or resource busy");
-+ TEST_COMPARE_STRING (strerrorname_np (EBUSY), "EBUSY");
-+#endif
-+#ifdef EEXIST
-+ TEST_COMPARE_STRING (strerrordesc_np (EEXIST), "File exists");
-+ TEST_COMPARE_STRING (strerrorname_np (EEXIST), "EEXIST");
-+#endif
-+#ifdef EXDEV
-+ TEST_COMPARE_STRING (strerrordesc_np (EXDEV), "Invalid cross-device link");
-+ TEST_COMPARE_STRING (strerrorname_np (EXDEV), "EXDEV");
-+#endif
-+#ifdef ENODEV
-+ TEST_COMPARE_STRING (strerrordesc_np (ENODEV), "No such device");
-+ TEST_COMPARE_STRING (strerrorname_np (ENODEV), "ENODEV");
-+#endif
-+#ifdef ENOTDIR
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTDIR), "Not a directory");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTDIR), "ENOTDIR");
-+#endif
-+#ifdef EISDIR
-+ TEST_COMPARE_STRING (strerrordesc_np (EISDIR), "Is a directory");
-+ TEST_COMPARE_STRING (strerrorname_np (EISDIR), "EISDIR");
-+#endif
-+#ifdef EINVAL
-+ TEST_COMPARE_STRING (strerrordesc_np (EINVAL), "Invalid argument");
-+ TEST_COMPARE_STRING (strerrorname_np (EINVAL), "EINVAL");
-+#endif
-+#ifdef EMFILE
-+ TEST_COMPARE_STRING (strerrordesc_np (EMFILE), "Too many open files");
-+ TEST_COMPARE_STRING (strerrorname_np (EMFILE), "EMFILE");
-+#endif
-+#ifdef ENFILE
-+ TEST_COMPARE_STRING (strerrordesc_np (ENFILE),
-+ "Too many open files in system");
-+ TEST_COMPARE_STRING (strerrorname_np (ENFILE), "ENFILE");
-+#endif
-+#ifdef ENOTTY
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTTY),
-+ "Inappropriate ioctl for device");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTTY), "ENOTTY");
-+#endif
-+#ifdef ETXTBSY
-+ TEST_COMPARE_STRING (strerrordesc_np (ETXTBSY), "Text file busy");
-+ TEST_COMPARE_STRING (strerrorname_np (ETXTBSY), "ETXTBSY");
-+#endif
-+#ifdef EFBIG
-+ TEST_COMPARE_STRING (strerrordesc_np (EFBIG), "File too large");
-+ TEST_COMPARE_STRING (strerrorname_np (EFBIG), "EFBIG");
-+#endif
-+#ifdef ENOSPC
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSPC), "No space left on device");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSPC), "ENOSPC");
-+#endif
-+#ifdef ESPIPE
-+ TEST_COMPARE_STRING (strerrordesc_np (ESPIPE), "Illegal seek");
-+ TEST_COMPARE_STRING (strerrorname_np (ESPIPE), "ESPIPE");
-+#endif
-+#ifdef EROFS
-+ TEST_COMPARE_STRING (strerrordesc_np (EROFS), "Read-only file system");
-+ TEST_COMPARE_STRING (strerrorname_np (EROFS), "EROFS");
-+#endif
-+#ifdef EMLINK
-+ TEST_COMPARE_STRING (strerrordesc_np (EMLINK), "Too many links");
-+ TEST_COMPARE_STRING (strerrorname_np (EMLINK), "EMLINK");
-+#endif
-+#ifdef EPIPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EPIPE), "Broken pipe");
-+ TEST_COMPARE_STRING (strerrorname_np (EPIPE), "EPIPE");
-+#endif
-+#ifdef EDOM
-+ TEST_COMPARE_STRING (strerrordesc_np (EDOM),
-+ "Numerical argument out of domain");
-+ TEST_COMPARE_STRING (strerrorname_np (EDOM), "EDOM");
-+#endif
-+#ifdef ERANGE
-+ TEST_COMPARE_STRING (strerrordesc_np (ERANGE),
-+ "Numerical result out of range");
-+ TEST_COMPARE_STRING (strerrorname_np (ERANGE), "ERANGE");
-+#endif
-+#ifdef EAGAIN
-+ TEST_COMPARE_STRING (strerrordesc_np (EAGAIN),
-+ "Resource temporarily unavailable");
-+ TEST_COMPARE_STRING (strerrorname_np (EAGAIN), "EAGAIN");
-+#endif
-+#ifdef EINPROGRESS
-+ TEST_COMPARE_STRING (strerrordesc_np (EINPROGRESS),
-+ "Operation now in progress");
-+ TEST_COMPARE_STRING (strerrorname_np (EINPROGRESS), "EINPROGRESS");
-+#endif
-+#ifdef EALREADY
-+ TEST_COMPARE_STRING (strerrordesc_np (EALREADY),
-+ "Operation already in progress");
-+ TEST_COMPARE_STRING (strerrorname_np (EALREADY), "EALREADY");
-+#endif
-+#ifdef ENOTSOCK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTSOCK),
-+ "Socket operation on non-socket");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTSOCK), "ENOTSOCK");
-+#endif
-+#ifdef EMSGSIZE
-+ TEST_COMPARE_STRING (strerrordesc_np (EMSGSIZE), "Message too long");
-+ TEST_COMPARE_STRING (strerrorname_np (EMSGSIZE), "EMSGSIZE");
-+#endif
-+#ifdef EPROTOTYPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROTOTYPE),
-+ "Protocol wrong type for socket");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROTOTYPE), "EPROTOTYPE");
-+#endif
-+#ifdef ENOPROTOOPT
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOPROTOOPT),
-+ "Protocol not available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOPROTOOPT), "ENOPROTOOPT");
-+#endif
-+#ifdef EPROTONOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROTONOSUPPORT),
-+ "Protocol not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROTONOSUPPORT), "EPROTONOSUPPORT");
-+#endif
-+#ifdef ESOCKTNOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (ESOCKTNOSUPPORT),
-+ "Socket type not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (ESOCKTNOSUPPORT), "ESOCKTNOSUPPORT");
-+#endif
-+#ifdef EOPNOTSUPP
-+ TEST_COMPARE_STRING (strerrordesc_np (EOPNOTSUPP),
-+ "Operation not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (EOPNOTSUPP), "EOPNOTSUPP");
-+#endif
-+#ifdef EPFNOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (EPFNOSUPPORT),
-+ "Protocol family not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (EPFNOSUPPORT), "EPFNOSUPPORT");
-+#endif
-+#ifdef EAFNOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (EAFNOSUPPORT),
-+ "Address family not supported by protocol");
-+ TEST_COMPARE_STRING (strerrorname_np (EAFNOSUPPORT), "EAFNOSUPPORT");
-+#endif
-+#ifdef EADDRINUSE
-+ TEST_COMPARE_STRING (strerrordesc_np (EADDRINUSE),
-+ "Address already in use");
-+ TEST_COMPARE_STRING (strerrorname_np (EADDRINUSE), "EADDRINUSE");
-+#endif
-+#ifdef EADDRNOTAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (EADDRNOTAVAIL),
-+ "Cannot assign requested address");
-+ TEST_COMPARE_STRING (strerrorname_np (EADDRNOTAVAIL), "EADDRNOTAVAIL");
-+#endif
-+#ifdef ENETDOWN
-+ TEST_COMPARE_STRING (strerrordesc_np (ENETDOWN), "Network is down");
-+ TEST_COMPARE_STRING (strerrorname_np (ENETDOWN), "ENETDOWN");
-+#endif
-+#ifdef ENETUNREACH
-+ TEST_COMPARE_STRING (strerrordesc_np (ENETUNREACH),
-+ "Network is unreachable");
-+ TEST_COMPARE_STRING (strerrorname_np (ENETUNREACH), "ENETUNREACH");
-+#endif
-+#ifdef ENETRESET
-+ TEST_COMPARE_STRING (strerrordesc_np (ENETRESET),
-+ "Network dropped connection on reset");
-+ TEST_COMPARE_STRING (strerrorname_np (ENETRESET), "ENETRESET");
-+#endif
-+#ifdef ECONNABORTED
-+ TEST_COMPARE_STRING (strerrordesc_np (ECONNABORTED),
-+ "Software caused connection abort");
-+ TEST_COMPARE_STRING (strerrorname_np (ECONNABORTED), "ECONNABORTED");
-+#endif
-+#ifdef ECONNRESET
-+ TEST_COMPARE_STRING (strerrordesc_np (ECONNRESET),
-+ "Connection reset by peer");
-+ TEST_COMPARE_STRING (strerrorname_np (ECONNRESET), "ECONNRESET");
-+#endif
-+#ifdef ENOBUFS
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOBUFS),
-+ "No buffer space available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOBUFS), "ENOBUFS");
-+#endif
-+#ifdef EISCONN
-+ TEST_COMPARE_STRING (strerrordesc_np (EISCONN),
-+ "Transport endpoint is already connected");
-+ TEST_COMPARE_STRING (strerrorname_np (EISCONN), "EISCONN");
-+#endif
-+#ifdef ENOTCONN
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTCONN),
-+ "Transport endpoint is not connected");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTCONN), "ENOTCONN");
-+#endif
-+#ifdef EDESTADDRREQ
-+ TEST_COMPARE_STRING (strerrordesc_np (EDESTADDRREQ),
-+ "Destination address required");
-+ TEST_COMPARE_STRING (strerrorname_np (EDESTADDRREQ), "EDESTADDRREQ");
-+#endif
-+#ifdef ESHUTDOWN
-+ TEST_COMPARE_STRING (strerrordesc_np (ESHUTDOWN),
-+ "Cannot send after transport endpoint shutdown");
-+ TEST_COMPARE_STRING (strerrorname_np (ESHUTDOWN), "ESHUTDOWN");
-+#endif
-+#ifdef ETOOMANYREFS
-+ TEST_COMPARE_STRING (strerrordesc_np (ETOOMANYREFS),
-+ "Too many references: cannot splice");
-+ TEST_COMPARE_STRING (strerrorname_np (ETOOMANYREFS), "ETOOMANYREFS");
-+#endif
-+#ifdef ETIMEDOUT
-+ TEST_COMPARE_STRING (strerrordesc_np (ETIMEDOUT), "Connection timed out");
-+ TEST_COMPARE_STRING (strerrorname_np (ETIMEDOUT), "ETIMEDOUT");
-+#endif
-+#ifdef ECONNREFUSED
-+ TEST_COMPARE_STRING (strerrordesc_np (ECONNREFUSED), "Connection refused");
-+ TEST_COMPARE_STRING (strerrorname_np (ECONNREFUSED), "ECONNREFUSED");
-+#endif
-+#ifdef ELOOP
-+ TEST_COMPARE_STRING (strerrordesc_np (ELOOP),
-+ "Too many levels of symbolic links");
-+ TEST_COMPARE_STRING (strerrorname_np (ELOOP), "ELOOP");
-+#endif
-+#ifdef ENAMETOOLONG
-+ TEST_COMPARE_STRING (strerrordesc_np (ENAMETOOLONG), "File name too long");
-+ TEST_COMPARE_STRING (strerrorname_np (ENAMETOOLONG), "ENAMETOOLONG");
-+#endif
-+#ifdef EHOSTDOWN
-+ TEST_COMPARE_STRING (strerrordesc_np (EHOSTDOWN), "Host is down");
-+ TEST_COMPARE_STRING (strerrorname_np (EHOSTDOWN), "EHOSTDOWN");
-+#endif
-+#ifdef EHOSTUNREACH
-+ TEST_COMPARE_STRING (strerrordesc_np (EHOSTUNREACH), "No route to host");
-+ TEST_COMPARE_STRING (strerrorname_np (EHOSTUNREACH), "EHOSTUNREACH");
-+#endif
-+#ifdef ENOTEMPTY
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTEMPTY), "Directory not empty");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTEMPTY), "ENOTEMPTY");
-+#endif
-+#ifdef EUSERS
-+ TEST_COMPARE_STRING (strerrordesc_np (EUSERS), "Too many users");
-+ TEST_COMPARE_STRING (strerrorname_np (EUSERS), "EUSERS");
-+#endif
-+#ifdef EDQUOT
-+ TEST_COMPARE_STRING (strerrordesc_np (EDQUOT), "Disk quota exceeded");
-+ TEST_COMPARE_STRING (strerrorname_np (EDQUOT), "EDQUOT");
-+#endif
-+#ifdef ESTALE
-+ TEST_COMPARE_STRING (strerrordesc_np (ESTALE), "Stale file handle");
-+ TEST_COMPARE_STRING (strerrorname_np (ESTALE), "ESTALE");
-+#endif
-+#ifdef EREMOTE
-+ TEST_COMPARE_STRING (strerrordesc_np (EREMOTE), "Object is remote");
-+ TEST_COMPARE_STRING (strerrorname_np (EREMOTE), "EREMOTE");
-+#endif
-+#ifdef ENOLCK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOLCK), "No locks available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOLCK), "ENOLCK");
-+#endif
-+#ifdef ENOSYS
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSYS), "Function not implemented");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSYS), "ENOSYS");
-+#endif
-+#ifdef EILSEQ
-+ TEST_COMPARE_STRING (strerrordesc_np (EILSEQ),
-+ "Invalid or incomplete multibyte or wide character");
-+ TEST_COMPARE_STRING (strerrorname_np (EILSEQ), "EILSEQ");
-+#endif
-+#ifdef EBADMSG
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADMSG), "Bad message");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADMSG), "EBADMSG");
-+#endif
-+#ifdef EIDRM
-+ TEST_COMPARE_STRING (strerrordesc_np (EIDRM), "Identifier removed");
-+ TEST_COMPARE_STRING (strerrorname_np (EIDRM), "EIDRM");
-+#endif
-+#ifdef EMULTIHOP
-+ TEST_COMPARE_STRING (strerrordesc_np (EMULTIHOP), "Multihop attempted");
-+ TEST_COMPARE_STRING (strerrorname_np (EMULTIHOP), "EMULTIHOP");
-+#endif
-+#ifdef ENODATA
-+ TEST_COMPARE_STRING (strerrordesc_np (ENODATA), "No data available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENODATA), "ENODATA");
-+#endif
-+#ifdef ENOLINK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOLINK), "Link has been severed");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOLINK), "ENOLINK");
-+#endif
-+#ifdef ENOMSG
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOMSG),
-+ "No message of desired type");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOMSG), "ENOMSG");
-+#endif
-+#ifdef ENOSR
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSR), "Out of streams resources");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSR), "ENOSR");
-+#endif
-+#ifdef ENOSTR
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSTR), "Device not a stream");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSTR), "ENOSTR");
-+#endif
-+#ifdef EOVERFLOW
-+ TEST_COMPARE_STRING (strerrordesc_np (EOVERFLOW),
-+ "Value too large for defined data type");
-+ TEST_COMPARE_STRING (strerrorname_np (EOVERFLOW), "EOVERFLOW");
-+#endif
-+#ifdef EPROTO
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROTO), "Protocol error");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROTO), "EPROTO");
-+#endif
-+#ifdef ETIME
-+ TEST_COMPARE_STRING (strerrordesc_np (ETIME), "Timer expired");
-+ TEST_COMPARE_STRING (strerrorname_np (ETIME), "ETIME");
-+#endif
-+#ifdef ECANCELED
-+ TEST_COMPARE_STRING (strerrordesc_np (ECANCELED), "Operation canceled");
-+ TEST_COMPARE_STRING (strerrorname_np (ECANCELED), "ECANCELED");
-+#endif
-+#ifdef EOWNERDEAD
-+ TEST_COMPARE_STRING (strerrordesc_np (EOWNERDEAD), "Owner died");
-+ TEST_COMPARE_STRING (strerrorname_np (EOWNERDEAD), "EOWNERDEAD");
-+#endif
-+#ifdef ENOTRECOVERABLE
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTRECOVERABLE),
-+ "State not recoverable");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTRECOVERABLE), "ENOTRECOVERABLE");
-+#endif
-+#ifdef ERESTART
-+ TEST_COMPARE_STRING (strerrordesc_np (ERESTART),
-+ "Interrupted system call should be restarted");
-+ TEST_COMPARE_STRING (strerrorname_np (ERESTART), "ERESTART");
-+#endif
-+#ifdef ECHRNG
-+ TEST_COMPARE_STRING (strerrordesc_np (ECHRNG),
-+ "Channel number out of range");
-+ TEST_COMPARE_STRING (strerrorname_np (ECHRNG), "ECHRNG");
-+#endif
-+#ifdef EL2NSYNC
-+ TEST_COMPARE_STRING (strerrordesc_np (EL2NSYNC),
-+ "Level 2 not synchronized");
-+ TEST_COMPARE_STRING (strerrorname_np (EL2NSYNC), "EL2NSYNC");
-+#endif
-+#ifdef EL3HLT
-+ TEST_COMPARE_STRING (strerrordesc_np (EL3HLT), "Level 3 halted");
-+ TEST_COMPARE_STRING (strerrorname_np (EL3HLT), "EL3HLT");
-+#endif
-+#ifdef EL3RST
-+ TEST_COMPARE_STRING (strerrordesc_np (EL3RST), "Level 3 reset");
-+ TEST_COMPARE_STRING (strerrorname_np (EL3RST), "EL3RST");
-+#endif
-+#ifdef ELNRNG
-+ TEST_COMPARE_STRING (strerrordesc_np (ELNRNG), "Link number out of range");
-+ TEST_COMPARE_STRING (strerrorname_np (ELNRNG), "ELNRNG");
-+#endif
-+#ifdef EUNATCH
-+ TEST_COMPARE_STRING (strerrordesc_np (EUNATCH),
-+ "Protocol driver not attached");
-+ TEST_COMPARE_STRING (strerrorname_np (EUNATCH), "EUNATCH");
-+#endif
-+#ifdef ENOCSI
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOCSI),
-+ "No CSI structure available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOCSI), "ENOCSI");
-+#endif
-+#ifdef EL2HLT
-+ TEST_COMPARE_STRING (strerrordesc_np (EL2HLT), "Level 2 halted");
-+ TEST_COMPARE_STRING (strerrorname_np (EL2HLT), "EL2HLT");
-+#endif
-+#ifdef EBADE
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADE), "Invalid exchange");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADE), "EBADE");
-+#endif
-+#ifdef EBADR
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADR),
-+ "Invalid request descriptor");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADR), "EBADR");
-+#endif
-+#ifdef EXFULL
-+ TEST_COMPARE_STRING (strerrordesc_np (EXFULL), "Exchange full");
-+ TEST_COMPARE_STRING (strerrorname_np (EXFULL), "EXFULL");
-+#endif
-+#ifdef ENOANO
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOANO), "No anode");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOANO), "ENOANO");
-+#endif
-+#ifdef EBADRQC
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADRQC), "Invalid request code");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADRQC), "EBADRQC");
-+#endif
-+#ifdef EBADSLT
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADSLT), "Invalid slot");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADSLT), "EBADSLT");
-+#endif
-+#ifdef EBFONT
-+ TEST_COMPARE_STRING (strerrordesc_np (EBFONT), "Bad font file format");
-+ TEST_COMPARE_STRING (strerrorname_np (EBFONT), "EBFONT");
-+#endif
-+#ifdef ENONET
-+ TEST_COMPARE_STRING (strerrordesc_np (ENONET),
-+ "Machine is not on the network");
-+ TEST_COMPARE_STRING (strerrorname_np (ENONET), "ENONET");
-+#endif
-+#ifdef ENOPKG
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOPKG), "Package not installed");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOPKG), "ENOPKG");
-+#endif
-+#ifdef EADV
-+ TEST_COMPARE_STRING (strerrordesc_np (EADV), "Advertise error");
-+ TEST_COMPARE_STRING (strerrorname_np (EADV), "EADV");
-+#endif
-+#ifdef ESRMNT
-+ TEST_COMPARE_STRING (strerrordesc_np (ESRMNT), "Srmount error");
-+ TEST_COMPARE_STRING (strerrorname_np (ESRMNT), "ESRMNT");
-+#endif
-+#ifdef ECOMM
-+ TEST_COMPARE_STRING (strerrordesc_np (ECOMM),
-+ "Communication error on send");
-+ TEST_COMPARE_STRING (strerrorname_np (ECOMM), "ECOMM");
-+#endif
-+#ifdef EDOTDOT
-+ TEST_COMPARE_STRING (strerrordesc_np (EDOTDOT), "RFS specific error");
-+ TEST_COMPARE_STRING (strerrorname_np (EDOTDOT), "EDOTDOT");
-+#endif
-+#ifdef ENOTUNIQ
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTUNIQ),
-+ "Name not unique on network");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTUNIQ), "ENOTUNIQ");
-+#endif
-+#ifdef EBADFD
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADFD),
-+ "File descriptor in bad state");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADFD), "EBADFD");
-+#endif
-+#ifdef EREMCHG
-+ TEST_COMPARE_STRING (strerrordesc_np (EREMCHG), "Remote address changed");
-+ TEST_COMPARE_STRING (strerrorname_np (EREMCHG), "EREMCHG");
-+#endif
-+#ifdef ELIBACC
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBACC),
-+ "Can not access a needed shared library");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBACC), "ELIBACC");
-+#endif
-+#ifdef ELIBBAD
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBBAD),
-+ "Accessing a corrupted shared library");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBBAD), "ELIBBAD");
-+#endif
-+#ifdef ELIBSCN
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBSCN),
-+ ".lib section in a.out corrupted");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBSCN), "ELIBSCN");
-+#endif
-+#ifdef ELIBMAX
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBMAX),
-+ "Attempting to link in too many shared libraries");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBMAX), "ELIBMAX");
-+#endif
-+#ifdef ELIBEXEC
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBEXEC),
-+ "Cannot exec a shared library directly");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBEXEC), "ELIBEXEC");
-+#endif
-+#ifdef ESTRPIPE
-+ TEST_COMPARE_STRING (strerrordesc_np (ESTRPIPE), "Streams pipe error");
-+ TEST_COMPARE_STRING (strerrorname_np (ESTRPIPE), "ESTRPIPE");
-+#endif
-+#ifdef EUCLEAN
-+ TEST_COMPARE_STRING (strerrordesc_np (EUCLEAN),
-+ "Structure needs cleaning");
-+ TEST_COMPARE_STRING (strerrorname_np (EUCLEAN), "EUCLEAN");
-+#endif
-+#ifdef ENOTNAM
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTNAM),
-+ "Not a XENIX named type file");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTNAM), "ENOTNAM");
-+#endif
-+#ifdef ENAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (ENAVAIL),
-+ "No XENIX semaphores available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENAVAIL), "ENAVAIL");
-+#endif
-+#ifdef EISNAM
-+ TEST_COMPARE_STRING (strerrordesc_np (EISNAM), "Is a named type file");
-+ TEST_COMPARE_STRING (strerrorname_np (EISNAM), "EISNAM");
-+#endif
-+#ifdef EREMOTEIO
-+ TEST_COMPARE_STRING (strerrordesc_np (EREMOTEIO), "Remote I/O error");
-+ TEST_COMPARE_STRING (strerrorname_np (EREMOTEIO), "EREMOTEIO");
-+#endif
-+#ifdef ENOMEDIUM
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOMEDIUM), "No medium found");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOMEDIUM), "ENOMEDIUM");
-+#endif
-+#ifdef EMEDIUMTYPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EMEDIUMTYPE), "Wrong medium type");
-+ TEST_COMPARE_STRING (strerrorname_np (EMEDIUMTYPE), "EMEDIUMTYPE");
-+#endif
-+#ifdef ENOKEY
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOKEY),
-+ "Required key not available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOKEY), "ENOKEY");
-+#endif
-+#ifdef EKEYEXPIRED
-+ TEST_COMPARE_STRING (strerrordesc_np (EKEYEXPIRED), "Key has expired");
-+ TEST_COMPARE_STRING (strerrorname_np (EKEYEXPIRED), "EKEYEXPIRED");
-+#endif
-+#ifdef EKEYREVOKED
-+ TEST_COMPARE_STRING (strerrordesc_np (EKEYREVOKED),
-+ "Key has been revoked");
-+ TEST_COMPARE_STRING (strerrorname_np (EKEYREVOKED), "EKEYREVOKED");
-+#endif
-+#ifdef EKEYREJECTED
-+ TEST_COMPARE_STRING (strerrordesc_np (EKEYREJECTED),
-+ "Key was rejected by service");
-+ TEST_COMPARE_STRING (strerrorname_np (EKEYREJECTED), "EKEYREJECTED");
-+#endif
-+#ifdef ERFKILL
-+ TEST_COMPARE_STRING (strerrordesc_np (ERFKILL),
-+ "Operation not possible due to RF-kill");
-+ TEST_COMPARE_STRING (strerrorname_np (ERFKILL), "ERFKILL");
-+#endif
-+#ifdef EHWPOISON
-+ TEST_COMPARE_STRING (strerrordesc_np (EHWPOISON),
-+ "Memory page has hardware error");
-+ TEST_COMPARE_STRING (strerrorname_np (EHWPOISON), "EHWPOISON");
-+#endif
-+#ifdef EBADRPC
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADRPC), "RPC struct is bad");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADRPC), "EBADRPC");
-+#endif
-+#ifdef EFTYPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EFTYPE),
-+ "Inappropriate file type or format");
-+ TEST_COMPARE_STRING (strerrorname_np (EFTYPE), "EFTYPE");
-+#endif
-+#ifdef EPROCUNAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROCUNAVAIL),
-+ "RPC bad procedure for program");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROCUNAVAIL), "EPROCUNAVAIL");
-+#endif
-+#ifdef EAUTH
-+ TEST_COMPARE_STRING (strerrordesc_np (EAUTH), "Authentication error");
-+ TEST_COMPARE_STRING (strerrorname_np (EAUTH), "EAUTH");
-+#endif
-+#ifdef EDIED
-+ TEST_COMPARE_STRING (strerrordesc_np (EDIED), "Translator died");
-+ TEST_COMPARE_STRING (strerrorname_np (EDIED), "EDIED");
-+#endif
-+#ifdef ERPCMISMATCH
-+ TEST_COMPARE_STRING (strerrordesc_np (ERPCMISMATCH), "RPC version wrong");
-+ TEST_COMPARE_STRING (strerrorname_np (ERPCMISMATCH), "ERPCMISMATCH");
-+#endif
-+#ifdef EGREGIOUS
-+ TEST_COMPARE_STRING (strerrordesc_np (EGREGIOUS),
-+ "You really blew it this time");
-+ TEST_COMPARE_STRING (strerrorname_np (EGREGIOUS), "EGREGIOUS");
-+#endif
-+#ifdef EPROCLIM
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROCLIM), "Too many processes");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROCLIM), "EPROCLIM");
-+#endif
-+#ifdef EGRATUITOUS
-+ TEST_COMPARE_STRING (strerrordesc_np (EGRATUITOUS), "Gratuitous error");
-+ TEST_COMPARE_STRING (strerrorname_np (EGRATUITOUS), "EGRATUITOUS");
-+#endif
-+#if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTSUP), "Not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTSUP), "ENOTSUP");
-+#endif
-+#ifdef EPROGMISMATCH
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROGMISMATCH),
-+ "RPC program version wrong");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROGMISMATCH), "EPROGMISMATCH");
-+#endif
-+#ifdef EBACKGROUND
-+ TEST_COMPARE_STRING (strerrordesc_np (EBACKGROUND),
-+ "Inappropriate operation for background process");
-+ TEST_COMPARE_STRING (strerrorname_np (EBACKGROUND), "EBACKGROUND");
-+#endif
-+#ifdef EIEIO
-+ TEST_COMPARE_STRING (strerrordesc_np (EIEIO), "Computer bought the farm");
-+ TEST_COMPARE_STRING (strerrorname_np (EIEIO), "EIEIO");
-+#endif
-+#if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-+ TEST_COMPARE_STRING (strerrordesc_np (EWOULDBLOCK),
-+ "Operation would block");
-+ TEST_COMPARE_STRING (strerrorname_np (EWOULDBLOCK), "EWOULDBLOCK");
-+#endif
-+#ifdef ENEEDAUTH
-+ TEST_COMPARE_STRING (strerrordesc_np (ENEEDAUTH), "Need authenticator");
-+ TEST_COMPARE_STRING (strerrorname_np (ENEEDAUTH), "ENEEDAUTH");
-+#endif
-+#ifdef ED
-+ TEST_COMPARE_STRING (strerrordesc_np (ED), "?");
-+ TEST_COMPARE_STRING (strerrorname_np (ED), "ED");
-+#endif
-+#ifdef EPROGUNAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROGUNAVAIL),
-+ "RPC program not available");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROGUNAVAIL), "EPROGUNAVAIL");
-+#endif
-
- return 0;
- }
-diff -pruN glibc-2.32.orig/stdio-common/vfscanf-internal.c glibc-2.32/stdio-common/vfscanf-internal.c
---- glibc-2.32.orig/stdio-common/vfscanf-internal.c 2021-09-18 21:02:32.699184579 +1000
-+++ glibc-2.32/stdio-common/vfscanf-internal.c 2021-09-18 21:03:05.312302287 +1000
-@@ -277,7 +277,7 @@ __vfscanf_internal (FILE *s, const char
- #endif
- {
- va_list arg;
-- const CHAR_T *f = format;
-+ const UCHAR_T *f = (const UCHAR_T *) format;
- UCHAR_T fc; /* Current character of the format. */
- WINT_T done = 0; /* Assignments done. */
- size_t read_in = 0; /* Chars read in. */
-@@ -415,10 +415,11 @@ __vfscanf_internal (FILE *s, const char
- #endif
-
- #ifndef COMPILE_WSCANF
-- if (!isascii ((unsigned char) *f))
-+ if (!isascii (*f))
- {
- /* Non-ASCII, may be a multibyte. */
-- int len = __mbrlen (f, strlen (f), &state);
-+ int len = __mbrlen ((const char *) f, strlen ((const char *) f),
-+ &state);
- if (len > 0)
- {
- do
-@@ -426,7 +427,7 @@ __vfscanf_internal (FILE *s, const char
- c = inchar ();
- if (__glibc_unlikely (c == EOF))
- input_error ();
-- else if (c != (unsigned char) *f++)
-+ else if (c != *f++)
- {
- ungetc_not_eof (c, s);
- conv_error ();
-@@ -484,9 +485,9 @@ __vfscanf_internal (FILE *s, const char
- char_buffer_rewind (&charbuf);
-
- /* Check for a positional parameter specification. */
-- if (ISDIGIT ((UCHAR_T) *f))
-+ if (ISDIGIT (*f))
- {
-- argpos = read_int ((const UCHAR_T **) &f);
-+ argpos = read_int (&f);
- if (*f == L_('$'))
- ++f;
- else
-@@ -521,8 +522,8 @@ __vfscanf_internal (FILE *s, const char
-
- /* Find the maximum field width. */
- width = 0;
-- if (ISDIGIT ((UCHAR_T) *f))
-- width = read_int ((const UCHAR_T **) &f);
-+ if (ISDIGIT (*f))
-+ width = read_int (&f);
- got_width:
- if (width == 0)
- width = -1;
-@@ -2522,12 +2523,11 @@ __vfscanf_internal (FILE *s, const char
- }
-
- while ((fc = *f++) != '\0' && fc != ']')
-- if (fc == '-' && *f != '\0' && *f != ']'
-- && (unsigned char) f[-2] <= (unsigned char) *f)
-+ if (fc == '-' && *f != '\0' && *f != ']' && f[-2] <= *f)
- {
- /* Add all characters from the one before the '-'
- up to (but not including) the next format char. */
-- for (fc = (unsigned char) f[-2]; fc < (unsigned char) *f; ++fc)
-+ for (fc = f[-2]; fc < *f; ++fc)
- ((char *)charbuf.scratch.data)[fc] = 1;
- }
- else
-diff -pruN glibc-2.32.orig/stdlib/tst-secure-getenv.c glibc-2.32/stdlib/tst-secure-getenv.c
---- glibc-2.32.orig/stdlib/tst-secure-getenv.c 2021-09-18 21:02:32.700184614 +1000
-+++ glibc-2.32/stdlib/tst-secure-getenv.c 2021-09-18 21:03:05.312302287 +1000
-@@ -30,167 +30,12 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
-+#include <support/check.h>
- #include <support/support.h>
-+#include <support/capture_subprocess.h>
- #include <support/test-driver.h>
-
- static char MAGIC_ARGUMENT[] = "run-actual-test";
--#define MAGIC_STATUS 19
--
--/* Return a GID which is not our current GID, but is present in the
-- supplementary group list. */
--static gid_t
--choose_gid (void)
--{
-- int count = getgroups (0, NULL);
-- if (count < 0)
-- {
-- printf ("getgroups: %m\n");
-- exit (1);
-- }
-- gid_t *groups;
-- groups = xcalloc (count, sizeof (*groups));
-- int ret = getgroups (count, groups);
-- if (ret < 0)
-- {
-- printf ("getgroups: %m\n");
-- exit (1);
-- }
-- gid_t current = getgid ();
-- gid_t not_current = 0;
-- for (int i = 0; i < ret; ++i)
-- {
-- if (groups[i] != current)
-- {
-- not_current = groups[i];
-- break;
-- }
-- }
-- free (groups);
-- return not_current;
--}
--
--
--/* Copies the executable into a restricted directory, so that we can
-- safely make it SGID with the TARGET group ID. Then runs the
-- executable. */
--static int
--run_executable_sgid (gid_t target)
--{
-- char *dirname = xasprintf ("%s/secure-getenv.%jd",
-- test_dir, (intmax_t) getpid ());
-- char *execname = xasprintf ("%s/bin", dirname);
-- int infd = -1;
-- int outfd = -1;
-- int ret = -1;
-- if (mkdir (dirname, 0700) < 0)
-- {
-- printf ("mkdir: %m\n");
-- goto err;
-- }
-- infd = open ("/proc/self/exe", O_RDONLY);
-- if (infd < 0)
-- {
-- printf ("open (/proc/self/exe): %m\n");
-- goto err;
-- }
-- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
-- if (outfd < 0)
-- {
-- printf ("open (%s): %m\n", execname);
-- goto err;
-- }
-- char buf[4096];
-- for (;;)
-- {
-- ssize_t rdcount = read (infd, buf, sizeof (buf));
-- if (rdcount < 0)
-- {
-- printf ("read: %m\n");
-- goto err;
-- }
-- if (rdcount == 0)
-- break;
-- char *p = buf;
-- char *end = buf + rdcount;
-- while (p != end)
-- {
-- ssize_t wrcount = write (outfd, buf, end - p);
-- if (wrcount == 0)
-- errno = ENOSPC;
-- if (wrcount <= 0)
-- {
-- printf ("write: %m\n");
-- goto err;
-- }
-- p += wrcount;
-- }
-- }
-- if (fchown (outfd, getuid (), target) < 0)
-- {
-- printf ("fchown (%s): %m\n", execname);
-- goto err;
-- }
-- if (fchmod (outfd, 02750) < 0)
-- {
-- printf ("fchmod (%s): %m\n", execname);
-- goto err;
-- }
-- if (close (outfd) < 0)
-- {
-- printf ("close (outfd): %m\n");
-- goto err;
-- }
-- if (close (infd) < 0)
-- {
-- printf ("close (infd): %m\n");
-- goto err;
-- }
--
-- int kid = fork ();
-- if (kid < 0)
-- {
-- printf ("fork: %m\n");
-- goto err;
-- }
-- if (kid == 0)
-- {
-- /* Child process. */
-- char *args[] = { execname, MAGIC_ARGUMENT, NULL };
-- execve (execname, args, environ);
-- printf ("execve (%s): %m\n", execname);
-- _exit (1);
-- }
-- int status;
-- if (waitpid (kid, &status, 0) < 0)
-- {
-- printf ("waitpid: %m\n");
-- goto err;
-- }
-- if (!WIFEXITED (status) || WEXITSTATUS (status) != MAGIC_STATUS)
-- {
-- printf ("Unexpected exit status %d from child process\n",
-- status);
-- goto err;
-- }
-- ret = 0;
--
--err:
-- if (outfd >= 0)
-- close (outfd);
-- if (infd >= 0)
-- close (infd);
-- if (execname)
-- {
-- unlink (execname);
-- free (execname);
-- }
-- if (dirname)
-- {
-- rmdir (dirname);
-- free (dirname);
-- }
-- return ret;
--}
-
- static int
- do_test (void)
-@@ -212,15 +57,15 @@ do_test (void)
- exit (1);
- }
-
-- gid_t target = choose_gid ();
-- if (target == 0)
-- {
-- fprintf (stderr,
-- "Could not find a suitable GID for user %jd, skipping test\n",
-- (intmax_t) getuid ());
-- exit (0);
-- }
-- return run_executable_sgid (target);
-+ int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT);
-+
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ if (!WIFEXITED (status))
-+ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
-+
-+ return 0;
- }
-
- static void
-@@ -229,23 +74,15 @@ alternative_main (int argc, char **argv)
- if (argc == 2 && strcmp (argv[1], MAGIC_ARGUMENT) == 0)
- {
- if (getgid () == getegid ())
-- {
-- /* This can happen if the file system is mounted nosuid. */
-- fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n",
-- (intmax_t) getgid ());
-- exit (MAGIC_STATUS);
-- }
-+ /* This can happen if the file system is mounted nosuid. */
-+ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
-+ (intmax_t) getgid ());
- if (getenv ("PATH") == NULL)
-- {
-- printf ("PATH variable not present\n");
-- exit (3);
-- }
-+ FAIL_EXIT (3, "PATH variable not present\n");
- if (secure_getenv ("PATH") != NULL)
-- {
-- printf ("PATH variable not filtered out\n");
-- exit (4);
-- }
-- exit (MAGIC_STATUS);
-+ FAIL_EXIT (4, "PATH variable not filtered out\n");
-+
-+ exit (EXIT_SUCCESS);
- }
- }
-
-diff -pruN glibc-2.32.orig/string/bits/string_fortified.h glibc-2.32/string/bits/string_fortified.h
---- glibc-2.32.orig/string/bits/string_fortified.h 2021-09-18 21:02:32.700184614 +1000
-+++ glibc-2.32/string/bits/string_fortified.h 2021-09-18 21:03:05.312302287 +1000
-@@ -22,11 +22,6 @@
- # error "Never use <bits/string_fortified.h> directly; include <string.h> instead."
- #endif
-
--#if !__GNUC_PREREQ (5,0)
--__warndecl (__warn_memset_zero_len,
-- "memset used with constant zero length parameter; this could be due to transposed parameters");
--#endif
--
- __fortify_function void *
- __NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
- size_t __len))
-@@ -58,16 +53,6 @@ __NTH (mempcpy (void *__restrict __dest,
- __fortify_function void *
- __NTH (memset (void *__dest, int __ch, size_t __len))
- {
-- /* GCC-5.0 and newer implements these checks in the compiler, so we don't
-- need them here. */
--#if !__GNUC_PREREQ (5,0)
-- if (__builtin_constant_p (__len) && __len == 0
-- && (!__builtin_constant_p (__ch) || __ch != 0))
-- {
-- __warn_memset_zero_len ();
-- return __dest;
-- }
--#endif
- return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
- }
-
-diff -pruN glibc-2.32.orig/support/capture_subprocess.h glibc-2.32/support/capture_subprocess.h
---- glibc-2.32.orig/support/capture_subprocess.h 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/capture_subprocess.h 2021-09-18 21:03:05.312302287 +1000
-@@ -41,6 +41,12 @@ struct support_capture_subprocess suppor
- struct support_capture_subprocess support_capture_subprogram
- (const char *file, char *const argv[]);
-
-+/* Copy the running program into a setgid binary and run it with CHILD_ID
-+ argument. If execution is successful, return the exit status of the child
-+ program, otherwise return a non-zero failure exit code. */
-+int support_capture_subprogram_self_sgid
-+ (char *child_id);
-+
- /* Deallocate the subprocess data captured by
- support_capture_subprocess. */
- void support_capture_subprocess_free (struct support_capture_subprocess *);
-diff -pruN glibc-2.32.orig/support/Makefile glibc-2.32/support/Makefile
---- glibc-2.32.orig/support/Makefile 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -35,6 +35,8 @@ libsupport-routines = \
- ignore_stderr \
- next_to_fault \
- oom_error \
-+ resolv_response_context_duplicate \
-+ resolv_response_context_free \
- resolv_test \
- set_fortify_handler \
- support-xfstat \
-diff -pruN glibc-2.32.orig/support/resolv_response_context_duplicate.c glibc-2.32/support/resolv_response_context_duplicate.c
---- glibc-2.32.orig/support/resolv_response_context_duplicate.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/support/resolv_response_context_duplicate.c 2021-09-18 21:03:05.312302287 +1000
-@@ -0,0 +1,37 @@
-+/* Duplicate a response context used in DNS resolver tests.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <string.h>
-+#include <support/resolv_test.h>
-+#include <support/support.h>
-+
-+struct resolv_response_context *
-+resolv_response_context_duplicate (const struct resolv_response_context *ctx)
-+{
-+ struct resolv_response_context *result = xmalloc (sizeof (*result));
-+ memcpy (result, ctx, sizeof (*result));
-+ if (result->client_address != NULL)
-+ {
-+ result->client_address = xmalloc (result->client_address_length);
-+ memcpy (result->client_address, ctx->client_address,
-+ result->client_address_length);
-+ }
-+ result->query_buffer = xmalloc (result->query_length);
-+ memcpy (result->query_buffer, ctx->query_buffer, result->query_length);
-+ return result;
-+}
-diff -pruN glibc-2.32.orig/support/resolv_response_context_free.c glibc-2.32/support/resolv_response_context_free.c
---- glibc-2.32.orig/support/resolv_response_context_free.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/support/resolv_response_context_free.c 2021-09-18 21:03:05.312302287 +1000
-@@ -0,0 +1,28 @@
-+/* Free a response context used in DNS resolver tests.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <stdlib.h>
-+#include <support/resolv_test.h>
-+
-+void
-+resolv_response_context_free (struct resolv_response_context *ctx)
-+{
-+ free (ctx->query_buffer);
-+ free (ctx->client_address);
-+ free (ctx);
-+}
-diff -pruN glibc-2.32.orig/support/resolv_test.c glibc-2.32/support/resolv_test.c
---- glibc-2.32.orig/support/resolv_test.c 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/resolv_test.c 2021-09-18 21:03:05.312302287 +1000
-@@ -181,7 +181,9 @@ resolv_response_init (struct resolv_resp
- b->buffer[2] |= b->query_buffer[2] & 0x01; /* Copy the RD bit. */
- if (flags.tc)
- b->buffer[2] |= 0x02;
-- b->buffer[3] = 0x80 | flags.rcode; /* Always set RA. */
-+ b->buffer[3] = flags.rcode;
-+ if (!flags.clear_ra)
-+ b->buffer[3] |= 0x80;
- if (flags.ad)
- b->buffer[3] |= 0x20;
-
-@@ -434,9 +436,9 @@ resolv_response_buffer (const struct res
- return result;
- }
-
--static struct resolv_response_builder *
--response_builder_allocate
-- (const unsigned char *query_buffer, size_t query_length)
-+struct resolv_response_builder *
-+resolv_response_builder_allocate (const unsigned char *query_buffer,
-+ size_t query_length)
- {
- struct resolv_response_builder *b = xmalloc (sizeof (*b));
- memset (b, 0, offsetof (struct resolv_response_builder, buffer));
-@@ -445,8 +447,8 @@ response_builder_allocate
- return b;
- }
-
--static void
--response_builder_free (struct resolv_response_builder *b)
-+void
-+resolv_response_builder_free (struct resolv_response_builder *b)
- {
- tdestroy (b->compression_offsets, free);
- free (b);
-@@ -661,13 +663,17 @@ server_thread_udp_process_one (struct re
-
- struct resolv_response_context ctx =
- {
-+ .test = obj,
-+ .client_address = &peer,
-+ .client_address_length = peerlen,
- .query_buffer = query,
- .query_length = length,
- .server_index = server_index,
- .tcp = false,
- .edns = qinfo.edns,
- };
-- struct resolv_response_builder *b = response_builder_allocate (query, length);
-+ struct resolv_response_builder *b
-+ = resolv_response_builder_allocate (query, length);
- obj->config.response_callback
- (&ctx, b, qinfo.qname, qinfo.qclass, qinfo.qtype);
-
-@@ -684,7 +690,7 @@ server_thread_udp_process_one (struct re
- if (b->offset >= 12)
- printf ("info: UDP server %d: sending response:"
- " %zu bytes, RCODE %d (for %s/%u/%u)\n",
-- server_index, b->offset, b->buffer[3] & 0x0f,
-+ ctx.server_index, b->offset, b->buffer[3] & 0x0f,
- qinfo.qname, qinfo.qclass, qinfo.qtype);
- else
- printf ("info: UDP server %d: sending response: %zu bytes"
-@@ -694,23 +700,31 @@ server_thread_udp_process_one (struct re
- if (b->truncate_bytes > 0)
- printf ("info: truncated by %u bytes\n", b->truncate_bytes);
- }
-- size_t to_send = b->offset;
-- if (to_send < b->truncate_bytes)
-- to_send = 0;
-- else
-- to_send -= b->truncate_bytes;
--
-- /* Ignore most errors here because the other end may have closed
-- the socket. */
-- if (sendto (obj->servers[server_index].socket_udp,
-- b->buffer, to_send, 0,
-- (struct sockaddr *) &peer, peerlen) < 0)
-- TEST_VERIFY_EXIT (errno != EBADF);
-+ resolv_response_send_udp (&ctx, b);
- }
-- response_builder_free (b);
-+ resolv_response_builder_free (b);
- return true;
- }
-
-+void
-+resolv_response_send_udp (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b)
-+{
-+ TEST_VERIFY_EXIT (!ctx->tcp);
-+ size_t to_send = b->offset;
-+ if (to_send < b->truncate_bytes)
-+ to_send = 0;
-+ else
-+ to_send -= b->truncate_bytes;
-+
-+ /* Ignore most errors here because the other end may have closed
-+ the socket. */
-+ if (sendto (ctx->test->servers[ctx->server_index].socket_udp,
-+ b->buffer, to_send, 0,
-+ ctx->client_address, ctx->client_address_length) < 0)
-+ TEST_VERIFY_EXIT (errno != EBADF);
-+}
-+
- /* UDP thread_callback function. Variant for one thread per
- server. */
- static void
-@@ -897,14 +911,15 @@ server_thread_tcp_client (void *arg)
-
- struct resolv_response_context ctx =
- {
-+ .test = closure->obj,
- .query_buffer = query_buffer,
- .query_length = query_length,
- .server_index = closure->server_index,
- .tcp = true,
- .edns = qinfo.edns,
- };
-- struct resolv_response_builder *b = response_builder_allocate
-- (query_buffer, query_length);
-+ struct resolv_response_builder *b
-+ = resolv_response_builder_allocate (query_buffer, query_length);
- closure->obj->config.response_callback
- (&ctx, b, qinfo.qname, qinfo.qclass, qinfo.qtype);
-
-@@ -936,7 +951,7 @@ server_thread_tcp_client (void *arg)
- writev_fully (closure->client_socket, buffers, 2);
- }
- bool close_flag = b->close;
-- response_builder_free (b);
-+ resolv_response_builder_free (b);
- free (query_buffer);
- if (close_flag)
- break;
-diff -pruN glibc-2.32.orig/support/resolv_test.h glibc-2.32/support/resolv_test.h
---- glibc-2.32.orig/support/resolv_test.h 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/resolv_test.h 2021-09-18 21:03:05.312302287 +1000
-@@ -35,25 +35,36 @@ struct resolv_edns_info
- uint16_t payload_size;
- };
-
-+/* This opaque struct collects information about the resolver testing
-+ currently in progress. */
-+struct resolv_test;
-+
- /* This struct provides context information when the response callback
- specified in struct resolv_redirect_config is invoked. */
- struct resolv_response_context
- {
-- const unsigned char *query_buffer;
-+ struct resolv_test *test;
-+ void *client_address;
-+ size_t client_address_length;
-+ unsigned char *query_buffer;
- size_t query_length;
- int server_index;
- bool tcp;
- struct resolv_edns_info edns;
- };
-
-+/* Produces a deep copy of the context. */
-+struct resolv_response_context *
-+ resolv_response_context_duplicate (const struct resolv_response_context *);
-+
-+/* Frees the copy. For the context passed to the response function,
-+ this happens implicitly. */
-+void resolv_response_context_free (struct resolv_response_context *);
-+
- /* This opaque struct is used to construct responses from within the
- response callback function. */
- struct resolv_response_builder;
-
--/* This opaque struct collects information about the resolver testing
-- currently in progress. */
--struct resolv_test;
--
- enum
- {
- /* Maximum number of test servers supported by the framework. */
-@@ -137,6 +148,10 @@ struct resolv_response_flags
- /* If true, the AD (authenticated data) flag will be set. */
- bool ad;
-
-+ /* If true, do not set the RA (recursion available) flag in the
-+ response. */
-+ bool clear_ra;
-+
- /* Initial section count values. Can be used to artificially
- increase the counts, for malformed packet testing.*/
- unsigned short qdcount;
-@@ -188,6 +203,22 @@ void resolv_response_close (struct resol
- /* The size of the response packet built so far. */
- size_t resolv_response_length (const struct resolv_response_builder *);
-
-+/* Allocates a response builder tied to a specific query packet,
-+ starting at QUERY_BUFFER, containing QUERY_LENGTH bytes. */
-+struct resolv_response_builder *
-+ resolv_response_builder_allocate (const unsigned char *query_buffer,
-+ size_t query_length);
-+
-+/* Deallocates a response buffer. */
-+void resolv_response_builder_free (struct resolv_response_builder *);
-+
-+/* Sends a UDP response using a specific context. This can be used to
-+ reorder or duplicate responses, along with
-+ resolv_response_context_duplicate and
-+ response_builder_allocate. */
-+void resolv_response_send_udp (const struct resolv_response_context *,
-+ struct resolv_response_builder *);
-+
- __END_DECLS
-
- #endif /* SUPPORT_RESOLV_TEST_H */
-diff -pruN glibc-2.32.orig/support/subprocess.h glibc-2.32/support/subprocess.h
---- glibc-2.32.orig/support/subprocess.h 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/subprocess.h 2021-09-18 21:03:05.312302287 +1000
-@@ -38,6 +38,11 @@ struct support_subprocess support_subpro
- struct support_subprocess support_subprogram
- (const char *file, char *const argv[]);
-
-+/* Invoke program FILE with ARGV arguments by using posix_spawn and wait for it
-+ to complete. Return program exit status. */
-+int support_subprogram_wait
-+ (const char *file, char *const argv[]);
-+
- /* Wait for the subprocess indicated by PROC::PID. Return the status
- indicate by waitpid call. */
- int support_process_wait (struct support_subprocess *proc);
-diff -pruN glibc-2.32.orig/support/support_capture_subprocess.c glibc-2.32/support/support_capture_subprocess.c
---- glibc-2.32.orig/support/support_capture_subprocess.c 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/support_capture_subprocess.c 2021-09-18 21:03:05.313302322 +1000
-@@ -20,11 +20,14 @@
- #include <support/capture_subprocess.h>
-
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdlib.h>
- #include <support/check.h>
- #include <support/xunistd.h>
- #include <support/xsocket.h>
- #include <support/xspawn.h>
-+#include <support/support.h>
-+#include <support/test-driver.h>
-
- static void
- transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream)
-@@ -36,7 +39,7 @@ transfer (const char *what, struct pollf
- if (ret < 0)
- {
- support_record_failure ();
-- printf ("error: reading from subprocess %s: %m", what);
-+ printf ("error: reading from subprocess %s: %m\n", what);
- pfd->events = 0;
- pfd->revents = 0;
- }
-@@ -102,6 +105,129 @@ support_capture_subprogram (const char *
- return result;
- }
-
-+/* Copies the executable into a restricted directory, so that we can
-+ safely make it SGID with the TARGET group ID. Then runs the
-+ executable. */
-+static int
-+copy_and_spawn_sgid (char *child_id, gid_t gid)
-+{
-+ char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
-+ test_dir, (intmax_t) getpid ());
-+ char *execname = xasprintf ("%s/bin", dirname);
-+ int infd = -1;
-+ int outfd = -1;
-+ int ret = 1, status = 1;
-+
-+ TEST_VERIFY (mkdir (dirname, 0700) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+
-+ infd = open ("/proc/self/exe", O_RDONLY);
-+ if (infd < 0)
-+ FAIL_UNSUPPORTED ("unsupported: Cannot read binary from procfs\n");
-+
-+ outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
-+ TEST_VERIFY (outfd >= 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+
-+ char buf[4096];
-+ for (;;)
-+ {
-+ ssize_t rdcount = read (infd, buf, sizeof (buf));
-+ TEST_VERIFY (rdcount >= 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ if (rdcount == 0)
-+ break;
-+ char *p = buf;
-+ char *end = buf + rdcount;
-+ while (p != end)
-+ {
-+ ssize_t wrcount = write (outfd, buf, end - p);
-+ if (wrcount == 0)
-+ errno = ENOSPC;
-+ TEST_VERIFY (wrcount > 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ p += wrcount;
-+ }
-+ }
-+ TEST_VERIFY (fchown (outfd, getuid (), gid) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ TEST_VERIFY (fchmod (outfd, 02750) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ TEST_VERIFY (close (outfd) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ TEST_VERIFY (close (infd) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+
-+ /* We have the binary, now spawn the subprocess. Avoid using
-+ support_subprogram because we only want the program exit status, not the
-+ contents. */
-+ ret = 0;
-+
-+ char * const args[] = {execname, child_id, NULL};
-+
-+ status = support_subprogram_wait (args[0], args);
-+
-+err:
-+ if (outfd >= 0)
-+ close (outfd);
-+ if (infd >= 0)
-+ close (infd);
-+ if (execname != NULL)
-+ {
-+ unlink (execname);
-+ free (execname);
-+ }
-+ if (dirname != NULL)
-+ {
-+ rmdir (dirname);
-+ free (dirname);
-+ }
-+
-+ if (ret != 0)
-+ FAIL_EXIT1("Failed to make sgid executable for test\n");
-+
-+ return status;
-+}
-+
-+int
-+support_capture_subprogram_self_sgid (char *child_id)
-+{
-+ gid_t target = 0;
-+ const int count = 64;
-+ gid_t groups[count];
-+
-+ /* Get a GID which is not our current GID, but is present in the
-+ supplementary group list. */
-+ int ret = getgroups (count, groups);
-+ if (ret < 0)
-+ FAIL_UNSUPPORTED("Could not get group list for user %jd\n",
-+ (intmax_t) getuid ());
-+
-+ gid_t current = getgid ();
-+ for (int i = 0; i < ret; ++i)
-+ {
-+ if (groups[i] != current)
-+ {
-+ target = groups[i];
-+ break;
-+ }
-+ }
-+
-+ if (target == 0)
-+ FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n",
-+ (intmax_t) getuid ());
-+
-+ return copy_and_spawn_sgid (child_id, target);
-+}
-+
- void
- support_capture_subprocess_free (struct support_capture_subprocess *p)
- {
-diff -pruN glibc-2.32.orig/support/support_subprocess.c glibc-2.32/support/support_subprocess.c
---- glibc-2.32.orig/support/support_subprocess.c 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/support_subprocess.c 2021-09-18 21:03:05.313302322 +1000
-@@ -27,7 +27,7 @@
- #include <support/subprocess.h>
-
- static struct support_subprocess
--support_suprocess_init (void)
-+support_subprocess_init (void)
- {
- struct support_subprocess result;
-
-@@ -48,7 +48,7 @@ support_suprocess_init (void)
- struct support_subprocess
- support_subprocess (void (*callback) (void *), void *closure)
- {
-- struct support_subprocess result = support_suprocess_init ();
-+ struct support_subprocess result = support_subprocess_init ();
-
- result.pid = xfork ();
- if (result.pid == 0)
-@@ -71,7 +71,7 @@ support_subprocess (void (*callback) (vo
- struct support_subprocess
- support_subprogram (const char *file, char *const argv[])
- {
-- struct support_subprocess result = support_suprocess_init ();
-+ struct support_subprocess result = support_subprocess_init ();
-
- posix_spawn_file_actions_t fa;
- /* posix_spawn_file_actions_init does not fail. */
-@@ -84,7 +84,7 @@ support_subprogram (const char *file, ch
- xposix_spawn_file_actions_addclose (&fa, result.stdout_pipe[1]);
- xposix_spawn_file_actions_addclose (&fa, result.stderr_pipe[1]);
-
-- result.pid = xposix_spawn (file, &fa, NULL, argv, NULL);
-+ result.pid = xposix_spawn (file, &fa, NULL, argv, environ);
-
- xclose (result.stdout_pipe[1]);
- xclose (result.stderr_pipe[1]);
-@@ -93,6 +93,19 @@ support_subprogram (const char *file, ch
- }
-
- int
-+support_subprogram_wait (const char *file, char *const argv[])
-+{
-+ posix_spawn_file_actions_t fa;
-+
-+ posix_spawn_file_actions_init (&fa);
-+ struct support_subprocess res = support_subprocess_init ();
-+
-+ res.pid = xposix_spawn (file, &fa, NULL, argv, environ);
-+
-+ return support_process_wait (&res);
-+}
-+
-+int
- support_process_wait (struct support_subprocess *proc)
- {
- xclose (proc->stdout_pipe[0]);
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/dl-bti.c glibc-2.32/sysdeps/aarch64/dl-bti.c
---- glibc-2.32.orig/sysdeps/aarch64/dl-bti.c 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/dl-bti.c 2021-09-18 21:03:05.313302322 +1000
-@@ -19,43 +19,76 @@
- #include <errno.h>
- #include <libintl.h>
- #include <ldsodefs.h>
-+#include <sys/mman.h>
-
--static int
--enable_bti (struct link_map *map, const char *program)
-+/* See elf/dl-load.h. */
-+#ifndef MAP_COPY
-+# define MAP_COPY (MAP_PRIVATE | MAP_DENYWRITE)
-+#endif
-+
-+/* Enable BTI protection for MAP. */
-+
-+void
-+_dl_bti_protect (struct link_map *map, int fd)
- {
-+ const size_t pagesz = GLRO(dl_pagesize);
- const ElfW(Phdr) *phdr;
-- unsigned prot;
-
- for (phdr = map->l_phdr; phdr < &map->l_phdr[map->l_phnum]; ++phdr)
- if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_X))
- {
-- void *start = (void *) (phdr->p_vaddr + map->l_addr);
-- size_t len = phdr->p_memsz;
-+ size_t vstart = ALIGN_DOWN (phdr->p_vaddr, pagesz);
-+ size_t vend = ALIGN_UP (phdr->p_vaddr + phdr->p_filesz, pagesz);
-+ off_t off = ALIGN_DOWN (phdr->p_offset, pagesz);
-+ void *start = (void *) (vstart + map->l_addr);
-+ size_t len = vend - vstart;
-
-- prot = PROT_EXEC | PROT_BTI;
-+ unsigned prot = PROT_EXEC | PROT_BTI;
- if (phdr->p_flags & PF_R)
- prot |= PROT_READ;
- if (phdr->p_flags & PF_W)
- prot |= PROT_WRITE;
-
-- if (__mprotect (start, len, prot) < 0)
-- {
-- if (program)
-- _dl_fatal_printf ("%s: mprotect failed to turn on BTI\n",
-- map->l_name);
-- else
-- _dl_signal_error (errno, map->l_name, "dlopen",
-- N_("mprotect failed to turn on BTI"));
-- }
-+ if (fd == -1)
-+ /* Ignore failures for kernel mapped binaries. */
-+ __mprotect (start, len, prot);
-+ else
-+ map->l_mach.bti_fail = __mmap (start, len, prot,
-+ MAP_FIXED|MAP_COPY|MAP_FILE,
-+ fd, off) == MAP_FAILED;
- }
-- return 0;
- }
-
--/* Enable BTI for L if required. */
-+
-+static void
-+bti_failed (struct link_map *l, const char *program)
-+{
-+ if (program)
-+ _dl_fatal_printf ("%s: %s: failed to turn on BTI protection\n",
-+ program, l->l_name);
-+ else
-+ /* Note: the errno value is not available any more. */
-+ _dl_signal_error (0, l->l_name, "dlopen",
-+ N_("failed to turn on BTI protection"));
-+}
-+
-+
-+/* Enable BTI for L and its dependencies. */
-
- void
- _dl_bti_check (struct link_map *l, const char *program)
- {
-- if (GLRO(dl_aarch64_cpu_features).bti && l->l_mach.bti)
-- enable_bti (l, program);
-+ if (!GLRO(dl_aarch64_cpu_features).bti)
-+ return;
-+
-+ if (l->l_mach.bti_fail)
-+ bti_failed (l, program);
-+
-+ unsigned int i = l->l_searchlist.r_nlist;
-+ while (i-- > 0)
-+ {
-+ struct link_map *dep = l->l_initfini[i];
-+ if (dep->l_mach.bti_fail)
-+ bti_failed (dep, program);
-+ }
- }
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/dl-machine.h glibc-2.32/sysdeps/aarch64/dl-machine.h
---- glibc-2.32.orig/sysdeps/aarch64/dl-machine.h 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/dl-machine.h 2021-09-18 21:03:05.313302322 +1000
-@@ -395,13 +395,6 @@ elf_machine_lazy_rel (struct link_map *m
- /* Check for unexpected PLT reloc type. */
- if (__builtin_expect (r_type == AARCH64_R(JUMP_SLOT), 1))
- {
-- if (map->l_mach.plt == 0)
-- {
-- /* Prelinking. */
-- *reloc_addr += l_addr;
-- return;
-- }
--
- if (__glibc_unlikely (map->l_info[DT_AARCH64 (VARIANT_PCS)] != NULL))
- {
- /* Check the symbol table for variant PCS symbols. */
-@@ -425,7 +418,10 @@ elf_machine_lazy_rel (struct link_map *m
- }
- }
-
-- *reloc_addr = map->l_mach.plt;
-+ if (map->l_mach.plt == 0)
-+ *reloc_addr += l_addr;
-+ else
-+ *reloc_addr = map->l_mach.plt;
- }
- else if (__builtin_expect (r_type == AARCH64_R(TLSDESC), 1))
- {
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/dl-prop.h glibc-2.32/sysdeps/aarch64/dl-prop.h
---- glibc-2.32.orig/sysdeps/aarch64/dl-prop.h 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/dl-prop.h 2021-09-18 21:03:05.313302322 +1000
-@@ -19,6 +19,8 @@
- #ifndef _DL_PROP_H
- #define _DL_PROP_H
-
-+extern void _dl_bti_protect (struct link_map *, int) attribute_hidden;
-+
- extern void _dl_bti_check (struct link_map *, const char *)
- attribute_hidden;
-
-@@ -35,14 +37,18 @@ _dl_open_check (struct link_map *m)
- }
-
- static inline void __attribute__ ((always_inline))
--_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- }
-
- static inline int
--_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
-- void *data)
-+_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
-+ uint32_t datasz, void *data)
- {
-+ if (!GLRO(dl_aarch64_cpu_features).bti)
-+ /* Skip note processing. */
-+ return 0;
-+
- if (type == GNU_PROPERTY_AARCH64_FEATURE_1_AND)
- {
- /* Stop if the property note is ill-formed. */
-@@ -51,7 +57,7 @@ _dl_process_gnu_property (struct link_ma
-
- unsigned int feature_1 = *(unsigned int *) data;
- if (feature_1 & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)
-- l->l_mach.bti = true;
-+ _dl_bti_protect (l, fd);
-
- /* Stop if we processed the property note. */
- return 0;
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/linkmap.h glibc-2.32/sysdeps/aarch64/linkmap.h
---- glibc-2.32.orig/sysdeps/aarch64/linkmap.h 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/linkmap.h 2021-09-18 21:03:05.313302322 +1000
-@@ -22,5 +22,5 @@ struct link_map_machine
- {
- ElfW(Addr) plt; /* Address of .plt */
- void *tlsdesc_table; /* Address of TLS descriptor hash table. */
-- bool bti; /* Branch Target Identification is enabled. */
-+ bool bti_fail; /* Failed to enable Branch Target Identification. */
- };
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy_advsimd.S glibc-2.32/sysdeps/aarch64/multiarch/memcpy_advsimd.S
---- glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy_advsimd.S 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/multiarch/memcpy_advsimd.S 2021-09-18 21:03:05.313302322 +1000
-@@ -223,12 +223,13 @@ L(copy_long_backwards):
- b.ls L(copy64_from_start)
-
- L(loop64_backwards):
-- stp A_q, B_q, [dstend, -32]
-+ str B_q, [dstend, -16]
-+ str A_q, [dstend, -32]
- ldp A_q, B_q, [srcend, -96]
-- stp C_q, D_q, [dstend, -64]
-+ str D_q, [dstend, -48]
-+ str C_q, [dstend, -64]!
- ldp C_q, D_q, [srcend, -128]
- sub srcend, srcend, 64
-- sub dstend, dstend, 64
- subs count, count, 64
- b.hi L(loop64_backwards)
-
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy.c glibc-2.32/sysdeps/aarch64/multiarch/memcpy.c
---- glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy.c 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/multiarch/memcpy.c 2021-09-18 21:03:05.313302322 +1000
-@@ -41,7 +41,8 @@ libc_ifunc (__libc_memcpy,
- ? __memcpy_falkor
- : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
- ? __memcpy_thunderx2
-- : (IS_NEOVERSE_N1 (midr)
-+ : (IS_NEOVERSE_N1 (midr) || IS_NEOVERSE_N2 (midr)
-+ || IS_NEOVERSE_V1 (midr)
- ? __memcpy_simd
- : __memcpy_generic)))));
-
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/multiarch/memmove.c glibc-2.32/sysdeps/aarch64/multiarch/memmove.c
---- glibc-2.32.orig/sysdeps/aarch64/multiarch/memmove.c 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/multiarch/memmove.c 2021-09-18 21:03:05.313302322 +1000
-@@ -41,7 +41,8 @@ libc_ifunc (__libc_memmove,
- ? __memmove_falkor
- : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
- ? __memmove_thunderx2
-- : (IS_NEOVERSE_N1 (midr)
-+ : (IS_NEOVERSE_N1 (midr) || IS_NEOVERSE_N2 (midr)
-+ || IS_NEOVERSE_V1 (midr)
- ? __memmove_simd
- : __memmove_generic)))));
-
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/start.S glibc-2.32/sysdeps/aarch64/start.S
---- glibc-2.32.orig/sysdeps/aarch64/start.S 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/start.S 2021-09-18 21:03:05.313302322 +1000
-@@ -43,11 +43,9 @@
- */
-
- .text
-- .globl _start
-- .type _start,#function
--_start:
-- BTI_C
-+ENTRY(_start)
- /* Create an initial frame with 0 LR and FP */
-+ cfi_undefined (x30)
- mov x29, #0
- mov x30, #0
-
-@@ -101,8 +99,10 @@ _start:
- because crt1.o and rcrt1.o share code and the later must avoid the
- use of GOT relocations before __libc_start_main is called. */
- __wrap_main:
-+ BTI_C
- b main
- #endif
-+END(_start)
-
- /* Define a symbol for the first piece of initialized data. */
- .data
-diff -pruN glibc-2.32.orig/sysdeps/generic/dl-prop.h glibc-2.32/sysdeps/generic/dl-prop.h
---- glibc-2.32.orig/sysdeps/generic/dl-prop.h 2021-09-18 21:02:32.705184785 +1000
-+++ glibc-2.32/sysdeps/generic/dl-prop.h 2021-09-18 21:03:05.313302322 +1000
-@@ -37,15 +37,15 @@ _dl_open_check (struct link_map *m)
- }
-
- static inline void __attribute__ ((always_inline))
--_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- }
-
- /* Called for each property in the NT_GNU_PROPERTY_TYPE_0 note of L,
- processing of the properties continues until this returns 0. */
- static inline int __attribute__ ((always_inline))
--_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
-- void *data)
-+_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
-+ uint32_t datasz, void *data)
- {
- return 0;
- }
-diff -pruN glibc-2.32.orig/sysdeps/generic/ldsodefs.h glibc-2.32/sysdeps/generic/ldsodefs.h
---- glibc-2.32.orig/sysdeps/generic/ldsodefs.h 2021-09-18 21:02:32.705184785 +1000
-+++ glibc-2.32/sysdeps/generic/ldsodefs.h 2021-09-18 21:03:05.313302322 +1000
-@@ -919,8 +919,9 @@ extern void _dl_rtld_di_serinfo (struct
- Dl_serinfo *si, bool counting);
-
- /* Process PT_GNU_PROPERTY program header PH in module L after
-- PT_LOAD segments are mapped. */
--void _dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph);
-+ PT_LOAD segments are mapped from file FD. */
-+void _dl_process_pt_gnu_property (struct link_map *l, int fd,
-+ const ElfW(Phdr) *ph);
-
-
- /* Search loaded objects' symbol tables for a definition of the symbol
-diff -pruN glibc-2.32.orig/sysdeps/generic/unwind.h glibc-2.32/sysdeps/generic/unwind.h
---- glibc-2.32.orig/sysdeps/generic/unwind.h 2021-09-18 21:02:32.706184819 +1000
-+++ glibc-2.32/sysdeps/generic/unwind.h 2021-09-18 21:03:05.313302322 +1000
-@@ -75,15 +75,21 @@ typedef void (*_Unwind_Exception_Cleanup
-
- struct _Unwind_Exception
- {
-- _Unwind_Exception_Class exception_class;
-- _Unwind_Exception_Cleanup_Fn exception_cleanup;
-- _Unwind_Word private_1;
-- _Unwind_Word private_2;
-+ union
-+ {
-+ struct
-+ {
-+ _Unwind_Exception_Class exception_class;
-+ _Unwind_Exception_Cleanup_Fn exception_cleanup;
-+ _Unwind_Word private_1;
-+ _Unwind_Word private_2;
-+ };
-
-- /* @@@ The IA-64 ABI says that this structure must be double-word aligned.
-- Taking that literally does not make much sense generically. Instead we
-- provide the maximum alignment required by any type for the machine. */
--} __attribute__((__aligned__));
-+ /* The IA-64 ABI says that this structure must be double-word aligned. */
-+ _Unwind_Word unwind_exception_align[2]
-+ __attribute__ ((__aligned__ (2 * sizeof (_Unwind_Word))));
-+ };
-+};
-
-
- /* The ACTIONS argument to the personality routine is a bitwise OR of one
-diff -pruN glibc-2.32.orig/sysdeps/gnu/errlist.h glibc-2.32/sysdeps/gnu/errlist.h
---- glibc-2.32.orig/sysdeps/gnu/errlist.h 2021-09-18 21:02:32.706184819 +1000
-+++ glibc-2.32/sysdeps/gnu/errlist.h 2021-09-18 21:03:05.313302322 +1000
-@@ -1,24 +1,21 @@
--#ifndef ERR_MAP
--#define ERR_MAP(value) value
--#endif
--_S(ERR_MAP(0), N_("Success"))
-+_S(0, N_("Success"))
- #ifdef EPERM
- /*
- TRANS Only the owner of the file (or other resource)
- TRANS or processes with special privileges can perform the operation. */
--_S(ERR_MAP(EPERM), N_("Operation not permitted"))
-+_S(EPERM, N_("Operation not permitted"))
- #endif
- #ifdef ENOENT
- /*
- TRANS This is a ``file doesn't exist'' error
- TRANS for ordinary files that are referenced in contexts where they are
- TRANS expected to already exist. */
--_S(ERR_MAP(ENOENT), N_("No such file or directory"))
-+_S(ENOENT, N_("No such file or directory"))
- #endif
- #ifdef ESRCH
- /*
- TRANS No process matches the specified process ID. */
--_S(ERR_MAP(ESRCH), N_("No such process"))
-+_S(ESRCH, N_("No such process"))
- #endif
- #ifdef EINTR
- /*
-@@ -29,12 +26,12 @@ TRANS
- TRANS You can choose to have functions resume after a signal that is handled,
- TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
- TRANS Primitives}. */
--_S(ERR_MAP(EINTR), N_("Interrupted system call"))
-+_S(EINTR, N_("Interrupted system call"))
- #endif
- #ifdef EIO
- /*
- TRANS Usually used for physical read or write errors. */
--_S(ERR_MAP(EIO), N_("Input/output error"))
-+_S(EIO, N_("Input/output error"))
- #endif
- #ifdef ENXIO
- /*
-@@ -43,7 +40,7 @@ TRANS represented by a file you specifie
- TRANS This can mean that the device file was installed incorrectly, or that
- TRANS the physical device is missing or not correctly attached to the
- TRANS computer. */
--_S(ERR_MAP(ENXIO), N_("No such device or address"))
-+_S(ENXIO, N_("No such device or address"))
- #endif
- #ifdef E2BIG
- /*
-@@ -51,27 +48,27 @@ TRANS Used when the arguments passed to
- TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
- TRANS File}) occupy too much memory space. This condition never arises on
- TRANS @gnuhurdsystems{}. */
--_S(ERR_MAP(E2BIG), N_("Argument list too long"))
-+_S(E2BIG, N_("Argument list too long"))
- #endif
- #ifdef ENOEXEC
- /*
- TRANS Invalid executable file format. This condition is detected by the
- TRANS @code{exec} functions; see @ref{Executing a File}. */
--_S(ERR_MAP(ENOEXEC), N_("Exec format error"))
-+_S(ENOEXEC, N_("Exec format error"))
- #endif
- #ifdef EBADF
- /*
- TRANS For example, I/O on a descriptor that has been
- TRANS closed or reading from a descriptor open only for writing (or vice
- TRANS versa). */
--_S(ERR_MAP(EBADF), N_("Bad file descriptor"))
-+_S(EBADF, N_("Bad file descriptor"))
- #endif
- #ifdef ECHILD
- /*
- TRANS This error happens on operations that are
- TRANS supposed to manipulate child processes, when there aren't any processes
- TRANS to manipulate. */
--_S(ERR_MAP(ECHILD), N_("No child processes"))
-+_S(ECHILD, N_("No child processes"))
- #endif
- #ifdef EDEADLK
- /*
-@@ -79,74 +76,74 @@ TRANS Allocating a system resource would
- TRANS deadlock situation. The system does not guarantee that it will notice
- TRANS all such situations. This error means you got lucky and the system
- TRANS noticed; it might just hang. @xref{File Locks}, for an example. */
--_S(ERR_MAP(EDEADLK), N_("Resource deadlock avoided"))
-+_S(EDEADLK, N_("Resource deadlock avoided"))
- #endif
- #ifdef ENOMEM
- /*
- TRANS The system cannot allocate more virtual memory
- TRANS because its capacity is full. */
--_S(ERR_MAP(ENOMEM), N_("Cannot allocate memory"))
-+_S(ENOMEM, N_("Cannot allocate memory"))
- #endif
- #ifdef EACCES
- /*
- TRANS The file permissions do not allow the attempted operation. */
--_S(ERR_MAP(EACCES), N_("Permission denied"))
-+_S(EACCES, N_("Permission denied"))
- #endif
- #ifdef EFAULT
- /*
- TRANS An invalid pointer was detected.
- TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead. */
--_S(ERR_MAP(EFAULT), N_("Bad address"))
-+_S(EFAULT, N_("Bad address"))
- #endif
- #ifdef ENOTBLK
- /*
- TRANS A file that isn't a block special file was given in a situation that
- TRANS requires one. For example, trying to mount an ordinary file as a file
- TRANS system in Unix gives this error. */
--_S(ERR_MAP(ENOTBLK), N_("Block device required"))
-+_S(ENOTBLK, N_("Block device required"))
- #endif
- #ifdef EBUSY
- /*
- TRANS A system resource that can't be shared is already in use.
- TRANS For example, if you try to delete a file that is the root of a currently
- TRANS mounted filesystem, you get this error. */
--_S(ERR_MAP(EBUSY), N_("Device or resource busy"))
-+_S(EBUSY, N_("Device or resource busy"))
- #endif
- #ifdef EEXIST
- /*
- TRANS An existing file was specified in a context where it only
- TRANS makes sense to specify a new file. */
--_S(ERR_MAP(EEXIST), N_("File exists"))
-+_S(EEXIST, N_("File exists"))
- #endif
- #ifdef EXDEV
- /*
- TRANS An attempt to make an improper link across file systems was detected.
- TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
- TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}). */
--_S(ERR_MAP(EXDEV), N_("Invalid cross-device link"))
-+_S(EXDEV, N_("Invalid cross-device link"))
- #endif
- #ifdef ENODEV
- /*
- TRANS The wrong type of device was given to a function that expects a
- TRANS particular sort of device. */
--_S(ERR_MAP(ENODEV), N_("No such device"))
-+_S(ENODEV, N_("No such device"))
- #endif
- #ifdef ENOTDIR
- /*
- TRANS A file that isn't a directory was specified when a directory is required. */
--_S(ERR_MAP(ENOTDIR), N_("Not a directory"))
-+_S(ENOTDIR, N_("Not a directory"))
- #endif
- #ifdef EISDIR
- /*
- TRANS You cannot open a directory for writing,
- TRANS or create or remove hard links to it. */
--_S(ERR_MAP(EISDIR), N_("Is a directory"))
-+_S(EISDIR, N_("Is a directory"))
- #endif
- #ifdef EINVAL
- /*
- TRANS This is used to indicate various kinds of problems
- TRANS with passing the wrong argument to a library function. */
--_S(ERR_MAP(EINVAL), N_("Invalid argument"))
-+_S(EINVAL, N_("Invalid argument"))
- #endif
- #ifdef EMFILE
- /*
-@@ -157,20 +154,20 @@ TRANS In BSD and GNU, the number of open
- TRANS limit that can usually be increased. If you get this error, you might
- TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
- TRANS @pxref{Limits on Resources}. */
--_S(ERR_MAP(EMFILE), N_("Too many open files"))
-+_S(EMFILE, N_("Too many open files"))
- #endif
- #ifdef ENFILE
- /*
- TRANS There are too many distinct file openings in the entire system. Note
- TRANS that any number of linked channels count as just one file opening; see
- TRANS @ref{Linked Channels}. This error never occurs on @gnuhurdsystems{}. */
--_S(ERR_MAP(ENFILE), N_("Too many open files in system"))
-+_S(ENFILE, N_("Too many open files in system"))
- #endif
- #ifdef ENOTTY
- /*
- TRANS Inappropriate I/O control operation, such as trying to set terminal
- TRANS modes on an ordinary file. */
--_S(ERR_MAP(ENOTTY), N_("Inappropriate ioctl for device"))
-+_S(ENOTTY, N_("Inappropriate ioctl for device"))
- #endif
- #ifdef ETXTBSY
- /*
-@@ -179,35 +176,35 @@ TRANS write to a file that is currently
- TRANS debugger to run a program is considered having it open for writing and
- TRANS will cause this error. (The name stands for ``text file busy''.) This
- TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary. */
--_S(ERR_MAP(ETXTBSY), N_("Text file busy"))
-+_S(ETXTBSY, N_("Text file busy"))
- #endif
- #ifdef EFBIG
- /*
- TRANS The size of a file would be larger than allowed by the system. */
--_S(ERR_MAP(EFBIG), N_("File too large"))
-+_S(EFBIG, N_("File too large"))
- #endif
- #ifdef ENOSPC
- /*
- TRANS Write operation on a file failed because the
- TRANS disk is full. */
--_S(ERR_MAP(ENOSPC), N_("No space left on device"))
-+_S(ENOSPC, N_("No space left on device"))
- #endif
- #ifdef ESPIPE
- /*
- TRANS Invalid seek operation (such as on a pipe). */
--_S(ERR_MAP(ESPIPE), N_("Illegal seek"))
-+_S(ESPIPE, N_("Illegal seek"))
- #endif
- #ifdef EROFS
- /*
- TRANS An attempt was made to modify something on a read-only file system. */
--_S(ERR_MAP(EROFS), N_("Read-only file system"))
-+_S(EROFS, N_("Read-only file system"))
- #endif
- #ifdef EMLINK
- /*
- TRANS The link count of a single file would become too large.
- TRANS @code{rename} can cause this error if the file being renamed already has
- TRANS as many links as it can take (@pxref{Renaming Files}). */
--_S(ERR_MAP(EMLINK), N_("Too many links"))
-+_S(EMLINK, N_("Too many links"))
- #endif
- #ifdef EPIPE
- /*
-@@ -216,19 +213,19 @@ TRANS Every library function that return
- TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
- TRANS or blocked. Thus, your program will never actually see @code{EPIPE}
- TRANS unless it has handled or blocked @code{SIGPIPE}. */
--_S(ERR_MAP(EPIPE), N_("Broken pipe"))
-+_S(EPIPE, N_("Broken pipe"))
- #endif
- #ifdef EDOM
- /*
- TRANS Used by mathematical functions when an argument value does
- TRANS not fall into the domain over which the function is defined. */
--_S(ERR_MAP(EDOM), N_("Numerical argument out of domain"))
-+_S(EDOM, N_("Numerical argument out of domain"))
- #endif
- #ifdef ERANGE
- /*
- TRANS Used by mathematical functions when the result value is
- TRANS not representable because of overflow or underflow. */
--_S(ERR_MAP(ERANGE), N_("Numerical result out of range"))
-+_S(ERANGE, N_("Numerical result out of range"))
- #endif
- #ifdef EAGAIN
- /*
-@@ -261,7 +258,7 @@ TRANS Such shortages are usually fairly
- TRANS so usually an interactive program should report the error to the user
- TRANS and return to its command loop.
- TRANS @end itemize */
--_S(ERR_MAP(EAGAIN), N_("Resource temporarily unavailable"))
-+_S(EAGAIN, N_("Resource temporarily unavailable"))
- #endif
- #ifdef EINPROGRESS
- /*
-@@ -273,47 +270,47 @@ TRANS the operation has begun and will t
- TRANS the object before the call completes return @code{EALREADY}. You can
- TRANS use the @code{select} function to find out when the pending operation
- TRANS has completed; @pxref{Waiting for I/O}. */
--_S(ERR_MAP(EINPROGRESS), N_("Operation now in progress"))
-+_S(EINPROGRESS, N_("Operation now in progress"))
- #endif
- #ifdef EALREADY
- /*
- TRANS An operation is already in progress on an object that has non-blocking
- TRANS mode selected. */
--_S(ERR_MAP(EALREADY), N_("Operation already in progress"))
-+_S(EALREADY, N_("Operation already in progress"))
- #endif
- #ifdef ENOTSOCK
- /*
- TRANS A file that isn't a socket was specified when a socket is required. */
--_S(ERR_MAP(ENOTSOCK), N_("Socket operation on non-socket"))
-+_S(ENOTSOCK, N_("Socket operation on non-socket"))
- #endif
- #ifdef EMSGSIZE
- /*
- TRANS The size of a message sent on a socket was larger than the supported
- TRANS maximum size. */
--_S(ERR_MAP(EMSGSIZE), N_("Message too long"))
-+_S(EMSGSIZE, N_("Message too long"))
- #endif
- #ifdef EPROTOTYPE
- /*
- TRANS The socket type does not support the requested communications protocol. */
--_S(ERR_MAP(EPROTOTYPE), N_("Protocol wrong type for socket"))
-+_S(EPROTOTYPE, N_("Protocol wrong type for socket"))
- #endif
- #ifdef ENOPROTOOPT
- /*
- TRANS You specified a socket option that doesn't make sense for the
- TRANS particular protocol being used by the socket. @xref{Socket Options}. */
--_S(ERR_MAP(ENOPROTOOPT), N_("Protocol not available"))
-+_S(ENOPROTOOPT, N_("Protocol not available"))
- #endif
- #ifdef EPROTONOSUPPORT
- /*
- TRANS The socket domain does not support the requested communications protocol
- TRANS (perhaps because the requested protocol is completely invalid).
- TRANS @xref{Creating a Socket}. */
--_S(ERR_MAP(EPROTONOSUPPORT), N_("Protocol not supported"))
-+_S(EPROTONOSUPPORT, N_("Protocol not supported"))
- #endif
- #ifdef ESOCKTNOSUPPORT
- /*
- TRANS The socket type is not supported. */
--_S(ERR_MAP(ESOCKTNOSUPPORT), N_("Socket type not supported"))
-+_S(ESOCKTNOSUPPORT, N_("Socket type not supported"))
- #endif
- #ifdef EOPNOTSUPP
- /*
-@@ -323,71 +320,71 @@ TRANS implemented for all communications
- TRANS error can happen for many calls when the object does not support the
- TRANS particular operation; it is a generic indication that the server knows
- TRANS nothing to do for that call. */
--_S(ERR_MAP(EOPNOTSUPP), N_("Operation not supported"))
-+_S(EOPNOTSUPP, N_("Operation not supported"))
- #endif
- #ifdef EPFNOSUPPORT
- /*
- TRANS The socket communications protocol family you requested is not supported. */
--_S(ERR_MAP(EPFNOSUPPORT), N_("Protocol family not supported"))
-+_S(EPFNOSUPPORT, N_("Protocol family not supported"))
- #endif
- #ifdef EAFNOSUPPORT
- /*
- TRANS The address family specified for a socket is not supported; it is
- TRANS inconsistent with the protocol being used on the socket. @xref{Sockets}. */
--_S(ERR_MAP(EAFNOSUPPORT), N_("Address family not supported by protocol"))
-+_S(EAFNOSUPPORT, N_("Address family not supported by protocol"))
- #endif
- #ifdef EADDRINUSE
- /*
- TRANS The requested socket address is already in use. @xref{Socket Addresses}. */
--_S(ERR_MAP(EADDRINUSE), N_("Address already in use"))
-+_S(EADDRINUSE, N_("Address already in use"))
- #endif
- #ifdef EADDRNOTAVAIL
- /*
- TRANS The requested socket address is not available; for example, you tried
- TRANS to give a socket a name that doesn't match the local host name.
- TRANS @xref{Socket Addresses}. */
--_S(ERR_MAP(EADDRNOTAVAIL), N_("Cannot assign requested address"))
-+_S(EADDRNOTAVAIL, N_("Cannot assign requested address"))
- #endif
- #ifdef ENETDOWN
- /*
- TRANS A socket operation failed because the network was down. */
--_S(ERR_MAP(ENETDOWN), N_("Network is down"))
-+_S(ENETDOWN, N_("Network is down"))
- #endif
- #ifdef ENETUNREACH
- /*
- TRANS A socket operation failed because the subnet containing the remote host
- TRANS was unreachable. */
--_S(ERR_MAP(ENETUNREACH), N_("Network is unreachable"))
-+_S(ENETUNREACH, N_("Network is unreachable"))
- #endif
- #ifdef ENETRESET
- /*
- TRANS A network connection was reset because the remote host crashed. */
--_S(ERR_MAP(ENETRESET), N_("Network dropped connection on reset"))
-+_S(ENETRESET, N_("Network dropped connection on reset"))
- #endif
- #ifdef ECONNABORTED
- /*
- TRANS A network connection was aborted locally. */
--_S(ERR_MAP(ECONNABORTED), N_("Software caused connection abort"))
-+_S(ECONNABORTED, N_("Software caused connection abort"))
- #endif
- #ifdef ECONNRESET
- /*
- TRANS A network connection was closed for reasons outside the control of the
- TRANS local host, such as by the remote machine rebooting or an unrecoverable
- TRANS protocol violation. */
--_S(ERR_MAP(ECONNRESET), N_("Connection reset by peer"))
-+_S(ECONNRESET, N_("Connection reset by peer"))
- #endif
- #ifdef ENOBUFS
- /*
- TRANS The kernel's buffers for I/O operations are all in use. In GNU, this
- TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
- TRANS other from network operations. */
--_S(ERR_MAP(ENOBUFS), N_("No buffer space available"))
-+_S(ENOBUFS, N_("No buffer space available"))
- #endif
- #ifdef EISCONN
- /*
- TRANS You tried to connect a socket that is already connected.
- TRANS @xref{Connecting}. */
--_S(ERR_MAP(EISCONN), N_("Transport endpoint is already connected"))
-+_S(EISCONN, N_("Transport endpoint is already connected"))
- #endif
- #ifdef ENOTCONN
- /*
-@@ -395,74 +392,74 @@ TRANS The socket is not connected to any
- TRANS try to transmit data over a socket, without first specifying a
- TRANS destination for the data. For a connectionless socket (for datagram
- TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead. */
--_S(ERR_MAP(ENOTCONN), N_("Transport endpoint is not connected"))
-+_S(ENOTCONN, N_("Transport endpoint is not connected"))
- #endif
- #ifdef EDESTADDRREQ
- /*
- TRANS No default destination address was set for the socket. You get this
- TRANS error when you try to transmit data over a connectionless socket,
- TRANS without first specifying a destination for the data with @code{connect}. */
--_S(ERR_MAP(EDESTADDRREQ), N_("Destination address required"))
-+_S(EDESTADDRREQ, N_("Destination address required"))
- #endif
- #ifdef ESHUTDOWN
- /*
- TRANS The socket has already been shut down. */
--_S(ERR_MAP(ESHUTDOWN), N_("Cannot send after transport endpoint shutdown"))
-+_S(ESHUTDOWN, N_("Cannot send after transport endpoint shutdown"))
- #endif
- #ifdef ETOOMANYREFS
--_S(ERR_MAP(ETOOMANYREFS), N_("Too many references: cannot splice"))
-+_S(ETOOMANYREFS, N_("Too many references: cannot splice"))
- #endif
- #ifdef ETIMEDOUT
- /*
- TRANS A socket operation with a specified timeout received no response during
- TRANS the timeout period. */
--_S(ERR_MAP(ETIMEDOUT), N_("Connection timed out"))
-+_S(ETIMEDOUT, N_("Connection timed out"))
- #endif
- #ifdef ECONNREFUSED
- /*
- TRANS A remote host refused to allow the network connection (typically because
- TRANS it is not running the requested service). */
--_S(ERR_MAP(ECONNREFUSED), N_("Connection refused"))
-+_S(ECONNREFUSED, N_("Connection refused"))
- #endif
- #ifdef ELOOP
- /*
- TRANS Too many levels of symbolic links were encountered in looking up a file name.
- TRANS This often indicates a cycle of symbolic links. */
--_S(ERR_MAP(ELOOP), N_("Too many levels of symbolic links"))
-+_S(ELOOP, N_("Too many levels of symbolic links"))
- #endif
- #ifdef ENAMETOOLONG
- /*
- TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
- TRANS Files}) or host name too long (in @code{gethostname} or
- TRANS @code{sethostname}; @pxref{Host Identification}). */
--_S(ERR_MAP(ENAMETOOLONG), N_("File name too long"))
-+_S(ENAMETOOLONG, N_("File name too long"))
- #endif
- #ifdef EHOSTDOWN
- /*
- TRANS The remote host for a requested network connection is down. */
--_S(ERR_MAP(EHOSTDOWN), N_("Host is down"))
-+_S(EHOSTDOWN, N_("Host is down"))
- #endif
- /*
- TRANS The remote host for a requested network connection is not reachable. */
- #ifdef EHOSTUNREACH
--_S(ERR_MAP(EHOSTUNREACH), N_("No route to host"))
-+_S(EHOSTUNREACH, N_("No route to host"))
- #endif
- #ifdef ENOTEMPTY
- /*
- TRANS Directory not empty, where an empty directory was expected. Typically,
- TRANS this error occurs when you are trying to delete a directory. */
--_S(ERR_MAP(ENOTEMPTY), N_("Directory not empty"))
-+_S(ENOTEMPTY, N_("Directory not empty"))
- #endif
- #ifdef EUSERS
- /*
- TRANS The file quota system is confused because there are too many users.
- TRANS @c This can probably happen in a GNU system when using NFS. */
--_S(ERR_MAP(EUSERS), N_("Too many users"))
-+_S(EUSERS, N_("Too many users"))
- #endif
- #ifdef EDQUOT
- /*
- TRANS The user's disk quota was exceeded. */
--_S(ERR_MAP(EDQUOT), N_("Disk quota exceeded"))
-+_S(EDQUOT, N_("Disk quota exceeded"))
- #endif
- #ifdef ESTALE
- /*
-@@ -471,7 +468,7 @@ TRANS file system which is due to file s
- TRANS for NFS file systems or corruption in other file systems.
- TRANS Repairing this condition usually requires unmounting, possibly repairing
- TRANS and remounting the file system. */
--_S(ERR_MAP(ESTALE), N_("Stale file handle"))
-+_S(ESTALE, N_("Stale file handle"))
- #endif
- #ifdef EREMOTE
- /*
-@@ -479,7 +476,7 @@ TRANS An attempt was made to NFS-mount a
- TRANS already specifies an NFS-mounted file.
- TRANS (This is an error on some operating systems, but we expect it to work
- TRANS properly on @gnuhurdsystems{}, making this error code impossible.) */
--_S(ERR_MAP(EREMOTE), N_("Object is remote"))
-+_S(EREMOTE, N_("Object is remote"))
- #endif
- #ifdef ENOLCK
- /*
-@@ -487,7 +484,7 @@ TRANS This is used by the file locking f
- TRANS @ref{File Locks}. This error is never generated by @gnuhurdsystems{}, but
- TRANS it can result from an operation to an NFS server running another
- TRANS operating system. */
--_S(ERR_MAP(ENOLCK), N_("No locks available"))
-+_S(ENOLCK, N_("No locks available"))
- #endif
- #ifdef ENOSYS
- /*
-@@ -496,46 +493,46 @@ TRANS not implemented at all, either in
- TRANS operating system. When you get this error, you can be sure that this
- TRANS particular function will always fail with @code{ENOSYS} unless you
- TRANS install a new version of the C library or the operating system. */
--_S(ERR_MAP(ENOSYS), N_("Function not implemented"))
-+_S(ENOSYS, N_("Function not implemented"))
- #endif
- #ifdef EILSEQ
- /*
- TRANS While decoding a multibyte character the function came along an invalid
- TRANS or an incomplete sequence of bytes or the given wide character is invalid. */
--_S(ERR_MAP(EILSEQ), N_("Invalid or incomplete multibyte or wide character"))
-+_S(EILSEQ, N_("Invalid or incomplete multibyte or wide character"))
- #endif
- #ifdef EBADMSG
--_S(ERR_MAP(EBADMSG), N_("Bad message"))
-+_S(EBADMSG, N_("Bad message"))
- #endif
- #ifdef EIDRM
--_S(ERR_MAP(EIDRM), N_("Identifier removed"))
-+_S(EIDRM, N_("Identifier removed"))
- #endif
- #ifdef EMULTIHOP
--_S(ERR_MAP(EMULTIHOP), N_("Multihop attempted"))
-+_S(EMULTIHOP, N_("Multihop attempted"))
- #endif
- #ifdef ENODATA
--_S(ERR_MAP(ENODATA), N_("No data available"))
-+_S(ENODATA, N_("No data available"))
- #endif
- #ifdef ENOLINK
--_S(ERR_MAP(ENOLINK), N_("Link has been severed"))
-+_S(ENOLINK, N_("Link has been severed"))
- #endif
- #ifdef ENOMSG
--_S(ERR_MAP(ENOMSG), N_("No message of desired type"))
-+_S(ENOMSG, N_("No message of desired type"))
- #endif
- #ifdef ENOSR
--_S(ERR_MAP(ENOSR), N_("Out of streams resources"))
-+_S(ENOSR, N_("Out of streams resources"))
- #endif
- #ifdef ENOSTR
--_S(ERR_MAP(ENOSTR), N_("Device not a stream"))
-+_S(ENOSTR, N_("Device not a stream"))
- #endif
- #ifdef EOVERFLOW
--_S(ERR_MAP(EOVERFLOW), N_("Value too large for defined data type"))
-+_S(EOVERFLOW, N_("Value too large for defined data type"))
- #endif
- #ifdef EPROTO
--_S(ERR_MAP(EPROTO), N_("Protocol error"))
-+_S(EPROTO, N_("Protocol error"))
- #endif
- #ifdef ETIME
--_S(ERR_MAP(ETIME), N_("Timer expired"))
-+_S(ETIME, N_("Timer expired"))
- #endif
- #ifdef ECANCELED
- /*
-@@ -543,148 +540,148 @@ TRANS An asynchronous operation was canc
- TRANS completed. @xref{Asynchronous I/O}. When you call @code{aio_cancel},
- TRANS the normal result is for the operations affected to complete with this
- TRANS error; @pxref{Cancel AIO Operations}. */
--_S(ERR_MAP(ECANCELED), N_("Operation canceled"))
-+_S(ECANCELED, N_("Operation canceled"))
- #endif
- #ifdef EOWNERDEAD
--_S(ERR_MAP(EOWNERDEAD), N_("Owner died"))
-+_S(EOWNERDEAD, N_("Owner died"))
- #endif
- #ifdef ENOTRECOVERABLE
--_S(ERR_MAP(ENOTRECOVERABLE), N_("State not recoverable"))
-+_S(ENOTRECOVERABLE, N_("State not recoverable"))
- #endif
- #ifdef ERESTART
--_S(ERR_MAP(ERESTART), N_("Interrupted system call should be restarted"))
-+_S(ERESTART, N_("Interrupted system call should be restarted"))
- #endif
- #ifdef ECHRNG
--_S(ERR_MAP(ECHRNG), N_("Channel number out of range"))
-+_S(ECHRNG, N_("Channel number out of range"))
- #endif
- #ifdef EL2NSYNC
--_S(ERR_MAP(EL2NSYNC), N_("Level 2 not synchronized"))
-+_S(EL2NSYNC, N_("Level 2 not synchronized"))
- #endif
- #ifdef EL3HLT
--_S(ERR_MAP(EL3HLT), N_("Level 3 halted"))
-+_S(EL3HLT, N_("Level 3 halted"))
- #endif
- #ifdef EL3RST
--_S(ERR_MAP(EL3RST), N_("Level 3 reset"))
-+_S(EL3RST, N_("Level 3 reset"))
- #endif
- #ifdef ELNRNG
--_S(ERR_MAP(ELNRNG), N_("Link number out of range"))
-+_S(ELNRNG, N_("Link number out of range"))
- #endif
- #ifdef EUNATCH
--_S(ERR_MAP(EUNATCH), N_("Protocol driver not attached"))
-+_S(EUNATCH, N_("Protocol driver not attached"))
- #endif
- #ifdef ENOCSI
--_S(ERR_MAP(ENOCSI), N_("No CSI structure available"))
-+_S(ENOCSI, N_("No CSI structure available"))
- #endif
- #ifdef EL2HLT
--_S(ERR_MAP(EL2HLT), N_("Level 2 halted"))
-+_S(EL2HLT, N_("Level 2 halted"))
- #endif
- #ifdef EBADE
--_S(ERR_MAP(EBADE), N_("Invalid exchange"))
-+_S(EBADE, N_("Invalid exchange"))
- #endif
- #ifdef EBADR
--_S(ERR_MAP(EBADR), N_("Invalid request descriptor"))
-+_S(EBADR, N_("Invalid request descriptor"))
- #endif
- #ifdef EXFULL
--_S(ERR_MAP(EXFULL), N_("Exchange full"))
-+_S(EXFULL, N_("Exchange full"))
- #endif
- #ifdef ENOANO
--_S(ERR_MAP(ENOANO), N_("No anode"))
-+_S(ENOANO, N_("No anode"))
- #endif
- #ifdef EBADRQC
--_S(ERR_MAP(EBADRQC), N_("Invalid request code"))
-+_S(EBADRQC, N_("Invalid request code"))
- #endif
- #ifdef EBADSLT
--_S(ERR_MAP(EBADSLT), N_("Invalid slot"))
-+_S(EBADSLT, N_("Invalid slot"))
- #endif
- #ifdef EBFONT
--_S(ERR_MAP(EBFONT), N_("Bad font file format"))
-+_S(EBFONT, N_("Bad font file format"))
- #endif
- #ifdef ENONET
--_S(ERR_MAP(ENONET), N_("Machine is not on the network"))
-+_S(ENONET, N_("Machine is not on the network"))
- #endif
- #ifdef ENOPKG
--_S(ERR_MAP(ENOPKG), N_("Package not installed"))
-+_S(ENOPKG, N_("Package not installed"))
- #endif
- #ifdef EADV
--_S(ERR_MAP(EADV), N_("Advertise error"))
-+_S(EADV, N_("Advertise error"))
- #endif
- #ifdef ESRMNT
--_S(ERR_MAP(ESRMNT), N_("Srmount error"))
-+_S(ESRMNT, N_("Srmount error"))
- #endif
- #ifdef ECOMM
--_S(ERR_MAP(ECOMM), N_("Communication error on send"))
-+_S(ECOMM, N_("Communication error on send"))
- #endif
- #ifdef EDOTDOT
--_S(ERR_MAP(EDOTDOT), N_("RFS specific error"))
-+_S(EDOTDOT, N_("RFS specific error"))
- #endif
- #ifdef ENOTUNIQ
--_S(ERR_MAP(ENOTUNIQ), N_("Name not unique on network"))
-+_S(ENOTUNIQ, N_("Name not unique on network"))
- #endif
- #ifdef EBADFD
--_S(ERR_MAP(EBADFD), N_("File descriptor in bad state"))
-+_S(EBADFD, N_("File descriptor in bad state"))
- #endif
- #ifdef EREMCHG
--_S(ERR_MAP(EREMCHG), N_("Remote address changed"))
-+_S(EREMCHG, N_("Remote address changed"))
- #endif
- #ifdef ELIBACC
--_S(ERR_MAP(ELIBACC), N_("Can not access a needed shared library"))
-+_S(ELIBACC, N_("Can not access a needed shared library"))
- #endif
- #ifdef ELIBBAD
--_S(ERR_MAP(ELIBBAD), N_("Accessing a corrupted shared library"))
-+_S(ELIBBAD, N_("Accessing a corrupted shared library"))
- #endif
- #ifdef ELIBSCN
--_S(ERR_MAP(ELIBSCN), N_(".lib section in a.out corrupted"))
-+_S(ELIBSCN, N_(".lib section in a.out corrupted"))
- #endif
- #ifdef ELIBMAX
--_S(ERR_MAP(ELIBMAX), N_("Attempting to link in too many shared libraries"))
-+_S(ELIBMAX, N_("Attempting to link in too many shared libraries"))
- #endif
- #ifdef ELIBEXEC
--_S(ERR_MAP(ELIBEXEC), N_("Cannot exec a shared library directly"))
-+_S(ELIBEXEC, N_("Cannot exec a shared library directly"))
- #endif
- #ifdef ESTRPIPE
--_S(ERR_MAP(ESTRPIPE), N_("Streams pipe error"))
-+_S(ESTRPIPE, N_("Streams pipe error"))
- #endif
- #ifdef EUCLEAN
--_S(ERR_MAP(EUCLEAN), N_("Structure needs cleaning"))
-+_S(EUCLEAN, N_("Structure needs cleaning"))
- #endif
- #ifdef ENOTNAM
--_S(ERR_MAP(ENOTNAM), N_("Not a XENIX named type file"))
-+_S(ENOTNAM, N_("Not a XENIX named type file"))
- #endif
- #ifdef ENAVAIL
--_S(ERR_MAP(ENAVAIL), N_("No XENIX semaphores available"))
-+_S(ENAVAIL, N_("No XENIX semaphores available"))
- #endif
- #ifdef EISNAM
--_S(ERR_MAP(EISNAM), N_("Is a named type file"))
-+_S(EISNAM, N_("Is a named type file"))
- #endif
- #ifdef EREMOTEIO
--_S(ERR_MAP(EREMOTEIO), N_("Remote I/O error"))
-+_S(EREMOTEIO, N_("Remote I/O error"))
- #endif
- #ifdef ENOMEDIUM
--_S(ERR_MAP(ENOMEDIUM), N_("No medium found"))
-+_S(ENOMEDIUM, N_("No medium found"))
- #endif
- #ifdef EMEDIUMTYPE
--_S(ERR_MAP(EMEDIUMTYPE), N_("Wrong medium type"))
-+_S(EMEDIUMTYPE, N_("Wrong medium type"))
- #endif
- #ifdef ENOKEY
--_S(ERR_MAP(ENOKEY), N_("Required key not available"))
-+_S(ENOKEY, N_("Required key not available"))
- #endif
- #ifdef EKEYEXPIRED
--_S(ERR_MAP(EKEYEXPIRED), N_("Key has expired"))
-+_S(EKEYEXPIRED, N_("Key has expired"))
- #endif
- #ifdef EKEYREVOKED
--_S(ERR_MAP(EKEYREVOKED), N_("Key has been revoked"))
-+_S(EKEYREVOKED, N_("Key has been revoked"))
- #endif
- #ifdef EKEYREJECTED
--_S(ERR_MAP(EKEYREJECTED), N_("Key was rejected by service"))
-+_S(EKEYREJECTED, N_("Key was rejected by service"))
- #endif
- #ifdef ERFKILL
--_S(ERR_MAP(ERFKILL), N_("Operation not possible due to RF-kill"))
-+_S(ERFKILL, N_("Operation not possible due to RF-kill"))
- #endif
- #ifdef EHWPOISON
--_S(ERR_MAP(EHWPOISON), N_("Memory page has hardware error"))
-+_S(EHWPOISON, N_("Memory page has hardware error"))
- #endif
- #ifdef EBADRPC
--_S(ERR_MAP(EBADRPC), N_("RPC struct is bad"))
-+_S(EBADRPC, N_("RPC struct is bad"))
- #endif
- #ifdef EFTYPE
- /*
-@@ -693,40 +690,40 @@ TRANS operation, or a data file had the
- TRANS
- TRANS On some systems @code{chmod} returns this error if you try to set the
- TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}. */
--_S(ERR_MAP(EFTYPE), N_("Inappropriate file type or format"))
-+_S(EFTYPE, N_("Inappropriate file type or format"))
- #endif
- #ifdef EPROCUNAVAIL
--_S(ERR_MAP(EPROCUNAVAIL), N_("RPC bad procedure for program"))
-+_S(EPROCUNAVAIL, N_("RPC bad procedure for program"))
- #endif
- #ifdef EAUTH
--_S(ERR_MAP(EAUTH), N_("Authentication error"))
-+_S(EAUTH, N_("Authentication error"))
- #endif
- #ifdef EDIED
- /*
- TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
- TRANS translated by a program and the translator program dies while starting
- TRANS up, before it has connected to the file. */
--_S(ERR_MAP(EDIED), N_("Translator died"))
-+_S(EDIED, N_("Translator died"))
- #endif
- #ifdef ERPCMISMATCH
--_S(ERR_MAP(ERPCMISMATCH), N_("RPC version wrong"))
-+_S(ERPCMISMATCH, N_("RPC version wrong"))
- #endif
- #ifdef EGREGIOUS
- /*
- TRANS You did @strong{what}? */
--_S(ERR_MAP(EGREGIOUS), N_("You really blew it this time"))
-+_S(EGREGIOUS, N_("You really blew it this time"))
- #endif
- #ifdef EPROCLIM
- /*
- TRANS This means that the per-user limit on new process would be exceeded by
- TRANS an attempted @code{fork}. @xref{Limits on Resources}, for details on
- TRANS the @code{RLIMIT_NPROC} limit. */
--_S(ERR_MAP(EPROCLIM), N_("Too many processes"))
-+_S(EPROCLIM, N_("Too many processes"))
- #endif
- #ifdef EGRATUITOUS
- /*
- TRANS This error code has no purpose. */
--_S(ERR_MAP(EGRATUITOUS), N_("Gratuitous error"))
-+_S(EGRATUITOUS, N_("Gratuitous error"))
- #endif
- #if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
- /*
-@@ -742,10 +739,10 @@ TRANS values.
- TRANS
- TRANS If the entire function is not available at all in the implementation,
- TRANS it returns @code{ENOSYS} instead. */
--_S(ERR_MAP(ENOTSUP), N_("Not supported"))
-+_S(ENOTSUP, N_("Not supported"))
- #endif
- #ifdef EPROGMISMATCH
--_S(ERR_MAP(EPROGMISMATCH), N_("RPC program version wrong"))
-+_S(EPROGMISMATCH, N_("RPC program version wrong"))
- #endif
- #ifdef EBACKGROUND
- /*
-@@ -755,7 +752,7 @@ TRANS foreground process group of the te
- TRANS error because functions such as @code{read} and @code{write} translate
- TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal. @xref{Job Control},
- TRANS for information on process groups and these signals. */
--_S(ERR_MAP(EBACKGROUND), N_("Inappropriate operation for background process"))
-+_S(EBACKGROUND, N_("Inappropriate operation for background process"))
- #endif
- #ifdef EIEIO
- /*
-@@ -773,7 +770,7 @@ TRANS @c "bought the farm" means "died".
- TRANS @c
- TRANS @c Translators, please do not translate this litteraly, translate it into
- TRANS @c an idiomatic funny way of saying that the computer died. */
--_S(ERR_MAP(EIEIO), N_("Computer bought the farm"))
-+_S(EIEIO, N_("Computer bought the farm"))
- #endif
- #if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- /*
-@@ -782,18 +779,18 @@ TRANS The values are always the same, on
- TRANS
- TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
- TRANS separate error code. */
--_S(ERR_MAP(EWOULDBLOCK), N_("Operation would block"))
-+_S(EWOULDBLOCK, N_("Operation would block"))
- #endif
- #ifdef ENEEDAUTH
--_S(ERR_MAP(ENEEDAUTH), N_("Need authenticator"))
-+_S(ENEEDAUTH, N_("Need authenticator"))
- #endif
- #ifdef ED
- /*
- TRANS The experienced user will know what is wrong.
- TRANS @c This error code is a joke. Its perror text is part of the joke.
- TRANS @c Don't change it. */
--_S(ERR_MAP(ED), N_("?"))
-+_S(ED, N_("?"))
- #endif
- #ifdef EPROGUNAVAIL
--_S(ERR_MAP(EPROGUNAVAIL), N_("RPC program not available"))
-+_S(EPROGUNAVAIL, N_("RPC program not available"))
- #endif
-diff -pruN glibc-2.32.orig/sysdeps/i386/dl-machine.h glibc-2.32/sysdeps/i386/dl-machine.h
---- glibc-2.32.orig/sysdeps/i386/dl-machine.h 2021-09-18 21:02:32.707184853 +1000
-+++ glibc-2.32/sysdeps/i386/dl-machine.h 2021-09-18 21:03:05.313302322 +1000
-@@ -338,16 +338,22 @@ elf_machine_rel (struct link_map *map, c
- {
- # ifndef RTLD_BOOTSTRAP
- if (sym_map != map
-- && sym_map->l_type != lt_executable
- && !sym_map->l_relocated)
- {
- const char *strtab
- = (const char *) D_PTR (map, l_info[DT_STRTAB]);
-- _dl_error_printf ("\
-+ if (sym_map->l_type == lt_executable)
-+ _dl_fatal_printf ("\
-+%s: IFUNC symbol '%s' referenced in '%s' is defined in the executable \
-+and creates an unsatisfiable circular dependency.\n",
-+ RTLD_PROGNAME, strtab + refsym->st_name,
-+ map->l_name);
-+ else
-+ _dl_error_printf ("\
- %s: Relink `%s' with `%s' for IFUNC symbol `%s'\n",
-- RTLD_PROGNAME, map->l_name,
-- sym_map->l_name,
-- strtab + refsym->st_name);
-+ RTLD_PROGNAME, map->l_name,
-+ sym_map->l_name,
-+ strtab + refsym->st_name);
- }
- # endif
- value = ((Elf32_Addr (*) (void)) value) ();
-diff -pruN glibc-2.32.orig/sysdeps/powerpc/powerpc64/backtrace.c glibc-2.32/sysdeps/powerpc/powerpc64/backtrace.c
---- glibc-2.32.orig/sysdeps/powerpc/powerpc64/backtrace.c 2021-09-18 21:02:32.723185402 +1000
-+++ glibc-2.32/sysdeps/powerpc/powerpc64/backtrace.c 2021-09-18 21:03:05.313302322 +1000
-@@ -54,11 +54,22 @@ struct signal_frame_64 {
- /* We don't care about the rest, since the IP value is at 'uc' field. */
- };
-
-+/* Test if the address match to the inside the trampoline code.
-+ Up to and including kernel 5.8, returning from an interrupt or syscall to a
-+ signal handler starts execution directly at the handler's entry point, with
-+ LR set to address of the sigreturn trampoline (the vDSO symbol).
-+ Newer kernels will branch to signal handler from the trampoline instead, so
-+ checking the stacktrace against the vDSO entrypoint does not work in such
-+ case.
-+ The vDSO branches with a 'bctrl' instruction, so checking either the
-+ vDSO address itself and the next instruction should cover all kernel
-+ versions. */
- static inline bool
- is_sigtramp_address (void *nip)
- {
- #ifdef HAVE_SIGTRAMP_RT64
-- if (nip == GLRO (dl_vdso_sigtramp_rt64))
-+ if (nip == GLRO (dl_vdso_sigtramp_rt64) ||
-+ nip == GLRO (dl_vdso_sigtramp_rt64) + 4)
- return true;
- #endif
- return false;
-diff -pruN glibc-2.32.orig/sysdeps/s390/configure glibc-2.32/sysdeps/s390/configure
---- glibc-2.32.orig/sysdeps/s390/configure 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/configure 2021-09-18 21:03:05.313302322 +1000
-@@ -123,7 +123,9 @@ void testinsn (char *buf)
- __asm__ (".machine \"arch13\" \n\t"
- ".machinemode \"zarch_nohighgprs\" \n\t"
- "lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
-@@ -271,7 +273,9 @@ else
- void testinsn (char *buf)
- {
- __asm__ ("lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
-diff -pruN glibc-2.32.orig/sysdeps/s390/configure.ac glibc-2.32/sysdeps/s390/configure.ac
---- glibc-2.32.orig/sysdeps/s390/configure.ac 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/configure.ac 2021-09-18 21:03:05.313302322 +1000
-@@ -88,7 +88,9 @@ void testinsn (char *buf)
- __asm__ (".machine \"arch13\" \n\t"
- ".machinemode \"zarch_nohighgprs\" \n\t"
- "lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- dnl test, if assembler supports S390 arch13 instructions
-@@ -195,7 +197,9 @@ cat > conftest.c <<\EOF
- void testinsn (char *buf)
- {
- __asm__ ("lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- dnl test, if assembler supports S390 arch13 zarch instructions as default
-diff -pruN glibc-2.32.orig/sysdeps/s390/memmove.c glibc-2.32/sysdeps/s390/memmove.c
---- glibc-2.32.orig/sysdeps/s390/memmove.c 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/memmove.c 2021-09-18 21:03:05.313302322 +1000
-@@ -43,7 +43,7 @@ extern __typeof (__redirect_memmove) MEM
- s390_libc_ifunc_expr (__redirect_memmove, memmove,
- ({
- s390_libc_ifunc_expr_stfle_init ();
-- (HAVE_MEMMOVE_ARCH13
-+ (HAVE_MEMMOVE_ARCH13 && (hwcap & HWCAP_S390_VXRS_EXT2)
- && S390_IS_ARCH13_MIE3 (stfle_bits))
- ? MEMMOVE_ARCH13
- : (HAVE_MEMMOVE_Z13 && (hwcap & HWCAP_S390_VX))
-diff -pruN glibc-2.32.orig/sysdeps/s390/multiarch/ifunc-impl-list.c glibc-2.32/sysdeps/s390/multiarch/ifunc-impl-list.c
---- glibc-2.32.orig/sysdeps/s390/multiarch/ifunc-impl-list.c 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/multiarch/ifunc-impl-list.c 2021-09-18 21:03:05.313302322 +1000
-@@ -171,7 +171,8 @@ __libc_ifunc_impl_list (const char *name
- IFUNC_IMPL (i, name, memmove,
- # if HAVE_MEMMOVE_ARCH13
- IFUNC_IMPL_ADD (array, i, memmove,
-- S390_IS_ARCH13_MIE3 (stfle_bits),
-+ ((dl_hwcap & HWCAP_S390_VXRS_EXT2)
-+ && S390_IS_ARCH13_MIE3 (stfle_bits)),
- MEMMOVE_ARCH13)
- # endif
- # if HAVE_MEMMOVE_Z13
-diff -pruN glibc-2.32.orig/sysdeps/sh/be/sh4/fpu/Implies glibc-2.32/sysdeps/sh/be/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/sh/be/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/sh/be/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/sh/le/sh4/fpu/Implies glibc-2.32/sysdeps/sh/le/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/sh/le/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/sh/le/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/aarch64/cpu-features.h glibc-2.32/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/aarch64/cpu-features.h 2021-09-18 21:02:32.731185676 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/aarch64/cpu-features.h 2021-09-18 21:03:05.313302322 +1000
-@@ -54,6 +54,10 @@
- && MIDR_PARTNUM(midr) == 0x000)
- #define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
- && MIDR_PARTNUM(midr) == 0xd0c)
-+#define IS_NEOVERSE_N2(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
-+ && MIDR_PARTNUM(midr) == 0xd49)
-+#define IS_NEOVERSE_V1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
-+ && MIDR_PARTNUM(midr) == 0xd40)
-
- #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \
- && MIDR_PARTNUM(midr) == 0x000)
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.32/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/Makefile 2021-09-18 21:02:32.731185676 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/Makefile 2021-09-18 21:03:05.313302322 +1000
-@@ -100,7 +100,7 @@ tests += tst-clone tst-clone2 tst-clone3
- tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
- test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
- tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
-- tst-tgkill
-+ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux
- tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
-
- CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/mq_notify.c glibc-2.32/sysdeps/unix/sysv/linux/mq_notify.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/mq_notify.c 2021-09-18 21:02:32.736185847 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/mq_notify.c 2021-09-18 21:09:50.680196980 +1000
-@@ -132,9 +132,12 @@ helper_thread (void *arg)
- to wait until it is done with it. */
- (void) __pthread_barrier_wait (¬ify_barrier);
- }
-- else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
-- /* The only state we keep is the copy of the thread attributes. */
-- free (data.attr);
-+ else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED && data.attr != NULL)
-+ {
-+ /* The only state we keep is the copy of the thread attributes. */
-+ pthread_attr_destroy (data.attr);
-+ free (data.attr);
-+ }
- }
- return NULL;
- }
-@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sig
- if (data.attr == NULL)
- return -1;
-
-- memcpy (data.attr, notification->sigev_notify_attributes,
-- sizeof (pthread_attr_t));
-+ int ret = __pthread_attr_copy (data.attr,
-+ notification->sigev_notify_attributes);
-+ if (ret != 0)
-+ {
-+ free (data.attr);
-+ __set_errno (ret);
-+ return -1;
-+ }
- }
-
- /* Construct the new request. */
-@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sig
- int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se);
-
- /* If it failed, free the allocated memory. */
-- if (__glibc_unlikely (retval != 0))
-- free (data.attr);
-+ if (retval != 0 && data.attr != NULL)
-+ {
-+ pthread_attr_destroy (data.attr);
-+ free (data.attr);
-+ }
-
- return retval;
- }
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/msgctl.c glibc-2.32/sysdeps/unix/sysv/linux/msgctl.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/msgctl.c 2021-09-18 21:02:32.736185847 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/msgctl.c 2021-09-18 21:03:05.313302322 +1000
-@@ -90,8 +90,15 @@ __msgctl64 (int msqid, int cmd, struct _
- struct kernel_msqid64_ds ksemid, *arg = NULL;
- if (buf != NULL)
- {
-- msqid64_to_kmsqid64 (buf, &ksemid);
-- arg = &ksemid;
-+ /* This is a Linux extension where kernel returns a 'struct msginfo'
-+ instead. */
-+ if (cmd == IPC_INFO || cmd == MSG_INFO)
-+ arg = (struct kernel_msqid64_ds *) buf;
-+ else
-+ {
-+ msqid64_to_kmsqid64 (buf, &ksemid);
-+ arg = &ksemid;
-+ }
- }
- # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
- if (cmd == IPC_SET)
-@@ -169,8 +176,15 @@ __msgctl (int msqid, int cmd, struct msq
- struct __msqid64_ds msqid64, *buf64 = NULL;
- if (buf != NULL)
- {
-- msqid_to_msqid64 (&msqid64, buf);
-- buf64 = &msqid64;
-+ /* This is a Linux extension where kernel returns a 'struct msginfo'
-+ instead. */
-+ if (cmd == IPC_INFO || cmd == MSG_INFO)
-+ buf64 = (struct __msqid64_ds *) buf;
-+ else
-+ {
-+ msqid_to_msqid64 (&msqid64, buf);
-+ buf64 = &msqid64;
-+ }
- }
-
- int ret = __msgctl64 (msqid, cmd, buf64);
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/semctl.c glibc-2.32/sysdeps/unix/sysv/linux/semctl.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/semctl.c 2021-09-18 21:02:32.739185950 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/semctl.c 2021-09-18 21:03:05.313302322 +1000
-@@ -102,6 +102,7 @@ semun64_to_ksemun64 (int cmd, union semu
- r.array = semun64.array;
- break;
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_STAT:
- case IPC_SET:
- r.buf = buf;
-@@ -150,6 +151,7 @@ __semctl64 (int semid, int semnum, int c
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-@@ -238,6 +240,7 @@ semun_to_semun64 (int cmd, union semun s
- r.array = semun.array;
- break;
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_STAT:
- case IPC_SET:
- r.buf = semid64;
-@@ -267,6 +270,7 @@ __semctl (int semid, int semnum, int cmd
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-@@ -321,6 +325,7 @@ __semctl_mode16 (int semid, int semnum,
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-@@ -354,6 +359,7 @@ __old_semctl (int semid, int semnum, int
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies glibc-2.32/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+unix/sysv/linux/sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies glibc-2.32/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+unix/sysv/linux/sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/shmctl.c glibc-2.32/sysdeps/unix/sysv/linux/shmctl.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/shmctl.c 2021-09-18 21:02:32.740185984 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/shmctl.c 2021-09-18 21:03:05.313302322 +1000
-@@ -90,8 +90,15 @@ __shmctl64 (int shmid, int cmd, struct _
- struct kernel_shmid64_ds kshmid, *arg = NULL;
- if (buf != NULL)
- {
-- shmid64_to_kshmid64 (buf, &kshmid);
-- arg = &kshmid;
-+ /* This is a Linux extension where kernel expects either a
-+ 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */
-+ if (cmd == IPC_INFO || cmd == SHM_INFO)
-+ arg = (struct kernel_shmid64_ds *) buf;
-+ else
-+ {
-+ shmid64_to_kshmid64 (buf, &kshmid);
-+ arg = &kshmid;
-+ }
- }
- # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
- if (cmd == IPC_SET)
-@@ -107,7 +114,6 @@ __shmctl64 (int shmid, int cmd, struct _
-
- switch (cmd)
- {
-- case IPC_INFO:
- case IPC_STAT:
- case SHM_STAT:
- case SHM_STAT_ANY:
-@@ -168,8 +174,15 @@ __shmctl (int shmid, int cmd, struct shm
- struct __shmid64_ds shmid64, *buf64 = NULL;
- if (buf != NULL)
- {
-- shmid_to_shmid64 (&shmid64, buf);
-- buf64 = &shmid64;
-+ /* This is a Linux extension where kernel expects either a
-+ 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */
-+ if (cmd == IPC_INFO || cmd == SHM_INFO)
-+ buf64 = (struct __shmid64_ds *) buf;
-+ else
-+ {
-+ shmid_to_shmid64 (&shmid64, buf);
-+ buf64 = &shmid64;
-+ }
- }
-
- int ret = __shmctl64 (shmid, cmd, buf64);
-@@ -178,7 +191,6 @@ __shmctl (int shmid, int cmd, struct shm
-
- switch (cmd)
- {
-- case IPC_INFO:
- case IPC_STAT:
- case SHM_STAT:
- case SHM_STAT_ANY:
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1,177 @@
-+/* Basic tests for Linux SYSV message queue extensions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <sys/ipc.h>
-+#include <sys/msg.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+
-+#include <support/check.h>
-+#include <support/temp_file.h>
-+
-+#define MSGQ_MODE 0644
-+
-+/* These are for the temporary file we generate. */
-+static char *name;
-+static int msqid;
-+
-+static void
-+remove_msq (void)
-+{
-+ /* Enforce message queue removal in case of early test failure.
-+ Ignore error since the msg may already have being removed. */
-+ msgctl (msqid, IPC_RMID, NULL);
-+}
-+
-+static void
-+do_prepare (int argc, char *argv[])
-+{
-+ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvmsg.", &name) != -1);
-+}
-+
-+#define PREPARE do_prepare
-+
-+struct test_msginfo
-+{
-+ int msgmax;
-+ int msgmnb;
-+ int msgmni;
-+};
-+
-+/* It tries to obtain some system-wide SysV messsage queue information from
-+ /proc to check against IPC_INFO/MSG_INFO. The /proc only returns the
-+ tunables value of MSGMAX, MSGMNB, and MSGMNI.
-+
-+ The kernel also returns constant value for MSGSSZ, MSGSEG and also MSGMAP,
-+ MSGPOOL, and MSGTQL (for IPC_INFO). The issue to check them is they might
-+ change over kernel releases. */
-+
-+static int
-+read_proc_file (const char *file)
-+{
-+ FILE *f = fopen (file, "r");
-+ if (f == NULL)
-+ FAIL_UNSUPPORTED ("/proc is not mounted or %s is not available", file);
-+
-+ int v;
-+ int r = fscanf (f, "%d", & v);
-+ TEST_VERIFY_EXIT (r == 1);
-+
-+ fclose (f);
-+ return v;
-+}
-+
-+
-+/* Check if the message queue with IDX (index into the kernel's internal
-+ array) matches the one with KEY. The CMD is either MSG_STAT or
-+ MSG_STAT_ANY. */
-+
-+static bool
-+check_msginfo (int idx, key_t key, int cmd)
-+{
-+ struct msqid_ds msginfo;
-+ int mid = msgctl (idx, cmd, &msginfo);
-+ /* Ignore unused array slot returned by the kernel or information from
-+ unknown message queue. */
-+ if ((mid == -1 && errno == EINVAL) || mid != msqid)
-+ return false;
-+
-+ if (mid == -1)
-+ FAIL_EXIT1 ("msgctl with %s failed: %m",
-+ cmd == MSG_STAT ? "MSG_STAT" : "MSG_STAT_ANY");
-+
-+ TEST_COMPARE (msginfo.msg_perm.__key, key);
-+ TEST_COMPARE (msginfo.msg_perm.mode, MSGQ_MODE);
-+ TEST_COMPARE (msginfo.msg_qnum, 0);
-+
-+ return true;
-+}
-+
-+static int
-+do_test (void)
-+{
-+ atexit (remove_msq);
-+
-+ key_t key = ftok (name, 'G');
-+ if (key == -1)
-+ FAIL_EXIT1 ("ftok failed: %m");
-+
-+ msqid = msgget (key, MSGQ_MODE | IPC_CREAT);
-+ if (msqid == -1)
-+ FAIL_EXIT1 ("msgget failed: %m");
-+
-+ struct test_msginfo tipcinfo;
-+ tipcinfo.msgmax = read_proc_file ("/proc/sys/kernel/msgmax");
-+ tipcinfo.msgmnb = read_proc_file ("/proc/sys/kernel/msgmnb");
-+ tipcinfo.msgmni = read_proc_file ("/proc/sys/kernel/msgmni");
-+
-+ int msqidx;
-+
-+ {
-+ struct msginfo ipcinfo;
-+ msqidx = msgctl (msqid, IPC_INFO, (struct msqid_ds *) &ipcinfo);
-+ if (msqidx == -1)
-+ FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax);
-+ TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb);
-+ TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni);
-+ }
-+
-+ /* Same as before but with MSG_INFO. */
-+ {
-+ struct msginfo ipcinfo;
-+ msqidx = msgctl (msqid, MSG_INFO, (struct msqid_ds *) &ipcinfo);
-+ if (msqidx == -1)
-+ FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax);
-+ TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb);
-+ TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni);
-+ }
-+
-+ /* We check if the created message queue shows in global list. */
-+ bool found = false;
-+ for (int i = 0; i <= msqidx; i++)
-+ {
-+ /* We can't tell apart if MSG_STAT_ANY is not supported (kernel older
-+ than 4.17) or if the index used is invalid. So it just check if the
-+ value returned from a valid call matches the created message
-+ queue. */
-+ check_msginfo (i, key, MSG_STAT_ANY);
-+
-+ if (check_msginfo (i, key, MSG_STAT))
-+ {
-+ found = true;
-+ break;
-+ }
-+ }
-+
-+ if (!found)
-+ FAIL_EXIT1 ("msgctl with MSG_STAT/MSG_STAT_ANY could not find the "
-+ "created message queue");
-+
-+ if (msgctl (msqid, IPC_RMID, NULL) == -1)
-+ FAIL_EXIT1 ("msgctl failed");
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c 2021-09-18 21:03:05.314302356 +1000
-@@ -0,0 +1,184 @@
-+/* Basic tests for Linux SYSV semaphore extensions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <sys/ipc.h>
-+#include <sys/sem.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+
-+#include <support/check.h>
-+#include <support/temp_file.h>
-+
-+/* These are for the temporary file we generate. */
-+static char *name;
-+static int semid;
-+
-+static void
-+remove_sem (void)
-+{
-+ /* Enforce message queue removal in case of early test failure.
-+ Ignore error since the sem may already have being removed. */
-+ semctl (semid, 0, IPC_RMID, 0);
-+}
-+
-+static void
-+do_prepare (int argc, char *argv[])
-+{
-+ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvsem.", &name) != -1);
-+}
-+
-+#define PREPARE do_prepare
-+
-+#define SEM_MODE 0644
-+
-+union semun
-+{
-+ int val;
-+ struct semid_ds *buf;
-+ unsigned short *array;
-+ struct seminfo *__buf;
-+};
-+
-+struct test_seminfo
-+{
-+ int semmsl;
-+ int semmns;
-+ int semopm;
-+ int semmni;
-+};
-+
-+/* It tries to obtain some system-wide SysV semaphore information from /proc
-+ to check against IPC_INFO/SEM_INFO. The /proc only returns the tunables
-+ value of SEMMSL, SEMMNS, SEMOPM, and SEMMNI.
-+
-+ The kernel also returns constant value for SEMVMX, SEMMNU, SEMMAP, SEMUME,
-+ and also SEMUSZ and SEMAEM (for IPC_INFO). The issue to check them is they
-+ might change over kernel releases. */
-+
-+static void
-+read_sem_stat (struct test_seminfo *tseminfo)
-+{
-+ FILE *f = fopen ("/proc/sys/kernel/sem", "r");
-+ if (f == NULL)
-+ FAIL_UNSUPPORTED ("/proc is not mounted or /proc/sys/kernel/sem is not "
-+ "available");
-+
-+ int r = fscanf (f, "%d %d %d %d",
-+ &tseminfo->semmsl, &tseminfo->semmns, &tseminfo->semopm,
-+ &tseminfo->semmni);
-+ TEST_VERIFY_EXIT (r == 4);
-+
-+ fclose (f);
-+}
-+
-+
-+/* Check if the semaphore with IDX (index into the kernel's internal array)
-+ matches the one with KEY. The CMD is either SEM_STAT or SEM_STAT_ANY. */
-+
-+static bool
-+check_seminfo (int idx, key_t key, int cmd)
-+{
-+ struct semid_ds seminfo;
-+ int sid = semctl (idx, 0, cmd, (union semun) { .buf = &seminfo });
-+ /* Ignore unused array slot returned by the kernel or information from
-+ unknown semaphores. */
-+ if ((sid == -1 && errno == EINVAL) || sid != semid)
-+ return false;
-+
-+ if (sid == -1)
-+ FAIL_EXIT1 ("semctl with SEM_STAT failed (errno=%d)", errno);
-+
-+ TEST_COMPARE (seminfo.sem_perm.__key, key);
-+ TEST_COMPARE (seminfo.sem_perm.mode, SEM_MODE);
-+ TEST_COMPARE (seminfo.sem_nsems, 1);
-+
-+ return true;
-+}
-+
-+static int
-+do_test (void)
-+{
-+ atexit (remove_sem);
-+
-+ key_t key = ftok (name, 'G');
-+ if (key == -1)
-+ FAIL_EXIT1 ("ftok failed: %m");
-+
-+ semid = semget (key, 1, IPC_CREAT | IPC_EXCL | SEM_MODE);
-+ if (semid == -1)
-+ FAIL_EXIT1 ("semget failed: %m");
-+
-+ struct test_seminfo tipcinfo;
-+ read_sem_stat (&tipcinfo);
-+
-+ int semidx;
-+
-+ {
-+ struct seminfo ipcinfo;
-+ semidx = semctl (semid, 0, IPC_INFO, (union semun) { .__buf = &ipcinfo });
-+ if (semidx == -1)
-+ FAIL_EXIT1 ("semctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl);
-+ TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns);
-+ TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm);
-+ TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni);
-+ }
-+
-+ /* Same as before but with SEM_INFO. */
-+ {
-+ struct seminfo ipcinfo;
-+ semidx = semctl (semid, 0, SEM_INFO, (union semun) { .__buf = &ipcinfo });
-+ if (semidx == -1)
-+ FAIL_EXIT1 ("semctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl);
-+ TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns);
-+ TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm);
-+ TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni);
-+ }
-+
-+ /* We check if the created semaphore shows in the system-wide status. */
-+ bool found = false;
-+ for (int i = 0; i <= semidx; i++)
-+ {
-+ /* We can't tell apart if SEM_STAT_ANY is not supported (kernel older
-+ than 4.17) or if the index used is invalid. So it just check if
-+ value returned from a valid call matches the created semaphore. */
-+ check_seminfo (i, key, SEM_STAT_ANY);
-+
-+ if (check_seminfo (i, key, SEM_STAT))
-+ {
-+ found = true;
-+ break;
-+ }
-+ }
-+
-+ if (!found)
-+ FAIL_EXIT1 ("semctl with SEM_STAT/SEM_STAT_ANY could not find the "
-+ "created semaphore");
-+
-+ if (semctl (semid, 0, IPC_RMID, 0) == -1)
-+ FAIL_EXIT1 ("semctl failed: %m");
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c 2021-09-18 21:03:05.314302356 +1000
-@@ -0,0 +1,185 @@
-+/* Basic tests for Linux SYSV shared memory extensions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+
-+#include <support/check.h>
-+#include <support/temp_file.h>
-+
-+#define SHM_MODE 0644
-+
-+/* These are for the temporary file we generate. */
-+static char *name;
-+static int shmid;
-+static long int pgsz;
-+
-+static void
-+remove_shm (void)
-+{
-+ /* Enforce message queue removal in case of early test failure.
-+ Ignore error since the shm may already have being removed. */
-+ shmctl (shmid, IPC_RMID, NULL);
-+}
-+
-+static void
-+do_prepare (int argc, char *argv[])
-+{
-+ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvshm.", &name) != -1);
-+}
-+
-+#define PREPARE do_prepare
-+
-+struct test_shminfo
-+{
-+ unsigned long int shmall;
-+ unsigned long int shmmax;
-+ unsigned long int shmmni;
-+};
-+
-+/* It tries to obtain some system-wide SysV shared memory information from
-+ /proc to check against IPC_INFO/SHM_INFO. The /proc only returns the
-+ tunables value of SHMALL, SHMMAX, and SHMMNI. */
-+
-+static uint64_t
-+read_proc_file (const char *file)
-+{
-+ FILE *f = fopen (file, "r");
-+ if (f == NULL)
-+ FAIL_UNSUPPORTED ("/proc is not mounted or %s is not available", file);
-+
-+ /* Handle 32-bit binaries running on 64-bit kernels. */
-+ uint64_t v;
-+ int r = fscanf (f, "%" SCNu64, &v);
-+ TEST_VERIFY_EXIT (r == 1);
-+
-+ fclose (f);
-+ return v;
-+}
-+
-+
-+/* Check if the message queue with IDX (index into the kernel's internal
-+ array) matches the one with KEY. The CMD is either SHM_STAT or
-+ SHM_STAT_ANY. */
-+
-+static bool
-+check_shminfo (int idx, key_t key, int cmd)
-+{
-+ struct shmid_ds shminfo;
-+ int sid = shmctl (idx, cmd, &shminfo);
-+ /* Ignore unused array slot returned by the kernel or information from
-+ unknown message queue. */
-+ if ((sid == -1 && errno == EINVAL) || sid != shmid)
-+ return false;
-+
-+ if (sid == -1)
-+ FAIL_EXIT1 ("shmctl with %s failed: %m",
-+ cmd == SHM_STAT ? "SHM_STAT" : "SHM_STAT_ANY");
-+
-+ TEST_COMPARE (shminfo.shm_perm.__key, key);
-+ TEST_COMPARE (shminfo.shm_perm.mode, SHM_MODE);
-+ TEST_COMPARE (shminfo.shm_segsz, pgsz);
-+
-+ return true;
-+}
-+
-+static int
-+do_test (void)
-+{
-+ atexit (remove_shm);
-+
-+ pgsz = sysconf (_SC_PAGESIZE);
-+ if (pgsz == -1)
-+ FAIL_EXIT1 ("sysconf (_SC_PAGESIZE) failed: %m");
-+
-+ key_t key = ftok (name, 'G');
-+ if (key == -1)
-+ FAIL_EXIT1 ("ftok failed: %m");
-+
-+ shmid = shmget (key, pgsz, IPC_CREAT | IPC_EXCL | SHM_MODE);
-+ if (shmid == -1)
-+ FAIL_EXIT1 ("shmget failed: %m");
-+
-+ struct test_shminfo tipcinfo;
-+ {
-+ uint64_t v = read_proc_file ("/proc/sys/kernel/shmmax");
-+#if LONG_MAX == INT_MAX
-+ /* Kernel explicit clamp the value for shmmax on compat symbol (32-bit
-+ binaries running on 64-bit kernels). */
-+ if (v > INT_MAX)
-+ v = INT_MAX;
-+#endif
-+ tipcinfo.shmmax = v;
-+ }
-+ tipcinfo.shmall = read_proc_file ("/proc/sys/kernel/shmall");
-+ tipcinfo.shmmni = read_proc_file ("/proc/sys/kernel/shmmni");
-+
-+ int shmidx;
-+
-+ /* Note: SHM_INFO does not return a shminfo, but rather a 'struct shm_info'.
-+ It is tricky to verify its values since the syscall returns system wide
-+ resources consumed by shared memory. The shmctl implementation handles
-+ SHM_INFO as IPC_INFO, so the IPC_INFO test should validate SHM_INFO as
-+ well. */
-+
-+ {
-+ struct shminfo ipcinfo;
-+ shmidx = shmctl (shmid, IPC_INFO, (struct shmid_ds *) &ipcinfo);
-+ if (shmidx == -1)
-+ FAIL_EXIT1 ("shmctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.shmall, tipcinfo.shmall);
-+ TEST_COMPARE (ipcinfo.shmmax, tipcinfo.shmmax);
-+ TEST_COMPARE (ipcinfo.shmmni, tipcinfo.shmmni);
-+ }
-+
-+ /* We check if the created shared memory shows in the global list. */
-+ bool found = false;
-+ for (int i = 0; i <= shmidx; i++)
-+ {
-+ /* We can't tell apart if SHM_STAT_ANY is not supported (kernel older
-+ than 4.17) or if the index used is invalid. So it just check if
-+ value returned from a valid call matches the created message
-+ queue. */
-+ check_shminfo (i, key, SHM_STAT_ANY);
-+
-+ if (check_shminfo (i, key, SHM_STAT))
-+ {
-+ found = true;
-+ break;
-+ }
-+ }
-+
-+ if (!found)
-+ FAIL_EXIT1 ("shmctl with SHM_STAT/SHM_STAT_ANY could not find the "
-+ "created shared memory");
-+
-+ if (shmctl (shmid, IPC_RMID, NULL) == -1)
-+ FAIL_EXIT1 ("shmctl failed");
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/64/configure glibc-2.32/sysdeps/unix/sysv/linux/x86_64/64/configure
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/64/configure 2021-09-18 21:02:32.741186019 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/x86_64/64/configure 2021-09-18 21:03:05.314302356 +1000
-@@ -4,10 +4,10 @@
- test -n "$libc_cv_slibdir" ||
- case "$prefix" in
- /usr | /usr/)
-- libc_cv_slibdir='/lib64'
-- libc_cv_rtlddir='/lib64'
-+ libc_cv_slibdir='/lib'
-+ libc_cv_rtlddir='/lib'
- if test "$libdir" = '${exec_prefix}/lib'; then
-- libdir='${exec_prefix}/lib64';
-+ libdir='${exec_prefix}/lib';
- # Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_complocaledir='${exec_prefix}/lib/locale'
- fi
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h glibc-2.32/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2021-09-18 21:03:05.314302356 +1000
-@@ -18,9 +18,9 @@
- #include <sysdeps/generic/ldconfig.h>
-
- #define SYSDEP_KNOWN_INTERPRETER_NAMES \
-- { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
-+ { "/lib32/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
- { "/libx32/ld-linux-x32.so.2", FLAG_ELF_LIBC6 }, \
-- { "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
-+ { "/lib/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
- #define SYSDEP_KNOWN_LIBRARY_NAMES \
- { "libc.so.6", FLAG_ELF_LIBC6 }, \
- { "libm.so.6", FLAG_ELF_LIBC6 },
-diff -pruN glibc-2.32.orig/sysdeps/x86/cacheinfo.c glibc-2.32/sysdeps/x86/cacheinfo.c
---- glibc-2.32.orig/sysdeps/x86/cacheinfo.c 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/cacheinfo.c 2021-09-18 21:03:05.314302356 +1000
-@@ -808,7 +808,7 @@ init_cacheinfo (void)
- threads = 1 << ((ecx >> 12) & 0x0f);
- }
-
-- if (threads == 0)
-+ if (threads == 0 || cpu_features->basic.family >= 0x17)
- {
- /* If APIC ID width is not available, use logical
- processor count. */
-@@ -823,8 +823,22 @@ init_cacheinfo (void)
- if (threads > 0)
- shared /= threads;
-
-- /* Account for exclusive L2 and L3 caches. */
-- shared += core;
-+ /* Get shared cache per ccx for Zen architectures. */
-+ if (cpu_features->basic.family >= 0x17)
-+ {
-+ unsigned int eax;
-+
-+ /* Get number of threads share the L3 cache in CCX. */
-+ __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
-+
-+ unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
-+ shared *= threads_per_ccx;
-+ }
-+ else
-+ {
-+ /* Account for exclusive L2 and L3 caches. */
-+ shared += core;
-+ }
- }
- }
-
-@@ -854,14 +868,20 @@ init_cacheinfo (void)
- __x86_shared_cache_size = shared;
- }
-
-- /* The large memcpy micro benchmark in glibc shows that 6 times of
-- shared cache size is the approximate value above which non-temporal
-- store becomes faster on a 8-core processor. This is the 3/4 of the
-- total shared cache size. */
-+ /* The default setting for the non_temporal threshold is 3/4 of one
-+ thread's share of the chip's cache. For most Intel and AMD processors
-+ with an initial release date between 2017 and 2020, a thread's typical
-+ share of the cache is from 500 KBytes to 2 MBytes. Using the 3/4
-+ threshold leaves 125 KBytes to 500 KBytes of the thread's data
-+ in cache after a maximum temporal copy, which will maintain
-+ in cache a reasonable portion of the thread's stack and other
-+ active data. If the threshold is set higher than one thread's
-+ share of the cache, it has a substantial risk of negatively
-+ impacting the performance of other threads running on the chip. */
- __x86_shared_non_temporal_threshold
- = (cpu_features->non_temporal_threshold != 0
- ? cpu_features->non_temporal_threshold
-- : __x86_shared_cache_size * threads * 3 / 4);
-+ : __x86_shared_cache_size * 3 / 4);
-
- /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */
- unsigned int minimum_rep_movsb_threshold;
-diff -pruN glibc-2.32.orig/sysdeps/x86/dl-cet.c glibc-2.32/sysdeps/x86/dl-cet.c
---- glibc-2.32.orig/sysdeps/x86/dl-cet.c 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/dl-cet.c 2021-09-18 21:03:05.314302356 +1000
-@@ -47,7 +47,10 @@ dl_cet_check (struct link_map *m, const
- /* No legacy object check if both IBT and SHSTK are always on. */
- if (enable_ibt_type == cet_always_on
- && enable_shstk_type == cet_always_on)
-- return;
-+ {
-+ THREAD_SETMEM (THREAD_SELF, header.feature_1, GL(dl_x86_feature_1));
-+ return;
-+ }
-
- /* Check if IBT is enabled by kernel. */
- bool ibt_enabled
-diff -pruN glibc-2.32.orig/sysdeps/x86/dl-prop.h glibc-2.32/sysdeps/x86/dl-prop.h
---- glibc-2.32.orig/sysdeps/x86/dl-prop.h 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/dl-prop.h 2021-09-18 21:03:05.314302356 +1000
-@@ -145,15 +145,15 @@ _dl_process_cet_property_note (struct li
- }
-
- static inline void __attribute__ ((unused))
--_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr);
- _dl_process_cet_property_note (l, note, ph->p_memsz, ph->p_align);
- }
-
- static inline int __attribute__ ((always_inline))
--_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
-- void *data)
-+_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
-+ uint32_t datasz, void *data)
- {
- return 0;
- }
-diff -pruN glibc-2.32.orig/sysdeps/x86/Makefile glibc-2.32/sysdeps/x86/Makefile
---- glibc-2.32.orig/sysdeps/x86/Makefile 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/Makefile 2021-09-18 21:03:05.314302356 +1000
-@@ -12,6 +12,12 @@ endif
- ifeq ($(subdir),setjmp)
- gen-as-const-headers += jmp_buf-ssp.sym
- sysdep_routines += __longjmp_cancel
-+ifneq ($(enable-cet),no)
-+ifneq ($(have-tunables),no)
-+tests += tst-setjmp-cet
-+tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on
-+endif
-+endif
- endif
-
- ifeq ($(subdir),string)
-diff -pruN glibc-2.32.orig/sysdeps/x86/tst-setjmp-cet.c glibc-2.32/sysdeps/x86/tst-setjmp-cet.c
---- glibc-2.32.orig/sysdeps/x86/tst-setjmp-cet.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/x86/tst-setjmp-cet.c 2021-09-18 21:03:05.314302356 +1000
-@@ -0,0 +1 @@
-+#include <setjmp/tst-setjmp.c>
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/configure glibc-2.32/sysdeps/x86_64/configure
---- glibc-2.32.orig/sysdeps/x86_64/configure 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/configure 2021-09-18 21:03:05.314302356 +1000
-@@ -107,39 +107,6 @@ if test x"$build_mathvec" = xnotset; the
- build_mathvec=yes
- fi
-
--if test "$static_pie" = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker static PIE support" >&5
--$as_echo_n "checking for linker static PIE support... " >&6; }
--if ${libc_cv_ld_static_pie+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- cat > conftest.s <<\EOF
-- .text
-- .global _start
-- .weak foo
--_start:
-- leaq foo(%rip), %rax
--EOF
-- libc_cv_pie_option="-Wl,-pie"
-- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&5'
-- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- libc_cv_ld_static_pie=yes
-- else
-- libc_cv_ld_static_pie=no
-- fi
--rm -f conftest*
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_static_pie" >&5
--$as_echo "$libc_cv_ld_static_pie" >&6; }
-- if test "$libc_cv_ld_static_pie" != yes; then
-- as_fn_error $? "linker support for static PIE needed" "$LINENO" 5
-- fi
--fi
--
- $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/configure.ac glibc-2.32/sysdeps/x86_64/configure.ac
---- glibc-2.32.orig/sysdeps/x86_64/configure.ac 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/configure.ac 2021-09-18 21:03:05.314302356 +1000
-@@ -53,31 +53,6 @@ if test x"$build_mathvec" = xnotset; the
- build_mathvec=yes
- fi
-
--dnl Check if linker supports static PIE with the fix for
--dnl
--dnl https://sourceware.org/bugzilla/show_bug.cgi?id=21782
--dnl
--if test "$static_pie" = yes; then
-- AC_CACHE_CHECK(for linker static PIE support, libc_cv_ld_static_pie, [dnl
--cat > conftest.s <<\EOF
-- .text
-- .global _start
-- .weak foo
--_start:
-- leaq foo(%rip), %rax
--EOF
-- libc_cv_pie_option="-Wl,-pie"
-- if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&AS_MESSAGE_LOG_FD); then
-- libc_cv_ld_static_pie=yes
-- else
-- libc_cv_ld_static_pie=no
-- fi
--rm -f conftest*])
-- if test "$libc_cv_ld_static_pie" != yes; then
-- AC_MSG_ERROR([linker support for static PIE needed])
-- fi
--fi
--
- dnl It is always possible to access static and hidden symbols in an
- dnl position independent way.
- AC_DEFINE(PI_STATIC_AND_HIDDEN)
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/dl-machine.h glibc-2.32/sysdeps/x86_64/dl-machine.h
---- glibc-2.32.orig/sysdeps/x86_64/dl-machine.h 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/dl-machine.h 2021-09-18 21:03:05.314302356 +1000
-@@ -315,16 +315,22 @@ elf_machine_rela (struct link_map *map,
- {
- # ifndef RTLD_BOOTSTRAP
- if (sym_map != map
-- && sym_map->l_type != lt_executable
- && !sym_map->l_relocated)
- {
- const char *strtab
- = (const char *) D_PTR (map, l_info[DT_STRTAB]);
-- _dl_error_printf ("\
-+ if (sym_map->l_type == lt_executable)
-+ _dl_fatal_printf ("\
-+%s: IFUNC symbol '%s' referenced in '%s' is defined in the executable \
-+and creates an unsatisfiable circular dependency.\n",
-+ RTLD_PROGNAME, strtab + refsym->st_name,
-+ map->l_name);
-+ else
-+ _dl_error_printf ("\
- %s: Relink `%s' with `%s' for IFUNC symbol `%s'\n",
-- RTLD_PROGNAME, map->l_name,
-- sym_map->l_name,
-- strtab + refsym->st_name);
-+ RTLD_PROGNAME, map->l_name,
-+ sym_map->l_name,
-+ strtab + refsym->st_name);
- }
- # endif
- value = ((ElfW(Addr) (*) (void)) value) ();
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h glibc-2.32/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h
---- glibc-2.32.orig/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h 2021-09-18 21:03:05.314302356 +1000
-@@ -32,7 +32,7 @@ IFUNC_SELECTOR (void)
- && CPU_FEATURE_USABLE_P (cpu_features, AVX2))
- return OPTIMIZE (fma);
-
-- if (CPU_FEATURE_USABLE_P (cpu_features, FMA))
-+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA4))
- return OPTIMIZE (fma4);
-
- return OPTIMIZE (sse2);
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S glibc-2.32/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S
---- glibc-2.32.orig/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S 2021-09-18 21:02:32.745186156 +1000
-+++ glibc-2.32/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S 2021-09-18 21:03:05.314302356 +1000
-@@ -56,6 +56,13 @@
- # endif
- #endif
-
-+/* Avoid short distance rep movsb only with non-SSE vector. */
-+#ifndef AVOID_SHORT_DISTANCE_REP_MOVSB
-+# define AVOID_SHORT_DISTANCE_REP_MOVSB (VEC_SIZE > 16)
-+#else
-+# define AVOID_SHORT_DISTANCE_REP_MOVSB 0
-+#endif
-+
- #ifndef PREFETCH
- # define PREFETCH(addr) prefetcht0 addr
- #endif
-@@ -243,7 +250,21 @@ L(movsb):
- cmpq %r9, %rdi
- /* Avoid slow backward REP MOVSB. */
- jb L(more_8x_vec_backward)
-+# if AVOID_SHORT_DISTANCE_REP_MOVSB
-+ movq %rdi, %rcx
-+ subq %rsi, %rcx
-+ jmp 2f
-+# endif
- 1:
-+# if AVOID_SHORT_DISTANCE_REP_MOVSB
-+ movq %rsi, %rcx
-+ subq %rdi, %rcx
-+2:
-+/* Avoid "rep movsb" if RCX, the distance between source and destination,
-+ is N*4GB + [1..63] with N >= 0. */
-+ cmpl $63, %ecx
-+ jbe L(more_2x_vec) /* Avoid "rep movsb" if ECX <= 63. */
-+# endif
- mov %RDX_LP, %RCX_LP
- rep movsb
- L(nop):
-diff -pruN glibc-2.32.orig/sysvipc/test-sysvsem.c glibc-2.32/sysvipc/test-sysvsem.c
---- glibc-2.32.orig/sysvipc/test-sysvsem.c 2021-09-18 21:02:32.746186190 +1000
-+++ glibc-2.32/sysvipc/test-sysvsem.c 2021-09-18 21:03:05.314302356 +1000
-@@ -20,6 +20,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <stdbool.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/sem.h>
-diff -pruN glibc-2.32.orig/version.h glibc-2.32/version.h
---- glibc-2.32.orig/version.h 2021-09-18 21:02:32.746186190 +1000
-+++ glibc-2.32/version.h 2021-09-18 21:03:05.314302356 +1000
-@@ -1,4 +1,4 @@
- /* This file just defines the current version number of libc. */
-
--#define RELEASE "release"
-+#define RELEASE "stable"
- #define VERSION "2.32"
diff --git a/glibc/glibc-c-utf8-locale-1.patch b/glibc/glibc-c-utf8-locale-1.patch
new file mode 100644
index 00000000..3b800647
--- /dev/null
+++ b/glibc/glibc-c-utf8-locale-1.patch
@@ -0,0 +1,980 @@
+commit f5117c6504888fab5423282a4607c552b90fd3f9
+Author: Carlos O'Donell <carlos(a)redhat.com>
+Date: Thu Jul 29 22:45:39 2021 -0400
+
+ Add 'codepoint_collation' support for LC_COLLATE.
+
+ Support a new directive 'codepoint_collation' in the LC_COLLATE
+ section of a locale source file. This new directive causes all
+ collation rules to be dropped and instead STRCMP (strcmp or
+ wcscmp) is used for collation of the input character set. This
+ is required to allow for a C.UTF-8 that contains zero collation
+ rules (minimal size) and sorts using code point sorting.
+
+ To date the only implementation of a locale with zero collation
+ rules is the C/POSIX locale. The C/POSIX locale provides
+ identity tables for _NL_COLLATE_COLLSEQMB and
+ _NL_COLLATE_COLLSEQWC that map to ASCII even though it has zero
+ rules. This has lead to existing fnmatch, regexec, and regcomp
+ implementations that require these tables. It is not correct
+ to use these tables when nrules == 0, but the conservative fix
+ is to provide these tables when nrules == 0. This assures that
+ existing static applications using a new C.UTF-8 locale with
+ 'codepoint_collation' at least have functional range expressions
+ with ASCII e.g. [0-9] or [a-z]. Such static applications would
+ not have the fixes to fnmatch, regexec and regcomp that avoid
+ the use of the tables when nrules == 0. Future fixes to fnmatch,
+ regexec, and regcomp would allow range expressions to use the
+ full set of code points for such ranges.
+
+ Tested on x86_64 and i686 without regression.
+
+ Reviewed-by: Florian Weimer <fweimer(a)redhat.com>
+
+diff --git a/locale/C-collate-seq.c b/locale/C-collate-seq.c
+new file mode 100644
+index 0000000000000000..4fb82cb8357936b6
+--- /dev/null
++++ b/locale/C-collate-seq.c
+@@ -0,0 +1,100 @@
++/* Copyright (C) 1995-2021 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <stdint.h>
++
++static const char collseqmb[] =
++{
++ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
++ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
++ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
++ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
++ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
++ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
++ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
++ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
++ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
++ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
++ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
++ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
++ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
++ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
++ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
++ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
++ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
++ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
++ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
++ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
++ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
++ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
++ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
++ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
++ '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
++ '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
++ '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
++ '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
++ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
++ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
++ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
++ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
++};
++
++/* This table must be 256 bytes in size. We index bytes into the
++ table to find the collation sequence. */
++_Static_assert (sizeof (collseqmb) == 256);
++
++static const uint32_t collseqwc[] =
++{
++ 8, 1, 8, 0x0, 0xff,
++ /* 1st-level table */
++ 6 * sizeof (uint32_t),
++ /* 2nd-level table */
++ 7 * sizeof (uint32_t),
++ /* 3rd-level table */
++ L'\x00', L'\x01', L'\x02', L'\x03', L'\x04', L'\x05', L'\x06', L'\x07',
++ L'\x08', L'\x09', L'\x0a', L'\x0b', L'\x0c', L'\x0d', L'\x0e', L'\x0f',
++ L'\x10', L'\x11', L'\x12', L'\x13', L'\x14', L'\x15', L'\x16', L'\x17',
++ L'\x18', L'\x19', L'\x1a', L'\x1b', L'\x1c', L'\x1d', L'\x1e', L'\x1f',
++ L'\x20', L'\x21', L'\x22', L'\x23', L'\x24', L'\x25', L'\x26', L'\x27',
++ L'\x28', L'\x29', L'\x2a', L'\x2b', L'\x2c', L'\x2d', L'\x2e', L'\x2f',
++ L'\x30', L'\x31', L'\x32', L'\x33', L'\x34', L'\x35', L'\x36', L'\x37',
++ L'\x38', L'\x39', L'\x3a', L'\x3b', L'\x3c', L'\x3d', L'\x3e', L'\x3f',
++ L'\x40', L'\x41', L'\x42', L'\x43', L'\x44', L'\x45', L'\x46', L'\x47',
++ L'\x48', L'\x49', L'\x4a', L'\x4b', L'\x4c', L'\x4d', L'\x4e', L'\x4f',
++ L'\x50', L'\x51', L'\x52', L'\x53', L'\x54', L'\x55', L'\x56', L'\x57',
++ L'\x58', L'\x59', L'\x5a', L'\x5b', L'\x5c', L'\x5d', L'\x5e', L'\x5f',
++ L'\x60', L'\x61', L'\x62', L'\x63', L'\x64', L'\x65', L'\x66', L'\x67',
++ L'\x68', L'\x69', L'\x6a', L'\x6b', L'\x6c', L'\x6d', L'\x6e', L'\x6f',
++ L'\x70', L'\x71', L'\x72', L'\x73', L'\x74', L'\x75', L'\x76', L'\x77',
++ L'\x78', L'\x79', L'\x7a', L'\x7b', L'\x7c', L'\x7d', L'\x7e', L'\x7f',
++ L'\x80', L'\x81', L'\x82', L'\x83', L'\x84', L'\x85', L'\x86', L'\x87',
++ L'\x88', L'\x89', L'\x8a', L'\x8b', L'\x8c', L'\x8d', L'\x8e', L'\x8f',
++ L'\x90', L'\x91', L'\x92', L'\x93', L'\x94', L'\x95', L'\x96', L'\x97',
++ L'\x98', L'\x99', L'\x9a', L'\x9b', L'\x9c', L'\x9d', L'\x9e', L'\x9f',
++ L'\xa0', L'\xa1', L'\xa2', L'\xa3', L'\xa4', L'\xa5', L'\xa6', L'\xa7',
++ L'\xa8', L'\xa9', L'\xaa', L'\xab', L'\xac', L'\xad', L'\xae', L'\xaf',
++ L'\xb0', L'\xb1', L'\xb2', L'\xb3', L'\xb4', L'\xb5', L'\xb6', L'\xb7',
++ L'\xb8', L'\xb9', L'\xba', L'\xbb', L'\xbc', L'\xbd', L'\xbe', L'\xbf',
++ L'\xc0', L'\xc1', L'\xc2', L'\xc3', L'\xc4', L'\xc5', L'\xc6', L'\xc7',
++ L'\xc8', L'\xc9', L'\xca', L'\xcb', L'\xcc', L'\xcd', L'\xce', L'\xcf',
++ L'\xd0', L'\xd1', L'\xd2', L'\xd3', L'\xd4', L'\xd5', L'\xd6', L'\xd7',
++ L'\xd8', L'\xd9', L'\xda', L'\xdb', L'\xdc', L'\xdd', L'\xde', L'\xdf',
++ L'\xe0', L'\xe1', L'\xe2', L'\xe3', L'\xe4', L'\xe5', L'\xe6', L'\xe7',
++ L'\xe8', L'\xe9', L'\xea', L'\xeb', L'\xec', L'\xed', L'\xee', L'\xef',
++ L'\xf0', L'\xf1', L'\xf2', L'\xf3', L'\xf4', L'\xf5', L'\xf6', L'\xf7',
++ L'\xf8', L'\xf9', L'\xfa', L'\xfb', L'\xfc', L'\xfd', L'\xfe', L'\xff'
++};
+diff --git a/locale/C-collate.c b/locale/C-collate.c
+index 76d9373683314943..120ce0a40aeb9a0f 100644
+--- a/locale/C-collate.c
++++ b/locale/C-collate.c
+@@ -20,83 +20,7 @@
+ #include <stdint.h>
+ #include "localeinfo.h"
+
+-static const char collseqmb[] =
+-{
+- '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+- '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+- '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+- '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+- '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+- '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+- '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+- '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+- '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+- '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+- '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+- '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+- '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+- '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+- '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+- '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+- '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+- '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+- '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+- '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+- '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+- '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+- '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+- '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+- '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+- '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
+- '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
+- '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
+- '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+- '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+- '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+- '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
+-};
+-
+-static const uint32_t collseqwc[] =
+-{
+- 8, 1, 8, 0x0, 0xff,
+- /* 1st-level table */
+- 6 * sizeof (uint32_t),
+- /* 2nd-level table */
+- 7 * sizeof (uint32_t),
+- /* 3rd-level table */
+- L'\x00', L'\x01', L'\x02', L'\x03', L'\x04', L'\x05', L'\x06', L'\x07',
+- L'\x08', L'\x09', L'\x0a', L'\x0b', L'\x0c', L'\x0d', L'\x0e', L'\x0f',
+- L'\x10', L'\x11', L'\x12', L'\x13', L'\x14', L'\x15', L'\x16', L'\x17',
+- L'\x18', L'\x19', L'\x1a', L'\x1b', L'\x1c', L'\x1d', L'\x1e', L'\x1f',
+- L'\x20', L'\x21', L'\x22', L'\x23', L'\x24', L'\x25', L'\x26', L'\x27',
+- L'\x28', L'\x29', L'\x2a', L'\x2b', L'\x2c', L'\x2d', L'\x2e', L'\x2f',
+- L'\x30', L'\x31', L'\x32', L'\x33', L'\x34', L'\x35', L'\x36', L'\x37',
+- L'\x38', L'\x39', L'\x3a', L'\x3b', L'\x3c', L'\x3d', L'\x3e', L'\x3f',
+- L'\x40', L'\x41', L'\x42', L'\x43', L'\x44', L'\x45', L'\x46', L'\x47',
+- L'\x48', L'\x49', L'\x4a', L'\x4b', L'\x4c', L'\x4d', L'\x4e', L'\x4f',
+- L'\x50', L'\x51', L'\x52', L'\x53', L'\x54', L'\x55', L'\x56', L'\x57',
+- L'\x58', L'\x59', L'\x5a', L'\x5b', L'\x5c', L'\x5d', L'\x5e', L'\x5f',
+- L'\x60', L'\x61', L'\x62', L'\x63', L'\x64', L'\x65', L'\x66', L'\x67',
+- L'\x68', L'\x69', L'\x6a', L'\x6b', L'\x6c', L'\x6d', L'\x6e', L'\x6f',
+- L'\x70', L'\x71', L'\x72', L'\x73', L'\x74', L'\x75', L'\x76', L'\x77',
+- L'\x78', L'\x79', L'\x7a', L'\x7b', L'\x7c', L'\x7d', L'\x7e', L'\x7f',
+- L'\x80', L'\x81', L'\x82', L'\x83', L'\x84', L'\x85', L'\x86', L'\x87',
+- L'\x88', L'\x89', L'\x8a', L'\x8b', L'\x8c', L'\x8d', L'\x8e', L'\x8f',
+- L'\x90', L'\x91', L'\x92', L'\x93', L'\x94', L'\x95', L'\x96', L'\x97',
+- L'\x98', L'\x99', L'\x9a', L'\x9b', L'\x9c', L'\x9d', L'\x9e', L'\x9f',
+- L'\xa0', L'\xa1', L'\xa2', L'\xa3', L'\xa4', L'\xa5', L'\xa6', L'\xa7',
+- L'\xa8', L'\xa9', L'\xaa', L'\xab', L'\xac', L'\xad', L'\xae', L'\xaf',
+- L'\xb0', L'\xb1', L'\xb2', L'\xb3', L'\xb4', L'\xb5', L'\xb6', L'\xb7',
+- L'\xb8', L'\xb9', L'\xba', L'\xbb', L'\xbc', L'\xbd', L'\xbe', L'\xbf',
+- L'\xc0', L'\xc1', L'\xc2', L'\xc3', L'\xc4', L'\xc5', L'\xc6', L'\xc7',
+- L'\xc8', L'\xc9', L'\xca', L'\xcb', L'\xcc', L'\xcd', L'\xce', L'\xcf',
+- L'\xd0', L'\xd1', L'\xd2', L'\xd3', L'\xd4', L'\xd5', L'\xd6', L'\xd7',
+- L'\xd8', L'\xd9', L'\xda', L'\xdb', L'\xdc', L'\xdd', L'\xde', L'\xdf',
+- L'\xe0', L'\xe1', L'\xe2', L'\xe3', L'\xe4', L'\xe5', L'\xe6', L'\xe7',
+- L'\xe8', L'\xe9', L'\xea', L'\xeb', L'\xec', L'\xed', L'\xee', L'\xef',
+- L'\xf0', L'\xf1', L'\xf2', L'\xf3', L'\xf4', L'\xf5', L'\xf6', L'\xf7',
+- L'\xf8', L'\xf9', L'\xfa', L'\xfb', L'\xfc', L'\xfd', L'\xfe', L'\xff'
+-};
++#include "C-collate-seq.c"
+
+ const struct __locale_data _nl_C_LC_COLLATE attribute_hidden =
+ {
+diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
+index b6406b775d3a81ad..0f314e40c4305dea 100644
+--- a/locale/programs/ld-collate.c
++++ b/locale/programs/ld-collate.c
+@@ -24,6 +24,7 @@
+ #include <wchar.h>
+ #include <stdint.h>
+ #include <sys/param.h>
++#include <array_length.h>
+
+ #include "localedef.h"
+ #include "charmap.h"
+@@ -195,6 +196,9 @@ struct name_list
+ /* The real definition of the struct for the LC_COLLATE locale. */
+ struct locale_collate_t
+ {
++ /* Does the locale use code points to compare the encoding? */
++ bool codepoint_collation;
++
+ int col_weight_max;
+ int cur_weight_max;
+
+@@ -1510,6 +1514,7 @@ collate_startup (struct linereader *ldfile, struct localedef_t *locale,
+ obstack_init (&collate->mempool);
+
+ collate->col_weight_max = -1;
++ collate->codepoint_collation = false;
+ }
+ else
+ /* Reuse the copy_locale's data structures. */
+@@ -1568,6 +1573,10 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
+ return;
+ }
+
++ /* No data required. */
++ if (collate->codepoint_collation)
++ return;
++
+ /* If this assertion is hit change the type in `element_t'. */
+ assert (nrules <= sizeof (runp->used_in_level) * 8);
+
+@@ -2092,6 +2101,10 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
+ }
+ }
+
++/* Include the C locale identity tables for _NL_COLLATE_COLLSEQMB and
++ _NL_COLLATE_COLLSEQWC. */
++#include "C-collate-seq.c"
++
+ void
+ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ const char *output_path)
+@@ -2115,7 +2128,7 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ add_locale_uint32 (&file, nrules);
+
+ /* If we have no LC_COLLATE data emit only the number of rules as zero. */
+- if (collate == NULL)
++ if (collate == NULL || collate->codepoint_collation)
+ {
+ size_t idx;
+ for (idx = 1; idx < nelems; idx++)
+@@ -2123,6 +2136,17 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ /* The words have to be handled specially. */
+ if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB))
+ add_locale_uint32 (&file, 0);
++ else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_CODESET)
++ && collate != NULL)
++ /* A valid LC_COLLATE must have a code set name. */
++ add_locale_string (&file, charmap->code_set_name);
++ else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQMB)
++ && collate != NULL)
++ add_locale_raw_data (&file, collseqmb, sizeof (collseqmb));
++ else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQWC)
++ && collate != NULL)
++ add_locale_uint32_array (&file, collseqwc,
++ array_length (collseqwc));
+ else
+ add_locale_empty (&file);
+ }
+@@ -2672,6 +2696,10 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
+
+ switch (nowtok)
+ {
++ case tok_codepoint_collation:
++ collate->codepoint_collation = true;
++ break;
++
+ case tok_copy:
+ /* Allow copying other locales. */
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
+@@ -3742,9 +3770,11 @@ error while adding equivalent collating symbol"));
+ /* Next we assume `LC_COLLATE'. */
+ if (!ignore_content)
+ {
+- if (state == 0 && copy_locale == NULL)
++ if (state == 0
++ && copy_locale == NULL
++ && !collate->codepoint_collation)
+ /* We must either see a copy statement or have
+- ordering values. */
++ ordering values, or codepoint_collation. */
+ lr_error (ldfile,
+ _("%s: empty category description not allowed"),
+ "LC_COLLATE");
+diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
+index bcded15ddb4c44bb..2e59eb9ac014134b 100644
+--- a/locale/programs/locfile-kw.gperf
++++ b/locale/programs/locfile-kw.gperf
+@@ -54,6 +54,7 @@ translit_end, tok_translit_end, 0
+ translit_ignore, tok_translit_ignore, 0
+ default_missing, tok_default_missing, 0
+ LC_COLLATE, tok_lc_collate, 0
++codepoint_collation, tok_codepoint_collation, 0
+ coll_weight_max, tok_coll_weight_max, 0
+ section-symbol, tok_section_symbol, 0
+ collating-element, tok_collating_element, 0
+diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
+index bc1cb8f0845852ad..fe6335692bd422cd 100644
+--- a/locale/programs/locfile-kw.h
++++ b/locale/programs/locfile-kw.h
+@@ -54,7 +54,7 @@
+ #line 24 "locfile-kw.gperf"
+ struct keyword_t ;
+
+-#define TOTAL_KEYWORDS 178
++#define TOTAL_KEYWORDS 179
+ #define MIN_WORD_LENGTH 3
+ #define MAX_WORD_LENGTH 22
+ #define MIN_HASH_VALUE 3
+@@ -134,92 +134,92 @@ locfile_hash (register const char *str, register size_t len)
+ #line 31 "locfile-kw.gperf"
+ {"END", tok_end, 0},
+ {""}, {""},
+-#line 70 "locfile-kw.gperf"
++#line 71 "locfile-kw.gperf"
+ {"IGNORE", tok_ignore, 0},
+-#line 129 "locfile-kw.gperf"
++#line 130 "locfile-kw.gperf"
+ {"LC_TIME", tok_lc_time, 0},
+ #line 30 "locfile-kw.gperf"
+ {"LC_CTYPE", tok_lc_ctype, 0},
+ {""},
+-#line 168 "locfile-kw.gperf"
++#line 169 "locfile-kw.gperf"
+ {"LC_ADDRESS", tok_lc_address, 0},
+-#line 153 "locfile-kw.gperf"
++#line 154 "locfile-kw.gperf"
+ {"LC_MESSAGES", tok_lc_messages, 0},
+-#line 161 "locfile-kw.gperf"
++#line 162 "locfile-kw.gperf"
+ {"LC_NAME", tok_lc_name, 0},
+-#line 158 "locfile-kw.gperf"
++#line 159 "locfile-kw.gperf"
+ {"LC_PAPER", tok_lc_paper, 0},
+-#line 186 "locfile-kw.gperf"
++#line 187 "locfile-kw.gperf"
+ {"LC_MEASUREMENT", tok_lc_measurement, 0},
+ #line 56 "locfile-kw.gperf"
+ {"LC_COLLATE", tok_lc_collate, 0},
+ {""},
+-#line 188 "locfile-kw.gperf"
++#line 189 "locfile-kw.gperf"
+ {"LC_IDENTIFICATION", tok_lc_identification, 0},
+-#line 201 "locfile-kw.gperf"
++#line 202 "locfile-kw.gperf"
+ {"revision", tok_revision, 0},
+-#line 69 "locfile-kw.gperf"
++#line 70 "locfile-kw.gperf"
+ {"UNDEFINED", tok_undefined, 0},
+-#line 125 "locfile-kw.gperf"
++#line 126 "locfile-kw.gperf"
+ {"LC_NUMERIC", tok_lc_numeric, 0},
+-#line 82 "locfile-kw.gperf"
++#line 83 "locfile-kw.gperf"
+ {"LC_MONETARY", tok_lc_monetary, 0},
+-#line 181 "locfile-kw.gperf"
++#line 182 "locfile-kw.gperf"
+ {"LC_TELEPHONE", tok_lc_telephone, 0},
+ {""}, {""}, {""},
+-#line 75 "locfile-kw.gperf"
++#line 76 "locfile-kw.gperf"
+ {"define", tok_define, 0},
+-#line 154 "locfile-kw.gperf"
++#line 155 "locfile-kw.gperf"
+ {"yesexpr", tok_yesexpr, 0},
+-#line 141 "locfile-kw.gperf"
++#line 142 "locfile-kw.gperf"
+ {"era_year", tok_era_year, 0},
+ {""},
+ #line 54 "locfile-kw.gperf"
+ {"translit_ignore", tok_translit_ignore, 0},
+-#line 156 "locfile-kw.gperf"
++#line 157 "locfile-kw.gperf"
+ {"yesstr", tok_yesstr, 0},
+ {""},
+-#line 89 "locfile-kw.gperf"
++#line 90 "locfile-kw.gperf"
+ {"negative_sign", tok_negative_sign, 0},
+ {""},
+-#line 137 "locfile-kw.gperf"
++#line 138 "locfile-kw.gperf"
+ {"t_fmt", tok_t_fmt, 0},
+-#line 159 "locfile-kw.gperf"
++#line 160 "locfile-kw.gperf"
+ {"height", tok_height, 0},
+ {""}, {""},
+ #line 52 "locfile-kw.gperf"
+ {"translit_start", tok_translit_start, 0},
+-#line 136 "locfile-kw.gperf"
++#line 137 "locfile-kw.gperf"
+ {"d_fmt", tok_d_fmt, 0},
+ {""},
+ #line 53 "locfile-kw.gperf"
+ {"translit_end", tok_translit_end, 0},
+-#line 94 "locfile-kw.gperf"
++#line 95 "locfile-kw.gperf"
+ {"n_cs_precedes", tok_n_cs_precedes, 0},
+-#line 144 "locfile-kw.gperf"
++#line 145 "locfile-kw.gperf"
+ {"era_t_fmt", tok_era_t_fmt, 0},
+ #line 39 "locfile-kw.gperf"
+ {"space", tok_space, 0},
+-#line 72 "locfile-kw.gperf"
+- {"reorder-end", tok_reorder_end, 0},
+ #line 73 "locfile-kw.gperf"
++ {"reorder-end", tok_reorder_end, 0},
++#line 74 "locfile-kw.gperf"
+ {"reorder-sections-after", tok_reorder_sections_after, 0},
+ {""},
+-#line 142 "locfile-kw.gperf"
++#line 143 "locfile-kw.gperf"
+ {"era_d_fmt", tok_era_d_fmt, 0},
+-#line 189 "locfile-kw.gperf"
++#line 190 "locfile-kw.gperf"
+ {"title", tok_title, 0},
+ {""}, {""},
+-#line 149 "locfile-kw.gperf"
++#line 150 "locfile-kw.gperf"
+ {"timezone", tok_timezone, 0},
+ {""},
+-#line 74 "locfile-kw.gperf"
++#line 75 "locfile-kw.gperf"
+ {"reorder-sections-end", tok_reorder_sections_end, 0},
+ {""}, {""}, {""},
+-#line 95 "locfile-kw.gperf"
++#line 96 "locfile-kw.gperf"
+ {"n_sep_by_space", tok_n_sep_by_space, 0},
+ {""}, {""},
+-#line 100 "locfile-kw.gperf"
++#line 101 "locfile-kw.gperf"
+ {"int_n_cs_precedes", tok_int_n_cs_precedes, 0},
+ {""}, {""}, {""},
+ #line 26 "locfile-kw.gperf"
+@@ -233,147 +233,147 @@ locfile_hash (register const char *str, register size_t len)
+ {"print", tok_print, 0},
+ #line 44 "locfile-kw.gperf"
+ {"xdigit", tok_xdigit, 0},
+-#line 110 "locfile-kw.gperf"
++#line 111 "locfile-kw.gperf"
+ {"duo_n_cs_precedes", tok_duo_n_cs_precedes, 0},
+-#line 127 "locfile-kw.gperf"
++#line 128 "locfile-kw.gperf"
+ {"thousands_sep", tok_thousands_sep, 0},
+-#line 197 "locfile-kw.gperf"
++#line 198 "locfile-kw.gperf"
+ {"territory", tok_territory, 0},
+ #line 36 "locfile-kw.gperf"
+ {"digit", tok_digit, 0},
+ {""}, {""},
+-#line 92 "locfile-kw.gperf"
++#line 93 "locfile-kw.gperf"
+ {"p_cs_precedes", tok_p_cs_precedes, 0},
+ {""}, {""},
+-#line 62 "locfile-kw.gperf"
++#line 63 "locfile-kw.gperf"
+ {"script", tok_script, 0},
+ #line 29 "locfile-kw.gperf"
+ {"include", tok_include, 0},
+ {""},
+-#line 78 "locfile-kw.gperf"
++#line 79 "locfile-kw.gperf"
+ {"else", tok_else, 0},
+-#line 184 "locfile-kw.gperf"
++#line 185 "locfile-kw.gperf"
+ {"int_select", tok_int_select, 0},
+ {""}, {""}, {""},
+-#line 132 "locfile-kw.gperf"
++#line 133 "locfile-kw.gperf"
+ {"week", tok_week, 0},
+ #line 33 "locfile-kw.gperf"
+ {"upper", tok_upper, 0},
+ {""}, {""},
+-#line 194 "locfile-kw.gperf"
++#line 195 "locfile-kw.gperf"
+ {"tel", tok_tel, 0},
+-#line 93 "locfile-kw.gperf"
++#line 94 "locfile-kw.gperf"
+ {"p_sep_by_space", tok_p_sep_by_space, 0},
+-#line 160 "locfile-kw.gperf"
++#line 161 "locfile-kw.gperf"
+ {"width", tok_width, 0},
+ {""},
+-#line 98 "locfile-kw.gperf"
++#line 99 "locfile-kw.gperf"
+ {"int_p_cs_precedes", tok_int_p_cs_precedes, 0},
+ {""}, {""},
+ #line 41 "locfile-kw.gperf"
+ {"punct", tok_punct, 0},
+ {""}, {""},
+-#line 101 "locfile-kw.gperf"
++#line 102 "locfile-kw.gperf"
+ {"int_n_sep_by_space", tok_int_n_sep_by_space, 0},
+ {""}, {""}, {""},
+-#line 108 "locfile-kw.gperf"
++#line 109 "locfile-kw.gperf"
+ {"duo_p_cs_precedes", tok_duo_p_cs_precedes, 0},
+ #line 48 "locfile-kw.gperf"
+ {"charconv", tok_charconv, 0},
+ {""},
+ #line 47 "locfile-kw.gperf"
+ {"class", tok_class, 0},
+-#line 114 "locfile-kw.gperf"
+- {"duo_int_n_cs_precedes", tok_duo_int_n_cs_precedes, 0},
+ #line 115 "locfile-kw.gperf"
++ {"duo_int_n_cs_precedes", tok_duo_int_n_cs_precedes, 0},
++#line 116 "locfile-kw.gperf"
+ {"duo_int_n_sep_by_space", tok_duo_int_n_sep_by_space, 0},
+-#line 111 "locfile-kw.gperf"
++#line 112 "locfile-kw.gperf"
+ {"duo_n_sep_by_space", tok_duo_n_sep_by_space, 0},
+-#line 119 "locfile-kw.gperf"
++#line 120 "locfile-kw.gperf"
+ {"duo_int_n_sign_posn", tok_duo_int_n_sign_posn, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+-#line 58 "locfile-kw.gperf"
++#line 59 "locfile-kw.gperf"
+ {"section-symbol", tok_section_symbol, 0},
+-#line 185 "locfile-kw.gperf"
++#line 186 "locfile-kw.gperf"
+ {"int_prefix", tok_int_prefix, 0},
+ {""}, {""}, {""}, {""},
+ #line 42 "locfile-kw.gperf"
+ {"graph", tok_graph, 0},
+ {""}, {""},
+-#line 99 "locfile-kw.gperf"
++#line 100 "locfile-kw.gperf"
+ {"int_p_sep_by_space", tok_int_p_sep_by_space, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 112 "locfile-kw.gperf"
+- {"duo_int_p_cs_precedes", tok_duo_int_p_cs_precedes, 0},
+ #line 113 "locfile-kw.gperf"
++ {"duo_int_p_cs_precedes", tok_duo_int_p_cs_precedes, 0},
++#line 114 "locfile-kw.gperf"
+ {"duo_int_p_sep_by_space", tok_duo_int_p_sep_by_space, 0},
+-#line 109 "locfile-kw.gperf"
++#line 110 "locfile-kw.gperf"
+ {"duo_p_sep_by_space", tok_duo_p_sep_by_space, 0},
+-#line 118 "locfile-kw.gperf"
++#line 119 "locfile-kw.gperf"
+ {"duo_int_p_sign_posn", tok_duo_int_p_sign_posn, 0},
+-#line 157 "locfile-kw.gperf"
++#line 158 "locfile-kw.gperf"
+ {"nostr", tok_nostr, 0},
+ {""}, {""},
+-#line 140 "locfile-kw.gperf"
++#line 141 "locfile-kw.gperf"
+ {"era", tok_era, 0},
+ {""},
+-#line 84 "locfile-kw.gperf"
++#line 85 "locfile-kw.gperf"
+ {"currency_symbol", tok_currency_symbol, 0},
+ {""},
+-#line 167 "locfile-kw.gperf"
++#line 168 "locfile-kw.gperf"
+ {"name_ms", tok_name_ms, 0},
+-#line 165 "locfile-kw.gperf"
+- {"name_mrs", tok_name_mrs, 0},
+ #line 166 "locfile-kw.gperf"
++ {"name_mrs", tok_name_mrs, 0},
++#line 167 "locfile-kw.gperf"
+ {"name_miss", tok_name_miss, 0},
+-#line 83 "locfile-kw.gperf"
++#line 84 "locfile-kw.gperf"
+ {"int_curr_symbol", tok_int_curr_symbol, 0},
+-#line 190 "locfile-kw.gperf"
++#line 191 "locfile-kw.gperf"
+ {"source", tok_source, 0},
+-#line 164 "locfile-kw.gperf"
++#line 165 "locfile-kw.gperf"
+ {"name_mr", tok_name_mr, 0},
+-#line 163 "locfile-kw.gperf"
++#line 164 "locfile-kw.gperf"
+ {"name_gen", tok_name_gen, 0},
+-#line 202 "locfile-kw.gperf"
++#line 203 "locfile-kw.gperf"
+ {"date", tok_date, 0},
+ {""}, {""},
+-#line 191 "locfile-kw.gperf"
++#line 192 "locfile-kw.gperf"
+ {"address", tok_address, 0},
+-#line 162 "locfile-kw.gperf"
++#line 163 "locfile-kw.gperf"
+ {"name_fmt", tok_name_fmt, 0},
+ #line 32 "locfile-kw.gperf"
+ {"copy", tok_copy, 0},
+-#line 103 "locfile-kw.gperf"
++#line 104 "locfile-kw.gperf"
+ {"int_n_sign_posn", tok_int_n_sign_posn, 0},
+ {""}, {""},
+-#line 131 "locfile-kw.gperf"
++#line 132 "locfile-kw.gperf"
+ {"day", tok_day, 0},
+-#line 105 "locfile-kw.gperf"
++#line 106 "locfile-kw.gperf"
+ {"duo_currency_symbol", tok_duo_currency_symbol, 0},
+ {""}, {""}, {""},
+-#line 150 "locfile-kw.gperf"
++#line 151 "locfile-kw.gperf"
+ {"date_fmt", tok_date_fmt, 0},
+-#line 64 "locfile-kw.gperf"
++#line 65 "locfile-kw.gperf"
+ {"order_end", tok_order_end, 0},
+-#line 117 "locfile-kw.gperf"
++#line 118 "locfile-kw.gperf"
+ {"duo_n_sign_posn", tok_duo_n_sign_posn, 0},
+ {""},
+-#line 170 "locfile-kw.gperf"
++#line 171 "locfile-kw.gperf"
+ {"country_name", tok_country_name, 0},
+-#line 71 "locfile-kw.gperf"
++#line 72 "locfile-kw.gperf"
+ {"reorder-after", tok_reorder_after, 0},
+ {""}, {""},
+-#line 155 "locfile-kw.gperf"
++#line 156 "locfile-kw.gperf"
+ {"noexpr", tok_noexpr, 0},
+ #line 50 "locfile-kw.gperf"
+ {"tolower", tok_tolower, 0},
+-#line 198 "locfile-kw.gperf"
++#line 199 "locfile-kw.gperf"
+ {"audience", tok_audience, 0},
+ {""}, {""}, {""},
+ #line 49 "locfile-kw.gperf"
+ {"toupper", tok_toupper, 0},
+-#line 68 "locfile-kw.gperf"
++#line 69 "locfile-kw.gperf"
+ {"position", tok_position, 0},
+ {""},
+ #line 40 "locfile-kw.gperf"
+@@ -381,196 +381,197 @@ locfile_hash (register const char *str, register size_t len)
+ {""},
+ #line 27 "locfile-kw.gperf"
+ {"comment_char", tok_comment_char, 0},
+-#line 88 "locfile-kw.gperf"
++#line 89 "locfile-kw.gperf"
+ {"positive_sign", tok_positive_sign, 0},
+ {""}, {""}, {""}, {""},
+-#line 61 "locfile-kw.gperf"
++#line 62 "locfile-kw.gperf"
+ {"symbol-equivalence", tok_symbol_equivalence, 0},
+ {""},
+-#line 102 "locfile-kw.gperf"
++#line 103 "locfile-kw.gperf"
+ {"int_p_sign_posn", tok_int_p_sign_posn, 0},
+-#line 175 "locfile-kw.gperf"
++#line 176 "locfile-kw.gperf"
+ {"country_car", tok_country_car, 0},
+ {""}, {""},
+-#line 104 "locfile-kw.gperf"
++#line 105 "locfile-kw.gperf"
+ {"duo_int_curr_symbol", tok_duo_int_curr_symbol, 0},
+ {""}, {""},
+-#line 135 "locfile-kw.gperf"
++#line 136 "locfile-kw.gperf"
+ {"d_t_fmt", tok_d_t_fmt, 0},
+ {""}, {""},
+-#line 116 "locfile-kw.gperf"
++#line 117 "locfile-kw.gperf"
+ {"duo_p_sign_posn", tok_duo_p_sign_posn, 0},
+-#line 187 "locfile-kw.gperf"
++#line 188 "locfile-kw.gperf"
+ {"measurement", tok_measurement, 0},
+-#line 176 "locfile-kw.gperf"
++#line 177 "locfile-kw.gperf"
+ {"country_isbn", tok_country_isbn, 0},
+ #line 37 "locfile-kw.gperf"
+ {"outdigit", tok_outdigit, 0},
+ {""}, {""},
+-#line 143 "locfile-kw.gperf"
++#line 144 "locfile-kw.gperf"
+ {"era_d_t_fmt", tok_era_d_t_fmt, 0},
+ {""}, {""}, {""},
+ #line 34 "locfile-kw.gperf"
+ {"lower", tok_lower, 0},
+-#line 183 "locfile-kw.gperf"
++#line 184 "locfile-kw.gperf"
+ {"tel_dom_fmt", tok_tel_dom_fmt, 0},
+-#line 171 "locfile-kw.gperf"
++#line 172 "locfile-kw.gperf"
+ {"country_post", tok_country_post, 0},
+-#line 148 "locfile-kw.gperf"
++#line 149 "locfile-kw.gperf"
+ {"cal_direction", tok_cal_direction, 0},
+- {""},
+-#line 139 "locfile-kw.gperf"
++#line 57 "locfile-kw.gperf"
++ {"codepoint_collation", tok_codepoint_collation, 0},
++#line 140 "locfile-kw.gperf"
+ {"t_fmt_ampm", tok_t_fmt_ampm, 0},
+-#line 91 "locfile-kw.gperf"
++#line 92 "locfile-kw.gperf"
+ {"frac_digits", tok_frac_digits, 0},
+ {""}, {""},
+-#line 177 "locfile-kw.gperf"
++#line 178 "locfile-kw.gperf"
+ {"lang_name", tok_lang_name, 0},
+-#line 90 "locfile-kw.gperf"
++#line 91 "locfile-kw.gperf"
+ {"int_frac_digits", tok_int_frac_digits, 0},
+ {""},
+-#line 121 "locfile-kw.gperf"
++#line 122 "locfile-kw.gperf"
+ {"uno_valid_to", tok_uno_valid_to, 0},
+-#line 126 "locfile-kw.gperf"
++#line 127 "locfile-kw.gperf"
+ {"decimal_point", tok_decimal_point, 0},
+ {""},
+-#line 133 "locfile-kw.gperf"
++#line 134 "locfile-kw.gperf"
+ {"abmon", tok_abmon, 0},
+ {""}, {""}, {""}, {""},
+-#line 107 "locfile-kw.gperf"
++#line 108 "locfile-kw.gperf"
+ {"duo_frac_digits", tok_duo_frac_digits, 0},
+-#line 182 "locfile-kw.gperf"
++#line 183 "locfile-kw.gperf"
+ {"tel_int_fmt", tok_tel_int_fmt, 0},
+-#line 123 "locfile-kw.gperf"
++#line 124 "locfile-kw.gperf"
+ {"duo_valid_to", tok_duo_valid_to, 0},
+-#line 146 "locfile-kw.gperf"
++#line 147 "locfile-kw.gperf"
+ {"first_weekday", tok_first_weekday, 0},
+ {""},
+-#line 130 "locfile-kw.gperf"
++#line 131 "locfile-kw.gperf"
+ {"abday", tok_abday, 0},
+ {""},
+-#line 200 "locfile-kw.gperf"
++#line 201 "locfile-kw.gperf"
+ {"abbreviation", tok_abbreviation, 0},
+-#line 147 "locfile-kw.gperf"
++#line 148 "locfile-kw.gperf"
+ {"first_workday", tok_first_workday, 0},
+ {""}, {""},
+-#line 97 "locfile-kw.gperf"
++#line 98 "locfile-kw.gperf"
+ {"n_sign_posn", tok_n_sign_posn, 0},
+ {""}, {""}, {""},
+-#line 145 "locfile-kw.gperf"
++#line 146 "locfile-kw.gperf"
+ {"alt_digits", tok_alt_digits, 0},
+ {""}, {""},
+-#line 128 "locfile-kw.gperf"
++#line 129 "locfile-kw.gperf"
+ {"grouping", tok_grouping, 0},
+ {""},
+ #line 45 "locfile-kw.gperf"
+ {"blank", tok_blank, 0},
+ {""}, {""},
+-#line 196 "locfile-kw.gperf"
++#line 197 "locfile-kw.gperf"
+ {"language", tok_language, 0},
+-#line 120 "locfile-kw.gperf"
++#line 121 "locfile-kw.gperf"
+ {"uno_valid_from", tok_uno_valid_from, 0},
+ {""},
+-#line 199 "locfile-kw.gperf"
++#line 200 "locfile-kw.gperf"
+ {"application", tok_application, 0},
+ {""},
+-#line 80 "locfile-kw.gperf"
++#line 81 "locfile-kw.gperf"
+ {"elifndef", tok_elifndef, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 122 "locfile-kw.gperf"
++#line 123 "locfile-kw.gperf"
+ {"duo_valid_from", tok_duo_valid_from, 0},
+-#line 57 "locfile-kw.gperf"
++#line 58 "locfile-kw.gperf"
+ {"coll_weight_max", tok_coll_weight_max, 0},
+ {""},
+-#line 79 "locfile-kw.gperf"
++#line 80 "locfile-kw.gperf"
+ {"elifdef", tok_elifdef, 0},
+-#line 67 "locfile-kw.gperf"
++#line 68 "locfile-kw.gperf"
+ {"backward", tok_backward, 0},
+-#line 106 "locfile-kw.gperf"
++#line 107 "locfile-kw.gperf"
+ {"duo_int_frac_digits", tok_duo_int_frac_digits, 0},
+ {""}, {""}, {""}, {""}, {""}, {""},
+-#line 96 "locfile-kw.gperf"
++#line 97 "locfile-kw.gperf"
+ {"p_sign_posn", tok_p_sign_posn, 0},
+ {""},
+-#line 203 "locfile-kw.gperf"
++#line 204 "locfile-kw.gperf"
+ {"category", tok_category, 0},
+ {""}, {""}, {""}, {""},
+-#line 134 "locfile-kw.gperf"
++#line 135 "locfile-kw.gperf"
+ {"mon", tok_mon, 0},
+ {""},
+-#line 124 "locfile-kw.gperf"
++#line 125 "locfile-kw.gperf"
+ {"conversion_rate", tok_conversion_rate, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 63 "locfile-kw.gperf"
++#line 64 "locfile-kw.gperf"
+ {"order_start", tok_order_start, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 178 "locfile-kw.gperf"
++#line 179 "locfile-kw.gperf"
+ {"lang_ab", tok_lang_ab, 0},
+-#line 180 "locfile-kw.gperf"
++#line 181 "locfile-kw.gperf"
+ {"lang_lib", tok_lang_lib, 0},
+ {""}, {""}, {""},
+-#line 192 "locfile-kw.gperf"
++#line 193 "locfile-kw.gperf"
+ {"contact", tok_contact, 0},
+ {""}, {""}, {""},
+-#line 173 "locfile-kw.gperf"
++#line 174 "locfile-kw.gperf"
+ {"country_ab3", tok_country_ab3, 0},
+ {""}, {""}, {""},
+-#line 193 "locfile-kw.gperf"
++#line 194 "locfile-kw.gperf"
+ {"email", tok_email, 0},
+-#line 172 "locfile-kw.gperf"
++#line 173 "locfile-kw.gperf"
+ {"country_ab2", tok_country_ab2, 0},
+ {""}, {""}, {""},
+ #line 55 "locfile-kw.gperf"
+ {"default_missing", tok_default_missing, 0},
+ {""}, {""},
+-#line 195 "locfile-kw.gperf"
++#line 196 "locfile-kw.gperf"
+ {"fax", tok_fax, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 174 "locfile-kw.gperf"
++#line 175 "locfile-kw.gperf"
+ {"country_num", tok_country_num, 0},
+ {""}, {""}, {""}, {""}, {""}, {""},
+ #line 51 "locfile-kw.gperf"
+ {"map", tok_map, 0},
+-#line 65 "locfile-kw.gperf"
++#line 66 "locfile-kw.gperf"
+ {"from", tok_from, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 86 "locfile-kw.gperf"
++#line 87 "locfile-kw.gperf"
+ {"mon_thousands_sep", tok_mon_thousands_sep, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+-#line 81 "locfile-kw.gperf"
++#line 82 "locfile-kw.gperf"
+ {"endif", tok_endif, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 151 "locfile-kw.gperf"
++#line 152 "locfile-kw.gperf"
+ {"alt_mon", tok_alt_mon, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 76 "locfile-kw.gperf"
++#line 77 "locfile-kw.gperf"
+ {"undef", tok_undef, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 59 "locfile-kw.gperf"
++#line 60 "locfile-kw.gperf"
+ {"collating-element", tok_collating_element, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 152 "locfile-kw.gperf"
++#line 153 "locfile-kw.gperf"
+ {"ab_alt_mon", tok_ab_alt_mon, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 66 "locfile-kw.gperf"
++#line 67 "locfile-kw.gperf"
+ {"forward", tok_forward, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+-#line 85 "locfile-kw.gperf"
++#line 86 "locfile-kw.gperf"
+ {"mon_decimal_point", tok_mon_decimal_point, 0},
+ {""}, {""},
+-#line 169 "locfile-kw.gperf"
++#line 170 "locfile-kw.gperf"
+ {"postal_fmt", tok_postal_fmt, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 60 "locfile-kw.gperf"
++#line 61 "locfile-kw.gperf"
+ {"collating-symbol", tok_collating_symbol, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+@@ -583,15 +584,15 @@ locfile_hash (register const char *str, register size_t len)
+ #line 38 "locfile-kw.gperf"
+ {"alnum", tok_alnum, 0},
+ {""},
+-#line 87 "locfile-kw.gperf"
++#line 88 "locfile-kw.gperf"
+ {"mon_grouping", tok_mon_grouping, 0},
+ {""},
+-#line 179 "locfile-kw.gperf"
++#line 180 "locfile-kw.gperf"
+ {"lang_term", tok_lang_term, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 77 "locfile-kw.gperf"
++#line 78 "locfile-kw.gperf"
+ {"ifdef", tok_ifdef, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+@@ -599,7 +600,7 @@ locfile_hash (register const char *str, register size_t len)
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+-#line 138 "locfile-kw.gperf"
++#line 139 "locfile-kw.gperf"
+ {"am_pm", tok_am_pm, 0}
+ };
+
+diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
+index 414ad3076223e971..f57d594e8d25c06f 100644
+--- a/locale/programs/locfile-token.h
++++ b/locale/programs/locfile-token.h
+@@ -91,6 +91,7 @@ enum token_t
+ tok_translit_ignore,
+ tok_default_missing,
+ tok_lc_collate,
++ tok_codepoint_collation,
+ tok_coll_weight_max,
+ tok_section_symbol,
+ tok_collating_element,
diff --git a/glibc/glibc-c-utf8-locale-2.patch b/glibc/glibc-c-utf8-locale-2.patch
new file mode 100644
index 00000000..7064b8e8
--- /dev/null
+++ b/glibc/glibc-c-utf8-locale-2.patch
@@ -0,0 +1,1437 @@
+commit 466f2be6c08070e9113ae2fdc7acd5d8828cba50
+Author: Carlos O'Donell <carlos(a)redhat.com>
+Date: Wed Sep 1 15:19:19 2021 -0400
+
+ Add generic C.UTF-8 locale (Bug 17318)
+
+ We add a new C.UTF-8 locale. This locale is not builtin to glibc, but
+ is provided as a distinct locale. The locale provides full support for
+ UTF-8 and this includes full code point sorting via STRCMP-based
+ collation (strcmp or wcscmp).
+
+ The collation uses a new keyword 'codepoint_collation' which drops all
+ collation rules and generates an empty zero rules collation to enable
+ STRCMP usage in collation. This ensures that we get full code point
+ sorting for C.UTF-8 with a minimal 1406 bytes of overhead (LC_COLLATE
+ structure information and ASCII collating tables).
+
+ The new locale is added to SUPPORTED. Minimal test data for specific
+ code points (minus those not supported by collate-test) is provided in
+ C.UTF-8.in, and this verifies code point sorting is working reasonably
+ across the range. The locale was tested manually with the full set of
+ code points without failure.
+
+ The locale is harmonized with locales already shipping in various
+ downstream distributions. A new tst-iconv9 test is added which verifies
+ the C.UTF-8 locale is generally usable.
+
+ Testing for fnmatch, regexec, and recomp is provided by extending
+ bug-regex1, bugregex19, bug-regex4, bug-regex6, transbug, tst-fnmatch,
+ tst-regcomp-truncated, and tst-regex to use C.UTF-8.
+
+ Tested on x86_64 or i686 without regression.
+
+ Reviewed-by: Florian Weimer <fweimer(a)redhat.com>
+
+diff --git a/iconv/Makefile b/iconv/Makefile
+index 07d77c9ecaafba1f..9993f2d3f3cd7498 100644
+--- a/iconv/Makefile
++++ b/iconv/Makefile
+@@ -43,8 +43,19 @@ CFLAGS-charmap.c += -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
+ CFLAGS-linereader.c += -DNO_TRANSLITERATION
+ CFLAGS-simple-hash.c += -I../locale
+
+-tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \
+- tst-iconv7 tst-iconv8 tst-iconv-mt tst-iconv-opt
++tests = \
++ tst-iconv1 \
++ tst-iconv2 \
++ tst-iconv3 \
++ tst-iconv4 \
++ tst-iconv5 \
++ tst-iconv6 \
++ tst-iconv7 \
++ tst-iconv8 \
++ tst-iconv9 \
++ tst-iconv-mt \
++ tst-iconv-opt \
++ # tests
+
+ others = iconv_prog iconvconfig
+ install-others-programs = $(inst_bindir)/iconv
+@@ -83,10 +94,15 @@ endif
+ include ../Rules
+
+ ifeq ($(run-built-tests),yes)
+-LOCALES := en_US.UTF-8
++# We have to generate locales (list sorted alphabetically)
++LOCALES := \
++ C.UTF-8 \
++ en_US.UTF-8 \
++ # LOCALES
+ include ../gen-locales.mk
+
+ $(objpfx)tst-iconv-opt.out: $(gen-locales)
++$(objpfx)tst-iconv9.out: $(gen-locales)
+ endif
+
+ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
+diff --git a/iconv/tst-iconv9.c b/iconv/tst-iconv9.c
+new file mode 100644
+index 0000000000000000..c46b1833d87b8e55
+--- /dev/null
++++ b/iconv/tst-iconv9.c
+@@ -0,0 +1,87 @@
++/* Verify that using C.UTF-8 works.
++
++ Copyright (C) 2021 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <iconv.h>
++#include <stddef.h>
++#include <stdio.h>
++#include <string.h>
++#include <support/support.h>
++#include <support/check.h>
++
++/* This test does two things:
++ (1) Verify that we have likely included translit_combining in C.UTF-8.
++ (2) Verify default_missing is '?' as expected. */
++
++/* ISO-8859-1 encoding of "fÃŒr". */
++char iso88591_in[] = { 0x66, 0xfc, 0x72, 0x0 };
++/* ASCII transliteration is "fur" with C.UTF-8 translit_combining. */
++char ascii_exp[] = { 0x66, 0x75, 0x72, 0x0 };
++
++/* First 3-byte UTF-8 code point. */
++char utf8_in[] = { 0xe0, 0xa0, 0x80, 0x0 };
++/* There is no ASCII transliteration for SAMARITAN LETTER ALAF
++ so we get default_missing used which is '?'. */
++char default_missing_exp[] = { 0x3f, 0x0 };
++
++static int
++do_test (void)
++{
++ char ascii_out[5];
++ iconv_t cd;
++ char *inbuf;
++ char *outbuf;
++ size_t inbytes;
++ size_t outbytes;
++ size_t n;
++
++ /* The C.UTF-8 locale should include translit_combining, which provides
++ the transliteration for "LATIN SMALL LETTER U WITH DIAERESIS" which
++ is not provided by locale/C-translit.h.in. */
++ xsetlocale (LC_ALL, "C.UTF-8");
++
++ /* From ISO-8859-1 to ASCII. */
++ cd = iconv_open ("ASCII//TRANSLIT,IGNORE", "ISO-8859-1");
++ TEST_VERIFY (cd != (iconv_t) -1);
++ inbuf = iso88591_in;
++ inbytes = 3;
++ outbuf = ascii_out;
++ outbytes = 3;
++ n = iconv (cd, &inbuf, &inbytes, &outbuf, &outbytes);
++ TEST_VERIFY (n != -1);
++ *outbuf = '\0';
++ TEST_COMPARE_BLOB (ascii_out, 3, ascii_exp, 3);
++ TEST_VERIFY (iconv_close (cd) == 0);
++
++ /* From UTF-8 to ASCII. */
++ cd = iconv_open ("ASCII//TRANSLIT,IGNORE", "UTF-8");
++ TEST_VERIFY (cd != (iconv_t) -1);
++ inbuf = utf8_in;
++ inbytes = 3;
++ outbuf = ascii_out;
++ outbytes = 3;
++ n = iconv (cd, &inbuf, &inbytes, &outbuf, &outbytes);
++ TEST_VERIFY (n != -1);
++ *outbuf = '\0';
++ TEST_COMPARE_BLOB (ascii_out, 1, default_missing_exp, 1);
++ TEST_VERIFY (iconv_close (cd) == 0);
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/localedata/C.UTF-8.in b/localedata/C.UTF-8.in
+new file mode 100644
+index 0000000000000000..c31dcc2aa045ee61
+--- /dev/null
++++ b/localedata/C.UTF-8.in
+@@ -0,0 +1,157 @@
++ ; <U1>
++ ; <U2>
++ ; <U3>
++ ; <U4>
++ ; <U5>
++ ; <U6>
++ ; <U7>
++ ; <U8>
++ ; <UE>
++ ; <UF>
++ ; <U10>
++ ; <U11>
++ ; <U12>
++ ; <U13>
++ ; <U14>
++ ; <U15>
++ ; <U16>
++ ; <U17>
++ ; <U18>
++ ; <U19>
++ ; <U1A>
++ ; <U1B>
++ ; <U1C>
++ ; <U1D>
++ ; <U1E>
++ ; <U1F>
++! ; <U21>
++" ; <U22>
++# ; <U23>
++$ ; <U24>
++% ; <U25>
++& ; <U26>
++' ; <U27>
++) ; <U29>
++* ; <U2A>
+++ ; <U2B>
++, ; <U2C>
++- ; <U2D>
++. ; <U2E>
++/ ; <U2F>
++0 ; <U30>
++1 ; <U31>
++2 ; <U32>
++3 ; <U33>
++4 ; <U34>
++5 ; <U35>
++6 ; <U36>
++7 ; <U37>
++8 ; <U38>
++9 ; <U39>
++< ; <U3C>
++= ; <U3D>
++> ; <U3E>
++? ; <U3F>
++@ ; <U40>
++A ; <U41>
++B ; <U42>
++C ; <U43>
++D ; <U44>
++E ; <U45>
++F ; <U46>
++G ; <U47>
++H ; <U48>
++I ; <U49>
++J ; <U4A>
++K ; <U4B>
++L ; <U4C>
++M ; <U4D>
++N ; <U4E>
++O ; <U4F>
++P ; <U50>
++Q ; <U51>
++R ; <U52>
++S ; <U53>
++T ; <U54>
++U ; <U55>
++V ; <U56>
++W ; <U57>
++X ; <U58>
++Y ; <U59>
++Z ; <U5A>
++[ ; <U5B>
++\ ; <U5C>
++] ; <U5D>
++^ ; <U5E>
++_ ; <U5F>
++` ; <U60>
++a ; <U61>
++b ; <U62>
++c ; <U63>
++d ; <U64>
++e ; <U65>
++f ; <U66>
++g ; <U67>
++h ; <U68>
++i ; <U69>
++j ; <U6A>
++k ; <U6B>
++l ; <U6C>
++m ; <U6D>
++n ; <U6E>
++o ; <U6F>
++p ; <U70>
++q ; <U71>
++r ; <U72>
++s ; <U73>
++t ; <U74>
++u ; <U75>
++v ; <U76>
++w ; <U77>
++x ; <U78>
++y ; <U79>
++z ; <U7A>
++{ ; <U7B>
++| ; <U7C>
++} ; <U7D>
++~ ; <U7E>
++ ; <U7F>
++Â ; <U80>
++ÿ ; <UFF>
++Ä ; <U100>
++à¿¿ ; <UFFF>
++á ; <U1000>
++ￜ ; <UFFFD>
++ï¿¿ ; <UFFFF>
++ð ; <U10000>
++ð¿¿ ; <U1FFFF>
++ð ; <U20000>
++𯿿 ; <U2FFFF>
++ð° ; <U30000>
++ð¿¿Ÿ ; <U3FFFE>
++ñ ; <U40000>
++ñ¿¿ ; <U4FFFF>
++ñ ; <U50000>
++ñ¿¿ ; <U5FFFF>
++ñ ; <U60000>
++񯿿 ; <U6FFFF>
++ñ° ; <U70000>
++ñ¿¿¿ ; <U7FFFF>
++ò ; <U80000>
++ò¿¿ ; <U8FFFF>
++ò ; <U90000>
++ò¿¿ ; <U9FFFF>
++ò ; <UA0000>
++򯿿 ; <UAFFFF>
++ò° ; <UB0000>
++ò¿¿¿ ; <UBFFFF>
++ó ; <UC0001>
++ó¿ ; <UCFFCC>
++ó ; <UD000E>
++ó¿¿ ; <UDFFFF>
++ó ; <UE0001>
++󯿿 ; <UEFFFF>
++ó° ; <UF0001>
++ó¿¿¿ ; <UFFFFF>
++ô ; <U100001>
++ô¿¿ ; <U10FFFF>
+diff --git a/localedata/Makefile b/localedata/Makefile
+index 0341528b0407ae3b..c9dd5a954e8194cc 100644
+--- a/localedata/Makefile
++++ b/localedata/Makefile
+@@ -47,6 +47,7 @@ test-input := \
+ bg_BG.UTF-8 \
+ br_FR.UTF-8 \
+ bs_BA.UTF-8 \
++ C.UTF-8 \
+ ckb_IQ.UTF-8 \
+ cmn_TW.UTF-8 \
+ crh_UA.UTF-8 \
+@@ -206,6 +207,7 @@ LOCALES := \
+ bg_BG.UTF-8 \
+ br_FR.UTF-8 \
+ bs_BA.UTF-8 \
++ C.UTF-8 \
+ ckb_IQ.UTF-8 \
+ cmn_TW.UTF-8 \
+ crh_UA.UTF-8 \
+diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
+index 34f7a7c3fe2b6526..546ce6cea16a8fdb 100644
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
+@@ -79,6 +79,7 @@ brx_IN/UTF-8 \
+ bs_BA.UTF-8/UTF-8 \
+ bs_BA/ISO-8859-2 \
+ byn_ER/UTF-8 \
++C.UTF-8/UTF-8 \
+ ca_AD.UTF-8/UTF-8 \
+ ca_AD/ISO-8859-15 \
+ ca_ES.UTF-8/UTF-8 \
+diff --git a/localedata/locales/C b/localedata/locales/C
+new file mode 100644
+index 0000000000000000..ca801c79cf7e953e
+--- /dev/null
++++ b/localedata/locales/C
+@@ -0,0 +1,194 @@
++escape_char /
++comment_char %
++% Locale for C locale in UTF-8
++
++LC_IDENTIFICATION
++title "C locale"
++source ""
++address ""
++contact ""
++email "bug-glibc-locales(a)gnu.org"
++tel ""
++fax ""
++language ""
++territory ""
++revision "2.0"
++date "2020-06-28"
++category "i18n:2012";LC_IDENTIFICATION
++category "i18n:2012";LC_CTYPE
++category "i18n:2012";LC_COLLATE
++category "i18n:2012";LC_TIME
++category "i18n:2012";LC_NUMERIC
++category "i18n:2012";LC_MONETARY
++category "i18n:2012";LC_MESSAGES
++category "i18n:2012";LC_PAPER
++category "i18n:2012";LC_NAME
++category "i18n:2012";LC_ADDRESS
++category "i18n:2012";LC_TELEPHONE
++category "i18n:2012";LC_MEASUREMENT
++END LC_IDENTIFICATION
++
++LC_CTYPE
++% Include only the i18n character type classes without any of the
++% transliteration that i18n uses by default.
++copy "i18n_ctype"
++
++% Include the neutral transliterations. The builtin C and
++% POSIX locales have +1600 transliterations that are built into
++% the locales, and these are a superset of those.
++translit_start
++include "translit_neutral";""
++% We must use '?' for default_missing because the transliteration
++% framework includes it directly into the output and so it must
++% be compatible with ASCII if that is the target character set.
++default_missing <U003F>
++translit_end
++
++% Include the transliterations that can convert combined characters.
++% These are generally expected by users.
++translit_start
++include "translit_combining";""
++translit_end
++
++END LC_CTYPE
++
++LC_COLLATE
++% The keyword 'codepoint_collation' in any part of any LC_COLLATE
++% immediately discards all collation information and causes the
++% locale to use strcmp/wcscmp for collation comparison. This is
++% exactly what is needed for C (ASCII) or C.UTF-8.
++codepoint_collation
++END LC_COLLATE
++
++LC_MONETARY
++
++% This is the 14652 i18n fdcc-set definition for the LC_MONETARY
++% category (except for the int_curr_symbol and currency_symbol, they are
++% empty in the 14652 i18n fdcc-set definition and also empty in
++% glibc/locale/C-monetary.c.).
++int_curr_symbol ""
++currency_symbol ""
++mon_decimal_point "."
++mon_thousands_sep ""
++mon_grouping -1
++positive_sign ""
++negative_sign "-"
++int_frac_digits -1
++frac_digits -1
++p_cs_precedes -1
++int_p_sep_by_space -1
++p_sep_by_space -1
++n_cs_precedes -1
++int_n_sep_by_space -1
++n_sep_by_space -1
++p_sign_posn -1
++n_sign_posn -1
++%
++END LC_MONETARY
++
++LC_NUMERIC
++% This is the POSIX Locale definition for
++% the LC_NUMERIC category.
++%
++decimal_point "."
++thousands_sep ""
++grouping -1
++END LC_NUMERIC
++
++LC_TIME
++% This is the POSIX Locale definition for the LC_TIME category with the
++% exception that time is per ISO 8601 and 24-hour.
++%
++% Abbreviated weekday names (%a)
++abday "Sun";"Mon";"Tue";"Wed";"Thu";"Fri";"Sat"
++
++% Full weekday names (%A)
++day "Sunday";"Monday";"Tuesday";"Wednesday";"Thursday";/
++ "Friday";"Saturday"
++
++% Abbreviated month names (%b)
++abmon "Jan";"Feb";"Mar";"Apr";"May";"Jun";"Jul";"Aug";"Sep";/
++ "Oct";"Nov";"Dec"
++
++% Full month names (%B)
++mon "January";"February";"March";"April";"May";"June";"July";/
++ "August";"September";"October";"November";"December"
++
++% Week description, consists of three fields:
++% 1. Number of days in a week.
++% 2. Gregorian date that is a first weekday (19971130 for Sunday, 19971201 for Monday).
++% 3. The weekday number to be contained in the first week of the year.
++%
++% ISO 8601 conforming applications should use the values 7, 19971201 (a
++% Monday), and 4 (Thursday), respectively.
++week 7;19971201;4
++first_weekday 1
++first_workday 2
++
++% Appropriate date and time representation (%c)
++d_t_fmt "%a %b %e %H:%M:%S %Y"
++
++% Appropriate date representation (%x)
++d_fmt "%m/%d/%y"
++
++% Appropriate time representation (%X)
++t_fmt "%H:%M:%S"
++
++% Appropriate AM/PM time representation (%r)
++t_fmt_ampm "%I:%M:%S %p"
++
++% Equivalent of AM/PM (%p)
++am_pm "AM";"PM"
++
++% Appropriate date representation (date(1))
++date_fmt "%a %b %e %H:%M:%S %Z %Y"
++END LC_TIME
++
++LC_MESSAGES
++% This is the POSIX Locale definition for
++% the LC_NUMERIC category.
++%
++yesexpr "^[yY]"
++noexpr "^[nN]"
++yesstr "Yes"
++nostr "No"
++END LC_MESSAGES
++
++LC_PAPER
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_PAPER category.
++% (A4 paper, this is also used in the built in C/POSIX
++% locale in glibc/locale/C-paper.c)
++height 297
++width 210
++END LC_PAPER
++
++LC_NAME
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_NAME category.
++% (also used in the built in C/POSIX locale in glibc/locale/C-name.c)
++name_fmt "%p%t%g%t%m%t%f"
++END LC_NAME
++
++LC_ADDRESS
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_ADDRESS category.
++% (also used in the built in C/POSIX locale in glibc/locale/C-address.c)
++postal_fmt "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N"
++END LC_ADDRESS
++
++LC_TELEPHONE
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_TELEPHONE category.
++% "+%c %a %l"
++tel_int_fmt "+%c %a %l"
++% (also used in the built in C/POSIX locale in glibc/locale/C-telephone.c)
++END LC_TELEPHONE
++
++LC_MEASUREMENT
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_MEASUREMENT category.
++% (same as in the built in C/POSIX locale in glibc/locale/C-measurement.c)
++%metric
++measurement 1
++END LC_MEASUREMENT
+diff --git a/posix/Makefile b/posix/Makefile
+index 059efb3cd2706cbe..a5229777eeb0e067 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -190,9 +190,19 @@ $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
+ $(evaluate-test)
+ endif
+
+-LOCALES := cs_CZ.UTF-8 da_DK.ISO-8859-1 de_DE.ISO-8859-1 de_DE.UTF-8 \
+- en_US.UTF-8 es_US.ISO-8859-1 es_US.UTF-8 ja_JP.EUC-JP tr_TR.UTF-8 \
+- cs_CZ.ISO-8859-2
++LOCALES := \
++ cs_CZ.ISO-8859-2 \
++ cs_CZ.UTF-8 \
++ C.UTF-8 \
++ da_DK.ISO-8859-1 \
++ de_DE.ISO-8859-1 \
++ de_DE.UTF-8 \
++ en_US.UTF-8 \
++ es_US.ISO-8859-1 \
++ es_US.UTF-8 \
++ ja_JP.EUC-JP \
++ tr_TR.UTF-8 \
++ # LOCALES
+ include ../gen-locales.mk
+
+ $(objpfx)bug-regex1.out: $(gen-locales)
+diff --git a/posix/bug-regex1.c b/posix/bug-regex1.c
+index 38eb543951862492..7e9f4ec430a95631 100644
+--- a/posix/bug-regex1.c
++++ b/posix/bug-regex1.c
+@@ -41,6 +41,26 @@ main (void)
+ puts (" -> OK");
+ }
+
++ puts ("in C.UTF-8 locale");
++ setlocale (LC_ALL, "C.UTF-8");
++ s = re_compile_pattern ("[an\371]*n", 7, ®ex);
++ if (s != NULL)
++ {
++ puts ("re_compile_pattern return non-NULL value");
++ result = 1;
++ }
++ else
++ {
++ match = re_match (®ex, "an", 2, 0, ®s);
++ if (match != 2)
++ {
++ printf ("re_match returned %d, expected 2\n", match);
++ result = 1;
++ }
++ else
++ puts (" -> OK");
++ }
++
+ puts ("in de_DE.ISO-8859-1 locale");
+ setlocale (LC_ALL, "de_DE.ISO-8859-1");
+ s = re_compile_pattern ("[anù]*n", 7, ®ex);
+diff --git a/posix/bug-regex19.c b/posix/bug-regex19.c
+index b3fee0a7302c3263..e00ff60a14f994bf 100644
+--- a/posix/bug-regex19.c
++++ b/posix/bug-regex19.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <locale.h>
+ #include <libc-diag.h>
++#include <support/support.h>
+
+ #define BRE RE_SYNTAX_POSIX_BASIC
+ #define ERE RE_SYNTAX_POSIX_EXTENDED
+@@ -407,8 +408,8 @@ do_mb_tests (const struct test_s *test)
+ return 0;
+ }
+
+-int
+-main (void)
++static int
++do_test (void)
+ {
+ size_t i;
+ int ret = 0;
+@@ -417,20 +418,17 @@ main (void)
+
+ for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
+ {
+- if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL)
+- {
+- puts ("setlocale de_DE.ISO-8859-1 failed");
+- ret = 1;
+- }
++ xsetlocale (LC_ALL, "de_DE.ISO-8859-1");
+ ret |= do_one_test (&tests[i], "");
+- if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
+- {
+- puts ("setlocale de_DE.UTF-8 failed");
+- ret = 1;
+- }
++ xsetlocale (LC_ALL, "de_DE.UTF-8");
++ ret |= do_one_test (&tests[i], "UTF-8 ");
++ ret |= do_mb_tests (&tests[i]);
++ xsetlocale (LC_ALL, "C.UTF-8");
+ ret |= do_one_test (&tests[i], "UTF-8 ");
+ ret |= do_mb_tests (&tests[i]);
+ }
+
+ return ret;
+ }
++
++#include <support/test-driver.c>
+diff --git a/posix/bug-regex4.c b/posix/bug-regex4.c
+index 8d5ae11567889301..6475833c525176b2 100644
+--- a/posix/bug-regex4.c
++++ b/posix/bug-regex4.c
+@@ -32,8 +32,33 @@ main (void)
+
+ memset (®ex, '\0', sizeof (regex));
+
++ printf ("INFO: Checking C.\n");
+ setlocale (LC_ALL, "C");
+
++ s = re_compile_pattern ("ab[cde]", 7, ®ex);
++ if (s != NULL)
++ {
++ puts ("re_compile_pattern returned non-NULL value");
++ result = 1;
++ }
++ else
++ {
++ match[0] = re_search_2 (®ex, "xyabez", 6, "", 0, 1, 5, NULL, 6);
++ match[1] = re_search_2 (®ex, NULL, 0, "abc", 3, 0, 3, NULL, 3);
++ match[2] = re_search_2 (®ex, "xya", 3, "bd", 2, 2, 3, NULL, 5);
++ if (match[0] != 2 || match[1] != 0 || match[2] != 2)
++ {
++ printf ("re_search_2 returned %d,%d,%d, expected 2,0,2\n",
++ match[0], match[1], match[2]);
++ result = 1;
++ }
++ else
++ puts (" -> OK");
++ }
++
++ printf ("INFO: Checking C.UTF-8.\n");
++ setlocale (LC_ALL, "C.UTF-8");
++
+ s = re_compile_pattern ("ab[cde]", 7, ®ex);
+ if (s != NULL)
+ {
+diff --git a/posix/bug-regex6.c b/posix/bug-regex6.c
+index 2bdf2126a49ee99b..0929b69b83c91e5e 100644
+--- a/posix/bug-regex6.c
++++ b/posix/bug-regex6.c
+@@ -30,7 +30,7 @@ main (int argc, char *argv[])
+ regex_t re;
+ regmatch_t mat[10];
+ int i, j, ret = 0;
+- const char *locales[] = { "C", "de_DE.UTF-8" };
++ const char *locales[] = { "C", "C.UTF-8", "de_DE.UTF-8" };
+ const char *string = "http://www.regex.com/pattern/matching.html#intro";
+ regmatch_t expect[10] = {
+ { 0, 48 }, { 0, 5 }, { 0, 4 }, { 5, 20 }, { 7, 20 }, { 20, 42 },
+diff --git a/posix/transbug.c b/posix/transbug.c
+index d0983b4d44d04fd2..b240177cf72326ff 100644
+--- a/posix/transbug.c
++++ b/posix/transbug.c
+@@ -116,16 +116,32 @@ do_test (void)
+ static const char lower[] = "[[:lower:]]+";
+ static const char upper[] = "[[:upper:]]+";
+ struct re_registers regs[4];
++ int result = 0;
+
++#define CHECK(exp) \
++ if (exp) { puts (#exp); result = 1; }
++
++ printf ("INFO: Checking C.\n");
+ setlocale (LC_ALL, "C");
+
+ (void) re_set_syntax (RE_SYNTAX_GNU_AWK);
+
+- int result;
+-#define CHECK(exp) \
+- if (exp) { puts (#exp); result = 1; }
++ result |= run_test (lower, regs);
++ result |= run_test (upper, ®s[2]);
++ if (! result)
++ {
++ CHECK (regs[0].start[0] != regs[2].start[0]);
++ CHECK (regs[0].end[0] != regs[2].end[0]);
++ CHECK (regs[1].start[0] != regs[3].start[0]);
++ CHECK (regs[1].end[0] != regs[3].end[0]);
++ }
++
++ printf ("INFO: Checking C.UTF-8.\n");
++ setlocale (LC_ALL, "C.UTF-8");
++
++ (void) re_set_syntax (RE_SYNTAX_GNU_AWK);
+
+- result = run_test (lower, regs);
++ result |= run_test (lower, regs);
+ result |= run_test (upper, ®s[2]);
+ if (! result)
+ {
+diff --git a/posix/tst-fnmatch.input b/posix/tst-fnmatch.input
+index 67aac5aadafd8aeb..6ff5318032e0afb2 100644
+--- a/posix/tst-fnmatch.input
++++ b/posix/tst-fnmatch.input
+@@ -472,6 +472,397 @@ C "\\" "[Z-\\]]" 0
+ C "]" "[Z-\\]]" 0
+ C "-" "[Z-\\]]" NOMATCH
+
++# B.6 004(C)
++C.UTF-8 "!#%+,-./01234567889" "!#%+,-./01234567889" 0
++C.UTF-8 ":;=@ABCDEFGHIJKLMNO" ":;=@ABCDEFGHIJKLMNO" 0
++C.UTF-8 "PQRSTUVWXYZ]abcdefg" "PQRSTUVWXYZ]abcdefg" 0
++C.UTF-8 "hijklmnopqrstuvwxyz" "hijklmnopqrstuvwxyz" 0
++C.UTF-8 "^_{}~" "^_{}~" 0
++
++# B.6 005(C)
++C.UTF-8 "\"$&'()" "\\\"\\$\\&\\'\\(\\)" 0
++C.UTF-8 "*?[\\`|" "\\*\\?\\[\\\\\\`\\|" 0
++C.UTF-8 "<>" "\\<\\>" 0
++
++# B.6 006(C)
++C.UTF-8 "?*[" "[?*[][?*[][?*[]" 0
++C.UTF-8 "a/b" "?/b" 0
++
++# B.6 007(C)
++C.UTF-8 "a/b" "a?b" 0
++C.UTF-8 "a/b" "a/?" 0
++C.UTF-8 "aa/b" "?/b" NOMATCH
++C.UTF-8 "aa/b" "a?b" NOMATCH
++C.UTF-8 "a/bb" "a/?" NOMATCH
++
++# B.6 009(C)
++C.UTF-8 "abc" "[abc]" NOMATCH
++C.UTF-8 "x" "[abc]" NOMATCH
++C.UTF-8 "a" "[abc]" 0
++C.UTF-8 "[" "[[abc]" 0
++C.UTF-8 "a" "[][abc]" 0
++C.UTF-8 "a]" "[]a]]" 0
++
++# B.6 010(C)
++C.UTF-8 "xyz" "[!abc]" NOMATCH
++C.UTF-8 "x" "[!abc]" 0
++C.UTF-8 "a" "[!abc]" NOMATCH
++
++# B.6 011(C)
++C.UTF-8 "]" "[][abc]" 0
++C.UTF-8 "abc]" "[][abc]" NOMATCH
++C.UTF-8 "[]abc" "[][]abc" NOMATCH
++C.UTF-8 "]" "[!]]" NOMATCH
++C.UTF-8 "aa]" "[!]a]" NOMATCH
++C.UTF-8 "]" "[!a]" 0
++C.UTF-8 "]]" "[!a]]" 0
++
++# B.6 012(C)
++C.UTF-8 "a" "[[.a.]]" 0
++C.UTF-8 "-" "[[.-.]]" 0
++C.UTF-8 "-" "[[.-.][.].]]" 0
++C.UTF-8 "-" "[[.].][.-.]]" 0
++C.UTF-8 "-" "[[.-.][=u=]]" 0
++C.UTF-8 "-" "[[.-.][:alpha:]]" 0
++C.UTF-8 "a" "[![.a.]]" NOMATCH
++
++# B.6 013(C)
++C.UTF-8 "a" "[[.b.]]" NOMATCH
++C.UTF-8 "a" "[[.b.][.c.]]" NOMATCH
++C.UTF-8 "a" "[[.b.][=b=]]" NOMATCH
++
++
++# B.6 015(C)
++C.UTF-8 "a" "[[=a=]]" 0
++C.UTF-8 "b" "[[=a=]b]" 0
++C.UTF-8 "b" "[[=a=][=b=]]" 0
++C.UTF-8 "a" "[[=a=][=b=]]" 0
++C.UTF-8 "a" "[[=a=][.b.]]" 0
++C.UTF-8 "a" "[[=a=][:digit:]]" 0
++
++# B.6 016(C)
++C.UTF-8 "=" "[[=a=]b]" NOMATCH
++C.UTF-8 "]" "[[=a=]b]" NOMATCH
++C.UTF-8 "a" "[[=b=][=c=]]" NOMATCH
++C.UTF-8 "a" "[[=b=][.].]]" NOMATCH
++C.UTF-8 "a" "[[=b=][:digit:]]" NOMATCH
++
++# B.6 017(C)
++C.UTF-8 "a" "[[:alnum:]]" 0
++C.UTF-8 "a" "[![:alnum:]]" NOMATCH
++C.UTF-8 "-" "[[:alnum:]]" NOMATCH
++C.UTF-8 "a]a" "[[:alnum:]]a" NOMATCH
++C.UTF-8 "-" "[[:alnum:]-]" 0
++C.UTF-8 "aa" "[[:alnum:]]a" 0
++C.UTF-8 "-" "[![:alnum:]]" 0
++C.UTF-8 "]" "[!][:alnum:]]" NOMATCH
++C.UTF-8 "[" "[![:alnum:][]" NOMATCH
++C.UTF-8 "a" "[[:alnum:]]" 0
++C.UTF-8 "b" "[[:alnum:]]" 0
++C.UTF-8 "c" "[[:alnum:]]" 0
++C.UTF-8 "d" "[[:alnum:]]" 0
++C.UTF-8 "e" "[[:alnum:]]" 0
++C.UTF-8 "f" "[[:alnum:]]" 0
++C.UTF-8 "g" "[[:alnum:]]" 0
++C.UTF-8 "h" "[[:alnum:]]" 0
++C.UTF-8 "i" "[[:alnum:]]" 0
++C.UTF-8 "j" "[[:alnum:]]" 0
++C.UTF-8 "k" "[[:alnum:]]" 0
++C.UTF-8 "l" "[[:alnum:]]" 0
++C.UTF-8 "m" "[[:alnum:]]" 0
++C.UTF-8 "n" "[[:alnum:]]" 0
++C.UTF-8 "o" "[[:alnum:]]" 0
++C.UTF-8 "p" "[[:alnum:]]" 0
++C.UTF-8 "q" "[[:alnum:]]" 0
++C.UTF-8 "r" "[[:alnum:]]" 0
++C.UTF-8 "s" "[[:alnum:]]" 0
++C.UTF-8 "t" "[[:alnum:]]" 0
++C.UTF-8 "u" "[[:alnum:]]" 0
++C.UTF-8 "v" "[[:alnum:]]" 0
++C.UTF-8 "w" "[[:alnum:]]" 0
++C.UTF-8 "x" "[[:alnum:]]" 0
++C.UTF-8 "y" "[[:alnum:]]" 0
++C.UTF-8 "z" "[[:alnum:]]" 0
++C.UTF-8 "A" "[[:alnum:]]" 0
++C.UTF-8 "B" "[[:alnum:]]" 0
++C.UTF-8 "C" "[[:alnum:]]" 0
++C.UTF-8 "D" "[[:alnum:]]" 0
++C.UTF-8 "E" "[[:alnum:]]" 0
++C.UTF-8 "F" "[[:alnum:]]" 0
++C.UTF-8 "G" "[[:alnum:]]" 0
++C.UTF-8 "H" "[[:alnum:]]" 0
++C.UTF-8 "I" "[[:alnum:]]" 0
++C.UTF-8 "J" "[[:alnum:]]" 0
++C.UTF-8 "K" "[[:alnum:]]" 0
++C.UTF-8 "L" "[[:alnum:]]" 0
++C.UTF-8 "M" "[[:alnum:]]" 0
++C.UTF-8 "N" "[[:alnum:]]" 0
++C.UTF-8 "O" "[[:alnum:]]" 0
++C.UTF-8 "P" "[[:alnum:]]" 0
++C.UTF-8 "Q" "[[:alnum:]]" 0
++C.UTF-8 "R" "[[:alnum:]]" 0
++C.UTF-8 "S" "[[:alnum:]]" 0
++C.UTF-8 "T" "[[:alnum:]]" 0
++C.UTF-8 "U" "[[:alnum:]]" 0
++C.UTF-8 "V" "[[:alnum:]]" 0
++C.UTF-8 "W" "[[:alnum:]]" 0
++C.UTF-8 "X" "[[:alnum:]]" 0
++C.UTF-8 "Y" "[[:alnum:]]" 0
++C.UTF-8 "Z" "[[:alnum:]]" 0
++C.UTF-8 "0" "[[:alnum:]]" 0
++C.UTF-8 "1" "[[:alnum:]]" 0
++C.UTF-8 "2" "[[:alnum:]]" 0
++C.UTF-8 "3" "[[:alnum:]]" 0
++C.UTF-8 "4" "[[:alnum:]]" 0
++C.UTF-8 "5" "[[:alnum:]]" 0
++C.UTF-8 "6" "[[:alnum:]]" 0
++C.UTF-8 "7" "[[:alnum:]]" 0
++C.UTF-8 "8" "[[:alnum:]]" 0
++C.UTF-8 "9" "[[:alnum:]]" 0
++C.UTF-8 "!" "[[:alnum:]]" NOMATCH
++C.UTF-8 "#" "[[:alnum:]]" NOMATCH
++C.UTF-8 "%" "[[:alnum:]]" NOMATCH
++C.UTF-8 "+" "[[:alnum:]]" NOMATCH
++C.UTF-8 "," "[[:alnum:]]" NOMATCH
++C.UTF-8 "-" "[[:alnum:]]" NOMATCH
++C.UTF-8 "." "[[:alnum:]]" NOMATCH
++C.UTF-8 "/" "[[:alnum:]]" NOMATCH
++C.UTF-8 ":" "[[:alnum:]]" NOMATCH
++C.UTF-8 ";" "[[:alnum:]]" NOMATCH
++C.UTF-8 "=" "[[:alnum:]]" NOMATCH
++C.UTF-8 "@" "[[:alnum:]]" NOMATCH
++C.UTF-8 "[" "[[:alnum:]]" NOMATCH
++C.UTF-8 "\\" "[[:alnum:]]" NOMATCH
++C.UTF-8 "]" "[[:alnum:]]" NOMATCH
++C.UTF-8 "^" "[[:alnum:]]" NOMATCH
++C.UTF-8 "_" "[[:alnum:]]" NOMATCH
++C.UTF-8 "{" "[[:alnum:]]" NOMATCH
++C.UTF-8 "}" "[[:alnum:]]" NOMATCH
++C.UTF-8 "~" "[[:alnum:]]" NOMATCH
++C.UTF-8 "\"" "[[:alnum:]]" NOMATCH
++C.UTF-8 "$" "[[:alnum:]]" NOMATCH
++C.UTF-8 "&" "[[:alnum:]]" NOMATCH
++C.UTF-8 "'" "[[:alnum:]]" NOMATCH
++C.UTF-8 "(" "[[:alnum:]]" NOMATCH
++C.UTF-8 ")" "[[:alnum:]]" NOMATCH
++C.UTF-8 "*" "[[:alnum:]]" NOMATCH
++C.UTF-8 "?" "[[:alnum:]]" NOMATCH
++C.UTF-8 "`" "[[:alnum:]]" NOMATCH
++C.UTF-8 "|" "[[:alnum:]]" NOMATCH
++C.UTF-8 "<" "[[:alnum:]]" NOMATCH
++C.UTF-8 ">" "[[:alnum:]]" NOMATCH
++C.UTF-8 "\t" "[[:cntrl:]]" 0
++C.UTF-8 "t" "[[:cntrl:]]" NOMATCH
++C.UTF-8 "t" "[[:lower:]]" 0
++C.UTF-8 "\t" "[[:lower:]]" NOMATCH
++C.UTF-8 "T" "[[:lower:]]" NOMATCH
++C.UTF-8 "\t" "[[:space:]]" 0
++C.UTF-8 "t" "[[:space:]]" NOMATCH
++C.UTF-8 "t" "[[:alpha:]]" 0
++C.UTF-8 "\t" "[[:alpha:]]" NOMATCH
++C.UTF-8 "0" "[[:digit:]]" 0
++C.UTF-8 "\t" "[[:digit:]]" NOMATCH
++C.UTF-8 "t" "[[:digit:]]" NOMATCH
++C.UTF-8 "\t" "[[:print:]]" NOMATCH
++C.UTF-8 "t" "[[:print:]]" 0
++C.UTF-8 "T" "[[:upper:]]" 0
++C.UTF-8 "\t" "[[:upper:]]" NOMATCH
++C.UTF-8 "t" "[[:upper:]]" NOMATCH
++C.UTF-8 "\t" "[[:blank:]]" 0
++C.UTF-8 "t" "[[:blank:]]" NOMATCH
++C.UTF-8 "\t" "[[:graph:]]" NOMATCH
++C.UTF-8 "t" "[[:graph:]]" 0
++C.UTF-8 "." "[[:punct:]]" 0
++C.UTF-8 "t" "[[:punct:]]" NOMATCH
++C.UTF-8 "\t" "[[:punct:]]" NOMATCH
++C.UTF-8 "0" "[[:xdigit:]]" 0
++C.UTF-8 "\t" "[[:xdigit:]]" NOMATCH
++C.UTF-8 "a" "[[:xdigit:]]" 0
++C.UTF-8 "A" "[[:xdigit:]]" 0
++C.UTF-8 "t" "[[:xdigit:]]" NOMATCH
++C.UTF-8 "a" "[[alpha]]" NOMATCH
++C.UTF-8 "a" "[[alpha:]]" NOMATCH
++C.UTF-8 "a]" "[[alpha]]" 0
++C.UTF-8 "a]" "[[alpha:]]" 0
++C.UTF-8 "a" "[[:alpha:][.b.]]" 0
++C.UTF-8 "a" "[[:alpha:][=b=]]" 0
++C.UTF-8 "a" "[[:alpha:][:digit:]]" 0
++C.UTF-8 "a" "[[:digit:][:alpha:]]" 0
++
++# B.6 018(C)
++C.UTF-8 "a" "[a-c]" 0
++C.UTF-8 "b" "[a-c]" 0
++C.UTF-8 "c" "[a-c]" 0
++C.UTF-8 "a" "[b-c]" NOMATCH
++C.UTF-8 "d" "[b-c]" NOMATCH
++C.UTF-8 "B" "[a-c]" NOMATCH
++C.UTF-8 "b" "[A-C]" NOMATCH
++C.UTF-8 "" "[a-c]" NOMATCH
++C.UTF-8 "as" "[a-ca-z]" NOMATCH
++C.UTF-8 "a" "[[.a.]-c]" 0
++C.UTF-8 "a" "[a-[.c.]]" 0
++C.UTF-8 "a" "[[.a.]-[.c.]]" 0
++C.UTF-8 "b" "[[.a.]-c]" 0
++C.UTF-8 "b" "[a-[.c.]]" 0
++C.UTF-8 "b" "[[.a.]-[.c.]]" 0
++C.UTF-8 "c" "[[.a.]-c]" 0
++C.UTF-8 "c" "[a-[.c.]]" 0
++C.UTF-8 "c" "[[.a.]-[.c.]]" 0
++C.UTF-8 "d" "[[.a.]-c]" NOMATCH
++C.UTF-8 "d" "[a-[.c.]]" NOMATCH
++C.UTF-8 "d" "[[.a.]-[.c.]]" NOMATCH
++
++# B.6 019(C)
++C.UTF-8 "a" "[c-a]" NOMATCH
++C.UTF-8 "a" "[[.c.]-a]" NOMATCH
++C.UTF-8 "a" "[c-[.a.]]" NOMATCH
++C.UTF-8 "a" "[[.c.]-[.a.]]" NOMATCH
++C.UTF-8 "c" "[c-a]" NOMATCH
++C.UTF-8 "c" "[[.c.]-a]" NOMATCH
++C.UTF-8 "c" "[c-[.a.]]" NOMATCH
++C.UTF-8 "c" "[[.c.]-[.a.]]" NOMATCH
++
++# B.6 020(C)
++C.UTF-8 "a" "[a-c0-9]" 0
++C.UTF-8 "d" "[a-c0-9]" NOMATCH
++C.UTF-8 "B" "[a-c0-9]" NOMATCH
++
++# B.6 021(C)
++C.UTF-8 "-" "[-a]" 0
++C.UTF-8 "a" "[-b]" NOMATCH
++C.UTF-8 "-" "[!-a]" NOMATCH
++C.UTF-8 "a" "[!-b]" 0
++C.UTF-8 "-" "[a-c-0-9]" 0
++C.UTF-8 "b" "[a-c-0-9]" 0
++C.UTF-8 "a:" "a[0-9-a]" NOMATCH
++C.UTF-8 "a:" "a[09-a]" 0
++
++# B.6 024(C)
++C.UTF-8 "" "*" 0
++C.UTF-8 "asd/sdf" "*" 0
++
++# B.6 025(C)
++C.UTF-8 "as" "[a-c][a-z]" 0
++C.UTF-8 "as" "??" 0
++
++# B.6 026(C)
++C.UTF-8 "asd/sdf" "as*df" 0
++C.UTF-8 "asd/sdf" "as*" 0
++C.UTF-8 "asd/sdf" "*df" 0
++C.UTF-8 "asd/sdf" "as*dg" NOMATCH
++C.UTF-8 "asdf" "as*df" 0
++C.UTF-8 "asdf" "as*df?" NOMATCH
++C.UTF-8 "asdf" "as*??" 0
++C.UTF-8 "asdf" "a*???" 0
++C.UTF-8 "asdf" "*????" 0
++C.UTF-8 "asdf" "????*" 0
++C.UTF-8 "asdf" "??*?" 0
++
++# B.6 027(C)
++C.UTF-8 "/" "/" 0
++C.UTF-8 "/" "/*" 0
++C.UTF-8 "/" "*/" 0
++C.UTF-8 "/" "/?" NOMATCH
++C.UTF-8 "/" "?/" NOMATCH
++C.UTF-8 "/" "?" 0
++C.UTF-8 "." "?" 0
++C.UTF-8 "/." "??" 0
++C.UTF-8 "/" "[!a-c]" 0
++C.UTF-8 "." "[!a-c]" 0
++
++# B.6 029(C)
++C.UTF-8 "/" "/" 0 PATHNAME
++C.UTF-8 "//" "//" 0 PATHNAME
++C.UTF-8 "/.a" "/*" 0 PATHNAME
++C.UTF-8 "/.a" "/?a" 0 PATHNAME
++C.UTF-8 "/.a" "/[!a-z]a" 0 PATHNAME
++C.UTF-8 "/.a/.b" "/*/?b" 0 PATHNAME
++
++# B.6 030(C)
++C.UTF-8 "/" "?" NOMATCH PATHNAME
++C.UTF-8 "/" "*" NOMATCH PATHNAME
++C.UTF-8 "a/b" "a?b" NOMATCH PATHNAME
++C.UTF-8 "/.a/.b" "/*b" NOMATCH PATHNAME
++
++# B.6 031(C)
++C.UTF-8 "/$" "\\/\\$" 0
++C.UTF-8 "/[" "\\/\\[" 0
++C.UTF-8 "/[" "\\/[" 0
++C.UTF-8 "/[]" "\\/\\[]" 0
++
++# B.6 032(C)
++C.UTF-8 "/$" "\\/\\$" NOMATCH NOESCAPE
++C.UTF-8 "/\\$" "\\/\\$" NOMATCH NOESCAPE
++C.UTF-8 "\\/\\$" "\\/\\$" 0 NOESCAPE
++
++# B.6 033(C)
++C.UTF-8 ".asd" ".*" 0 PERIOD
++C.UTF-8 "/.asd" "*" 0 PERIOD
++C.UTF-8 "/as/.df" "*/?*f" 0 PERIOD
++C.UTF-8 "..asd" ".[!a-z]*" 0 PERIOD
++
++# B.6 034(C)
++C.UTF-8 ".asd" "*" NOMATCH PERIOD
++C.UTF-8 ".asd" "?asd" NOMATCH PERIOD
++C.UTF-8 ".asd" "[!a-z]*" NOMATCH PERIOD
++
++# B.6 035(C)
++C.UTF-8 "/." "/." 0 PATHNAME|PERIOD
++C.UTF-8 "/.a./.b." "/.*/.*" 0 PATHNAME|PERIOD
++C.UTF-8 "/.a./.b." "/.??/.??" 0 PATHNAME|PERIOD
++
++# B.6 036(C)
++C.UTF-8 "/." "*" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/." "/*" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/." "/?" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/." "/[!a-z]" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/a./.b." "/*/*" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/a./.b." "/??/???" NOMATCH PATHNAME|PERIOD
++
++# Some home-grown tests.
++C.UTF-8 "foobar" "foo*[abc]z" NOMATCH
++C.UTF-8 "foobaz" "foo*[abc][xyz]" 0
++C.UTF-8 "foobaz" "foo?*[abc][xyz]" 0
++C.UTF-8 "foobaz" "foo?*[abc][x/yz]" 0
++C.UTF-8 "foobaz" "foo?*[abc]/[xyz]" NOMATCH PATHNAME
++C.UTF-8 "a" "a/" NOMATCH PATHNAME
++C.UTF-8 "a/" "a" NOMATCH PATHNAME
++C.UTF-8 "//a" "/a" NOMATCH PATHNAME
++C.UTF-8 "/a" "//a" NOMATCH PATHNAME
++C.UTF-8 "az" "[a-]z" 0
++C.UTF-8 "bz" "[ab-]z" 0
++C.UTF-8 "cz" "[ab-]z" NOMATCH
++C.UTF-8 "-z" "[ab-]z" 0
++C.UTF-8 "az" "[-a]z" 0
++C.UTF-8 "bz" "[-ab]z" 0
++C.UTF-8 "cz" "[-ab]z" NOMATCH
++C.UTF-8 "-z" "[-ab]z" 0
++C.UTF-8 "\\" "[\\\\-a]" 0
++C.UTF-8 "_" "[\\\\-a]" 0
++C.UTF-8 "a" "[\\\\-a]" 0
++C.UTF-8 "-" "[\\\\-a]" NOMATCH
++C.UTF-8 "\\" "[\\]-a]" NOMATCH
++C.UTF-8 "_" "[\\]-a]" 0
++C.UTF-8 "a" "[\\]-a]" 0
++C.UTF-8 "]" "[\\]-a]" 0
++C.UTF-8 "-" "[\\]-a]" NOMATCH
++C.UTF-8 "\\" "[!\\\\-a]" NOMATCH
++C.UTF-8 "_" "[!\\\\-a]" NOMATCH
++C.UTF-8 "a" "[!\\\\-a]" NOMATCH
++C.UTF-8 "-" "[!\\\\-a]" 0
++C.UTF-8 "!" "[\\!-]" 0
++C.UTF-8 "-" "[\\!-]" 0
++C.UTF-8 "\\" "[\\!-]" NOMATCH
++C.UTF-8 "Z" "[Z-\\\\]" 0
++C.UTF-8 "[" "[Z-\\\\]" 0
++C.UTF-8 "\\" "[Z-\\\\]" 0
++C.UTF-8 "-" "[Z-\\\\]" NOMATCH
++C.UTF-8 "Z" "[Z-\\]]" 0
++C.UTF-8 "[" "[Z-\\]]" 0
++C.UTF-8 "\\" "[Z-\\]]" 0
++C.UTF-8 "]" "[Z-\\]]" 0
++C.UTF-8 "-" "[Z-\\]]" NOMATCH
++
+ # Following are tests outside the scope of IEEE 2003.2 since they are using
+ # locales other than the C locale. The main focus of the tests is on the
+ # handling of ranges and the recognition of character (vs bytes).
+@@ -677,7 +1068,6 @@ C "x/y" "*" 0 PATHNAME|LEADING_DIR
+ C "x/y/z" "*" 0 PATHNAME|LEADING_DIR
+ C "x" "*x" 0 PATHNAME|LEADING_DIR
+
+-en_US.UTF-8 "\366.csv" "*.csv" 0
+ C "x/y" "*x" 0 PATHNAME|LEADING_DIR
+ C "x/y/z" "*x" 0 PATHNAME|LEADING_DIR
+ C "x" "x*" 0 PATHNAME|LEADING_DIR
+@@ -693,6 +1083,33 @@ C "x" "x?y" NOMATCH PATHNAME|LEADING_DIR
+ C "x/y" "x?y" NOMATCH PATHNAME|LEADING_DIR
+ C "x/y/z" "x?y" NOMATCH PATHNAME|LEADING_DIR
+
++# Duplicate the "Test of GNU extensions." tests but for C.UTF-8.
++C.UTF-8 "x" "x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "*x" 0 PATHNAME|LEADING_DIR
++
++C.UTF-8 "x/y" "*x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "*x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "x*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "a" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "a" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "a" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x" "x/y" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x/y" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x/y" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "x?y" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x?y" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x?y" NOMATCH PATHNAME|LEADING_DIR
++
++# Bug 14185
++en_US.UTF-8 "\366.csv" "*.csv" 0
++
+ # ksh style matching.
+ C "abcd" "?@(a|b)*@(c)d" 0 EXTMATCH
+ C "/dev/udp/129.22.8.102/45" "/dev/@(tcp|udp)/*/*" 0 PATHNAME|EXTMATCH
+@@ -822,3 +1239,133 @@ C "" "" 0
+ C "" "" 0 EXTMATCH
+ C "" "*([abc])" 0 EXTMATCH
+ C "" "?([abc])" 0 EXTMATCH
++
++# Duplicate the "ksh style matching." for C.UTF-8.
++C.UTF-8 "abcd" "?@(a|b)*@(c)d" 0 EXTMATCH
++C.UTF-8 "/dev/udp/129.22.8.102/45" "/dev/@(tcp|udp)/*/*" 0 PATHNAME|EXTMATCH
++C.UTF-8 "12" "[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "12abc" "[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "1" "[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "07" "+([0-7])" 0 EXTMATCH
++C.UTF-8 "0377" "+([0-7])" 0 EXTMATCH
++C.UTF-8 "09" "+([0-7])" NOMATCH EXTMATCH
++C.UTF-8 "paragraph" "para@(chute|graph)" 0 EXTMATCH
++C.UTF-8 "paramour" "para@(chute|graph)" NOMATCH EXTMATCH
++C.UTF-8 "para991" "para?([345]|99)1" 0 EXTMATCH
++C.UTF-8 "para381" "para?([345]|99)1" NOMATCH EXTMATCH
++C.UTF-8 "paragraph" "para*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "para" "para*([0-9])" 0 EXTMATCH
++C.UTF-8 "para13829383746592" "para*([0-9])" 0 EXTMATCH
++C.UTF-8 "paragraph" "para+([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "para" "para+([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "para987346523" "para+([0-9])" 0 EXTMATCH
++C.UTF-8 "paragraph" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "para.38" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "para.graph" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "para39" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "" "*(0|1|3|5|7|9)" 0 EXTMATCH
++C.UTF-8 "137577991" "*(0|1|3|5|7|9)" 0 EXTMATCH
++C.UTF-8 "2468" "*(0|1|3|5|7|9)" NOMATCH EXTMATCH
++C.UTF-8 "1358" "*(0|1|3|5|7|9)" NOMATCH EXTMATCH
++C.UTF-8 "file.c" "*.c?(c)" 0 EXTMATCH
++C.UTF-8 "file.C" "*.c?(c)" NOMATCH EXTMATCH
++C.UTF-8 "file.cc" "*.c?(c)" 0 EXTMATCH
++C.UTF-8 "file.ccc" "*.c?(c)" NOMATCH EXTMATCH
++C.UTF-8 "parse.y" "!(*.c|*.h|Makefile.in|config*|README)" 0 EXTMATCH
++C.UTF-8 "shell.c" "!(*.c|*.h|Makefile.in|config*|README)" NOMATCH EXTMATCH
++C.UTF-8 "Makefile" "!(*.c|*.h|Makefile.in|config*|README)" 0 EXTMATCH
++C.UTF-8 "VMS.FILE;1" "*\;[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "VMS.FILE;0" "*\;[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "VMS.FILE;" "*\;[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "VMS.FILE;139" "*\;[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "VMS.FILE;1N" "*\;[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "abcfefg" "ab**(e|f)" 0 EXTMATCH
++C.UTF-8 "abcfefg" "ab**(e|f)g" 0 EXTMATCH
++C.UTF-8 "ab" "ab*+(e|f)" NOMATCH EXTMATCH
++C.UTF-8 "abef" "ab***ef" 0 EXTMATCH
++C.UTF-8 "abef" "ab**" 0 EXTMATCH
++C.UTF-8 "fofo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "ffo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "foooofo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "foooofof" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "fooofoofofooo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "foooofof" "*(f+(o))" NOMATCH EXTMATCH
++C.UTF-8 "xfoooofof" "*(f*(o))" NOMATCH EXTMATCH
++C.UTF-8 "foooofofx" "*(f*(o))" NOMATCH EXTMATCH
++C.UTF-8 "ofxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofooofoofofooo" "*(f*(o))" NOMATCH EXTMATCH
++C.UTF-8 "foooxfooxfoxfooox" "*(f*(o)x)" 0 EXTMATCH
++C.UTF-8 "foooxfooxofoxfooox" "*(f*(o)x)" NOMATCH EXTMATCH
++C.UTF-8 "foooxfooxfxfooox" "*(f*(o)x)" 0 EXTMATCH
++C.UTF-8 "ofxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxoo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxofo" "*(*(of*(o)x)o)" NOMATCH EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxooofxofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "aac" "*(@(a))a@(c)" 0 EXTMATCH
++C.UTF-8 "ac" "*(@(a))a@(c)" 0 EXTMATCH
++C.UTF-8 "c" "*(@(a))a@(c)" NOMATCH EXTMATCH
++C.UTF-8 "aaac" "*(@(a))a@(c)" 0 EXTMATCH
++C.UTF-8 "baaac" "*(@(a))a@(c)" NOMATCH EXTMATCH
++C.UTF-8 "abcd" "?@(a|b)*@(c)d" 0 EXTMATCH
++C.UTF-8 "abcd" "@(ab|a*@(b))*(c)d" 0 EXTMATCH
++C.UTF-8 "acd" "@(ab|a*(b))*(c)d" 0 EXTMATCH
++C.UTF-8 "abbcd" "@(ab|a*(b))*(c)d" 0 EXTMATCH
++C.UTF-8 "effgz" "@(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "efgz" "@(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "egz" "@(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "egzefffgzbcdij" "*(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "egz" "@(b+(c)d|e+(f)g?|?(h)i@(j|k))" NOMATCH EXTMATCH
++C.UTF-8 "ofoofo" "*(of+(o))" 0 EXTMATCH
++C.UTF-8 "oxfoxoxfox" "*(oxf+(ox))" 0 EXTMATCH
++C.UTF-8 "oxfoxfox" "*(oxf+(ox))" NOMATCH EXTMATCH
++C.UTF-8 "ofoofo" "*(of+(o)|f)" 0 EXTMATCH
++C.UTF-8 "foofoofo" "@(foo|f|fo)*(f|of+(o))" 0 EXTMATCH
++C.UTF-8 "oofooofo" "*(of|oof+(o))" 0 EXTMATCH
++C.UTF-8 "fffooofoooooffoofffooofff" "*(*(f)*(o))" 0 EXTMATCH
++C.UTF-8 "fofoofoofofoo" "*(fo|foo)" 0 EXTMATCH
++C.UTF-8 "foo" "!(x)" 0 EXTMATCH
++C.UTF-8 "foo" "!(x)*" 0 EXTMATCH
++C.UTF-8 "foo" "!(foo)" NOMATCH EXTMATCH
++C.UTF-8 "foo" "!(foo)*" 0 EXTMATCH
++C.UTF-8 "foobar" "!(foo)" 0 EXTMATCH
++C.UTF-8 "foobar" "!(foo)*" 0 EXTMATCH
++C.UTF-8 "moo.cow" "!(*.*).!(*.*)" 0 EXTMATCH
++C.UTF-8 "mad.moo.cow" "!(*.*).!(*.*)" NOMATCH EXTMATCH
++C.UTF-8 "mucca.pazza" "mu!(*(c))?.pa!(*(z))?" NOMATCH EXTMATCH
++C.UTF-8 "fff" "!(f)" 0 EXTMATCH
++C.UTF-8 "fff" "*(!(f))" 0 EXTMATCH
++C.UTF-8 "fff" "+(!(f))" 0 EXTMATCH
++C.UTF-8 "ooo" "!(f)" 0 EXTMATCH
++C.UTF-8 "ooo" "*(!(f))" 0 EXTMATCH
++C.UTF-8 "ooo" "+(!(f))" 0 EXTMATCH
++C.UTF-8 "foo" "!(f)" 0 EXTMATCH
++C.UTF-8 "foo" "*(!(f))" 0 EXTMATCH
++C.UTF-8 "foo" "+(!(f))" 0 EXTMATCH
++C.UTF-8 "f" "!(f)" NOMATCH EXTMATCH
++C.UTF-8 "f" "*(!(f))" NOMATCH EXTMATCH
++C.UTF-8 "f" "+(!(f))" NOMATCH EXTMATCH
++C.UTF-8 "foot" "@(!(z*)|*x)" 0 EXTMATCH
++C.UTF-8 "zoot" "@(!(z*)|*x)" NOMATCH EXTMATCH
++C.UTF-8 "foox" "@(!(z*)|*x)" 0 EXTMATCH
++C.UTF-8 "zoox" "@(!(z*)|*x)" 0 EXTMATCH
++C.UTF-8 "foo" "*(!(foo))" 0 EXTMATCH
++C.UTF-8 "foob" "!(foo)b*" NOMATCH EXTMATCH
++C.UTF-8 "foobb" "!(foo)b*" 0 EXTMATCH
++C.UTF-8 "[" "*([a[])" 0 EXTMATCH
++C.UTF-8 "]" "*([]a[])" 0 EXTMATCH
++C.UTF-8 "a" "*([]a[])" 0 EXTMATCH
++C.UTF-8 "b" "*([!]a[])" 0 EXTMATCH
++C.UTF-8 "[" "*([!]a[]|[[])" 0 EXTMATCH
++C.UTF-8 "]" "*([!]a[]|[]])" 0 EXTMATCH
++C.UTF-8 "[" "!([!]a[])" 0 EXTMATCH
++C.UTF-8 "]" "!([!]a[])" 0 EXTMATCH
++C.UTF-8 ")" "*([)])" 0 EXTMATCH
++C.UTF-8 "*" "*([*(])" 0 EXTMATCH
++C.UTF-8 "abcd" "*!(|a)cd" 0 EXTMATCH
++C.UTF-8 "ab/.a" "+([abc])/*" NOMATCH EXTMATCH|PATHNAME|PERIOD
++C.UTF-8 "" "" 0
++C.UTF-8 "" "" 0 EXTMATCH
++C.UTF-8 "" "*([abc])" 0 EXTMATCH
++C.UTF-8 "" "?([abc])" 0 EXTMATCH
+diff --git a/posix/tst-regcomp-truncated.c b/posix/tst-regcomp-truncated.c
+index 84195fcd2ec153b8..da3f97799e37c607 100644
+--- a/posix/tst-regcomp-truncated.c
++++ b/posix/tst-regcomp-truncated.c
+@@ -37,6 +37,7 @@
+ static const char locales[][17] =
+ {
+ "C",
++ "C.UTF-8",
+ "en_US.UTF-8",
+ "de_DE.ISO-8859-1",
+ };
+diff --git a/posix/tst-regex.c b/posix/tst-regex.c
+index e7c2b05e8666a16e..531128de2a9176fa 100644
+--- a/posix/tst-regex.c
++++ b/posix/tst-regex.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <regex.h>
++#include <support/support.h>
+
+
+ #if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
+@@ -58,7 +59,7 @@ do_test (void)
+ const char *file;
+ int fd;
+ struct stat st;
+- int result;
++ int result = 0;
+ char *inmem;
+ char *outmem;
+ size_t inlen;
+@@ -123,7 +124,7 @@ do_test (void)
+
+ /* Run the actual tests. All tests are run in a single-byte and a
+ multi-byte locale. */
+- result = test_expr ("[Àáà âéÚêÃìîñöóòÎÌúùû]", 4, 4);
++ result |= test_expr ("[Àáà âéÚêÃìîñöóòÎÌúùû]", 4, 4);
+ result |= test_expr ("G.ran", 2, 3);
+ result |= test_expr ("G.\\{1\\}ran", 2, 3);
+ result |= test_expr ("G.*ran", 3, 44);
+@@ -143,19 +144,33 @@ do_test (void)
+ static int
+ test_expr (const char *expr, int expected, int expectedicase)
+ {
+- int result;
++ int result = 0;
+ char *inmem;
+ char *outmem;
+ size_t inlen;
+ size_t outlen;
+ char *uexpr;
+
+- /* First test: search with an UTF-8 locale. */
+- if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
+- error (EXIT_FAILURE, 0, "cannot set locale de_DE.UTF-8");
++ /* First test: search with basic C.UTF-8 locale. */
++ printf ("INFO: Testing C.UTF-8.\n");
++ xsetlocale (LC_ALL, "C.UTF-8");
+
+ printf ("\nTest \"%s\" with multi-byte locale\n", expr);
+- result = run_test (expr, mem, memlen, 0, expected);
++ result |= run_test (expr, mem, memlen, 0, expected);
++ printf ("\nTest \"%s\" with multi-byte locale, case insensitive\n", expr);
++ result |= run_test (expr, mem, memlen, 1, expectedicase);
++ printf ("\nTest \"%s\" backwards with multi-byte locale\n", expr);
++ result |= run_test_backwards (expr, mem, memlen, 0, expected);
++ printf ("\nTest \"%s\" backwards with multi-byte locale, case insensitive\n",
++ expr);
++ result |= run_test_backwards (expr, mem, memlen, 1, expectedicase);
++
++ /* Second test: search with an UTF-8 locale. */
++ printf ("INFO: Testing de_DE.UTF-8.\n");
++ xsetlocale (LC_ALL, "de_DE.UTF-8");
++
++ printf ("\nTest \"%s\" with multi-byte locale\n", expr);
++ result |= run_test (expr, mem, memlen, 0, expected);
+ printf ("\nTest \"%s\" with multi-byte locale, case insensitive\n", expr);
+ result |= run_test (expr, mem, memlen, 1, expectedicase);
+ printf ("\nTest \"%s\" backwards with multi-byte locale\n", expr);
+@@ -165,8 +180,8 @@ test_expr (const char *expr, int expected, int expectedicase)
+ result |= run_test_backwards (expr, mem, memlen, 1, expectedicase);
+
+ /* Second test: search with an ISO-8859-1 locale. */
+- if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL)
+- error (EXIT_FAILURE, 0, "cannot set locale de_DE.ISO-8859-1");
++ printf ("INFO: Testing de_DE.ISO-8859-1.\n");
++ xsetlocale (LC_ALL, "de_DE.ISO-8859-1");
+
+ inmem = (char *) expr;
+ inlen = strlen (expr);
diff --git a/glibc/glibc-python3.patch b/glibc/glibc-python3.patch
new file mode 100644
index 00000000..aaf45cc5
--- /dev/null
+++ b/glibc/glibc-python3.patch
@@ -0,0 +1,30 @@
+Use python3 for installed executable python scripts.
+
+Fedora is a Python3-only distribution:
+https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+This fixes build failures where builders may strictly enforce only
+python3 during a transitional phase.
+
+Author: Carlos O'Donell <carlos(a)redhat.com>
+
+diff --git a/benchtests/scripts/compare_bench.py b/benchtests/scripts/compare_bench.py
+index 6fcbd0803808e5ca..d43db393d63433bc 100755
+--- a/benchtests/scripts/compare_bench.py
++++ b/benchtests/scripts/compare_bench.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2015-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
+diff --git a/benchtests/scripts/import_bench.py b/benchtests/scripts/import_bench.py
+index a799b4e1b7dc6f30..3286e267168e83bf 100644
+--- a/benchtests/scripts/import_bench.py
++++ b/benchtests/scripts/import_bench.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2015-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
1
0
commit 5fcdf869e4073f6d1ad0a25429b2b07c7e594325
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:32:26 2021 +0100
glibc-32: 2.32 -> 2.34
diff --git a/glibc-32/.footprint b/glibc-32/.footprint
index d90b8baf..92b0e1b6 100644
--- a/glibc-32/.footprint
+++ b/glibc-32/.footprint
@@ -4,45 +4,28 @@ drwxr-xr-x root/root etc/ld.so.conf.d/
drwxr-xr-x root/root lib/
lrwxrwxrwx root/root lib/ld-linux.so.2 -> /lib32/ld-linux.so.2
drwxr-xr-x root/root lib32/
--rwxr-xr-x root/root lib32/ld-2.32.so
-lrwxrwxrwx root/root lib32/ld-linux.so.2 -> ld-2.32.so
--rwxr-xr-x root/root lib32/libBrokenLocale-2.32.so
-lrwxrwxrwx root/root lib32/libBrokenLocale.so.1 -> libBrokenLocale-2.32.so
+-rwxr-xr-x root/root lib32/ld-linux.so.2
+-rwxr-xr-x root/root lib32/libBrokenLocale.so.1
-rwxr-xr-x root/root lib32/libSegFault.so
--rwxr-xr-x root/root lib32/libanl-2.32.so
-lrwxrwxrwx root/root lib32/libanl.so.1 -> libanl-2.32.so
--rwxr-xr-x root/root lib32/libc-2.32.so
-lrwxrwxrwx root/root lib32/libc.so.6 -> libc-2.32.so
--rwxr-xr-x root/root lib32/libcrypt-2.32.so
-lrwxrwxrwx root/root lib32/libcrypt.so.1 -> libcrypt-2.32.so
--rwxr-xr-x root/root lib32/libdl-2.32.so
-lrwxrwxrwx root/root lib32/libdl.so.2 -> libdl-2.32.so
--rwxr-xr-x root/root lib32/libm-2.32.so
-lrwxrwxrwx root/root lib32/libm.so.6 -> libm-2.32.so
+-rwxr-xr-x root/root lib32/libanl.so.1
+-rwxr-xr-x root/root lib32/libc.so.6
+-rwxr-xr-x root/root lib32/libc_malloc_debug.so.0
+-rwxr-xr-x root/root lib32/libcrypt.so.1
+-rwxr-xr-x root/root lib32/libdl.so.2
+-rwxr-xr-x root/root lib32/libm.so.6
-rwxr-xr-x root/root lib32/libmemusage.so
--rwxr-xr-x root/root lib32/libnsl-2.32.so
-lrwxrwxrwx root/root lib32/libnsl.so.1 -> libnsl-2.32.so
--rwxr-xr-x root/root lib32/libnss_compat-2.32.so
-lrwxrwxrwx root/root lib32/libnss_compat.so.2 -> libnss_compat-2.32.so
--rwxr-xr-x root/root lib32/libnss_db-2.32.so
-lrwxrwxrwx root/root lib32/libnss_db.so.2 -> libnss_db-2.32.so
--rwxr-xr-x root/root lib32/libnss_dns-2.32.so
-lrwxrwxrwx root/root lib32/libnss_dns.so.2 -> libnss_dns-2.32.so
--rwxr-xr-x root/root lib32/libnss_files-2.32.so
-lrwxrwxrwx root/root lib32/libnss_files.so.2 -> libnss_files-2.32.so
--rwxr-xr-x root/root lib32/libnss_hesiod-2.32.so
-lrwxrwxrwx root/root lib32/libnss_hesiod.so.2 -> libnss_hesiod-2.32.so
+-rwxr-xr-x root/root lib32/libnsl.so.1
+-rwxr-xr-x root/root lib32/libnss_compat.so.2
+-rwxr-xr-x root/root lib32/libnss_db.so.2
+-rwxr-xr-x root/root lib32/libnss_dns.so.2
+-rwxr-xr-x root/root lib32/libnss_files.so.2
+-rwxr-xr-x root/root lib32/libnss_hesiod.so.2
-rwxr-xr-x root/root lib32/libpcprofile.so
--rwxr-xr-x root/root lib32/libpthread-2.32.so
-lrwxrwxrwx root/root lib32/libpthread.so.0 -> libpthread-2.32.so
--rwxr-xr-x root/root lib32/libresolv-2.32.so
-lrwxrwxrwx root/root lib32/libresolv.so.2 -> libresolv-2.32.so
--rwxr-xr-x root/root lib32/librt-2.32.so
-lrwxrwxrwx root/root lib32/librt.so.1 -> librt-2.32.so
--rwxr-xr-x root/root lib32/libthread_db-1.0.so
-lrwxrwxrwx root/root lib32/libthread_db.so.1 -> libthread_db-1.0.so
--rwxr-xr-x root/root lib32/libutil-2.32.so
-lrwxrwxrwx root/root lib32/libutil.so.1 -> libutil-2.32.so
+-rwxr-xr-x root/root lib32/libpthread.so.0
+-rwxr-xr-x root/root lib32/libresolv.so.2
+-rwxr-xr-x root/root lib32/librt.so.1
+-rwxr-xr-x root/root lib32/libthread_db.so.1
+-rwxr-xr-x root/root lib32/libutil.so.1
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/gnu/
@@ -304,6 +287,8 @@ drwxr-xr-x root/root usr/lib32/gconv/
-rwxr-xr-x root/root usr/lib32/gconv/UTF-7.so
-rwxr-xr-x root/root usr/lib32/gconv/VISCII.so
-rw-r--r-- root/root usr/lib32/gconv/gconv-modules
+drwxr-xr-x root/root usr/lib32/gconv/gconv-modules.d/
+-rw-r--r-- root/root usr/lib32/gconv/gconv-modules.d/gconv-modules-extra.conf
-rwxr-xr-x root/root usr/lib32/gconv/libCNS.so
-rwxr-xr-x root/root usr/lib32/gconv/libGB.so
-rwxr-xr-x root/root usr/lib32/gconv/libISOIR165.so
@@ -324,26 +309,21 @@ lrwxrwxrwx root/root usr/lib32/libBrokenLocale.so -> ../../lib32/libBrokenLocale
lrwxrwxrwx root/root usr/lib32/libanl.so -> ../../lib32/libanl.so.1
-rw-r--r-- root/root usr/lib32/libc.a
-rw-r--r-- root/root usr/lib32/libc.so
+lrwxrwxrwx root/root usr/lib32/libc_malloc_debug.so -> ../../lib32/libc_malloc_debug.so.0
-rw-r--r-- root/root usr/lib32/libc_nonshared.a
-rw-r--r-- root/root usr/lib32/libcrypt.a
lrwxrwxrwx root/root usr/lib32/libcrypt.so -> ../../lib32/libcrypt.so.1
-rw-r--r-- root/root usr/lib32/libdl.a
-lrwxrwxrwx root/root usr/lib32/libdl.so -> ../../lib32/libdl.so.2
-rw-r--r-- root/root usr/lib32/libg.a
-rw-r--r-- root/root usr/lib32/libm.a
lrwxrwxrwx root/root usr/lib32/libm.so -> ../../lib32/libm.so.6
-rw-r--r-- root/root usr/lib32/libmcheck.a
lrwxrwxrwx root/root usr/lib32/libnss_compat.so -> ../../lib32/libnss_compat.so.2
lrwxrwxrwx root/root usr/lib32/libnss_db.so -> ../../lib32/libnss_db.so.2
-lrwxrwxrwx root/root usr/lib32/libnss_dns.so -> ../../lib32/libnss_dns.so.2
-lrwxrwxrwx root/root usr/lib32/libnss_files.so -> ../../lib32/libnss_files.so.2
lrwxrwxrwx root/root usr/lib32/libnss_hesiod.so -> ../../lib32/libnss_hesiod.so.2
-rw-r--r-- root/root usr/lib32/libpthread.a
-lrwxrwxrwx root/root usr/lib32/libpthread.so -> ../../lib32/libpthread.so.0
-rw-r--r-- root/root usr/lib32/libresolv.a
lrwxrwxrwx root/root usr/lib32/libresolv.so -> ../../lib32/libresolv.so.2
-rw-r--r-- root/root usr/lib32/librt.a
-lrwxrwxrwx root/root usr/lib32/librt.so -> ../../lib32/librt.so.1
lrwxrwxrwx root/root usr/lib32/libthread_db.so -> ../../lib32/libthread_db.so.1
-rw-r--r-- root/root usr/lib32/libutil.a
-lrwxrwxrwx root/root usr/lib32/libutil.so -> ../../lib32/libutil.so.1
diff --git a/glibc-32/.signature b/glibc-32/.signature
index 2fb0c92f..58f95f12 100644
--- a/glibc-32/.signature
+++ b/glibc-32/.signature
@@ -1,8 +1,10 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqj6i1SWfeAprBs5+hbHng33d+BFxFRGCsMbJ+3fw/owHyw4U56/PmHiA9H2OW0HGk1rpe0oXfsWs33xYl4FLNQ8=
-SHA256 (Pkgfile) = 7e8956b17109fe3f039c196484c4bc2a443601d32646cca1b04f3628791daa96
-SHA256 (.footprint) = 45836a310a6801080a61130aca376091caab990a0c75d9fc039fcb7ad7298642
-SHA256 (glibc-2.32.tar.xz) = 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836
-SHA256 (linux-5.4.72.tar.xz) = 0e24645bd56fe5b55a7a662895f5562c103d71b54d097281f0c9c71ff22c1172
-SHA256 (glibc-2.32-5.patch) = 195b66ab42fd8fa82119b720e0432faebac2087cd16943d230d4839e4d308dcf
+RWRJc1FUaeVeqqIvfNfyoGIl3dJWeU+KOTOKkWvyJpUsCaumvqsUo08Gd66SzkGuMdBJ4qYBU1BI/SCmLS1faxl+je8FS/rAIws=
+SHA256 (Pkgfile) = 344f3dce94b58f4108dd81e696ed2005138ab6558ddb75131e3943a7602d473b
+SHA256 (.footprint) = 28c0be81580495d8789fce4c11a415bd557693f979c5beb40977cbac1607853b
+SHA256 (glibc-2.34.tar.xz) = 44d26a1fe20b8853a48f470ead01e4279e869ac149b195dda4e44a195d981ab2
+SHA256 (linux-5.10.tar.xz) = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
+SHA256 (glibc-c-utf8-locale-1.patch) = c48c306658ede269fb4a43140d41a3f609bffd17a8f661127e3e4dde48b85cd4
+SHA256 (glibc-c-utf8-locale-2.patch) = a9d3c0660e6a48bb22dc77afbc7bb47ce79ca0d8c2ee8ebee4228d8d4952214e
+SHA256 (glibc-python3.patch) = 4a6511436c8abb708f5cb7e9baaf9812f2dc4bb5665a9376c1e270eae4f8b14f
SHA256 (lib32.conf) = 2f174d2bcefe1c29327690514f34d6970fffdd54398320ca23a11b5f1e3c9b2d
diff --git a/glibc-32/Pkgfile b/glibc-32/Pkgfile
index b5e259fc..2e780f06 100644
--- a/glibc-32/Pkgfile
+++ b/glibc-32/Pkgfile
@@ -1,45 +1,59 @@
# Description: The C library used in the GNU system
# URL: http://www.gnu.org/software/libc/
-# Maintainer: CRUX System Team, core-ports at crux dot nu
+# Maintainer: CRUX System Team, core-ports at crux dot nu
name=glibc-32
-version=2.32
-release=4
-source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
- https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.tar.xz \
- glibc-$version-5.patch lib32.conf)
+version=2.34
+release=1
+source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz
+ https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+ glibc-c-utf8-locale-1.patch glibc-c-utf8-locale-2.patch
+ glibc-python3.patch
+ lib32.conf)
build() {
# install kernel headers
- cd linux-5.4.72
+ cd linux-5.10
make mrproper
- make headers_check
make INSTALL_HDR_PATH=$PKG/usr headers_install
chown root:root $PKG/usr
- patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-$version-5.patch
+ patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-python3.patch
+ patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-c-utf8-locale-1.patch
+ patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-c-utf8-locale-2.patch
mkdir $SRC/build
cd $SRC/build
export libc_cv_slibdir=/lib32
- export CC="${CC:-gcc} -m32"
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
export CFLAGS="$CFLAGS -Wno-error=parentheses"
- ../glibc-${version:0:4}/configure --prefix=/usr \
+ echo "slibdir=/lib32" >> configparms
+ echo "rootsbindir=/sbin" >> configparms
+ echo "rtlddir=/lib32" >> configparms
+ echo "sbindir=/usr/sbin" >> configparms
+
+ ../glibc-$version/configure --prefix=/usr \
--libdir=/usr/lib32 \
--libexecdir=/usr/lib32 \
--with-headers=$PKG/usr/include \
+ --with-pkgversion="$version-$release" \
+ --with-bugurl='https://crux.nu/bugs' \
--enable-kernel=4.9 \
--enable-add-ons \
- --disable-profile \
- --disable-werror \
- --without-gd \
+ --enable-lock-elision \
+ --enable-bind-now \
--enable-stack-protector=strong \
+ --enable-stackguard-randomization \
--enable-multi-arch \
- i686-pc-linux-gnu
+ --without-gd \
+ --disable-profile \
+ --disable-werror \
+ --host=i686-pc-linux-gnu
- make
+ make
#make check
make install_root=$PKG install
diff --git a/glibc-32/glibc-2.32-5.patch b/glibc-32/glibc-2.32-5.patch
deleted file mode 100644
index b08b1624..00000000
--- a/glibc-32/glibc-2.32-5.patch
+++ /dev/null
@@ -1,6165 +0,0 @@
-diff -pruN glibc-2.32.orig/debug/Makefile glibc-2.32/debug/Makefile
---- glibc-2.32.orig/debug/Makefile 2021-09-18 21:02:32.642182626 +1000
-+++ glibc-2.32/debug/Makefile 2021-09-18 21:03:05.310302219 +1000
-@@ -51,7 +51,7 @@ routines = backtrace backtracesyms back
- explicit_bzero_chk \
- stack_chk_fail fortify_fail \
- $(static-only-routines)
--static-only-routines := warning-nop stack_chk_fail_local
-+static-only-routines := stack_chk_fail_local
-
- # Don't add stack_chk_fail_local.o to libc.a since __stack_chk_fail_local
- # is an alias of __stack_chk_fail in stack_chk_fail.o.
-diff -pruN glibc-2.32.orig/debug/warning-nop.c glibc-2.32/debug/warning-nop.c
---- glibc-2.32.orig/debug/warning-nop.c 2021-09-18 21:02:32.642182626 +1000
-+++ glibc-2.32/debug/warning-nop.c 1970-01-01 10:00:00.000000000 +1000
-@@ -1,70 +0,0 @@
--/* Dummy nop functions to elicit link-time warnings.
-- Copyright (C) 2005-2020 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- In addition to the permissions in the GNU Lesser General Public
-- License, the Free Software Foundation gives you unlimited
-- permission to link the compiled version of this file with other
-- programs, and to distribute those programs without any restriction
-- coming from the use of this file. (The GNU Lesser General Public
-- License restrictions do apply in other respects; for example, they
-- cover modification of the file, and distribution when not linked
-- into another program.)
--
-- Note that people who make modified versions of this file are not
-- obligated to grant this special exception for their modified
-- versions; it is their choice whether to do so. The GNU Lesser
-- General Public License gives permission to release a modified
-- version without this exception; this exception also makes it
-- possible to release a modified version which carries forward this
-- exception.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, see
-- <https://www.gnu.org/licenses/>. */
--
--#include <sys/cdefs.h>
--
--static void
--__attribute__ ((used))
--nop (void)
--{
--}
--
--/* Don't insert any other #include's before this #undef! */
--
--#undef __warndecl
--#define __warndecl(name, msg) \
-- extern void name (void) __attribute__ ((alias ("nop"))) attribute_hidden; \
-- link_warning (name, msg)
--
--#undef __USE_FORTIFY_LEVEL
--#define __USE_FORTIFY_LEVEL 99
--
--/* Following here we need an #include for each public header file
-- that uses __warndecl. */
--
--/* Define away to avoid warnings with compilers that do not have these
-- builtins. */
--#define __builtin___memcpy_chk(dest, src, len, bos) NULL
--#define __builtin___memmove_chk(dest, src, len, bos) NULL
--#define __builtin___mempcpy_chk(dest, src, len, bos) NULL
--#define __builtin___memset_chk(dest, ch, len, bos) NULL
--#define __builtin___stpcpy_chk(dest, src, bos) NULL
--#define __builtin___strcat_chk(dest, src, bos) NULL
--#define __builtin___strcpy_chk(dest, src, bos) NULL
--#define __builtin___strncat_chk(dest, src, len, bos) NULL
--#define __builtin___strncpy_chk(dest, src, len, bos) NULL
--#define __builtin_object_size(bos, level) 0
--
--#include <string.h>
-diff -pruN glibc-2.32.orig/elf/dl-load.c glibc-2.32/elf/dl-load.c
---- glibc-2.32.orig/elf/dl-load.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/dl-load.c 2021-09-18 21:03:05.311302253 +1000
-@@ -855,10 +855,12 @@ lose (int code, int fd, const char *name
-
- /* Process PT_GNU_PROPERTY program header PH in module L after
- PT_LOAD segments are mapped. Only one NT_GNU_PROPERTY_TYPE_0
-- note is handled which contains processor specific properties. */
-+ note is handled which contains processor specific properties.
-+ FD is -1 for the kernel mapped main executable otherwise it is
-+ the fd used for loading module L. */
-
- void
--_dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr);
- const ElfW(Addr) size = ph->p_memsz;
-@@ -905,7 +907,7 @@ _dl_process_pt_gnu_property (struct link
- last_type = type;
-
- /* Target specific property processing. */
-- if (_dl_process_gnu_property (l, type, datasz, ptr) == 0)
-+ if (_dl_process_gnu_property (l, fd, type, datasz, ptr) == 0)
- return;
-
- /* Check the next property item. */
-@@ -1251,21 +1253,6 @@ _dl_map_object_from_fd (const char *name
- maplength, has_holes, loader);
- if (__glibc_unlikely (errstring != NULL))
- goto call_lose;
--
-- /* Process program headers again after load segments are mapped in
-- case processing requires accessing those segments. Scan program
-- headers backward so that PT_NOTE can be skipped if PT_GNU_PROPERTY
-- exits. */
-- for (ph = &phdr[l->l_phnum]; ph != phdr; --ph)
-- switch (ph[-1].p_type)
-- {
-- case PT_NOTE:
-- _dl_process_pt_note (l, &ph[-1]);
-- break;
-- case PT_GNU_PROPERTY:
-- _dl_process_pt_gnu_property (l, &ph[-1]);
-- break;
-- }
- }
-
- if (l->l_ld == 0)
-@@ -1377,6 +1364,21 @@ cannot enable executable stack as shared
- if (l->l_tls_initimage != NULL)
- l->l_tls_initimage = (char *) l->l_tls_initimage + l->l_addr;
-
-+ /* Process program headers again after load segments are mapped in
-+ case processing requires accessing those segments. Scan program
-+ headers backward so that PT_NOTE can be skipped if PT_GNU_PROPERTY
-+ exits. */
-+ for (ph = &l->l_phdr[l->l_phnum]; ph != l->l_phdr; --ph)
-+ switch (ph[-1].p_type)
-+ {
-+ case PT_NOTE:
-+ _dl_process_pt_note (l, fd, &ph[-1]);
-+ break;
-+ case PT_GNU_PROPERTY:
-+ _dl_process_pt_gnu_property (l, fd, &ph[-1]);
-+ break;
-+ }
-+
- /* We are done mapping in the file. We no longer need the descriptor. */
- if (__glibc_unlikely (__close_nocancel (fd) != 0))
- {
-diff -pruN glibc-2.32.orig/elf/dl-tunables.c glibc-2.32/elf/dl-tunables.c
---- glibc-2.32.orig/elf/dl-tunables.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/dl-tunables.c 2021-09-18 21:03:05.311302253 +1000
-@@ -177,6 +177,7 @@ parse_tunables (char *tunestr, char *val
- return;
-
- char *p = tunestr;
-+ size_t off = 0;
-
- while (true)
- {
-@@ -190,7 +191,11 @@ parse_tunables (char *tunestr, char *val
- /* If we reach the end of the string before getting a valid name-value
- pair, bail out. */
- if (p[len] == '\0')
-- return;
-+ {
-+ if (__libc_enable_secure)
-+ tunestr[off] = '\0';
-+ return;
-+ }
-
- /* We did not find a valid name-value pair before encountering the
- colon. */
-@@ -216,35 +221,28 @@ parse_tunables (char *tunestr, char *val
-
- if (tunable_is_name (cur->name, name))
- {
-- /* If we are in a secure context (AT_SECURE) then ignore the tunable
-- unless it is explicitly marked as secure. Tunable values take
-- precedence over their envvar aliases. */
-+ /* If we are in a secure context (AT_SECURE) then ignore the
-+ tunable unless it is explicitly marked as secure. Tunable
-+ values take precedence over their envvar aliases. We write
-+ the tunables that are not SXID_ERASE back to TUNESTR, thus
-+ dropping all SXID_ERASE tunables and any invalid or
-+ unrecognized tunables. */
- if (__libc_enable_secure)
- {
-- if (cur->security_level == TUNABLE_SECLEVEL_SXID_ERASE)
-+ if (cur->security_level != TUNABLE_SECLEVEL_SXID_ERASE)
- {
-- if (p[len] == '\0')
-- {
-- /* Last tunable in the valstring. Null-terminate and
-- return. */
-- *name = '\0';
-- return;
-- }
-- else
-- {
-- /* Remove the current tunable from the string. We do
-- this by overwriting the string starting from NAME
-- (which is where the current tunable begins) with
-- the remainder of the string. We then have P point
-- to NAME so that we continue in the correct
-- position in the valstring. */
-- char *q = &p[len + 1];
-- p = name;
-- while (*q != '\0')
-- *name++ = *q++;
-- name[0] = '\0';
-- len = 0;
-- }
-+ if (off > 0)
-+ tunestr[off++] = ':';
-+
-+ const char *n = cur->name;
-+
-+ while (*n != '\0')
-+ tunestr[off++] = *n++;
-+
-+ tunestr[off++] = '=';
-+
-+ for (size_t j = 0; j < len; j++)
-+ tunestr[off++] = value[j];
- }
-
- if (cur->security_level != TUNABLE_SECLEVEL_NONE)
-@@ -257,9 +255,7 @@ parse_tunables (char *tunestr, char *val
- }
- }
-
-- if (p[len] == '\0')
-- return;
-- else
-+ if (p[len] != '\0')
- p += len + 1;
- }
- }
-diff -pruN glibc-2.32.orig/elf/ifuncmain6pie.c glibc-2.32/elf/ifuncmain6pie.c
---- glibc-2.32.orig/elf/ifuncmain6pie.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/ifuncmain6pie.c 2021-09-18 21:03:05.311302253 +1000
-@@ -9,7 +9,6 @@
- #include "ifunc-sel.h"
-
- typedef int (*foo_p) (void);
--extern foo_p foo_ptr;
-
- static int
- one (void)
-@@ -28,20 +27,17 @@ foo_ifunc (void)
- }
-
- extern int foo (void);
--extern foo_p get_foo (void);
-+extern int call_foo (void);
- extern foo_p get_foo_p (void);
-
--foo_p my_foo_ptr = foo;
-+foo_p foo_ptr = foo;
-
- int
- main (void)
- {
- foo_p p;
-
-- p = get_foo ();
-- if (p != foo)
-- abort ();
-- if ((*p) () != -30)
-+ if (call_foo () != -30)
- abort ();
-
- p = get_foo_p ();
-@@ -52,12 +48,8 @@ main (void)
-
- if (foo_ptr != foo)
- abort ();
-- if (my_foo_ptr != foo)
-- abort ();
- if ((*foo_ptr) () != -30)
- abort ();
-- if ((*my_foo_ptr) () != -30)
-- abort ();
- if (foo () != -30)
- abort ();
-
-diff -pruN glibc-2.32.orig/elf/ifuncmod6.c glibc-2.32/elf/ifuncmod6.c
---- glibc-2.32.orig/elf/ifuncmod6.c 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/ifuncmod6.c 2021-09-18 21:03:05.311302253 +1000
-@@ -4,7 +4,7 @@ extern int foo (void);
-
- typedef int (*foo_p) (void);
-
--foo_p foo_ptr = foo;
-+extern foo_p foo_ptr;
-
- foo_p
- get_foo_p (void)
-@@ -12,8 +12,8 @@ get_foo_p (void)
- return foo_ptr;
- }
-
--foo_p
--get_foo (void)
-+int
-+call_foo (void)
- {
-- return foo;
-+ return foo ();
- }
-diff -pruN glibc-2.32.orig/elf/Makefile glibc-2.32/elf/Makefile
---- glibc-2.32.orig/elf/Makefile 2021-09-18 21:02:32.643182660 +1000
-+++ glibc-2.32/elf/Makefile 2021-09-18 21:03:05.311302253 +1000
-@@ -1381,6 +1381,8 @@ CFLAGS-ifuncmain7pie.c += $(pie-ccflag)
- CFLAGS-ifuncmain9pie.c += $(pie-ccflag)
- CFLAGS-tst-ifunc-textrel.c += $(pic-ccflag)
-
-+LDFLAGS-ifuncmain6pie = -Wl,-z,lazy
-+
- $(objpfx)ifuncmain1pie: $(objpfx)ifuncmod1.so
- $(objpfx)ifuncmain1staticpie: $(objpfx)ifuncdep1pic.o
- $(objpfx)ifuncmain1vispie: $(objpfx)ifuncmod1.so
-@@ -1630,8 +1632,6 @@ $(objpfx)tst-nodelete-dlclose.out: $(obj
-
- tst-env-setuid-ENV = MALLOC_CHECK_=2 MALLOC_MMAP_THRESHOLD_=4096 \
- LD_HWCAP_MASK=0x1
--tst-env-setuid-tunables-ENV = \
-- GLIBC_TUNABLES=glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096
-
- $(objpfx)tst-debug1: $(libdl)
- $(objpfx)tst-debug1.out: $(objpfx)tst-debug1mod1.so
-diff -pruN glibc-2.32.orig/elf/rtld.c glibc-2.32/elf/rtld.c
---- glibc-2.32.orig/elf/rtld.c 2021-09-18 21:02:32.644182694 +1000
-+++ glibc-2.32/elf/rtld.c 2021-09-18 21:03:05.311302253 +1000
-@@ -1534,10 +1534,10 @@ of this helper program; chances are you
- switch (ph[-1].p_type)
- {
- case PT_NOTE:
-- _dl_process_pt_note (main_map, &ph[-1]);
-+ _dl_process_pt_note (main_map, -1, &ph[-1]);
- break;
- case PT_GNU_PROPERTY:
-- _dl_process_pt_gnu_property (main_map, &ph[-1]);
-+ _dl_process_pt_gnu_property (main_map, -1, &ph[-1]);
- break;
- }
-
-diff -pruN glibc-2.32.orig/elf/tst-env-setuid.c glibc-2.32/elf/tst-env-setuid.c
---- glibc-2.32.orig/elf/tst-env-setuid.c 2021-09-18 21:02:32.644182694 +1000
-+++ glibc-2.32/elf/tst-env-setuid.c 2021-09-18 21:03:05.311302253 +1000
-@@ -29,173 +29,12 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
-+#include <support/check.h>
- #include <support/support.h>
- #include <support/test-driver.h>
-+#include <support/capture_subprocess.h>
-
- static char SETGID_CHILD[] = "setgid-child";
--#define CHILD_STATUS 42
--
--/* Return a GID which is not our current GID, but is present in the
-- supplementary group list. */
--static gid_t
--choose_gid (void)
--{
-- const int count = 64;
-- gid_t groups[count];
-- int ret = getgroups (count, groups);
-- if (ret < 0)
-- {
-- printf ("getgroups: %m\n");
-- exit (1);
-- }
-- gid_t current = getgid ();
-- for (int i = 0; i < ret; ++i)
-- {
-- if (groups[i] != current)
-- return groups[i];
-- }
-- return 0;
--}
--
--/* Spawn and execute a program and verify that it returns the CHILD_STATUS. */
--static pid_t
--do_execve (char **args)
--{
-- pid_t kid = vfork ();
--
-- if (kid < 0)
-- {
-- printf ("vfork: %m\n");
-- return -1;
-- }
--
-- if (kid == 0)
-- {
-- /* Child process. */
-- execve (args[0], args, environ);
-- _exit (-errno);
-- }
--
-- if (kid < 0)
-- return 1;
--
-- int status;
--
-- if (waitpid (kid, &status, 0) < 0)
-- {
-- printf ("waitpid: %m\n");
-- return 1;
-- }
--
-- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-- return EXIT_UNSUPPORTED;
--
-- if (!WIFEXITED (status) || WEXITSTATUS (status) != CHILD_STATUS)
-- {
-- printf ("Unexpected exit status %d from child process\n",
-- WEXITSTATUS (status));
-- return 1;
-- }
-- return 0;
--}
--
--/* Copies the executable into a restricted directory, so that we can
-- safely make it SGID with the TARGET group ID. Then runs the
-- executable. */
--static int
--run_executable_sgid (gid_t target)
--{
-- char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
-- test_dir, (intmax_t) getpid ());
-- char *execname = xasprintf ("%s/bin", dirname);
-- int infd = -1;
-- int outfd = -1;
-- int ret = 0;
-- if (mkdir (dirname, 0700) < 0)
-- {
-- printf ("mkdir: %m\n");
-- goto err;
-- }
-- infd = open ("/proc/self/exe", O_RDONLY);
-- if (infd < 0)
-- {
-- printf ("open (/proc/self/exe): %m\n");
-- goto err;
-- }
-- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
-- if (outfd < 0)
-- {
-- printf ("open (%s): %m\n", execname);
-- goto err;
-- }
-- char buf[4096];
-- for (;;)
-- {
-- ssize_t rdcount = read (infd, buf, sizeof (buf));
-- if (rdcount < 0)
-- {
-- printf ("read: %m\n");
-- goto err;
-- }
-- if (rdcount == 0)
-- break;
-- char *p = buf;
-- char *end = buf + rdcount;
-- while (p != end)
-- {
-- ssize_t wrcount = write (outfd, buf, end - p);
-- if (wrcount == 0)
-- errno = ENOSPC;
-- if (wrcount <= 0)
-- {
-- printf ("write: %m\n");
-- goto err;
-- }
-- p += wrcount;
-- }
-- }
-- if (fchown (outfd, getuid (), target) < 0)
-- {
-- printf ("fchown (%s): %m\n", execname);
-- goto err;
-- }
-- if (fchmod (outfd, 02750) < 0)
-- {
-- printf ("fchmod (%s): %m\n", execname);
-- goto err;
-- }
-- if (close (outfd) < 0)
-- {
-- printf ("close (outfd): %m\n");
-- goto err;
-- }
-- if (close (infd) < 0)
-- {
-- printf ("close (infd): %m\n");
-- goto err;
-- }
--
-- char *args[] = {execname, SETGID_CHILD, NULL};
--
-- ret = do_execve (args);
--
--err:
-- if (outfd >= 0)
-- close (outfd);
-- if (infd >= 0)
-- close (infd);
-- if (execname)
-- {
-- unlink (execname);
-- free (execname);
-- }
-- if (dirname)
-- {
-- rmdir (dirname);
-- free (dirname);
-- }
-- return ret;
--}
-
- #ifndef test_child
- static int
-@@ -256,40 +95,32 @@ do_test (int argc, char **argv)
- if (argc == 2 && strcmp (argv[1], SETGID_CHILD) == 0)
- {
- if (getgid () == getegid ())
-- {
-- /* This can happen if the file system is mounted nosuid. */
-- fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n",
-- (intmax_t) getgid ());
-- exit (EXIT_UNSUPPORTED);
-- }
-+ /* This can happen if the file system is mounted nosuid. */
-+ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
-+ (intmax_t) getgid ());
-
- int ret = test_child ();
-
- if (ret != 0)
- exit (1);
-
-- exit (CHILD_STATUS);
-+ exit (EXIT_SUCCESS);
- }
- else
- {
- if (test_parent () != 0)
- exit (1);
-
-- /* Try running a setgid program. */
-- gid_t target = choose_gid ();
-- if (target == 0)
-- {
-- fprintf (stderr,
-- "Could not find a suitable GID for user %jd, skipping test\n",
-- (intmax_t) getuid ());
-- exit (0);
-- }
-+ int status = support_capture_subprogram_self_sgid (SETGID_CHILD);
-
-- return run_executable_sgid (target);
-- }
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ if (!WIFEXITED (status))
-+ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
-
-- /* Something went wrong and our argv was corrupted. */
-- _exit (1);
-+ return 0;
-+ }
- }
-
- #define TEST_FUNCTION_ARGV do_test
-diff -pruN glibc-2.32.orig/elf/tst-env-setuid-tunables.c glibc-2.32/elf/tst-env-setuid-tunables.c
---- glibc-2.32.orig/elf/tst-env-setuid-tunables.c 2021-09-18 21:02:32.644182694 +1000
-+++ glibc-2.32/elf/tst-env-setuid-tunables.c 2021-09-18 21:03:05.311302253 +1000
-@@ -25,35 +25,76 @@
- #include "config.h"
- #undef _LIBC
-
--#define test_parent test_parent_tunables
--#define test_child test_child_tunables
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
-+#include <intprops.h>
-+#include <array_length.h>
-+
-+#include <support/check.h>
-+#include <support/support.h>
-+#include <support/test-driver.h>
-+#include <support/capture_subprocess.h>
-
--static int test_child_tunables (void);
--static int test_parent_tunables (void);
--
--#include "tst-env-setuid.c"
-+const char *teststrings[] =
-+{
-+ "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.check=2:glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096:glibc.malloc.check=2",
-+ "glibc.malloc.perturb=0x800",
-+ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.perturb=0x800:not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.not_valid.check=2:glibc.malloc.mmap_threshold=4096",
-+ "not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096:glibc.malloc.check=2",
-+ "glibc.malloc.check=4:glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096",
-+ ":glibc.malloc.garbage=2:glibc.malloc.check=1",
-+ "glibc.malloc.check=1:glibc.malloc.check=2",
-+ "not_valid.malloc.check=2",
-+ "glibc.not_valid.check=2",
-+};
-
--#define CHILD_VALSTRING_VALUE "glibc.malloc.mmap_threshold=4096"
--#define PARENT_VALSTRING_VALUE \
-- "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096"
-+const char *resultstrings[] =
-+{
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.perturb=0x800",
-+ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "glibc.malloc.mmap_threshold=4096",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+ "",
-+};
-
- static int
--test_child_tunables (void)
-+test_child (int off)
- {
- const char *val = getenv ("GLIBC_TUNABLES");
-
- #if HAVE_TUNABLES
-- if (val != NULL && strcmp (val, CHILD_VALSTRING_VALUE) == 0)
-+ if (val != NULL && strcmp (val, resultstrings[off]) == 0)
- return 0;
-
- if (val != NULL)
-- printf ("Unexpected GLIBC_TUNABLES VALUE %s\n", val);
-+ printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val);
-
- return 1;
- #else
- if (val != NULL)
- {
-- printf ("GLIBC_TUNABLES not cleared\n");
-+ printf ("[%d] GLIBC_TUNABLES not cleared\n", off);
- return 1;
- }
- return 0;
-@@ -61,15 +102,48 @@ test_child_tunables (void)
- }
-
- static int
--test_parent_tunables (void)
-+do_test (int argc, char **argv)
- {
-- const char *val = getenv ("GLIBC_TUNABLES");
-+ /* Setgid child process. */
-+ if (argc == 2)
-+ {
-+ if (getgid () == getegid ())
-+ /* This can happen if the file system is mounted nosuid. */
-+ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
-+ (intmax_t) getgid ());
-
-- if (val != NULL && strcmp (val, PARENT_VALSTRING_VALUE) == 0)
-- return 0;
-+ int ret = test_child (atoi (argv[1]));
-
-- if (val != NULL)
-- printf ("Unexpected GLIBC_TUNABLES VALUE %s\n", val);
-+ if (ret != 0)
-+ exit (1);
-
-- return 1;
-+ exit (EXIT_SUCCESS);
-+ }
-+ else
-+ {
-+ int ret = 0;
-+
-+ /* Spawn tests. */
-+ for (int i = 0; i < array_length (teststrings); i++)
-+ {
-+ char buf[INT_BUFSIZE_BOUND (int)];
-+
-+ printf ("Spawned test for %s (%d)\n", teststrings[i], i);
-+ snprintf (buf, sizeof (buf), "%d\n", i);
-+ if (setenv ("GLIBC_TUNABLES", teststrings[i], 1) != 0)
-+ exit (1);
-+
-+ int status = support_capture_subprogram_self_sgid (buf);
-+
-+ /* Bail out early if unsupported. */
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ ret |= status;
-+ }
-+ return ret;
-+ }
- }
-+
-+#define TEST_FUNCTION_ARGV do_test
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/iconv/gconv_charset.c glibc-2.32/iconv/gconv_charset.c
---- glibc-2.32.orig/iconv/gconv_charset.c 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/gconv_charset.c 2021-09-18 21:03:05.311302253 +1000
-@@ -216,3 +216,13 @@ out:
- return ret;
- }
- libc_hidden_def (__gconv_create_spec)
-+
-+
-+void
-+__gconv_destroy_spec (struct gconv_spec *conv_spec)
-+{
-+ free (conv_spec->fromcode);
-+ free (conv_spec->tocode);
-+ return;
-+}
-+libc_hidden_def (__gconv_destroy_spec)
-diff -pruN glibc-2.32.orig/iconv/gconv_charset.h glibc-2.32/iconv/gconv_charset.h
---- glibc-2.32.orig/iconv/gconv_charset.h 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/gconv_charset.h 2021-09-18 21:03:05.311302253 +1000
-@@ -48,33 +48,6 @@
- #define GCONV_IGNORE_ERRORS_SUFFIX "IGNORE"
-
-
--/* This function accepts the charset names of the source and destination of the
-- conversion and populates *conv_spec with an equivalent conversion
-- specification that may later be used by __gconv_open. The charset names
-- might contain options in the form of suffixes that alter the conversion,
-- e.g. "ISO-10646/UTF-8/TRANSLIT". It processes the charset names, ignoring
-- and truncating any suffix options in fromcode, and processing and truncating
-- any suffix options in tocode. Supported suffix options ("TRANSLIT" or
-- "IGNORE") when found in tocode lead to the corresponding flag in *conv_spec
-- to be set to true. Unrecognized suffix options are silently discarded. If
-- the function succeeds, it returns conv_spec back to the caller. It returns
-- NULL upon failure. */
--struct gconv_spec *
--__gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
-- const char *tocode);
--libc_hidden_proto (__gconv_create_spec)
--
--
--/* This function frees all heap memory allocated by __gconv_create_spec. */
--static void __attribute__ ((unused))
--gconv_destroy_spec (struct gconv_spec *conv_spec)
--{
-- free (conv_spec->fromcode);
-- free (conv_spec->tocode);
-- return;
--}
--
--
- /* This function copies in-order, characters from the source 's' that are
- either alpha-numeric or one in one of these: "_-.,:/" - into the destination
- 'wp' while dropping all other characters. In the process, it converts all
-diff -pruN glibc-2.32.orig/iconv/gconv_int.h glibc-2.32/iconv/gconv_int.h
---- glibc-2.32.orig/iconv/gconv_int.h 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/gconv_int.h 2021-09-18 21:03:05.311302253 +1000
-@@ -152,6 +152,27 @@ extern int __gconv_open (struct gconv_sp
- __gconv_t *handle, int flags);
- libc_hidden_proto (__gconv_open)
-
-+/* This function accepts the charset names of the source and destination of the
-+ conversion and populates *conv_spec with an equivalent conversion
-+ specification that may later be used by __gconv_open. The charset names
-+ might contain options in the form of suffixes that alter the conversion,
-+ e.g. "ISO-10646/UTF-8/TRANSLIT". It processes the charset names, ignoring
-+ and truncating any suffix options in fromcode, and processing and truncating
-+ any suffix options in tocode. Supported suffix options ("TRANSLIT" or
-+ "IGNORE") when found in tocode lead to the corresponding flag in *conv_spec
-+ to be set to true. Unrecognized suffix options are silently discarded. If
-+ the function succeeds, it returns conv_spec back to the caller. It returns
-+ NULL upon failure. */
-+extern struct gconv_spec *
-+__gconv_create_spec (struct gconv_spec *conv_spec, const char *fromcode,
-+ const char *tocode);
-+libc_hidden_proto (__gconv_create_spec)
-+
-+/* This function frees all heap memory allocated by __gconv_create_spec. */
-+extern void
-+__gconv_destroy_spec (struct gconv_spec *conv_spec);
-+libc_hidden_proto (__gconv_destroy_spec)
-+
- /* Free resources associated with transformation descriptor CD. */
- extern int __gconv_close (__gconv_t cd)
- attribute_hidden;
-diff -pruN glibc-2.32.orig/iconv/iconv_open.c glibc-2.32/iconv/iconv_open.c
---- glibc-2.32.orig/iconv/iconv_open.c 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/iconv_open.c 2021-09-18 21:03:05.311302253 +1000
-@@ -39,7 +39,7 @@ iconv_open (const char *tocode, const ch
-
- int res = __gconv_open (&conv_spec, &cd, 0);
-
-- gconv_destroy_spec (&conv_spec);
-+ __gconv_destroy_spec (&conv_spec);
-
- if (__builtin_expect (res, __GCONV_OK) != __GCONV_OK)
- {
-diff -pruN glibc-2.32.orig/iconv/iconv_prog.c glibc-2.32/iconv/iconv_prog.c
---- glibc-2.32.orig/iconv/iconv_prog.c 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/iconv_prog.c 2021-09-18 21:03:05.311302253 +1000
-@@ -184,7 +184,7 @@ main (int argc, char *argv[])
- /* Let's see whether we have these coded character sets. */
- res = __gconv_open (&conv_spec, &cd, 0);
-
-- gconv_destroy_spec (&conv_spec);
-+ __gconv_destroy_spec (&conv_spec);
-
- if (res != __GCONV_OK)
- {
-diff -pruN glibc-2.32.orig/iconv/tst-iconv_prog.sh glibc-2.32/iconv/tst-iconv_prog.sh
---- glibc-2.32.orig/iconv/tst-iconv_prog.sh 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/tst-iconv_prog.sh 2021-09-18 21:03:05.311302253 +1000
-@@ -102,12 +102,16 @@ hangarray=(
- "\x00\x80;-c;IBM1161;UTF-8//TRANSLIT//IGNORE"
- "\x00\xdb;-c;IBM1162;UTF-8//TRANSLIT//IGNORE"
- "\x00\x70;-c;IBM12712;UTF-8//TRANSLIT//IGNORE"
--# These are known hangs that are yet to be fixed:
--# "\x00\x0f;-c;IBM1364;UTF-8"
--# "\x00\x0f;-c;IBM1371;UTF-8"
--# "\x00\x0f;-c;IBM1388;UTF-8"
--# "\x00\x0f;-c;IBM1390;UTF-8"
--# "\x00\x0f;-c;IBM1399;UTF-8"
-+"\x00\x0f;-c;IBM1364;UTF-8"
-+"\x0e\x0e;-c;IBM1364;UTF-8"
-+"\x00\x0f;-c;IBM1371;UTF-8"
-+"\x0e\x0e;-c;IBM1371;UTF-8"
-+"\x00\x0f;-c;IBM1388;UTF-8"
-+"\x0e\x0e;-c;IBM1388;UTF-8"
-+"\x00\x0f;-c;IBM1390;UTF-8"
-+"\x0e\x0e;-c;IBM1390;UTF-8"
-+"\x00\x0f;-c;IBM1399;UTF-8"
-+"\x0e\x0e;-c;IBM1399;UTF-8"
- "\x00\x53;-c;IBM16804;UTF-8//TRANSLIT//IGNORE"
- "\x00\x41;-c;IBM274;UTF-8//TRANSLIT//IGNORE"
- "\x00\x41;-c;IBM275;UTF-8//TRANSLIT//IGNORE"
-diff -pruN glibc-2.32.orig/iconv/Versions glibc-2.32/iconv/Versions
---- glibc-2.32.orig/iconv/Versions 2021-09-18 21:02:32.646182763 +1000
-+++ glibc-2.32/iconv/Versions 2021-09-18 21:03:05.311302253 +1000
-@@ -6,7 +6,9 @@ libc {
- GLIBC_PRIVATE {
- # functions shared with iconv program
- __gconv_get_alias_db; __gconv_get_cache; __gconv_get_modules_db;
-- __gconv_open; __gconv_create_spec;
-+
-+ # functions used elsewhere in glibc
-+ __gconv_open; __gconv_create_spec; __gconv_destroy_spec;
-
- # function used by the gconv modules
- __gconv_transliterate;
-diff -pruN glibc-2.32.orig/iconvdata/bug-iconv13.c glibc-2.32/iconvdata/bug-iconv13.c
---- glibc-2.32.orig/iconvdata/bug-iconv13.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/iconvdata/bug-iconv13.c 2021-09-18 21:03:05.311302253 +1000
-@@ -0,0 +1,53 @@
-+/* bug 24973: Test EUC-KR module
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <errno.h>
-+#include <iconv.h>
-+#include <stdio.h>
-+#include <support/check.h>
-+
-+static int
-+do_test (void)
-+{
-+ iconv_t cd = iconv_open ("UTF-8//IGNORE", "EUC-KR");
-+ TEST_VERIFY_EXIT (cd != (iconv_t) -1);
-+
-+ /* 0xfe (->0x7e : row 94) and 0xc9 (->0x49 : row 41) are user-defined
-+ areas, which are not allowed and should be skipped over due to
-+ //IGNORE. The trailing 0xfe also is an incomplete sequence, which
-+ should be checked first. */
-+ char input[4] = { '\xc9', '\xa1', '\0', '\xfe' };
-+ char *inptr = input;
-+ size_t insize = sizeof (input);
-+ char output[4];
-+ char *outptr = output;
-+ size_t outsize = sizeof (output);
-+
-+ /* This used to crash due to buffer overrun. */
-+ TEST_VERIFY (iconv (cd, &inptr, &insize, &outptr, &outsize) == (size_t) -1);
-+ TEST_VERIFY (errno == EINVAL);
-+ /* The conversion should produce one character, the converted null
-+ character. */
-+ TEST_VERIFY (sizeof (output) - outsize == 1);
-+
-+ TEST_VERIFY_EXIT (iconv_close (cd) != -1);
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/iconvdata/bug-iconv14.c glibc-2.32/iconvdata/bug-iconv14.c
---- glibc-2.32.orig/iconvdata/bug-iconv14.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/iconvdata/bug-iconv14.c 2021-09-18 21:03:05.311302253 +1000
-@@ -0,0 +1,127 @@
-+/* Assertion in ISO-2022-JP-3 due to two-character sequence (bug 27256).
-+ Copyright (C) 2021 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <iconv.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <support/check.h>
-+
-+/* Use an escape sequence to return to the initial state. */
-+static void
-+with_escape_sequence (void)
-+{
-+ iconv_t c = iconv_open ("UTF-8", "ISO-2022-JP-3");
-+ TEST_VERIFY_EXIT (c != (iconv_t) -1);
-+
-+ char in[] = "\e$(O+D\e(B";
-+ char *inbuf = in;
-+ size_t inleft = strlen (in);
-+ char out[3]; /* Space for one output character. */
-+ char *outbuf;
-+ size_t outleft;
-+
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, &inbuf, &inleft, &outbuf, &outleft), (size_t) -1);
-+ TEST_COMPARE (errno, E2BIG);
-+ TEST_COMPARE (inleft, 3);
-+ TEST_COMPARE (inbuf - in, strlen (in) - 3);
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xc3);
-+ TEST_COMPARE (out[1] & 0xff, 0xa6);
-+
-+ /* Return to the initial shift state, producing the pending
-+ character. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, &inbuf, &inleft, &outbuf, &outleft), 0);
-+ TEST_COMPARE (inleft, 0);
-+ TEST_COMPARE (inbuf - in, strlen (in));
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ /* Nothing should be flushed the second time. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, NULL, 0, &outbuf, &outleft), 0);
-+ TEST_COMPARE (outleft, sizeof (out));
-+ TEST_COMPARE (outbuf - out, 0);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ TEST_COMPARE (iconv_close (c), 0);
-+}
-+
-+/* Use an explicit flush to return to the initial state. */
-+static void
-+with_flush (void)
-+{
-+ iconv_t c = iconv_open ("UTF-8", "ISO-2022-JP-3");
-+ TEST_VERIFY_EXIT (c != (iconv_t) -1);
-+
-+ char in[] = "\e$(O+D";
-+ char *inbuf = in;
-+ size_t inleft = strlen (in);
-+ char out[3]; /* Space for one output character. */
-+ char *outbuf;
-+ size_t outleft;
-+
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, &inbuf, &inleft, &outbuf, &outleft), (size_t) -1);
-+ TEST_COMPARE (errno, E2BIG);
-+ TEST_COMPARE (inleft, 0);
-+ TEST_COMPARE (inbuf - in, strlen (in));
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xc3);
-+ TEST_COMPARE (out[1] & 0xff, 0xa6);
-+
-+ /* Flush the pending character. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, NULL, 0, &outbuf, &outleft), 0);
-+ TEST_COMPARE (outleft, sizeof (out) - 2);
-+ TEST_COMPARE (outbuf - out, 2);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ /* Nothing should be flushed the second time. */
-+ outbuf = out;
-+ outleft = sizeof (out);
-+ TEST_COMPARE (iconv (c, NULL, 0, &outbuf, &outleft), 0);
-+ TEST_COMPARE (outleft, sizeof (out));
-+ TEST_COMPARE (outbuf - out, 0);
-+ TEST_COMPARE (out[0] & 0xff, 0xcc);
-+ TEST_COMPARE (out[1] & 0xff, 0x80);
-+
-+ TEST_COMPARE (iconv_close (c), 0);
-+}
-+
-+static int
-+do_test (void)
-+{
-+ with_escape_sequence ();
-+ with_flush ();
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/iconvdata/euc-kr.c glibc-2.32/iconvdata/euc-kr.c
---- glibc-2.32.orig/iconvdata/euc-kr.c 2021-09-18 21:02:32.648182831 +1000
-+++ glibc-2.32/iconvdata/euc-kr.c 2021-09-18 21:03:05.311302253 +1000
-@@ -80,11 +80,7 @@ euckr_from_ucs4 (uint32_t ch, unsigned c
- \
- if (ch <= 0x9f) \
- ++inptr; \
-- /* 0xfe(->0x7e : row 94) and 0xc9(->0x59 : row 41) are \
-- user-defined areas. */ \
-- else if (__builtin_expect (ch == 0xa0, 0) \
-- || __builtin_expect (ch > 0xfe, 0) \
-- || __builtin_expect (ch == 0xc9, 0)) \
-+ else if (__glibc_unlikely (ch == 0xa0)) \
- { \
- /* This is illegal. */ \
- STANDARD_FROM_LOOP_ERR_HANDLER (1); \
-diff -pruN glibc-2.32.orig/iconvdata/ibm1364.c glibc-2.32/iconvdata/ibm1364.c
---- glibc-2.32.orig/iconvdata/ibm1364.c 2021-09-18 21:02:32.649182866 +1000
-+++ glibc-2.32/iconvdata/ibm1364.c 2021-09-18 21:03:05.311302253 +1000
-@@ -158,24 +158,14 @@ enum
- \
- if (__builtin_expect (ch, 0) == SO) \
- { \
-- /* Shift OUT, change to DBCS converter. */ \
-- if (curcs == db) \
-- { \
-- result = __GCONV_ILLEGAL_INPUT; \
-- break; \
-- } \
-+ /* Shift OUT, change to DBCS converter (redundant escape okay). */ \
- curcs = db; \
- ++inptr; \
- continue; \
- } \
- if (__builtin_expect (ch, 0) == SI) \
- { \
-- /* Shift IN, change to SBCS converter. */ \
-- if (curcs == sb) \
-- { \
-- result = __GCONV_ILLEGAL_INPUT; \
-- break; \
-- } \
-+ /* Shift IN, change to SBCS converter (redundant escape okay). */ \
- curcs = sb; \
- ++inptr; \
- continue; \
-diff -pruN glibc-2.32.orig/iconvdata/iso-2022-jp-3.c glibc-2.32/iconvdata/iso-2022-jp-3.c
---- glibc-2.32.orig/iconvdata/iso-2022-jp-3.c 2021-09-18 21:02:32.651182934 +1000
-+++ glibc-2.32/iconvdata/iso-2022-jp-3.c 2021-09-18 21:03:05.311302253 +1000
-@@ -67,23 +67,34 @@ enum
- CURRENT_SEL_MASK = 7 << 3
- };
-
--/* During UCS-4 to ISO-2022-JP-3 conversion, the COUNT element of the state
-- also contains the last two bytes to be output, shifted by 6 bits, and a
-- one-bit indicator whether they must be preceded by the shift sequence,
-- in bit 22. */
-+/* During UCS-4 to ISO-2022-JP-3 conversion, the COUNT element of the
-+ state also contains the last two bytes to be output, shifted by 6
-+ bits, and a one-bit indicator whether they must be preceded by the
-+ shift sequence, in bit 22. During ISO-2022-JP-3 to UCS-4
-+ conversion, COUNT may also contain a non-zero pending wide
-+ character, shifted by six bits. This happens for certain inputs in
-+ JISX0213_1_2004_set and JISX0213_2_set if the second wide character
-+ in a combining sequence cannot be written because the buffer is
-+ full. */
-
- /* Since this is a stateful encoding we have to provide code which resets
- the output state to the initial state. This has to be done during the
- flushing. */
- #define EMIT_SHIFT_TO_INIT \
-- if ((data->__statep->__count & ~7) != ASCII_set) \
-+ if (data->__statep->__count != ASCII_set) \
- { \
- if (FROM_DIRECTION) \
- { \
-- /* It's easy, we don't have to emit anything, we just reset the \
-- state for the input. */ \
-- data->__statep->__count &= 7; \
-- data->__statep->__count |= ASCII_set; \
-+ if (__glibc_likely (outbuf + 4 <= outend)) \
-+ { \
-+ /* Write out the last character. */ \
-+ *((uint32_t *) outbuf) = data->__statep->__count >> 6; \
-+ outbuf += sizeof (uint32_t); \
-+ data->__statep->__count = ASCII_set; \
-+ } \
-+ else \
-+ /* We don't have enough room in the output buffer. */ \
-+ status = __GCONV_FULL_OUTPUT; \
- } \
- else \
- { \
-@@ -151,7 +162,21 @@ enum
- #define LOOPFCT FROM_LOOP
- #define BODY \
- { \
-- uint32_t ch = *inptr; \
-+ uint32_t ch; \
-+ \
-+ /* Output any pending character. */ \
-+ ch = set >> 6; \
-+ if (__glibc_unlikely (ch != 0)) \
-+ { \
-+ put32 (outptr, ch); \
-+ outptr += 4; \
-+ /* Remove the pending character, but preserve state bits. */ \
-+ set &= (1 << 6) - 1; \
-+ continue; \
-+ } \
-+ \
-+ /* Otherwise read the next input byte. */ \
-+ ch = *inptr; \
- \
- /* Recognize escape sequences. */ \
- if (__glibc_unlikely (ch == ESC)) \
-@@ -297,21 +322,25 @@ enum
- uint32_t u1 = __jisx0213_to_ucs_combining[ch - 1][0]; \
- uint32_t u2 = __jisx0213_to_ucs_combining[ch - 1][1]; \
- \
-+ inptr += 2; \
-+ \
-+ put32 (outptr, u1); \
-+ outptr += 4; \
-+ \
- /* See whether we have room for two characters. */ \
-- if (outptr + 8 <= outend) \
-+ if (outptr + 4 <= outend) \
- { \
-- inptr += 2; \
-- put32 (outptr, u1); \
-- outptr += 4; \
- put32 (outptr, u2); \
- outptr += 4; \
- continue; \
- } \
-- else \
-- { \
-- result = __GCONV_FULL_OUTPUT; \
-- break; \
-- } \
-+ \
-+ /* Otherwise store only the first character now, and \
-+ put the second one into the queue. */ \
-+ set |= u2 << 6; \
-+ /* Tell the caller why we terminate the loop. */ \
-+ result = __GCONV_FULL_OUTPUT; \
-+ break; \
- } \
- \
- inptr += 2; \
-diff -pruN glibc-2.32.orig/iconvdata/ksc5601.h glibc-2.32/iconvdata/ksc5601.h
---- glibc-2.32.orig/iconvdata/ksc5601.h 2021-09-18 21:02:32.652182968 +1000
-+++ glibc-2.32/iconvdata/ksc5601.h 2021-09-18 21:03:05.311302253 +1000
-@@ -50,15 +50,15 @@ ksc5601_to_ucs4 (const unsigned char **s
- unsigned char ch2;
- int idx;
-
-+ if (avail < 2)
-+ return 0;
-+
- /* row 94(0x7e) and row 41(0x49) are user-defined area in KS C 5601 */
-
- if (ch < offset || (ch - offset) <= 0x20 || (ch - offset) >= 0x7e
- || (ch - offset) == 0x49)
- return __UNKNOWN_10646_CHAR;
-
-- if (avail < 2)
-- return 0;
--
- ch2 = (*s)[1];
- if (ch2 < offset || (ch2 - offset) <= 0x20 || (ch2 - offset) >= 0x7f)
- return __UNKNOWN_10646_CHAR;
-diff -pruN glibc-2.32.orig/iconvdata/Makefile glibc-2.32/iconvdata/Makefile
---- glibc-2.32.orig/iconvdata/Makefile 2021-09-18 21:02:32.647182797 +1000
-+++ glibc-2.32/iconvdata/Makefile 2021-09-18 21:03:05.311302253 +1000
-@@ -73,7 +73,8 @@ modules.so := $(addsuffix .so, $(modules
- ifeq (yes,$(build-shared))
- tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
- tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7 bug-iconv8 bug-iconv9 \
-- bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4
-+ bug-iconv10 bug-iconv11 bug-iconv12 tst-iconv-big5-hkscs-to-2ucs4 \
-+ bug-iconv13 bug-iconv14
- ifeq ($(have-thread-library),yes)
- tests += bug-iconv3
- endif
-@@ -321,6 +322,8 @@ $(objpfx)bug-iconv10.out: $(objpfx)gconv
- $(addprefix $(objpfx),$(modules.so))
- $(objpfx)bug-iconv12.out: $(objpfx)gconv-modules \
- $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv14.out: $(objpfx)gconv-modules \
-+ $(addprefix $(objpfx),$(modules.so))
-
- $(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
- $(addprefix $(objpfx),$(modules.so)) \
-diff -pruN glibc-2.32.orig/intl/dcigettext.c glibc-2.32/intl/dcigettext.c
---- glibc-2.32.orig/intl/dcigettext.c 2021-09-18 21:02:32.656183106 +1000
-+++ glibc-2.32/intl/dcigettext.c 2021-09-18 21:03:05.311302253 +1000
-@@ -1120,15 +1120,18 @@ _nl_find_msg (struct loaded_l10nfile *do
-
- # ifdef _LIBC
-
-- struct gconv_spec conv_spec
-- = { .fromcode = norm_add_slashes (charset, ""),
-- .tocode = norm_add_slashes (outcharset, ""),
-- /* We always want to use transliteration. */
-- .translit = true,
-- .ignore = false
-- };
-+ struct gconv_spec conv_spec;
-+
-+ __gconv_create_spec (&conv_spec, charset, outcharset);
-+
-+ /* We always want to use transliteration. */
-+ conv_spec.translit = true;
-+
- int r = __gconv_open (&conv_spec, &convd->conv,
- GCONV_AVOID_NOCONV);
-+
-+ __gconv_destroy_spec (&conv_spec);
-+
- if (__builtin_expect (r != __GCONV_OK, 0))
- {
- /* If the output encoding is the same there is
-diff -pruN glibc-2.32.orig/intl/tst-codeset.c glibc-2.32/intl/tst-codeset.c
---- glibc-2.32.orig/intl/tst-codeset.c 2021-09-18 21:02:32.656183106 +1000
-+++ glibc-2.32/intl/tst-codeset.c 2021-09-18 21:03:05.311302253 +1000
-@@ -22,13 +22,11 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <support/check.h>
-
- static int
- do_test (void)
- {
-- char *s;
-- int result = 0;
--
- unsetenv ("LANGUAGE");
- unsetenv ("OUTPUT_CHARSET");
- setlocale (LC_ALL, "de_DE.ISO-8859-1");
-@@ -36,25 +34,21 @@ do_test (void)
- bindtextdomain ("codeset", OBJPFX "domaindir");
-
- /* Here we expect output in ISO-8859-1. */
-- s = gettext ("cheese");
-- if (strcmp (s, "K\344se"))
-- {
-- printf ("call 1 returned: %s\n", s);
-- result = 1;
-- }
-+ TEST_COMPARE_STRING (gettext ("cheese"), "K\344se");
-
-+ /* Here we expect output in UTF-8. */
- bind_textdomain_codeset ("codeset", "UTF-8");
-+ TEST_COMPARE_STRING (gettext ("cheese"), "K\303\244se");
-
-- /* Here we expect output in UTF-8. */
-- s = gettext ("cheese");
-- if (strcmp (s, "K\303\244se"))
-- {
-- printf ("call 2 returned: %s\n", s);
-- result = 1;
-- }
-+ /* `a with umlaut' is transliterated to `ae'. */
-+ bind_textdomain_codeset ("codeset", "ASCII//TRANSLIT");
-+ TEST_COMPARE_STRING (gettext ("cheese"), "Kaese");
-+
-+ /* Transliteration also works by default even if not set. */
-+ bind_textdomain_codeset ("codeset", "ASCII");
-+ TEST_COMPARE_STRING (gettext ("cheese"), "Kaese");
-
-- return result;
-+ return 0;
- }
-
--#define TEST_FUNCTION do_test ()
--#include "../test-skeleton.c"
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/malloc/Makefile glibc-2.32/malloc/Makefile
---- glibc-2.32.orig/malloc/Makefile 2021-09-18 21:02:32.670183585 +1000
-+++ glibc-2.32/malloc/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -62,6 +62,16 @@ endif
- tests += $(tests-static)
- test-srcs = tst-mtrace
-
-+# These tests either are run with MALLOC_CHECK_=3 by default or do not work
-+# with MALLOC_CHECK_=3 because they expect a specific failure.
-+tests-exclude-mcheck = tst-mcheck tst-malloc-usable \
-+ tst-interpose-nothread tst-interpose-static-nothread \
-+ tst-interpose-static-thread tst-malloc-too-large \
-+ tst-mxfast tst-safe-linking
-+
-+# Run all tests with MALLOC_CHECK_=3
-+tests-mcheck = $(filter-out $(tests-exclude-mcheck),$(tests))
-+
- routines = malloc morecore mcheck mtrace obstack reallocarray \
- scratch_buffer_grow scratch_buffer_grow_preserve \
- scratch_buffer_set_array_size \
-@@ -100,6 +110,11 @@ $(objpfx)tst-malloc-thread-exit: $(share
- $(objpfx)tst-malloc-thread-fail: $(shared-thread-library)
- $(objpfx)tst-malloc-fork-deadlock: $(shared-thread-library)
- $(objpfx)tst-malloc-stats-cancellation: $(shared-thread-library)
-+$(objpfx)tst-malloc-backtrace-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-thread-exit-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-thread-fail-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-fork-deadlock-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc-stats-cancellation-mcheck: $(shared-thread-library)
-
- # Export the __malloc_initialize_hook variable to libc.so.
- LDFLAGS-tst-mallocstate = -rdynamic
-@@ -239,6 +254,8 @@ $(tests:%=$(objpfx)%.o): CPPFLAGS += -DT
- $(objpfx)tst-interpose-nothread: $(objpfx)tst-interpose-aux-nothread.o
- $(objpfx)tst-interpose-thread: \
- $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library)
-+$(objpfx)tst-interpose-thread-mcheck: \
-+ $(objpfx)tst-interpose-aux-thread.o $(shared-thread-library)
- $(objpfx)tst-interpose-static-nothread: $(objpfx)tst-interpose-aux-nothread.o
- $(objpfx)tst-interpose-static-thread: \
- $(objpfx)tst-interpose-aux-thread.o $(static-thread-library)
-@@ -256,3 +273,6 @@ $(objpfx)tst-dynarray-fail-mem.out: $(ob
- $(objpfx)tst-malloc-tcache-leak: $(shared-thread-library)
- $(objpfx)tst-malloc_info: $(shared-thread-library)
- $(objpfx)tst-mallocfork2: $(shared-thread-library)
-+$(objpfx)tst-malloc-tcache-leak-mcheck: $(shared-thread-library)
-+$(objpfx)tst-malloc_info-mcheck: $(shared-thread-library)
-+$(objpfx)tst-mallocfork2-mcheck: $(shared-thread-library)
-diff -pruN glibc-2.32.orig/manual/tunables.texi glibc-2.32/manual/tunables.texi
---- glibc-2.32.orig/manual/tunables.texi 2021-09-18 21:02:32.672183654 +1000
-+++ glibc-2.32/manual/tunables.texi 2021-09-18 21:03:05.312302287 +1000
-@@ -432,7 +432,11 @@ set shared cache size in bytes for use i
-
- @deftp Tunable glibc.cpu.x86_non_temporal_threshold
- The @code{glibc.cpu.x86_non_temporal_threshold} tunable allows the user
--to set threshold in bytes for non temporal store.
-+to set threshold in bytes for non temporal store. Non temporal stores
-+give a hint to the hardware to move data directly to memory without
-+displacing other data from the cache. This tunable is used by some
-+platforms to determine when to use non temporal stores in operations
-+like memmove and memcpy.
-
- This tunable is specific to i386 and x86-64.
- @end deftp
-diff -pruN glibc-2.32.orig/misc/sys/cdefs.h glibc-2.32/misc/sys/cdefs.h
---- glibc-2.32.orig/misc/sys/cdefs.h 2021-09-18 21:02:32.690184271 +1000
-+++ glibc-2.32/misc/sys/cdefs.h 2021-09-18 21:03:05.312302287 +1000
-@@ -124,13 +124,10 @@
- #define __bos0(ptr) __builtin_object_size (ptr, 0)
-
- #if __GNUC_PREREQ (4,3)
--# define __warndecl(name, msg) \
-- extern void name (void) __attribute__((__warning__ (msg)))
- # define __warnattr(msg) __attribute__((__warning__ (msg)))
- # define __errordecl(name, msg) \
- extern void name (void) __attribute__((__error__ (msg)))
- #else
--# define __warndecl(name, msg) extern void name (void)
- # define __warnattr(msg)
- # define __errordecl(name, msg) extern void name (void)
- #endif
-diff -pruN glibc-2.32.orig/NEWS glibc-2.32/NEWS
---- glibc-2.32.orig/NEWS 2021-09-18 21:02:32.639182523 +1000
-+++ glibc-2.32/NEWS 2021-09-18 21:30:11.284117111 +1000
-@@ -5,6 +5,33 @@ See the end for copying conditions.
- Please send GNU C library bug reports via <https://sourceware.org/bugzilla/>
- using `glibc' in the "product" field.
-
-+The following bugs are resolved with this release:
-+
-+ [20019] NULL pointer dereference in libc.so.6 IFUNC due to uninitialized GOT
-+ [25399] Remove __warn_memset_zero_len
-+ [26224] iconv hangs when converting some invalid inputs from several IBM
-+ character sets (CVE-2020-27618)
-+ [26534] libm.so 2.32 SIGILL in pow() due to FMA4 instruction on non-FMA4
-+ system
-+ [26555] string: strerrorname_np does not return the documented value
-+ [26600] Transaction ID collisions cause slow DNS lookups in getaddrinfo
-+ [26636] libc: 32-bit shmctl(IPC_INFO) crashes when shminfo struct is
-+ at the end of a memory mapping
-+ [26637] libc: semctl SEM_STAT_ANY fails to pass the buffer specified
-+ by the caller to the kernel
-+ [26639] libc: msgctl IPC_INFO and MSG_INFO return garbage
-+ [26690] __vfscanf_internal: fix aliasing violation
-+ [26853] aarch64: Missing unwind information in statically linked startup code
-+ [26932] libc: sh: Multiple floating point functions defined as stubs only
-+ [27024] posix: Correct attribute access mode on readlinkat
-+ [27130] "rep movsb" performance issue
-+ [27177] GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on doesn't work
-+ [27256] gconv: Fix assertion failure in ISO-2022-JP-3 module
-+ [27462] nscd: Fix double free in netgroupcache
-+ [27471] Fix SXID_ERASE behavior in setuid programs
-+ [27896] Use __pthread_attr_copy in mq_notify (CVE-2021-33574)
-+ [28213] librt: fix NULL pointer dereference
-+
- Version 2.32
-
- Major new features:
-@@ -185,6 +212,14 @@ Security related changes:
- Dytrych of the Cisco Security Assessment and Penetration Team (See
- TALOS-2020-1019).
-
-+ CVE-2020-27618: An infinite loop has been fixed in the iconv program when
-+ invoked with input containing redundant shift sequences in the IBM1364,
-+ IBM1371, IBM1388, IBM1390, or IBM1399 character sets.
-+
-+ CVE-2021-33574: The mq_notify function has a potential use-after-free
-+ issue when using a notification type of SIGEV_THREAD and a thread
-+ attribute with a non-default affinity mask.
-+
- The following bugs are resolved with this release:
-
- [9809] localedata: ckb_IQ: new Kurdish Sorani locale
-diff -pruN glibc-2.32.orig/nscd/netgroupcache.c glibc-2.32/nscd/netgroupcache.c
---- glibc-2.32.orig/nscd/netgroupcache.c 2021-09-18 21:02:32.692184339 +1000
-+++ glibc-2.32/nscd/netgroupcache.c 2021-09-18 21:03:05.312302287 +1000
-@@ -248,7 +248,7 @@ addgetnetgrentX (struct database_dyn *db
- : NULL);
- ndomain = (ndomain ? newbuf + ndomaindiff
- : NULL);
-- buffer = newbuf;
-+ *tofreep = buffer = newbuf;
- }
-
- nhost = memcpy (buffer + bufused,
-@@ -319,7 +319,7 @@ addgetnetgrentX (struct database_dyn *db
- else if (status == NSS_STATUS_TRYAGAIN && e == ERANGE)
- {
- buflen *= 2;
-- buffer = xrealloc (buffer, buflen);
-+ *tofreep = buffer = xrealloc (buffer, buflen);
- }
- else if (status == NSS_STATUS_RETURN
- || status == NSS_STATUS_NOTFOUND
-diff -pruN glibc-2.32.orig/posix/unistd.h glibc-2.32/posix/unistd.h
---- glibc-2.32.orig/posix/unistd.h 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/posix/unistd.h 2021-09-18 21:04:13.411636170 +1000
-@@ -831,7 +831,7 @@ extern int symlinkat (const char *__from
- /* Like readlink but a relative PATH is interpreted relative to FD. */
- extern ssize_t readlinkat (int __fd, const char *__restrict __path,
- char *__restrict __buf, size_t __len)
-- __THROW __nonnull ((2, 3)) __wur __attr_access ((__read_only__, 3, 4));
-+ __THROW __nonnull ((2, 3)) __wur __attr_access ((__write_only__, 3, 4));
- #endif
-
- /* Remove the link NAME. */
-diff -pruN glibc-2.32.orig/posix/wordexp.c glibc-2.32/posix/wordexp.c
---- glibc-2.32.orig/posix/wordexp.c 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/posix/wordexp.c 2021-09-18 21:03:05.312302287 +1000
-@@ -1399,7 +1399,7 @@ envsubst:
- /* Is it a numeric parameter? */
- else if (isdigit (env[0]))
- {
-- int n = atoi (env);
-+ unsigned long n = strtoul (env, NULL, 10);
-
- if (n >= __libc_argc)
- /* Substitute NULL. */
-diff -pruN glibc-2.32.orig/posix/wordexp-test.c glibc-2.32/posix/wordexp-test.c
---- glibc-2.32.orig/posix/wordexp-test.c 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/posix/wordexp-test.c 2021-09-18 21:03:05.312302287 +1000
-@@ -183,6 +183,7 @@ struct test_case_struct
- { 0, NULL, "$var", 0, 0, { NULL, }, IFS },
- { 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS },
- { 0, NULL, "", 0, 0, { NULL, }, IFS },
-+ { 0, NULL, "${1234567890123456789012}", 0, 0, { NULL, }, IFS },
-
- /* Flags not already covered (testit() has special handling for these) */
- { 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS },
-diff -pruN glibc-2.32.orig/resolv/Makefile glibc-2.32/resolv/Makefile
---- glibc-2.32.orig/resolv/Makefile 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/resolv/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -61,6 +61,11 @@ tests += \
- tst-resolv-search \
- tst-resolv-trailing \
-
-+# This test calls __res_context_send directly, which is not exported
-+# from libresolv.
-+tests-internal += tst-resolv-txnid-collision
-+tests-static += tst-resolv-txnid-collision
-+
- # These tests need libdl.
- ifeq (yes,$(build-shared))
- tests += \
-@@ -191,6 +196,8 @@ $(objpfx)tst-resolv-search: $(objpfx)lib
- $(objpfx)tst-resolv-trailing: $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-threads: \
- $(libdl) $(objpfx)libresolv.so $(shared-thread-library)
-+$(objpfx)tst-resolv-txnid-collision: $(objpfx)libresolv.a \
-+ $(static-thread-library)
- $(objpfx)tst-resolv-canonname: \
- $(libdl) $(objpfx)libresolv.so $(shared-thread-library)
- $(objpfx)tst-resolv-trustad: $(objpfx)libresolv.so $(shared-thread-library)
-diff -pruN glibc-2.32.orig/resolv/res_send.c glibc-2.32/resolv/res_send.c
---- glibc-2.32.orig/resolv/res_send.c 2021-09-18 21:02:32.696184476 +1000
-+++ glibc-2.32/resolv/res_send.c 2021-09-18 21:03:05.312302287 +1000
-@@ -1342,15 +1342,6 @@ send_dg(res_state statp,
- *terrno = EMSGSIZE;
- return close_and_return_error (statp, resplen2);
- }
-- if ((recvresp1 || hp->id != anhp->id)
-- && (recvresp2 || hp2->id != anhp->id)) {
-- /*
-- * response from old query, ignore it.
-- * XXX - potential security hazard could
-- * be detected here.
-- */
-- goto wait;
-- }
-
- /* Paranoia check. Due to the connected UDP socket,
- the kernel has already filtered invalid addresses
-@@ -1360,15 +1351,24 @@ send_dg(res_state statp,
-
- /* Check for the correct header layout and a matching
- question. */
-- if ((recvresp1 || !res_queriesmatch(buf, buf + buflen,
-- *thisansp,
-- *thisansp
-- + *thisanssizp))
-- && (recvresp2 || !res_queriesmatch(buf2, buf2 + buflen2,
-- *thisansp,
-- *thisansp
-- + *thisanssizp)))
-- goto wait;
-+ int matching_query = 0; /* Default to no matching query. */
-+ if (!recvresp1
-+ && anhp->id == hp->id
-+ && res_queriesmatch (buf, buf + buflen,
-+ *thisansp, *thisansp + *thisanssizp))
-+ matching_query = 1;
-+ if (!recvresp2
-+ && anhp->id == hp2->id
-+ && res_queriesmatch (buf2, buf2 + buflen2,
-+ *thisansp, *thisansp + *thisanssizp))
-+ matching_query = 2;
-+ if (matching_query == 0)
-+ /* Spurious UDP packet. Drop it and continue
-+ waiting. */
-+ {
-+ need_recompute = 1;
-+ goto wait;
-+ }
-
- if (anhp->rcode == SERVFAIL ||
- anhp->rcode == NOTIMP ||
-@@ -1383,7 +1383,7 @@ send_dg(res_state statp,
- /* No data from the first reply. */
- resplen = 0;
- /* We are waiting for a possible second reply. */
-- if (hp->id == anhp->id)
-+ if (matching_query == 1)
- recvresp1 = 1;
- else
- recvresp2 = 1;
-@@ -1414,7 +1414,7 @@ send_dg(res_state statp,
- return (1);
- }
- /* Mark which reply we received. */
-- if (recvresp1 == 0 && hp->id == anhp->id)
-+ if (matching_query == 1)
- recvresp1 = 1;
- else
- recvresp2 = 1;
-diff -pruN glibc-2.32.orig/resolv/tst-resolv-txnid-collision.c glibc-2.32/resolv/tst-resolv-txnid-collision.c
---- glibc-2.32.orig/resolv/tst-resolv-txnid-collision.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/resolv/tst-resolv-txnid-collision.c 2021-09-18 21:03:05.312302287 +1000
-@@ -0,0 +1,334 @@
-+/* Test parallel queries with transaction ID collisions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <arpa/nameser.h>
-+#include <array_length.h>
-+#include <resolv-internal.h>
-+#include <resolv_context.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <support/check.h>
-+#include <support/check_nss.h>
-+#include <support/resolv_test.h>
-+#include <support/support.h>
-+#include <support/test-driver.h>
-+
-+/* Result of parsing a DNS question name.
-+
-+ A question name has the form reorder-N-M-rcode-C.example.net, where
-+ N and M are either 0 and 1, corresponding to the reorder member,
-+ and C is a number that will be stored in the rcode field.
-+
-+ Also see parse_qname below. */
-+struct parsed_qname
-+{
-+ /* The DNS response code requested from the first server. The
-+ second server always responds with RCODE zero. */
-+ int rcode;
-+
-+ /* Indicates whether to perform reordering in the responses from the
-+ respective server. */
-+ bool reorder[2];
-+};
-+
-+/* Fills *PARSED based on QNAME. */
-+static void
-+parse_qname (struct parsed_qname *parsed, const char *qname)
-+{
-+ int reorder0;
-+ int reorder1;
-+ int rcode;
-+ char *suffix;
-+ if (sscanf (qname, "reorder-%d-%d.rcode-%d.%ms",
-+ &reorder0, &reorder1, &rcode, &suffix) == 4)
-+ {
-+ if (reorder0 != 0)
-+ TEST_COMPARE (reorder0, 1);
-+ if (reorder1 != 0)
-+ TEST_COMPARE (reorder1, 1);
-+ TEST_VERIFY (rcode >= 0 && rcode <= 15);
-+ TEST_COMPARE_STRING (suffix, "example.net");
-+ free (suffix);
-+
-+ parsed->rcode = rcode;
-+ parsed->reorder[0] = reorder0;
-+ parsed->reorder[1] = reorder1;
-+ }
-+ else
-+ FAIL_EXIT1 ("unexpected query: %s", qname);
-+}
-+
-+/* Used to construct a response. The first server responds with an
-+ error, the second server succeeds. */
-+static void
-+build_response (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b,
-+ const char *qname, uint16_t qclass, uint16_t qtype)
-+{
-+ struct parsed_qname parsed;
-+ parse_qname (&parsed, qname);
-+
-+ switch (ctx->server_index)
-+ {
-+ case 0:
-+ {
-+ struct resolv_response_flags flags = { 0 };
-+ if (parsed.rcode == 0)
-+ /* Simulate a delegation in case a NODATA (RCODE zero)
-+ response is requested. */
-+ flags.clear_ra = true;
-+ else
-+ flags.rcode = parsed.rcode;
-+
-+ resolv_response_init (b, flags);
-+ resolv_response_add_question (b, qname, qclass, qtype);
-+ }
-+ break;
-+
-+ case 1:
-+ {
-+ struct resolv_response_flags flags = { 0, };
-+ resolv_response_init (b, flags);
-+ resolv_response_add_question (b, qname, qclass, qtype);
-+
-+ resolv_response_section (b, ns_s_an);
-+ resolv_response_open_record (b, qname, qclass, qtype, 0);
-+ if (qtype == T_A)
-+ {
-+ char ipv4[4] = { 192, 0, 2, 1 };
-+ resolv_response_add_data (b, &ipv4, sizeof (ipv4));
-+ }
-+ else
-+ {
-+ char ipv6[16]
-+ = { 0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
-+ resolv_response_add_data (b, &ipv6, sizeof (ipv6));
-+ }
-+ resolv_response_close_record (b);
-+ }
-+ break;
-+ }
-+}
-+
-+/* Used to reorder responses. */
-+struct resolv_response_context *previous_query;
-+
-+/* Used to keep track of the queries received. */
-+static int previous_server_index = -1;
-+static uint16_t previous_qtype;
-+
-+/* For each server, buffer the first query and then send both answers
-+ to the second query, reordered if requested. */
-+static void
-+response (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b,
-+ const char *qname, uint16_t qclass, uint16_t qtype)
-+{
-+ TEST_VERIFY (qtype == T_A || qtype == T_AAAA);
-+ if (ctx->server_index != 0)
-+ TEST_COMPARE (ctx->server_index, 1);
-+
-+ struct parsed_qname parsed;
-+ parse_qname (&parsed, qname);
-+
-+ if (previous_query == NULL)
-+ {
-+ /* No buffered query. Record this query and do not send a
-+ response. */
-+ TEST_COMPARE (previous_qtype, 0);
-+ previous_query = resolv_response_context_duplicate (ctx);
-+ previous_qtype = qtype;
-+ resolv_response_drop (b);
-+ previous_server_index = ctx->server_index;
-+
-+ if (test_verbose)
-+ printf ("info: buffering first query for: %s\n", qname);
-+ }
-+ else
-+ {
-+ TEST_VERIFY (previous_query != 0);
-+ TEST_COMPARE (ctx->server_index, previous_server_index);
-+ TEST_VERIFY (previous_qtype != qtype); /* Not a duplicate. */
-+
-+ /* If reordering, send a response for this query explicitly, and
-+ then skip the implicit send. */
-+ if (parsed.reorder[ctx->server_index])
-+ {
-+ if (test_verbose)
-+ printf ("info: sending reordered second response for: %s\n",
-+ qname);
-+ build_response (ctx, b, qname, qclass, qtype);
-+ resolv_response_send_udp (ctx, b);
-+ resolv_response_drop (b);
-+ }
-+
-+ /* Build a response for the previous query and send it, thus
-+ reordering the two responses. */
-+ {
-+ if (test_verbose)
-+ printf ("info: sending first response for: %s\n", qname);
-+ struct resolv_response_builder *btmp
-+ = resolv_response_builder_allocate (previous_query->query_buffer,
-+ previous_query->query_length);
-+ build_response (ctx, btmp, qname, qclass, previous_qtype);
-+ resolv_response_send_udp (ctx, btmp);
-+ resolv_response_builder_free (btmp);
-+ }
-+
-+ /* If not reordering, send the reply as usual. */
-+ if (!parsed.reorder[ctx->server_index])
-+ {
-+ if (test_verbose)
-+ printf ("info: sending non-reordered second response for: %s\n",
-+ qname);
-+ build_response (ctx, b, qname, qclass, qtype);
-+ }
-+
-+ /* Unbuffer the response and prepare for the next query. */
-+ resolv_response_context_free (previous_query);
-+ previous_query = NULL;
-+ previous_qtype = 0;
-+ previous_server_index = -1;
-+ }
-+}
-+
-+/* Runs a query for QNAME and checks for the expected reply. See
-+ struct parsed_qname for the expected format for QNAME. */
-+static void
-+test_qname (const char *qname, int rcode)
-+{
-+ struct resolv_context *ctx = __resolv_context_get ();
-+ TEST_VERIFY_EXIT (ctx != NULL);
-+
-+ unsigned char q1[512];
-+ int q1len = res_mkquery (QUERY, qname, C_IN, T_A, NULL, 0, NULL,
-+ q1, sizeof (q1));
-+ TEST_VERIFY_EXIT (q1len > 12);
-+
-+ unsigned char q2[512];
-+ int q2len = res_mkquery (QUERY, qname, C_IN, T_AAAA, NULL, 0, NULL,
-+ q2, sizeof (q2));
-+ TEST_VERIFY_EXIT (q2len > 12);
-+
-+ /* Produce a transaction ID collision. */
-+ memcpy (q2, q1, 2);
-+
-+ unsigned char ans1[512];
-+ unsigned char *ans1p = ans1;
-+ unsigned char *ans2p = NULL;
-+ int nans2p = 0;
-+ int resplen2 = 0;
-+ int ans2p_malloced = 0;
-+
-+ /* Perform a parallel A/AAAA query. */
-+ int resplen1 = __res_context_send (ctx, q1, q1len, q2, q2len,
-+ ans1, sizeof (ans1), &ans1p,
-+ &ans2p, &nans2p,
-+ &resplen2, &ans2p_malloced);
-+
-+ TEST_VERIFY (resplen1 > 12);
-+ TEST_VERIFY (resplen2 > 12);
-+ if (resplen1 <= 12 || resplen2 <= 12)
-+ return;
-+
-+ if (rcode == 1 || rcode == 3)
-+ {
-+ /* Format Error and Name Error responses does not trigger
-+ switching to the next server. */
-+ TEST_COMPARE (ans1p[3] & 0x0f, rcode);
-+ TEST_COMPARE (ans2p[3] & 0x0f, rcode);
-+ return;
-+ }
-+
-+ /* The response should be successful. */
-+ TEST_COMPARE (ans1p[3] & 0x0f, 0);
-+ TEST_COMPARE (ans2p[3] & 0x0f, 0);
-+
-+ /* Due to bug 19691, the answer may not be in the slot matching the
-+ query. Assume that the AAAA response is the longer one. */
-+ unsigned char *a_answer;
-+ int a_answer_length;
-+ unsigned char *aaaa_answer;
-+ int aaaa_answer_length;
-+ if (resplen2 > resplen1)
-+ {
-+ a_answer = ans1p;
-+ a_answer_length = resplen1;
-+ aaaa_answer = ans2p;
-+ aaaa_answer_length = resplen2;
-+ }
-+ else
-+ {
-+ a_answer = ans2p;
-+ a_answer_length = resplen2;
-+ aaaa_answer = ans1p;
-+ aaaa_answer_length = resplen1;
-+ }
-+
-+ {
-+ char *expected = xasprintf ("name: %s\n"
-+ "address: 192.0.2.1\n",
-+ qname);
-+ check_dns_packet (qname, a_answer, a_answer_length, expected);
-+ free (expected);
-+ }
-+ {
-+ char *expected = xasprintf ("name: %s\n"
-+ "address: 2001:db8::1\n",
-+ qname);
-+ check_dns_packet (qname, aaaa_answer, aaaa_answer_length, expected);
-+ free (expected);
-+ }
-+
-+ if (ans2p_malloced)
-+ free (ans2p);
-+
-+ __resolv_context_put (ctx);
-+}
-+
-+static int
-+do_test (void)
-+{
-+ struct resolv_test *aux = resolv_test_start
-+ ((struct resolv_redirect_config)
-+ {
-+ .response_callback = response,
-+
-+ /* The response callback use global state (the previous_*
-+ variables), and query processing must therefore be
-+ serialized. */
-+ .single_thread_udp = true,
-+ });
-+
-+ for (int rcode = 0; rcode <= 5; ++rcode)
-+ for (int do_reorder_0 = 0; do_reorder_0 < 2; ++do_reorder_0)
-+ for (int do_reorder_1 = 0; do_reorder_1 < 2; ++do_reorder_1)
-+ {
-+ char *qname = xasprintf ("reorder-%d-%d.rcode-%d.example.net",
-+ do_reorder_0, do_reorder_1, rcode);
-+ test_qname (qname, rcode);
-+ free (qname);
-+ }
-+
-+ resolv_test_end (aux);
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/Rules glibc-2.32/Rules
---- glibc-2.32.orig/Rules 2021-09-18 21:02:32.639182523 +1000
-+++ glibc-2.32/Rules 2021-09-18 21:03:05.310302219 +1000
-@@ -155,6 +155,7 @@ xtests: tests $(xtests-special)
- else
- tests: $(tests:%=$(objpfx)%.out) $(tests-internal:%=$(objpfx)%.out) \
- $(tests-container:%=$(objpfx)%.out) \
-+ $(tests-mcheck:%=$(objpfx)%-mcheck.out) \
- $(tests-special) $(tests-printers-out)
- xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
- endif
-@@ -165,7 +166,7 @@ ifeq ($(run-built-tests),no)
- tests-expected =
- else
- tests-expected = $(tests) $(tests-internal) $(tests-printers) \
-- $(tests-container)
-+ $(tests-container) $(tests-mcheck:%=%-mcheck)
- endif
- tests:
- $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
-@@ -191,6 +192,7 @@ else
- binaries-pie-tests =
- binaries-pie-notests =
- endif
-+binaries-mcheck-tests = $(tests-mcheck:%=%-mcheck)
- else
- binaries-all-notests =
- binaries-all-tests = $(tests) $(tests-internal) $(xtests) $(test-srcs)
-@@ -200,6 +202,7 @@ binaries-static-tests =
- binaries-static =
- binaries-pie-tests =
- binaries-pie-notests =
-+binaries-mcheck-tests =
- endif
-
- binaries-pie = $(binaries-pie-tests) $(binaries-pie-notests)
-@@ -223,6 +226,14 @@ $(addprefix $(objpfx),$(binaries-shared-
- $(+link-tests)
- endif
-
-+ifneq "$(strip $(binaries-mcheck-tests))" ""
-+$(addprefix $(objpfx),$(binaries-mcheck-tests)): %-mcheck: %.o \
-+ $(link-extra-libs-tests) \
-+ $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
-+ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
-+ $(+link-tests)
-+endif
-+
- ifneq "$(strip $(binaries-pie-tests))" ""
- $(addprefix $(objpfx),$(binaries-pie-tests)): %: %.o \
- $(link-extra-libs-tests) \
-@@ -253,6 +264,12 @@ $(addprefix $(objpfx),$(binaries-static-
- $(+link-static-tests)
- endif
-
-+# All mcheck tests will be run with MALLOC_CHECK_=3
-+define mcheck-ENVS
-+$(1)-mcheck-ENV = MALLOC_CHECK_=3
-+endef
-+$(foreach t,$(tests-mcheck),$(eval $(call mcheck-ENVS,$(t))))
-+
- ifneq "$(strip $(tests) $(tests-internal) $(xtests) $(test-srcs))" ""
- # These are the implicit rules for making test outputs
- # from the test programs and whatever input files are present.
-diff -pruN glibc-2.32.orig/stdio-common/errlist.c glibc-2.32/stdio-common/errlist.c
---- glibc-2.32.orig/stdio-common/errlist.c 2021-09-18 21:02:32.698184545 +1000
-+++ glibc-2.32/stdio-common/errlist.c 2021-09-18 21:03:05.312302287 +1000
-@@ -20,9 +20,13 @@
- #include <libintl.h>
- #include <array_length.h>
-
-+#ifndef ERR_MAP
-+# define ERR_MAP(n) n
-+#endif
-+
- const char *const _sys_errlist_internal[] =
- {
--#define _S(n, str) [n] = str,
-+#define _S(n, str) [ERR_MAP(n)] = str,
- #include <errlist.h>
- #undef _S
- };
-@@ -41,20 +45,21 @@ static const union sys_errname_t
- {
- #define MSGSTRFIELD1(line) str##line
- #define MSGSTRFIELD(line) MSGSTRFIELD1(line)
--#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(str)];
-+#define _S(n, str) char MSGSTRFIELD(__LINE__)[sizeof(#n)];
- #include <errlist.h>
- #undef _S
- };
- char str[0];
- } _sys_errname = { {
--#define _S(n, s) s,
-+#define _S(n, s) #n,
- #include <errlist.h>
- #undef _S
- } };
-
- static const unsigned short _sys_errnameidx[] =
- {
--#define _S(n, s) [n] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
-+#define _S(n, s) \
-+ [ERR_MAP(n)] = offsetof(union sys_errname_t, MSGSTRFIELD(__LINE__)),
- #include <errlist.h>
- #undef _S
- };
-diff -pruN glibc-2.32.orig/stdio-common/Makefile glibc-2.32/stdio-common/Makefile
---- glibc-2.32.orig/stdio-common/Makefile 2021-09-18 21:02:32.698184545 +1000
-+++ glibc-2.32/stdio-common/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -69,7 +69,8 @@ tests := tstscanf test_rdwr test-popen t
- tst-printf-bz25691 \
- tst-vfprintf-width-prec-alloc \
- tst-printf-fp-free \
-- tst-printf-fp-leak
-+ tst-printf-fp-leak \
-+ test-strerr
-
-
- test-srcs = tst-unbputc tst-printf tst-printfsz-islongdouble
-diff -pruN glibc-2.32.orig/stdio-common/test-strerr.c glibc-2.32/stdio-common/test-strerr.c
---- glibc-2.32.orig/stdio-common/test-strerr.c 2021-09-18 21:02:32.698184545 +1000
-+++ glibc-2.32/stdio-common/test-strerr.c 2021-09-18 21:03:05.312302287 +1000
-@@ -18,46 +18,672 @@
-
- #include <string.h>
- #include <errno.h>
--#include <array_length.h>
-
- #include <support/support.h>
- #include <support/check.h>
-
--#define N_(name) name
--
--static const char *const errlist[] =
-- {
--/* This file is auto-generated from errlist.def. */
--#include <errlist.h>
-- };
--
--#define MSGSTR_T errname_t
--#define MSGSTR errname
--#define MSGIDX errnameidx
--#include <errlist-name.h>
--#undef MSGSTR
--#undef MSGIDX
--
- static int
- do_test (void)
- {
-- TEST_VERIFY (strerrordesc_np (-1) == NULL);
-- TEST_VERIFY (strerrordesc_np (array_length (errlist)) == NULL);
-- for (size_t i = 0; i < array_length (errlist); i++)
-- {
-- if (errlist[i] == NULL)
-- continue;
-- TEST_COMPARE_STRING (strerrordesc_np (i), errlist[i]);
-- }
-+ TEST_COMPARE_STRING (strerrordesc_np (0), "Success");
-+ TEST_COMPARE_STRING (strerrorname_np (0), "0");
-
-- TEST_VERIFY (strerrorname_np (-1) == NULL);
-- TEST_VERIFY (strerrorname_np (array_length (errlist)) == NULL);
-- for (size_t i = 0; i < array_length (errlist); i++)
-- {
-- if (errlist[i] == NULL)
-- continue;
-- TEST_COMPARE_STRING (strerrorname_np (i), errname.str + errnameidx[i]);
-- }
-+#ifdef EPERM
-+ TEST_COMPARE_STRING (strerrordesc_np (EPERM), "Operation not permitted");
-+ TEST_COMPARE_STRING (strerrorname_np (EPERM), "EPERM");
-+#endif
-+#ifdef ENOENT
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOENT),
-+ "No such file or directory");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOENT), "ENOENT");
-+#endif
-+#ifdef ESRCH
-+ TEST_COMPARE_STRING (strerrordesc_np (ESRCH), "No such process");
-+ TEST_COMPARE_STRING (strerrorname_np (ESRCH), "ESRCH");
-+#endif
-+#ifdef EINTR
-+ TEST_COMPARE_STRING (strerrordesc_np (EINTR), "Interrupted system call");
-+ TEST_COMPARE_STRING (strerrorname_np (EINTR), "EINTR");
-+#endif
-+#ifdef EIO
-+ TEST_COMPARE_STRING (strerrordesc_np (EIO), "Input/output error");
-+ TEST_COMPARE_STRING (strerrorname_np (EIO), "EIO");
-+#endif
-+#ifdef ENXIO
-+ TEST_COMPARE_STRING (strerrordesc_np (ENXIO), "No such device or address");
-+ TEST_COMPARE_STRING (strerrorname_np (ENXIO), "ENXIO");
-+#endif
-+#ifdef E2BIG
-+ TEST_COMPARE_STRING (strerrordesc_np (E2BIG), "Argument list too long");
-+ TEST_COMPARE_STRING (strerrorname_np (E2BIG), "E2BIG");
-+#endif
-+#ifdef ENOEXEC
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOEXEC), "Exec format error");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOEXEC), "ENOEXEC");
-+#endif
-+#ifdef EBADF
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADF), "Bad file descriptor");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADF), "EBADF");
-+#endif
-+#ifdef ECHILD
-+ TEST_COMPARE_STRING (strerrordesc_np (ECHILD), "No child processes");
-+ TEST_COMPARE_STRING (strerrorname_np (ECHILD), "ECHILD");
-+#endif
-+#ifdef EDEADLK
-+ TEST_COMPARE_STRING (strerrordesc_np (EDEADLK),
-+ "Resource deadlock avoided");
-+ TEST_COMPARE_STRING (strerrorname_np (EDEADLK), "EDEADLK");
-+#endif
-+#ifdef ENOMEM
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOMEM), "Cannot allocate memory");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOMEM), "ENOMEM");
-+#endif
-+#ifdef EACCES
-+ TEST_COMPARE_STRING (strerrordesc_np (EACCES), "Permission denied");
-+ TEST_COMPARE_STRING (strerrorname_np (EACCES), "EACCES");
-+#endif
-+#ifdef EFAULT
-+ TEST_COMPARE_STRING (strerrordesc_np (EFAULT), "Bad address");
-+ TEST_COMPARE_STRING (strerrorname_np (EFAULT), "EFAULT");
-+#endif
-+#ifdef ENOTBLK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTBLK), "Block device required");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTBLK), "ENOTBLK");
-+#endif
-+#ifdef EBUSY
-+ TEST_COMPARE_STRING (strerrordesc_np (EBUSY), "Device or resource busy");
-+ TEST_COMPARE_STRING (strerrorname_np (EBUSY), "EBUSY");
-+#endif
-+#ifdef EEXIST
-+ TEST_COMPARE_STRING (strerrordesc_np (EEXIST), "File exists");
-+ TEST_COMPARE_STRING (strerrorname_np (EEXIST), "EEXIST");
-+#endif
-+#ifdef EXDEV
-+ TEST_COMPARE_STRING (strerrordesc_np (EXDEV), "Invalid cross-device link");
-+ TEST_COMPARE_STRING (strerrorname_np (EXDEV), "EXDEV");
-+#endif
-+#ifdef ENODEV
-+ TEST_COMPARE_STRING (strerrordesc_np (ENODEV), "No such device");
-+ TEST_COMPARE_STRING (strerrorname_np (ENODEV), "ENODEV");
-+#endif
-+#ifdef ENOTDIR
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTDIR), "Not a directory");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTDIR), "ENOTDIR");
-+#endif
-+#ifdef EISDIR
-+ TEST_COMPARE_STRING (strerrordesc_np (EISDIR), "Is a directory");
-+ TEST_COMPARE_STRING (strerrorname_np (EISDIR), "EISDIR");
-+#endif
-+#ifdef EINVAL
-+ TEST_COMPARE_STRING (strerrordesc_np (EINVAL), "Invalid argument");
-+ TEST_COMPARE_STRING (strerrorname_np (EINVAL), "EINVAL");
-+#endif
-+#ifdef EMFILE
-+ TEST_COMPARE_STRING (strerrordesc_np (EMFILE), "Too many open files");
-+ TEST_COMPARE_STRING (strerrorname_np (EMFILE), "EMFILE");
-+#endif
-+#ifdef ENFILE
-+ TEST_COMPARE_STRING (strerrordesc_np (ENFILE),
-+ "Too many open files in system");
-+ TEST_COMPARE_STRING (strerrorname_np (ENFILE), "ENFILE");
-+#endif
-+#ifdef ENOTTY
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTTY),
-+ "Inappropriate ioctl for device");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTTY), "ENOTTY");
-+#endif
-+#ifdef ETXTBSY
-+ TEST_COMPARE_STRING (strerrordesc_np (ETXTBSY), "Text file busy");
-+ TEST_COMPARE_STRING (strerrorname_np (ETXTBSY), "ETXTBSY");
-+#endif
-+#ifdef EFBIG
-+ TEST_COMPARE_STRING (strerrordesc_np (EFBIG), "File too large");
-+ TEST_COMPARE_STRING (strerrorname_np (EFBIG), "EFBIG");
-+#endif
-+#ifdef ENOSPC
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSPC), "No space left on device");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSPC), "ENOSPC");
-+#endif
-+#ifdef ESPIPE
-+ TEST_COMPARE_STRING (strerrordesc_np (ESPIPE), "Illegal seek");
-+ TEST_COMPARE_STRING (strerrorname_np (ESPIPE), "ESPIPE");
-+#endif
-+#ifdef EROFS
-+ TEST_COMPARE_STRING (strerrordesc_np (EROFS), "Read-only file system");
-+ TEST_COMPARE_STRING (strerrorname_np (EROFS), "EROFS");
-+#endif
-+#ifdef EMLINK
-+ TEST_COMPARE_STRING (strerrordesc_np (EMLINK), "Too many links");
-+ TEST_COMPARE_STRING (strerrorname_np (EMLINK), "EMLINK");
-+#endif
-+#ifdef EPIPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EPIPE), "Broken pipe");
-+ TEST_COMPARE_STRING (strerrorname_np (EPIPE), "EPIPE");
-+#endif
-+#ifdef EDOM
-+ TEST_COMPARE_STRING (strerrordesc_np (EDOM),
-+ "Numerical argument out of domain");
-+ TEST_COMPARE_STRING (strerrorname_np (EDOM), "EDOM");
-+#endif
-+#ifdef ERANGE
-+ TEST_COMPARE_STRING (strerrordesc_np (ERANGE),
-+ "Numerical result out of range");
-+ TEST_COMPARE_STRING (strerrorname_np (ERANGE), "ERANGE");
-+#endif
-+#ifdef EAGAIN
-+ TEST_COMPARE_STRING (strerrordesc_np (EAGAIN),
-+ "Resource temporarily unavailable");
-+ TEST_COMPARE_STRING (strerrorname_np (EAGAIN), "EAGAIN");
-+#endif
-+#ifdef EINPROGRESS
-+ TEST_COMPARE_STRING (strerrordesc_np (EINPROGRESS),
-+ "Operation now in progress");
-+ TEST_COMPARE_STRING (strerrorname_np (EINPROGRESS), "EINPROGRESS");
-+#endif
-+#ifdef EALREADY
-+ TEST_COMPARE_STRING (strerrordesc_np (EALREADY),
-+ "Operation already in progress");
-+ TEST_COMPARE_STRING (strerrorname_np (EALREADY), "EALREADY");
-+#endif
-+#ifdef ENOTSOCK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTSOCK),
-+ "Socket operation on non-socket");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTSOCK), "ENOTSOCK");
-+#endif
-+#ifdef EMSGSIZE
-+ TEST_COMPARE_STRING (strerrordesc_np (EMSGSIZE), "Message too long");
-+ TEST_COMPARE_STRING (strerrorname_np (EMSGSIZE), "EMSGSIZE");
-+#endif
-+#ifdef EPROTOTYPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROTOTYPE),
-+ "Protocol wrong type for socket");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROTOTYPE), "EPROTOTYPE");
-+#endif
-+#ifdef ENOPROTOOPT
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOPROTOOPT),
-+ "Protocol not available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOPROTOOPT), "ENOPROTOOPT");
-+#endif
-+#ifdef EPROTONOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROTONOSUPPORT),
-+ "Protocol not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROTONOSUPPORT), "EPROTONOSUPPORT");
-+#endif
-+#ifdef ESOCKTNOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (ESOCKTNOSUPPORT),
-+ "Socket type not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (ESOCKTNOSUPPORT), "ESOCKTNOSUPPORT");
-+#endif
-+#ifdef EOPNOTSUPP
-+ TEST_COMPARE_STRING (strerrordesc_np (EOPNOTSUPP),
-+ "Operation not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (EOPNOTSUPP), "EOPNOTSUPP");
-+#endif
-+#ifdef EPFNOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (EPFNOSUPPORT),
-+ "Protocol family not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (EPFNOSUPPORT), "EPFNOSUPPORT");
-+#endif
-+#ifdef EAFNOSUPPORT
-+ TEST_COMPARE_STRING (strerrordesc_np (EAFNOSUPPORT),
-+ "Address family not supported by protocol");
-+ TEST_COMPARE_STRING (strerrorname_np (EAFNOSUPPORT), "EAFNOSUPPORT");
-+#endif
-+#ifdef EADDRINUSE
-+ TEST_COMPARE_STRING (strerrordesc_np (EADDRINUSE),
-+ "Address already in use");
-+ TEST_COMPARE_STRING (strerrorname_np (EADDRINUSE), "EADDRINUSE");
-+#endif
-+#ifdef EADDRNOTAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (EADDRNOTAVAIL),
-+ "Cannot assign requested address");
-+ TEST_COMPARE_STRING (strerrorname_np (EADDRNOTAVAIL), "EADDRNOTAVAIL");
-+#endif
-+#ifdef ENETDOWN
-+ TEST_COMPARE_STRING (strerrordesc_np (ENETDOWN), "Network is down");
-+ TEST_COMPARE_STRING (strerrorname_np (ENETDOWN), "ENETDOWN");
-+#endif
-+#ifdef ENETUNREACH
-+ TEST_COMPARE_STRING (strerrordesc_np (ENETUNREACH),
-+ "Network is unreachable");
-+ TEST_COMPARE_STRING (strerrorname_np (ENETUNREACH), "ENETUNREACH");
-+#endif
-+#ifdef ENETRESET
-+ TEST_COMPARE_STRING (strerrordesc_np (ENETRESET),
-+ "Network dropped connection on reset");
-+ TEST_COMPARE_STRING (strerrorname_np (ENETRESET), "ENETRESET");
-+#endif
-+#ifdef ECONNABORTED
-+ TEST_COMPARE_STRING (strerrordesc_np (ECONNABORTED),
-+ "Software caused connection abort");
-+ TEST_COMPARE_STRING (strerrorname_np (ECONNABORTED), "ECONNABORTED");
-+#endif
-+#ifdef ECONNRESET
-+ TEST_COMPARE_STRING (strerrordesc_np (ECONNRESET),
-+ "Connection reset by peer");
-+ TEST_COMPARE_STRING (strerrorname_np (ECONNRESET), "ECONNRESET");
-+#endif
-+#ifdef ENOBUFS
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOBUFS),
-+ "No buffer space available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOBUFS), "ENOBUFS");
-+#endif
-+#ifdef EISCONN
-+ TEST_COMPARE_STRING (strerrordesc_np (EISCONN),
-+ "Transport endpoint is already connected");
-+ TEST_COMPARE_STRING (strerrorname_np (EISCONN), "EISCONN");
-+#endif
-+#ifdef ENOTCONN
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTCONN),
-+ "Transport endpoint is not connected");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTCONN), "ENOTCONN");
-+#endif
-+#ifdef EDESTADDRREQ
-+ TEST_COMPARE_STRING (strerrordesc_np (EDESTADDRREQ),
-+ "Destination address required");
-+ TEST_COMPARE_STRING (strerrorname_np (EDESTADDRREQ), "EDESTADDRREQ");
-+#endif
-+#ifdef ESHUTDOWN
-+ TEST_COMPARE_STRING (strerrordesc_np (ESHUTDOWN),
-+ "Cannot send after transport endpoint shutdown");
-+ TEST_COMPARE_STRING (strerrorname_np (ESHUTDOWN), "ESHUTDOWN");
-+#endif
-+#ifdef ETOOMANYREFS
-+ TEST_COMPARE_STRING (strerrordesc_np (ETOOMANYREFS),
-+ "Too many references: cannot splice");
-+ TEST_COMPARE_STRING (strerrorname_np (ETOOMANYREFS), "ETOOMANYREFS");
-+#endif
-+#ifdef ETIMEDOUT
-+ TEST_COMPARE_STRING (strerrordesc_np (ETIMEDOUT), "Connection timed out");
-+ TEST_COMPARE_STRING (strerrorname_np (ETIMEDOUT), "ETIMEDOUT");
-+#endif
-+#ifdef ECONNREFUSED
-+ TEST_COMPARE_STRING (strerrordesc_np (ECONNREFUSED), "Connection refused");
-+ TEST_COMPARE_STRING (strerrorname_np (ECONNREFUSED), "ECONNREFUSED");
-+#endif
-+#ifdef ELOOP
-+ TEST_COMPARE_STRING (strerrordesc_np (ELOOP),
-+ "Too many levels of symbolic links");
-+ TEST_COMPARE_STRING (strerrorname_np (ELOOP), "ELOOP");
-+#endif
-+#ifdef ENAMETOOLONG
-+ TEST_COMPARE_STRING (strerrordesc_np (ENAMETOOLONG), "File name too long");
-+ TEST_COMPARE_STRING (strerrorname_np (ENAMETOOLONG), "ENAMETOOLONG");
-+#endif
-+#ifdef EHOSTDOWN
-+ TEST_COMPARE_STRING (strerrordesc_np (EHOSTDOWN), "Host is down");
-+ TEST_COMPARE_STRING (strerrorname_np (EHOSTDOWN), "EHOSTDOWN");
-+#endif
-+#ifdef EHOSTUNREACH
-+ TEST_COMPARE_STRING (strerrordesc_np (EHOSTUNREACH), "No route to host");
-+ TEST_COMPARE_STRING (strerrorname_np (EHOSTUNREACH), "EHOSTUNREACH");
-+#endif
-+#ifdef ENOTEMPTY
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTEMPTY), "Directory not empty");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTEMPTY), "ENOTEMPTY");
-+#endif
-+#ifdef EUSERS
-+ TEST_COMPARE_STRING (strerrordesc_np (EUSERS), "Too many users");
-+ TEST_COMPARE_STRING (strerrorname_np (EUSERS), "EUSERS");
-+#endif
-+#ifdef EDQUOT
-+ TEST_COMPARE_STRING (strerrordesc_np (EDQUOT), "Disk quota exceeded");
-+ TEST_COMPARE_STRING (strerrorname_np (EDQUOT), "EDQUOT");
-+#endif
-+#ifdef ESTALE
-+ TEST_COMPARE_STRING (strerrordesc_np (ESTALE), "Stale file handle");
-+ TEST_COMPARE_STRING (strerrorname_np (ESTALE), "ESTALE");
-+#endif
-+#ifdef EREMOTE
-+ TEST_COMPARE_STRING (strerrordesc_np (EREMOTE), "Object is remote");
-+ TEST_COMPARE_STRING (strerrorname_np (EREMOTE), "EREMOTE");
-+#endif
-+#ifdef ENOLCK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOLCK), "No locks available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOLCK), "ENOLCK");
-+#endif
-+#ifdef ENOSYS
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSYS), "Function not implemented");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSYS), "ENOSYS");
-+#endif
-+#ifdef EILSEQ
-+ TEST_COMPARE_STRING (strerrordesc_np (EILSEQ),
-+ "Invalid or incomplete multibyte or wide character");
-+ TEST_COMPARE_STRING (strerrorname_np (EILSEQ), "EILSEQ");
-+#endif
-+#ifdef EBADMSG
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADMSG), "Bad message");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADMSG), "EBADMSG");
-+#endif
-+#ifdef EIDRM
-+ TEST_COMPARE_STRING (strerrordesc_np (EIDRM), "Identifier removed");
-+ TEST_COMPARE_STRING (strerrorname_np (EIDRM), "EIDRM");
-+#endif
-+#ifdef EMULTIHOP
-+ TEST_COMPARE_STRING (strerrordesc_np (EMULTIHOP), "Multihop attempted");
-+ TEST_COMPARE_STRING (strerrorname_np (EMULTIHOP), "EMULTIHOP");
-+#endif
-+#ifdef ENODATA
-+ TEST_COMPARE_STRING (strerrordesc_np (ENODATA), "No data available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENODATA), "ENODATA");
-+#endif
-+#ifdef ENOLINK
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOLINK), "Link has been severed");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOLINK), "ENOLINK");
-+#endif
-+#ifdef ENOMSG
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOMSG),
-+ "No message of desired type");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOMSG), "ENOMSG");
-+#endif
-+#ifdef ENOSR
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSR), "Out of streams resources");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSR), "ENOSR");
-+#endif
-+#ifdef ENOSTR
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOSTR), "Device not a stream");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOSTR), "ENOSTR");
-+#endif
-+#ifdef EOVERFLOW
-+ TEST_COMPARE_STRING (strerrordesc_np (EOVERFLOW),
-+ "Value too large for defined data type");
-+ TEST_COMPARE_STRING (strerrorname_np (EOVERFLOW), "EOVERFLOW");
-+#endif
-+#ifdef EPROTO
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROTO), "Protocol error");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROTO), "EPROTO");
-+#endif
-+#ifdef ETIME
-+ TEST_COMPARE_STRING (strerrordesc_np (ETIME), "Timer expired");
-+ TEST_COMPARE_STRING (strerrorname_np (ETIME), "ETIME");
-+#endif
-+#ifdef ECANCELED
-+ TEST_COMPARE_STRING (strerrordesc_np (ECANCELED), "Operation canceled");
-+ TEST_COMPARE_STRING (strerrorname_np (ECANCELED), "ECANCELED");
-+#endif
-+#ifdef EOWNERDEAD
-+ TEST_COMPARE_STRING (strerrordesc_np (EOWNERDEAD), "Owner died");
-+ TEST_COMPARE_STRING (strerrorname_np (EOWNERDEAD), "EOWNERDEAD");
-+#endif
-+#ifdef ENOTRECOVERABLE
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTRECOVERABLE),
-+ "State not recoverable");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTRECOVERABLE), "ENOTRECOVERABLE");
-+#endif
-+#ifdef ERESTART
-+ TEST_COMPARE_STRING (strerrordesc_np (ERESTART),
-+ "Interrupted system call should be restarted");
-+ TEST_COMPARE_STRING (strerrorname_np (ERESTART), "ERESTART");
-+#endif
-+#ifdef ECHRNG
-+ TEST_COMPARE_STRING (strerrordesc_np (ECHRNG),
-+ "Channel number out of range");
-+ TEST_COMPARE_STRING (strerrorname_np (ECHRNG), "ECHRNG");
-+#endif
-+#ifdef EL2NSYNC
-+ TEST_COMPARE_STRING (strerrordesc_np (EL2NSYNC),
-+ "Level 2 not synchronized");
-+ TEST_COMPARE_STRING (strerrorname_np (EL2NSYNC), "EL2NSYNC");
-+#endif
-+#ifdef EL3HLT
-+ TEST_COMPARE_STRING (strerrordesc_np (EL3HLT), "Level 3 halted");
-+ TEST_COMPARE_STRING (strerrorname_np (EL3HLT), "EL3HLT");
-+#endif
-+#ifdef EL3RST
-+ TEST_COMPARE_STRING (strerrordesc_np (EL3RST), "Level 3 reset");
-+ TEST_COMPARE_STRING (strerrorname_np (EL3RST), "EL3RST");
-+#endif
-+#ifdef ELNRNG
-+ TEST_COMPARE_STRING (strerrordesc_np (ELNRNG), "Link number out of range");
-+ TEST_COMPARE_STRING (strerrorname_np (ELNRNG), "ELNRNG");
-+#endif
-+#ifdef EUNATCH
-+ TEST_COMPARE_STRING (strerrordesc_np (EUNATCH),
-+ "Protocol driver not attached");
-+ TEST_COMPARE_STRING (strerrorname_np (EUNATCH), "EUNATCH");
-+#endif
-+#ifdef ENOCSI
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOCSI),
-+ "No CSI structure available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOCSI), "ENOCSI");
-+#endif
-+#ifdef EL2HLT
-+ TEST_COMPARE_STRING (strerrordesc_np (EL2HLT), "Level 2 halted");
-+ TEST_COMPARE_STRING (strerrorname_np (EL2HLT), "EL2HLT");
-+#endif
-+#ifdef EBADE
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADE), "Invalid exchange");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADE), "EBADE");
-+#endif
-+#ifdef EBADR
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADR),
-+ "Invalid request descriptor");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADR), "EBADR");
-+#endif
-+#ifdef EXFULL
-+ TEST_COMPARE_STRING (strerrordesc_np (EXFULL), "Exchange full");
-+ TEST_COMPARE_STRING (strerrorname_np (EXFULL), "EXFULL");
-+#endif
-+#ifdef ENOANO
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOANO), "No anode");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOANO), "ENOANO");
-+#endif
-+#ifdef EBADRQC
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADRQC), "Invalid request code");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADRQC), "EBADRQC");
-+#endif
-+#ifdef EBADSLT
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADSLT), "Invalid slot");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADSLT), "EBADSLT");
-+#endif
-+#ifdef EBFONT
-+ TEST_COMPARE_STRING (strerrordesc_np (EBFONT), "Bad font file format");
-+ TEST_COMPARE_STRING (strerrorname_np (EBFONT), "EBFONT");
-+#endif
-+#ifdef ENONET
-+ TEST_COMPARE_STRING (strerrordesc_np (ENONET),
-+ "Machine is not on the network");
-+ TEST_COMPARE_STRING (strerrorname_np (ENONET), "ENONET");
-+#endif
-+#ifdef ENOPKG
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOPKG), "Package not installed");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOPKG), "ENOPKG");
-+#endif
-+#ifdef EADV
-+ TEST_COMPARE_STRING (strerrordesc_np (EADV), "Advertise error");
-+ TEST_COMPARE_STRING (strerrorname_np (EADV), "EADV");
-+#endif
-+#ifdef ESRMNT
-+ TEST_COMPARE_STRING (strerrordesc_np (ESRMNT), "Srmount error");
-+ TEST_COMPARE_STRING (strerrorname_np (ESRMNT), "ESRMNT");
-+#endif
-+#ifdef ECOMM
-+ TEST_COMPARE_STRING (strerrordesc_np (ECOMM),
-+ "Communication error on send");
-+ TEST_COMPARE_STRING (strerrorname_np (ECOMM), "ECOMM");
-+#endif
-+#ifdef EDOTDOT
-+ TEST_COMPARE_STRING (strerrordesc_np (EDOTDOT), "RFS specific error");
-+ TEST_COMPARE_STRING (strerrorname_np (EDOTDOT), "EDOTDOT");
-+#endif
-+#ifdef ENOTUNIQ
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTUNIQ),
-+ "Name not unique on network");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTUNIQ), "ENOTUNIQ");
-+#endif
-+#ifdef EBADFD
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADFD),
-+ "File descriptor in bad state");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADFD), "EBADFD");
-+#endif
-+#ifdef EREMCHG
-+ TEST_COMPARE_STRING (strerrordesc_np (EREMCHG), "Remote address changed");
-+ TEST_COMPARE_STRING (strerrorname_np (EREMCHG), "EREMCHG");
-+#endif
-+#ifdef ELIBACC
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBACC),
-+ "Can not access a needed shared library");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBACC), "ELIBACC");
-+#endif
-+#ifdef ELIBBAD
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBBAD),
-+ "Accessing a corrupted shared library");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBBAD), "ELIBBAD");
-+#endif
-+#ifdef ELIBSCN
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBSCN),
-+ ".lib section in a.out corrupted");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBSCN), "ELIBSCN");
-+#endif
-+#ifdef ELIBMAX
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBMAX),
-+ "Attempting to link in too many shared libraries");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBMAX), "ELIBMAX");
-+#endif
-+#ifdef ELIBEXEC
-+ TEST_COMPARE_STRING (strerrordesc_np (ELIBEXEC),
-+ "Cannot exec a shared library directly");
-+ TEST_COMPARE_STRING (strerrorname_np (ELIBEXEC), "ELIBEXEC");
-+#endif
-+#ifdef ESTRPIPE
-+ TEST_COMPARE_STRING (strerrordesc_np (ESTRPIPE), "Streams pipe error");
-+ TEST_COMPARE_STRING (strerrorname_np (ESTRPIPE), "ESTRPIPE");
-+#endif
-+#ifdef EUCLEAN
-+ TEST_COMPARE_STRING (strerrordesc_np (EUCLEAN),
-+ "Structure needs cleaning");
-+ TEST_COMPARE_STRING (strerrorname_np (EUCLEAN), "EUCLEAN");
-+#endif
-+#ifdef ENOTNAM
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTNAM),
-+ "Not a XENIX named type file");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTNAM), "ENOTNAM");
-+#endif
-+#ifdef ENAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (ENAVAIL),
-+ "No XENIX semaphores available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENAVAIL), "ENAVAIL");
-+#endif
-+#ifdef EISNAM
-+ TEST_COMPARE_STRING (strerrordesc_np (EISNAM), "Is a named type file");
-+ TEST_COMPARE_STRING (strerrorname_np (EISNAM), "EISNAM");
-+#endif
-+#ifdef EREMOTEIO
-+ TEST_COMPARE_STRING (strerrordesc_np (EREMOTEIO), "Remote I/O error");
-+ TEST_COMPARE_STRING (strerrorname_np (EREMOTEIO), "EREMOTEIO");
-+#endif
-+#ifdef ENOMEDIUM
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOMEDIUM), "No medium found");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOMEDIUM), "ENOMEDIUM");
-+#endif
-+#ifdef EMEDIUMTYPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EMEDIUMTYPE), "Wrong medium type");
-+ TEST_COMPARE_STRING (strerrorname_np (EMEDIUMTYPE), "EMEDIUMTYPE");
-+#endif
-+#ifdef ENOKEY
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOKEY),
-+ "Required key not available");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOKEY), "ENOKEY");
-+#endif
-+#ifdef EKEYEXPIRED
-+ TEST_COMPARE_STRING (strerrordesc_np (EKEYEXPIRED), "Key has expired");
-+ TEST_COMPARE_STRING (strerrorname_np (EKEYEXPIRED), "EKEYEXPIRED");
-+#endif
-+#ifdef EKEYREVOKED
-+ TEST_COMPARE_STRING (strerrordesc_np (EKEYREVOKED),
-+ "Key has been revoked");
-+ TEST_COMPARE_STRING (strerrorname_np (EKEYREVOKED), "EKEYREVOKED");
-+#endif
-+#ifdef EKEYREJECTED
-+ TEST_COMPARE_STRING (strerrordesc_np (EKEYREJECTED),
-+ "Key was rejected by service");
-+ TEST_COMPARE_STRING (strerrorname_np (EKEYREJECTED), "EKEYREJECTED");
-+#endif
-+#ifdef ERFKILL
-+ TEST_COMPARE_STRING (strerrordesc_np (ERFKILL),
-+ "Operation not possible due to RF-kill");
-+ TEST_COMPARE_STRING (strerrorname_np (ERFKILL), "ERFKILL");
-+#endif
-+#ifdef EHWPOISON
-+ TEST_COMPARE_STRING (strerrordesc_np (EHWPOISON),
-+ "Memory page has hardware error");
-+ TEST_COMPARE_STRING (strerrorname_np (EHWPOISON), "EHWPOISON");
-+#endif
-+#ifdef EBADRPC
-+ TEST_COMPARE_STRING (strerrordesc_np (EBADRPC), "RPC struct is bad");
-+ TEST_COMPARE_STRING (strerrorname_np (EBADRPC), "EBADRPC");
-+#endif
-+#ifdef EFTYPE
-+ TEST_COMPARE_STRING (strerrordesc_np (EFTYPE),
-+ "Inappropriate file type or format");
-+ TEST_COMPARE_STRING (strerrorname_np (EFTYPE), "EFTYPE");
-+#endif
-+#ifdef EPROCUNAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROCUNAVAIL),
-+ "RPC bad procedure for program");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROCUNAVAIL), "EPROCUNAVAIL");
-+#endif
-+#ifdef EAUTH
-+ TEST_COMPARE_STRING (strerrordesc_np (EAUTH), "Authentication error");
-+ TEST_COMPARE_STRING (strerrorname_np (EAUTH), "EAUTH");
-+#endif
-+#ifdef EDIED
-+ TEST_COMPARE_STRING (strerrordesc_np (EDIED), "Translator died");
-+ TEST_COMPARE_STRING (strerrorname_np (EDIED), "EDIED");
-+#endif
-+#ifdef ERPCMISMATCH
-+ TEST_COMPARE_STRING (strerrordesc_np (ERPCMISMATCH), "RPC version wrong");
-+ TEST_COMPARE_STRING (strerrorname_np (ERPCMISMATCH), "ERPCMISMATCH");
-+#endif
-+#ifdef EGREGIOUS
-+ TEST_COMPARE_STRING (strerrordesc_np (EGREGIOUS),
-+ "You really blew it this time");
-+ TEST_COMPARE_STRING (strerrorname_np (EGREGIOUS), "EGREGIOUS");
-+#endif
-+#ifdef EPROCLIM
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROCLIM), "Too many processes");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROCLIM), "EPROCLIM");
-+#endif
-+#ifdef EGRATUITOUS
-+ TEST_COMPARE_STRING (strerrordesc_np (EGRATUITOUS), "Gratuitous error");
-+ TEST_COMPARE_STRING (strerrorname_np (EGRATUITOUS), "EGRATUITOUS");
-+#endif
-+#if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
-+ TEST_COMPARE_STRING (strerrordesc_np (ENOTSUP), "Not supported");
-+ TEST_COMPARE_STRING (strerrorname_np (ENOTSUP), "ENOTSUP");
-+#endif
-+#ifdef EPROGMISMATCH
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROGMISMATCH),
-+ "RPC program version wrong");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROGMISMATCH), "EPROGMISMATCH");
-+#endif
-+#ifdef EBACKGROUND
-+ TEST_COMPARE_STRING (strerrordesc_np (EBACKGROUND),
-+ "Inappropriate operation for background process");
-+ TEST_COMPARE_STRING (strerrorname_np (EBACKGROUND), "EBACKGROUND");
-+#endif
-+#ifdef EIEIO
-+ TEST_COMPARE_STRING (strerrordesc_np (EIEIO), "Computer bought the farm");
-+ TEST_COMPARE_STRING (strerrorname_np (EIEIO), "EIEIO");
-+#endif
-+#if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-+ TEST_COMPARE_STRING (strerrordesc_np (EWOULDBLOCK),
-+ "Operation would block");
-+ TEST_COMPARE_STRING (strerrorname_np (EWOULDBLOCK), "EWOULDBLOCK");
-+#endif
-+#ifdef ENEEDAUTH
-+ TEST_COMPARE_STRING (strerrordesc_np (ENEEDAUTH), "Need authenticator");
-+ TEST_COMPARE_STRING (strerrorname_np (ENEEDAUTH), "ENEEDAUTH");
-+#endif
-+#ifdef ED
-+ TEST_COMPARE_STRING (strerrordesc_np (ED), "?");
-+ TEST_COMPARE_STRING (strerrorname_np (ED), "ED");
-+#endif
-+#ifdef EPROGUNAVAIL
-+ TEST_COMPARE_STRING (strerrordesc_np (EPROGUNAVAIL),
-+ "RPC program not available");
-+ TEST_COMPARE_STRING (strerrorname_np (EPROGUNAVAIL), "EPROGUNAVAIL");
-+#endif
-
- return 0;
- }
-diff -pruN glibc-2.32.orig/stdio-common/vfscanf-internal.c glibc-2.32/stdio-common/vfscanf-internal.c
---- glibc-2.32.orig/stdio-common/vfscanf-internal.c 2021-09-18 21:02:32.699184579 +1000
-+++ glibc-2.32/stdio-common/vfscanf-internal.c 2021-09-18 21:03:05.312302287 +1000
-@@ -277,7 +277,7 @@ __vfscanf_internal (FILE *s, const char
- #endif
- {
- va_list arg;
-- const CHAR_T *f = format;
-+ const UCHAR_T *f = (const UCHAR_T *) format;
- UCHAR_T fc; /* Current character of the format. */
- WINT_T done = 0; /* Assignments done. */
- size_t read_in = 0; /* Chars read in. */
-@@ -415,10 +415,11 @@ __vfscanf_internal (FILE *s, const char
- #endif
-
- #ifndef COMPILE_WSCANF
-- if (!isascii ((unsigned char) *f))
-+ if (!isascii (*f))
- {
- /* Non-ASCII, may be a multibyte. */
-- int len = __mbrlen (f, strlen (f), &state);
-+ int len = __mbrlen ((const char *) f, strlen ((const char *) f),
-+ &state);
- if (len > 0)
- {
- do
-@@ -426,7 +427,7 @@ __vfscanf_internal (FILE *s, const char
- c = inchar ();
- if (__glibc_unlikely (c == EOF))
- input_error ();
-- else if (c != (unsigned char) *f++)
-+ else if (c != *f++)
- {
- ungetc_not_eof (c, s);
- conv_error ();
-@@ -484,9 +485,9 @@ __vfscanf_internal (FILE *s, const char
- char_buffer_rewind (&charbuf);
-
- /* Check for a positional parameter specification. */
-- if (ISDIGIT ((UCHAR_T) *f))
-+ if (ISDIGIT (*f))
- {
-- argpos = read_int ((const UCHAR_T **) &f);
-+ argpos = read_int (&f);
- if (*f == L_('$'))
- ++f;
- else
-@@ -521,8 +522,8 @@ __vfscanf_internal (FILE *s, const char
-
- /* Find the maximum field width. */
- width = 0;
-- if (ISDIGIT ((UCHAR_T) *f))
-- width = read_int ((const UCHAR_T **) &f);
-+ if (ISDIGIT (*f))
-+ width = read_int (&f);
- got_width:
- if (width == 0)
- width = -1;
-@@ -2522,12 +2523,11 @@ __vfscanf_internal (FILE *s, const char
- }
-
- while ((fc = *f++) != '\0' && fc != ']')
-- if (fc == '-' && *f != '\0' && *f != ']'
-- && (unsigned char) f[-2] <= (unsigned char) *f)
-+ if (fc == '-' && *f != '\0' && *f != ']' && f[-2] <= *f)
- {
- /* Add all characters from the one before the '-'
- up to (but not including) the next format char. */
-- for (fc = (unsigned char) f[-2]; fc < (unsigned char) *f; ++fc)
-+ for (fc = f[-2]; fc < *f; ++fc)
- ((char *)charbuf.scratch.data)[fc] = 1;
- }
- else
-diff -pruN glibc-2.32.orig/stdlib/tst-secure-getenv.c glibc-2.32/stdlib/tst-secure-getenv.c
---- glibc-2.32.orig/stdlib/tst-secure-getenv.c 2021-09-18 21:02:32.700184614 +1000
-+++ glibc-2.32/stdlib/tst-secure-getenv.c 2021-09-18 21:03:05.312302287 +1000
-@@ -30,167 +30,12 @@
- #include <sys/wait.h>
- #include <unistd.h>
-
-+#include <support/check.h>
- #include <support/support.h>
-+#include <support/capture_subprocess.h>
- #include <support/test-driver.h>
-
- static char MAGIC_ARGUMENT[] = "run-actual-test";
--#define MAGIC_STATUS 19
--
--/* Return a GID which is not our current GID, but is present in the
-- supplementary group list. */
--static gid_t
--choose_gid (void)
--{
-- int count = getgroups (0, NULL);
-- if (count < 0)
-- {
-- printf ("getgroups: %m\n");
-- exit (1);
-- }
-- gid_t *groups;
-- groups = xcalloc (count, sizeof (*groups));
-- int ret = getgroups (count, groups);
-- if (ret < 0)
-- {
-- printf ("getgroups: %m\n");
-- exit (1);
-- }
-- gid_t current = getgid ();
-- gid_t not_current = 0;
-- for (int i = 0; i < ret; ++i)
-- {
-- if (groups[i] != current)
-- {
-- not_current = groups[i];
-- break;
-- }
-- }
-- free (groups);
-- return not_current;
--}
--
--
--/* Copies the executable into a restricted directory, so that we can
-- safely make it SGID with the TARGET group ID. Then runs the
-- executable. */
--static int
--run_executable_sgid (gid_t target)
--{
-- char *dirname = xasprintf ("%s/secure-getenv.%jd",
-- test_dir, (intmax_t) getpid ());
-- char *execname = xasprintf ("%s/bin", dirname);
-- int infd = -1;
-- int outfd = -1;
-- int ret = -1;
-- if (mkdir (dirname, 0700) < 0)
-- {
-- printf ("mkdir: %m\n");
-- goto err;
-- }
-- infd = open ("/proc/self/exe", O_RDONLY);
-- if (infd < 0)
-- {
-- printf ("open (/proc/self/exe): %m\n");
-- goto err;
-- }
-- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
-- if (outfd < 0)
-- {
-- printf ("open (%s): %m\n", execname);
-- goto err;
-- }
-- char buf[4096];
-- for (;;)
-- {
-- ssize_t rdcount = read (infd, buf, sizeof (buf));
-- if (rdcount < 0)
-- {
-- printf ("read: %m\n");
-- goto err;
-- }
-- if (rdcount == 0)
-- break;
-- char *p = buf;
-- char *end = buf + rdcount;
-- while (p != end)
-- {
-- ssize_t wrcount = write (outfd, buf, end - p);
-- if (wrcount == 0)
-- errno = ENOSPC;
-- if (wrcount <= 0)
-- {
-- printf ("write: %m\n");
-- goto err;
-- }
-- p += wrcount;
-- }
-- }
-- if (fchown (outfd, getuid (), target) < 0)
-- {
-- printf ("fchown (%s): %m\n", execname);
-- goto err;
-- }
-- if (fchmod (outfd, 02750) < 0)
-- {
-- printf ("fchmod (%s): %m\n", execname);
-- goto err;
-- }
-- if (close (outfd) < 0)
-- {
-- printf ("close (outfd): %m\n");
-- goto err;
-- }
-- if (close (infd) < 0)
-- {
-- printf ("close (infd): %m\n");
-- goto err;
-- }
--
-- int kid = fork ();
-- if (kid < 0)
-- {
-- printf ("fork: %m\n");
-- goto err;
-- }
-- if (kid == 0)
-- {
-- /* Child process. */
-- char *args[] = { execname, MAGIC_ARGUMENT, NULL };
-- execve (execname, args, environ);
-- printf ("execve (%s): %m\n", execname);
-- _exit (1);
-- }
-- int status;
-- if (waitpid (kid, &status, 0) < 0)
-- {
-- printf ("waitpid: %m\n");
-- goto err;
-- }
-- if (!WIFEXITED (status) || WEXITSTATUS (status) != MAGIC_STATUS)
-- {
-- printf ("Unexpected exit status %d from child process\n",
-- status);
-- goto err;
-- }
-- ret = 0;
--
--err:
-- if (outfd >= 0)
-- close (outfd);
-- if (infd >= 0)
-- close (infd);
-- if (execname)
-- {
-- unlink (execname);
-- free (execname);
-- }
-- if (dirname)
-- {
-- rmdir (dirname);
-- free (dirname);
-- }
-- return ret;
--}
-
- static int
- do_test (void)
-@@ -212,15 +57,15 @@ do_test (void)
- exit (1);
- }
-
-- gid_t target = choose_gid ();
-- if (target == 0)
-- {
-- fprintf (stderr,
-- "Could not find a suitable GID for user %jd, skipping test\n",
-- (intmax_t) getuid ());
-- exit (0);
-- }
-- return run_executable_sgid (target);
-+ int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT);
-+
-+ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED)
-+ return EXIT_UNSUPPORTED;
-+
-+ if (!WIFEXITED (status))
-+ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status);
-+
-+ return 0;
- }
-
- static void
-@@ -229,23 +74,15 @@ alternative_main (int argc, char **argv)
- if (argc == 2 && strcmp (argv[1], MAGIC_ARGUMENT) == 0)
- {
- if (getgid () == getegid ())
-- {
-- /* This can happen if the file system is mounted nosuid. */
-- fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n",
-- (intmax_t) getgid ());
-- exit (MAGIC_STATUS);
-- }
-+ /* This can happen if the file system is mounted nosuid. */
-+ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n",
-+ (intmax_t) getgid ());
- if (getenv ("PATH") == NULL)
-- {
-- printf ("PATH variable not present\n");
-- exit (3);
-- }
-+ FAIL_EXIT (3, "PATH variable not present\n");
- if (secure_getenv ("PATH") != NULL)
-- {
-- printf ("PATH variable not filtered out\n");
-- exit (4);
-- }
-- exit (MAGIC_STATUS);
-+ FAIL_EXIT (4, "PATH variable not filtered out\n");
-+
-+ exit (EXIT_SUCCESS);
- }
- }
-
-diff -pruN glibc-2.32.orig/string/bits/string_fortified.h glibc-2.32/string/bits/string_fortified.h
---- glibc-2.32.orig/string/bits/string_fortified.h 2021-09-18 21:02:32.700184614 +1000
-+++ glibc-2.32/string/bits/string_fortified.h 2021-09-18 21:03:05.312302287 +1000
-@@ -22,11 +22,6 @@
- # error "Never use <bits/string_fortified.h> directly; include <string.h> instead."
- #endif
-
--#if !__GNUC_PREREQ (5,0)
--__warndecl (__warn_memset_zero_len,
-- "memset used with constant zero length parameter; this could be due to transposed parameters");
--#endif
--
- __fortify_function void *
- __NTH (memcpy (void *__restrict __dest, const void *__restrict __src,
- size_t __len))
-@@ -58,16 +53,6 @@ __NTH (mempcpy (void *__restrict __dest,
- __fortify_function void *
- __NTH (memset (void *__dest, int __ch, size_t __len))
- {
-- /* GCC-5.0 and newer implements these checks in the compiler, so we don't
-- need them here. */
--#if !__GNUC_PREREQ (5,0)
-- if (__builtin_constant_p (__len) && __len == 0
-- && (!__builtin_constant_p (__ch) || __ch != 0))
-- {
-- __warn_memset_zero_len ();
-- return __dest;
-- }
--#endif
- return __builtin___memset_chk (__dest, __ch, __len, __bos0 (__dest));
- }
-
-diff -pruN glibc-2.32.orig/support/capture_subprocess.h glibc-2.32/support/capture_subprocess.h
---- glibc-2.32.orig/support/capture_subprocess.h 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/capture_subprocess.h 2021-09-18 21:03:05.312302287 +1000
-@@ -41,6 +41,12 @@ struct support_capture_subprocess suppor
- struct support_capture_subprocess support_capture_subprogram
- (const char *file, char *const argv[]);
-
-+/* Copy the running program into a setgid binary and run it with CHILD_ID
-+ argument. If execution is successful, return the exit status of the child
-+ program, otherwise return a non-zero failure exit code. */
-+int support_capture_subprogram_self_sgid
-+ (char *child_id);
-+
- /* Deallocate the subprocess data captured by
- support_capture_subprocess. */
- void support_capture_subprocess_free (struct support_capture_subprocess *);
-diff -pruN glibc-2.32.orig/support/Makefile glibc-2.32/support/Makefile
---- glibc-2.32.orig/support/Makefile 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/Makefile 2021-09-18 21:03:05.312302287 +1000
-@@ -35,6 +35,8 @@ libsupport-routines = \
- ignore_stderr \
- next_to_fault \
- oom_error \
-+ resolv_response_context_duplicate \
-+ resolv_response_context_free \
- resolv_test \
- set_fortify_handler \
- support-xfstat \
-diff -pruN glibc-2.32.orig/support/resolv_response_context_duplicate.c glibc-2.32/support/resolv_response_context_duplicate.c
---- glibc-2.32.orig/support/resolv_response_context_duplicate.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/support/resolv_response_context_duplicate.c 2021-09-18 21:03:05.312302287 +1000
-@@ -0,0 +1,37 @@
-+/* Duplicate a response context used in DNS resolver tests.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <string.h>
-+#include <support/resolv_test.h>
-+#include <support/support.h>
-+
-+struct resolv_response_context *
-+resolv_response_context_duplicate (const struct resolv_response_context *ctx)
-+{
-+ struct resolv_response_context *result = xmalloc (sizeof (*result));
-+ memcpy (result, ctx, sizeof (*result));
-+ if (result->client_address != NULL)
-+ {
-+ result->client_address = xmalloc (result->client_address_length);
-+ memcpy (result->client_address, ctx->client_address,
-+ result->client_address_length);
-+ }
-+ result->query_buffer = xmalloc (result->query_length);
-+ memcpy (result->query_buffer, ctx->query_buffer, result->query_length);
-+ return result;
-+}
-diff -pruN glibc-2.32.orig/support/resolv_response_context_free.c glibc-2.32/support/resolv_response_context_free.c
---- glibc-2.32.orig/support/resolv_response_context_free.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/support/resolv_response_context_free.c 2021-09-18 21:03:05.312302287 +1000
-@@ -0,0 +1,28 @@
-+/* Free a response context used in DNS resolver tests.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <stdlib.h>
-+#include <support/resolv_test.h>
-+
-+void
-+resolv_response_context_free (struct resolv_response_context *ctx)
-+{
-+ free (ctx->query_buffer);
-+ free (ctx->client_address);
-+ free (ctx);
-+}
-diff -pruN glibc-2.32.orig/support/resolv_test.c glibc-2.32/support/resolv_test.c
---- glibc-2.32.orig/support/resolv_test.c 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/resolv_test.c 2021-09-18 21:03:05.312302287 +1000
-@@ -181,7 +181,9 @@ resolv_response_init (struct resolv_resp
- b->buffer[2] |= b->query_buffer[2] & 0x01; /* Copy the RD bit. */
- if (flags.tc)
- b->buffer[2] |= 0x02;
-- b->buffer[3] = 0x80 | flags.rcode; /* Always set RA. */
-+ b->buffer[3] = flags.rcode;
-+ if (!flags.clear_ra)
-+ b->buffer[3] |= 0x80;
- if (flags.ad)
- b->buffer[3] |= 0x20;
-
-@@ -434,9 +436,9 @@ resolv_response_buffer (const struct res
- return result;
- }
-
--static struct resolv_response_builder *
--response_builder_allocate
-- (const unsigned char *query_buffer, size_t query_length)
-+struct resolv_response_builder *
-+resolv_response_builder_allocate (const unsigned char *query_buffer,
-+ size_t query_length)
- {
- struct resolv_response_builder *b = xmalloc (sizeof (*b));
- memset (b, 0, offsetof (struct resolv_response_builder, buffer));
-@@ -445,8 +447,8 @@ response_builder_allocate
- return b;
- }
-
--static void
--response_builder_free (struct resolv_response_builder *b)
-+void
-+resolv_response_builder_free (struct resolv_response_builder *b)
- {
- tdestroy (b->compression_offsets, free);
- free (b);
-@@ -661,13 +663,17 @@ server_thread_udp_process_one (struct re
-
- struct resolv_response_context ctx =
- {
-+ .test = obj,
-+ .client_address = &peer,
-+ .client_address_length = peerlen,
- .query_buffer = query,
- .query_length = length,
- .server_index = server_index,
- .tcp = false,
- .edns = qinfo.edns,
- };
-- struct resolv_response_builder *b = response_builder_allocate (query, length);
-+ struct resolv_response_builder *b
-+ = resolv_response_builder_allocate (query, length);
- obj->config.response_callback
- (&ctx, b, qinfo.qname, qinfo.qclass, qinfo.qtype);
-
-@@ -684,7 +690,7 @@ server_thread_udp_process_one (struct re
- if (b->offset >= 12)
- printf ("info: UDP server %d: sending response:"
- " %zu bytes, RCODE %d (for %s/%u/%u)\n",
-- server_index, b->offset, b->buffer[3] & 0x0f,
-+ ctx.server_index, b->offset, b->buffer[3] & 0x0f,
- qinfo.qname, qinfo.qclass, qinfo.qtype);
- else
- printf ("info: UDP server %d: sending response: %zu bytes"
-@@ -694,23 +700,31 @@ server_thread_udp_process_one (struct re
- if (b->truncate_bytes > 0)
- printf ("info: truncated by %u bytes\n", b->truncate_bytes);
- }
-- size_t to_send = b->offset;
-- if (to_send < b->truncate_bytes)
-- to_send = 0;
-- else
-- to_send -= b->truncate_bytes;
--
-- /* Ignore most errors here because the other end may have closed
-- the socket. */
-- if (sendto (obj->servers[server_index].socket_udp,
-- b->buffer, to_send, 0,
-- (struct sockaddr *) &peer, peerlen) < 0)
-- TEST_VERIFY_EXIT (errno != EBADF);
-+ resolv_response_send_udp (&ctx, b);
- }
-- response_builder_free (b);
-+ resolv_response_builder_free (b);
- return true;
- }
-
-+void
-+resolv_response_send_udp (const struct resolv_response_context *ctx,
-+ struct resolv_response_builder *b)
-+{
-+ TEST_VERIFY_EXIT (!ctx->tcp);
-+ size_t to_send = b->offset;
-+ if (to_send < b->truncate_bytes)
-+ to_send = 0;
-+ else
-+ to_send -= b->truncate_bytes;
-+
-+ /* Ignore most errors here because the other end may have closed
-+ the socket. */
-+ if (sendto (ctx->test->servers[ctx->server_index].socket_udp,
-+ b->buffer, to_send, 0,
-+ ctx->client_address, ctx->client_address_length) < 0)
-+ TEST_VERIFY_EXIT (errno != EBADF);
-+}
-+
- /* UDP thread_callback function. Variant for one thread per
- server. */
- static void
-@@ -897,14 +911,15 @@ server_thread_tcp_client (void *arg)
-
- struct resolv_response_context ctx =
- {
-+ .test = closure->obj,
- .query_buffer = query_buffer,
- .query_length = query_length,
- .server_index = closure->server_index,
- .tcp = true,
- .edns = qinfo.edns,
- };
-- struct resolv_response_builder *b = response_builder_allocate
-- (query_buffer, query_length);
-+ struct resolv_response_builder *b
-+ = resolv_response_builder_allocate (query_buffer, query_length);
- closure->obj->config.response_callback
- (&ctx, b, qinfo.qname, qinfo.qclass, qinfo.qtype);
-
-@@ -936,7 +951,7 @@ server_thread_tcp_client (void *arg)
- writev_fully (closure->client_socket, buffers, 2);
- }
- bool close_flag = b->close;
-- response_builder_free (b);
-+ resolv_response_builder_free (b);
- free (query_buffer);
- if (close_flag)
- break;
-diff -pruN glibc-2.32.orig/support/resolv_test.h glibc-2.32/support/resolv_test.h
---- glibc-2.32.orig/support/resolv_test.h 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/resolv_test.h 2021-09-18 21:03:05.312302287 +1000
-@@ -35,25 +35,36 @@ struct resolv_edns_info
- uint16_t payload_size;
- };
-
-+/* This opaque struct collects information about the resolver testing
-+ currently in progress. */
-+struct resolv_test;
-+
- /* This struct provides context information when the response callback
- specified in struct resolv_redirect_config is invoked. */
- struct resolv_response_context
- {
-- const unsigned char *query_buffer;
-+ struct resolv_test *test;
-+ void *client_address;
-+ size_t client_address_length;
-+ unsigned char *query_buffer;
- size_t query_length;
- int server_index;
- bool tcp;
- struct resolv_edns_info edns;
- };
-
-+/* Produces a deep copy of the context. */
-+struct resolv_response_context *
-+ resolv_response_context_duplicate (const struct resolv_response_context *);
-+
-+/* Frees the copy. For the context passed to the response function,
-+ this happens implicitly. */
-+void resolv_response_context_free (struct resolv_response_context *);
-+
- /* This opaque struct is used to construct responses from within the
- response callback function. */
- struct resolv_response_builder;
-
--/* This opaque struct collects information about the resolver testing
-- currently in progress. */
--struct resolv_test;
--
- enum
- {
- /* Maximum number of test servers supported by the framework. */
-@@ -137,6 +148,10 @@ struct resolv_response_flags
- /* If true, the AD (authenticated data) flag will be set. */
- bool ad;
-
-+ /* If true, do not set the RA (recursion available) flag in the
-+ response. */
-+ bool clear_ra;
-+
- /* Initial section count values. Can be used to artificially
- increase the counts, for malformed packet testing.*/
- unsigned short qdcount;
-@@ -188,6 +203,22 @@ void resolv_response_close (struct resol
- /* The size of the response packet built so far. */
- size_t resolv_response_length (const struct resolv_response_builder *);
-
-+/* Allocates a response builder tied to a specific query packet,
-+ starting at QUERY_BUFFER, containing QUERY_LENGTH bytes. */
-+struct resolv_response_builder *
-+ resolv_response_builder_allocate (const unsigned char *query_buffer,
-+ size_t query_length);
-+
-+/* Deallocates a response buffer. */
-+void resolv_response_builder_free (struct resolv_response_builder *);
-+
-+/* Sends a UDP response using a specific context. This can be used to
-+ reorder or duplicate responses, along with
-+ resolv_response_context_duplicate and
-+ response_builder_allocate. */
-+void resolv_response_send_udp (const struct resolv_response_context *,
-+ struct resolv_response_builder *);
-+
- __END_DECLS
-
- #endif /* SUPPORT_RESOLV_TEST_H */
-diff -pruN glibc-2.32.orig/support/subprocess.h glibc-2.32/support/subprocess.h
---- glibc-2.32.orig/support/subprocess.h 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/subprocess.h 2021-09-18 21:03:05.312302287 +1000
-@@ -38,6 +38,11 @@ struct support_subprocess support_subpro
- struct support_subprocess support_subprogram
- (const char *file, char *const argv[]);
-
-+/* Invoke program FILE with ARGV arguments by using posix_spawn and wait for it
-+ to complete. Return program exit status. */
-+int support_subprogram_wait
-+ (const char *file, char *const argv[]);
-+
- /* Wait for the subprocess indicated by PROC::PID. Return the status
- indicate by waitpid call. */
- int support_process_wait (struct support_subprocess *proc);
-diff -pruN glibc-2.32.orig/support/support_capture_subprocess.c glibc-2.32/support/support_capture_subprocess.c
---- glibc-2.32.orig/support/support_capture_subprocess.c 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/support_capture_subprocess.c 2021-09-18 21:03:05.313302322 +1000
-@@ -20,11 +20,14 @@
- #include <support/capture_subprocess.h>
-
- #include <errno.h>
-+#include <fcntl.h>
- #include <stdlib.h>
- #include <support/check.h>
- #include <support/xunistd.h>
- #include <support/xsocket.h>
- #include <support/xspawn.h>
-+#include <support/support.h>
-+#include <support/test-driver.h>
-
- static void
- transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream)
-@@ -36,7 +39,7 @@ transfer (const char *what, struct pollf
- if (ret < 0)
- {
- support_record_failure ();
-- printf ("error: reading from subprocess %s: %m", what);
-+ printf ("error: reading from subprocess %s: %m\n", what);
- pfd->events = 0;
- pfd->revents = 0;
- }
-@@ -102,6 +105,129 @@ support_capture_subprogram (const char *
- return result;
- }
-
-+/* Copies the executable into a restricted directory, so that we can
-+ safely make it SGID with the TARGET group ID. Then runs the
-+ executable. */
-+static int
-+copy_and_spawn_sgid (char *child_id, gid_t gid)
-+{
-+ char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd",
-+ test_dir, (intmax_t) getpid ());
-+ char *execname = xasprintf ("%s/bin", dirname);
-+ int infd = -1;
-+ int outfd = -1;
-+ int ret = 1, status = 1;
-+
-+ TEST_VERIFY (mkdir (dirname, 0700) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+
-+ infd = open ("/proc/self/exe", O_RDONLY);
-+ if (infd < 0)
-+ FAIL_UNSUPPORTED ("unsupported: Cannot read binary from procfs\n");
-+
-+ outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700);
-+ TEST_VERIFY (outfd >= 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+
-+ char buf[4096];
-+ for (;;)
-+ {
-+ ssize_t rdcount = read (infd, buf, sizeof (buf));
-+ TEST_VERIFY (rdcount >= 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ if (rdcount == 0)
-+ break;
-+ char *p = buf;
-+ char *end = buf + rdcount;
-+ while (p != end)
-+ {
-+ ssize_t wrcount = write (outfd, buf, end - p);
-+ if (wrcount == 0)
-+ errno = ENOSPC;
-+ TEST_VERIFY (wrcount > 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ p += wrcount;
-+ }
-+ }
-+ TEST_VERIFY (fchown (outfd, getuid (), gid) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ TEST_VERIFY (fchmod (outfd, 02750) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ TEST_VERIFY (close (outfd) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+ TEST_VERIFY (close (infd) == 0);
-+ if (support_record_failure_is_failed ())
-+ goto err;
-+
-+ /* We have the binary, now spawn the subprocess. Avoid using
-+ support_subprogram because we only want the program exit status, not the
-+ contents. */
-+ ret = 0;
-+
-+ char * const args[] = {execname, child_id, NULL};
-+
-+ status = support_subprogram_wait (args[0], args);
-+
-+err:
-+ if (outfd >= 0)
-+ close (outfd);
-+ if (infd >= 0)
-+ close (infd);
-+ if (execname != NULL)
-+ {
-+ unlink (execname);
-+ free (execname);
-+ }
-+ if (dirname != NULL)
-+ {
-+ rmdir (dirname);
-+ free (dirname);
-+ }
-+
-+ if (ret != 0)
-+ FAIL_EXIT1("Failed to make sgid executable for test\n");
-+
-+ return status;
-+}
-+
-+int
-+support_capture_subprogram_self_sgid (char *child_id)
-+{
-+ gid_t target = 0;
-+ const int count = 64;
-+ gid_t groups[count];
-+
-+ /* Get a GID which is not our current GID, but is present in the
-+ supplementary group list. */
-+ int ret = getgroups (count, groups);
-+ if (ret < 0)
-+ FAIL_UNSUPPORTED("Could not get group list for user %jd\n",
-+ (intmax_t) getuid ());
-+
-+ gid_t current = getgid ();
-+ for (int i = 0; i < ret; ++i)
-+ {
-+ if (groups[i] != current)
-+ {
-+ target = groups[i];
-+ break;
-+ }
-+ }
-+
-+ if (target == 0)
-+ FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n",
-+ (intmax_t) getuid ());
-+
-+ return copy_and_spawn_sgid (child_id, target);
-+}
-+
- void
- support_capture_subprocess_free (struct support_capture_subprocess *p)
- {
-diff -pruN glibc-2.32.orig/support/support_subprocess.c glibc-2.32/support/support_subprocess.c
---- glibc-2.32.orig/support/support_subprocess.c 2021-09-18 21:02:32.701184648 +1000
-+++ glibc-2.32/support/support_subprocess.c 2021-09-18 21:03:05.313302322 +1000
-@@ -27,7 +27,7 @@
- #include <support/subprocess.h>
-
- static struct support_subprocess
--support_suprocess_init (void)
-+support_subprocess_init (void)
- {
- struct support_subprocess result;
-
-@@ -48,7 +48,7 @@ support_suprocess_init (void)
- struct support_subprocess
- support_subprocess (void (*callback) (void *), void *closure)
- {
-- struct support_subprocess result = support_suprocess_init ();
-+ struct support_subprocess result = support_subprocess_init ();
-
- result.pid = xfork ();
- if (result.pid == 0)
-@@ -71,7 +71,7 @@ support_subprocess (void (*callback) (vo
- struct support_subprocess
- support_subprogram (const char *file, char *const argv[])
- {
-- struct support_subprocess result = support_suprocess_init ();
-+ struct support_subprocess result = support_subprocess_init ();
-
- posix_spawn_file_actions_t fa;
- /* posix_spawn_file_actions_init does not fail. */
-@@ -84,7 +84,7 @@ support_subprogram (const char *file, ch
- xposix_spawn_file_actions_addclose (&fa, result.stdout_pipe[1]);
- xposix_spawn_file_actions_addclose (&fa, result.stderr_pipe[1]);
-
-- result.pid = xposix_spawn (file, &fa, NULL, argv, NULL);
-+ result.pid = xposix_spawn (file, &fa, NULL, argv, environ);
-
- xclose (result.stdout_pipe[1]);
- xclose (result.stderr_pipe[1]);
-@@ -93,6 +93,19 @@ support_subprogram (const char *file, ch
- }
-
- int
-+support_subprogram_wait (const char *file, char *const argv[])
-+{
-+ posix_spawn_file_actions_t fa;
-+
-+ posix_spawn_file_actions_init (&fa);
-+ struct support_subprocess res = support_subprocess_init ();
-+
-+ res.pid = xposix_spawn (file, &fa, NULL, argv, environ);
-+
-+ return support_process_wait (&res);
-+}
-+
-+int
- support_process_wait (struct support_subprocess *proc)
- {
- xclose (proc->stdout_pipe[0]);
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/dl-bti.c glibc-2.32/sysdeps/aarch64/dl-bti.c
---- glibc-2.32.orig/sysdeps/aarch64/dl-bti.c 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/dl-bti.c 2021-09-18 21:03:05.313302322 +1000
-@@ -19,43 +19,76 @@
- #include <errno.h>
- #include <libintl.h>
- #include <ldsodefs.h>
-+#include <sys/mman.h>
-
--static int
--enable_bti (struct link_map *map, const char *program)
-+/* See elf/dl-load.h. */
-+#ifndef MAP_COPY
-+# define MAP_COPY (MAP_PRIVATE | MAP_DENYWRITE)
-+#endif
-+
-+/* Enable BTI protection for MAP. */
-+
-+void
-+_dl_bti_protect (struct link_map *map, int fd)
- {
-+ const size_t pagesz = GLRO(dl_pagesize);
- const ElfW(Phdr) *phdr;
-- unsigned prot;
-
- for (phdr = map->l_phdr; phdr < &map->l_phdr[map->l_phnum]; ++phdr)
- if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_X))
- {
-- void *start = (void *) (phdr->p_vaddr + map->l_addr);
-- size_t len = phdr->p_memsz;
-+ size_t vstart = ALIGN_DOWN (phdr->p_vaddr, pagesz);
-+ size_t vend = ALIGN_UP (phdr->p_vaddr + phdr->p_filesz, pagesz);
-+ off_t off = ALIGN_DOWN (phdr->p_offset, pagesz);
-+ void *start = (void *) (vstart + map->l_addr);
-+ size_t len = vend - vstart;
-
-- prot = PROT_EXEC | PROT_BTI;
-+ unsigned prot = PROT_EXEC | PROT_BTI;
- if (phdr->p_flags & PF_R)
- prot |= PROT_READ;
- if (phdr->p_flags & PF_W)
- prot |= PROT_WRITE;
-
-- if (__mprotect (start, len, prot) < 0)
-- {
-- if (program)
-- _dl_fatal_printf ("%s: mprotect failed to turn on BTI\n",
-- map->l_name);
-- else
-- _dl_signal_error (errno, map->l_name, "dlopen",
-- N_("mprotect failed to turn on BTI"));
-- }
-+ if (fd == -1)
-+ /* Ignore failures for kernel mapped binaries. */
-+ __mprotect (start, len, prot);
-+ else
-+ map->l_mach.bti_fail = __mmap (start, len, prot,
-+ MAP_FIXED|MAP_COPY|MAP_FILE,
-+ fd, off) == MAP_FAILED;
- }
-- return 0;
- }
-
--/* Enable BTI for L if required. */
-+
-+static void
-+bti_failed (struct link_map *l, const char *program)
-+{
-+ if (program)
-+ _dl_fatal_printf ("%s: %s: failed to turn on BTI protection\n",
-+ program, l->l_name);
-+ else
-+ /* Note: the errno value is not available any more. */
-+ _dl_signal_error (0, l->l_name, "dlopen",
-+ N_("failed to turn on BTI protection"));
-+}
-+
-+
-+/* Enable BTI for L and its dependencies. */
-
- void
- _dl_bti_check (struct link_map *l, const char *program)
- {
-- if (GLRO(dl_aarch64_cpu_features).bti && l->l_mach.bti)
-- enable_bti (l, program);
-+ if (!GLRO(dl_aarch64_cpu_features).bti)
-+ return;
-+
-+ if (l->l_mach.bti_fail)
-+ bti_failed (l, program);
-+
-+ unsigned int i = l->l_searchlist.r_nlist;
-+ while (i-- > 0)
-+ {
-+ struct link_map *dep = l->l_initfini[i];
-+ if (dep->l_mach.bti_fail)
-+ bti_failed (dep, program);
-+ }
- }
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/dl-machine.h glibc-2.32/sysdeps/aarch64/dl-machine.h
---- glibc-2.32.orig/sysdeps/aarch64/dl-machine.h 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/dl-machine.h 2021-09-18 21:03:05.313302322 +1000
-@@ -395,13 +395,6 @@ elf_machine_lazy_rel (struct link_map *m
- /* Check for unexpected PLT reloc type. */
- if (__builtin_expect (r_type == AARCH64_R(JUMP_SLOT), 1))
- {
-- if (map->l_mach.plt == 0)
-- {
-- /* Prelinking. */
-- *reloc_addr += l_addr;
-- return;
-- }
--
- if (__glibc_unlikely (map->l_info[DT_AARCH64 (VARIANT_PCS)] != NULL))
- {
- /* Check the symbol table for variant PCS symbols. */
-@@ -425,7 +418,10 @@ elf_machine_lazy_rel (struct link_map *m
- }
- }
-
-- *reloc_addr = map->l_mach.plt;
-+ if (map->l_mach.plt == 0)
-+ *reloc_addr += l_addr;
-+ else
-+ *reloc_addr = map->l_mach.plt;
- }
- else if (__builtin_expect (r_type == AARCH64_R(TLSDESC), 1))
- {
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/dl-prop.h glibc-2.32/sysdeps/aarch64/dl-prop.h
---- glibc-2.32.orig/sysdeps/aarch64/dl-prop.h 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/dl-prop.h 2021-09-18 21:03:05.313302322 +1000
-@@ -19,6 +19,8 @@
- #ifndef _DL_PROP_H
- #define _DL_PROP_H
-
-+extern void _dl_bti_protect (struct link_map *, int) attribute_hidden;
-+
- extern void _dl_bti_check (struct link_map *, const char *)
- attribute_hidden;
-
-@@ -35,14 +37,18 @@ _dl_open_check (struct link_map *m)
- }
-
- static inline void __attribute__ ((always_inline))
--_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- }
-
- static inline int
--_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
-- void *data)
-+_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
-+ uint32_t datasz, void *data)
- {
-+ if (!GLRO(dl_aarch64_cpu_features).bti)
-+ /* Skip note processing. */
-+ return 0;
-+
- if (type == GNU_PROPERTY_AARCH64_FEATURE_1_AND)
- {
- /* Stop if the property note is ill-formed. */
-@@ -51,7 +57,7 @@ _dl_process_gnu_property (struct link_ma
-
- unsigned int feature_1 = *(unsigned int *) data;
- if (feature_1 & GNU_PROPERTY_AARCH64_FEATURE_1_BTI)
-- l->l_mach.bti = true;
-+ _dl_bti_protect (l, fd);
-
- /* Stop if we processed the property note. */
- return 0;
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/linkmap.h glibc-2.32/sysdeps/aarch64/linkmap.h
---- glibc-2.32.orig/sysdeps/aarch64/linkmap.h 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/linkmap.h 2021-09-18 21:03:05.313302322 +1000
-@@ -22,5 +22,5 @@ struct link_map_machine
- {
- ElfW(Addr) plt; /* Address of .plt */
- void *tlsdesc_table; /* Address of TLS descriptor hash table. */
-- bool bti; /* Branch Target Identification is enabled. */
-+ bool bti_fail; /* Failed to enable Branch Target Identification. */
- };
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy_advsimd.S glibc-2.32/sysdeps/aarch64/multiarch/memcpy_advsimd.S
---- glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy_advsimd.S 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/multiarch/memcpy_advsimd.S 2021-09-18 21:03:05.313302322 +1000
-@@ -223,12 +223,13 @@ L(copy_long_backwards):
- b.ls L(copy64_from_start)
-
- L(loop64_backwards):
-- stp A_q, B_q, [dstend, -32]
-+ str B_q, [dstend, -16]
-+ str A_q, [dstend, -32]
- ldp A_q, B_q, [srcend, -96]
-- stp C_q, D_q, [dstend, -64]
-+ str D_q, [dstend, -48]
-+ str C_q, [dstend, -64]!
- ldp C_q, D_q, [srcend, -128]
- sub srcend, srcend, 64
-- sub dstend, dstend, 64
- subs count, count, 64
- b.hi L(loop64_backwards)
-
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy.c glibc-2.32/sysdeps/aarch64/multiarch/memcpy.c
---- glibc-2.32.orig/sysdeps/aarch64/multiarch/memcpy.c 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/multiarch/memcpy.c 2021-09-18 21:03:05.313302322 +1000
-@@ -41,7 +41,8 @@ libc_ifunc (__libc_memcpy,
- ? __memcpy_falkor
- : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
- ? __memcpy_thunderx2
-- : (IS_NEOVERSE_N1 (midr)
-+ : (IS_NEOVERSE_N1 (midr) || IS_NEOVERSE_N2 (midr)
-+ || IS_NEOVERSE_V1 (midr)
- ? __memcpy_simd
- : __memcpy_generic)))));
-
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/multiarch/memmove.c glibc-2.32/sysdeps/aarch64/multiarch/memmove.c
---- glibc-2.32.orig/sysdeps/aarch64/multiarch/memmove.c 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/multiarch/memmove.c 2021-09-18 21:03:05.313302322 +1000
-@@ -41,7 +41,8 @@ libc_ifunc (__libc_memmove,
- ? __memmove_falkor
- : (IS_THUNDERX2 (midr) || IS_THUNDERX2PA (midr)
- ? __memmove_thunderx2
-- : (IS_NEOVERSE_N1 (midr)
-+ : (IS_NEOVERSE_N1 (midr) || IS_NEOVERSE_N2 (midr)
-+ || IS_NEOVERSE_V1 (midr)
- ? __memmove_simd
- : __memmove_generic)))));
-
-diff -pruN glibc-2.32.orig/sysdeps/aarch64/start.S glibc-2.32/sysdeps/aarch64/start.S
---- glibc-2.32.orig/sysdeps/aarch64/start.S 2021-09-18 21:02:32.702184682 +1000
-+++ glibc-2.32/sysdeps/aarch64/start.S 2021-09-18 21:03:05.313302322 +1000
-@@ -43,11 +43,9 @@
- */
-
- .text
-- .globl _start
-- .type _start,#function
--_start:
-- BTI_C
-+ENTRY(_start)
- /* Create an initial frame with 0 LR and FP */
-+ cfi_undefined (x30)
- mov x29, #0
- mov x30, #0
-
-@@ -101,8 +99,10 @@ _start:
- because crt1.o and rcrt1.o share code and the later must avoid the
- use of GOT relocations before __libc_start_main is called. */
- __wrap_main:
-+ BTI_C
- b main
- #endif
-+END(_start)
-
- /* Define a symbol for the first piece of initialized data. */
- .data
-diff -pruN glibc-2.32.orig/sysdeps/generic/dl-prop.h glibc-2.32/sysdeps/generic/dl-prop.h
---- glibc-2.32.orig/sysdeps/generic/dl-prop.h 2021-09-18 21:02:32.705184785 +1000
-+++ glibc-2.32/sysdeps/generic/dl-prop.h 2021-09-18 21:03:05.313302322 +1000
-@@ -37,15 +37,15 @@ _dl_open_check (struct link_map *m)
- }
-
- static inline void __attribute__ ((always_inline))
--_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- }
-
- /* Called for each property in the NT_GNU_PROPERTY_TYPE_0 note of L,
- processing of the properties continues until this returns 0. */
- static inline int __attribute__ ((always_inline))
--_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
-- void *data)
-+_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
-+ uint32_t datasz, void *data)
- {
- return 0;
- }
-diff -pruN glibc-2.32.orig/sysdeps/generic/ldsodefs.h glibc-2.32/sysdeps/generic/ldsodefs.h
---- glibc-2.32.orig/sysdeps/generic/ldsodefs.h 2021-09-18 21:02:32.705184785 +1000
-+++ glibc-2.32/sysdeps/generic/ldsodefs.h 2021-09-18 21:03:05.313302322 +1000
-@@ -919,8 +919,9 @@ extern void _dl_rtld_di_serinfo (struct
- Dl_serinfo *si, bool counting);
-
- /* Process PT_GNU_PROPERTY program header PH in module L after
-- PT_LOAD segments are mapped. */
--void _dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph);
-+ PT_LOAD segments are mapped from file FD. */
-+void _dl_process_pt_gnu_property (struct link_map *l, int fd,
-+ const ElfW(Phdr) *ph);
-
-
- /* Search loaded objects' symbol tables for a definition of the symbol
-diff -pruN glibc-2.32.orig/sysdeps/generic/unwind.h glibc-2.32/sysdeps/generic/unwind.h
---- glibc-2.32.orig/sysdeps/generic/unwind.h 2021-09-18 21:02:32.706184819 +1000
-+++ glibc-2.32/sysdeps/generic/unwind.h 2021-09-18 21:03:05.313302322 +1000
-@@ -75,15 +75,21 @@ typedef void (*_Unwind_Exception_Cleanup
-
- struct _Unwind_Exception
- {
-- _Unwind_Exception_Class exception_class;
-- _Unwind_Exception_Cleanup_Fn exception_cleanup;
-- _Unwind_Word private_1;
-- _Unwind_Word private_2;
-+ union
-+ {
-+ struct
-+ {
-+ _Unwind_Exception_Class exception_class;
-+ _Unwind_Exception_Cleanup_Fn exception_cleanup;
-+ _Unwind_Word private_1;
-+ _Unwind_Word private_2;
-+ };
-
-- /* @@@ The IA-64 ABI says that this structure must be double-word aligned.
-- Taking that literally does not make much sense generically. Instead we
-- provide the maximum alignment required by any type for the machine. */
--} __attribute__((__aligned__));
-+ /* The IA-64 ABI says that this structure must be double-word aligned. */
-+ _Unwind_Word unwind_exception_align[2]
-+ __attribute__ ((__aligned__ (2 * sizeof (_Unwind_Word))));
-+ };
-+};
-
-
- /* The ACTIONS argument to the personality routine is a bitwise OR of one
-diff -pruN glibc-2.32.orig/sysdeps/gnu/errlist.h glibc-2.32/sysdeps/gnu/errlist.h
---- glibc-2.32.orig/sysdeps/gnu/errlist.h 2021-09-18 21:02:32.706184819 +1000
-+++ glibc-2.32/sysdeps/gnu/errlist.h 2021-09-18 21:03:05.313302322 +1000
-@@ -1,24 +1,21 @@
--#ifndef ERR_MAP
--#define ERR_MAP(value) value
--#endif
--_S(ERR_MAP(0), N_("Success"))
-+_S(0, N_("Success"))
- #ifdef EPERM
- /*
- TRANS Only the owner of the file (or other resource)
- TRANS or processes with special privileges can perform the operation. */
--_S(ERR_MAP(EPERM), N_("Operation not permitted"))
-+_S(EPERM, N_("Operation not permitted"))
- #endif
- #ifdef ENOENT
- /*
- TRANS This is a ``file doesn't exist'' error
- TRANS for ordinary files that are referenced in contexts where they are
- TRANS expected to already exist. */
--_S(ERR_MAP(ENOENT), N_("No such file or directory"))
-+_S(ENOENT, N_("No such file or directory"))
- #endif
- #ifdef ESRCH
- /*
- TRANS No process matches the specified process ID. */
--_S(ERR_MAP(ESRCH), N_("No such process"))
-+_S(ESRCH, N_("No such process"))
- #endif
- #ifdef EINTR
- /*
-@@ -29,12 +26,12 @@ TRANS
- TRANS You can choose to have functions resume after a signal that is handled,
- TRANS rather than failing with @code{EINTR}; see @ref{Interrupted
- TRANS Primitives}. */
--_S(ERR_MAP(EINTR), N_("Interrupted system call"))
-+_S(EINTR, N_("Interrupted system call"))
- #endif
- #ifdef EIO
- /*
- TRANS Usually used for physical read or write errors. */
--_S(ERR_MAP(EIO), N_("Input/output error"))
-+_S(EIO, N_("Input/output error"))
- #endif
- #ifdef ENXIO
- /*
-@@ -43,7 +40,7 @@ TRANS represented by a file you specifie
- TRANS This can mean that the device file was installed incorrectly, or that
- TRANS the physical device is missing or not correctly attached to the
- TRANS computer. */
--_S(ERR_MAP(ENXIO), N_("No such device or address"))
-+_S(ENXIO, N_("No such device or address"))
- #endif
- #ifdef E2BIG
- /*
-@@ -51,27 +48,27 @@ TRANS Used when the arguments passed to
- TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
- TRANS File}) occupy too much memory space. This condition never arises on
- TRANS @gnuhurdsystems{}. */
--_S(ERR_MAP(E2BIG), N_("Argument list too long"))
-+_S(E2BIG, N_("Argument list too long"))
- #endif
- #ifdef ENOEXEC
- /*
- TRANS Invalid executable file format. This condition is detected by the
- TRANS @code{exec} functions; see @ref{Executing a File}. */
--_S(ERR_MAP(ENOEXEC), N_("Exec format error"))
-+_S(ENOEXEC, N_("Exec format error"))
- #endif
- #ifdef EBADF
- /*
- TRANS For example, I/O on a descriptor that has been
- TRANS closed or reading from a descriptor open only for writing (or vice
- TRANS versa). */
--_S(ERR_MAP(EBADF), N_("Bad file descriptor"))
-+_S(EBADF, N_("Bad file descriptor"))
- #endif
- #ifdef ECHILD
- /*
- TRANS This error happens on operations that are
- TRANS supposed to manipulate child processes, when there aren't any processes
- TRANS to manipulate. */
--_S(ERR_MAP(ECHILD), N_("No child processes"))
-+_S(ECHILD, N_("No child processes"))
- #endif
- #ifdef EDEADLK
- /*
-@@ -79,74 +76,74 @@ TRANS Allocating a system resource would
- TRANS deadlock situation. The system does not guarantee that it will notice
- TRANS all such situations. This error means you got lucky and the system
- TRANS noticed; it might just hang. @xref{File Locks}, for an example. */
--_S(ERR_MAP(EDEADLK), N_("Resource deadlock avoided"))
-+_S(EDEADLK, N_("Resource deadlock avoided"))
- #endif
- #ifdef ENOMEM
- /*
- TRANS The system cannot allocate more virtual memory
- TRANS because its capacity is full. */
--_S(ERR_MAP(ENOMEM), N_("Cannot allocate memory"))
-+_S(ENOMEM, N_("Cannot allocate memory"))
- #endif
- #ifdef EACCES
- /*
- TRANS The file permissions do not allow the attempted operation. */
--_S(ERR_MAP(EACCES), N_("Permission denied"))
-+_S(EACCES, N_("Permission denied"))
- #endif
- #ifdef EFAULT
- /*
- TRANS An invalid pointer was detected.
- TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead. */
--_S(ERR_MAP(EFAULT), N_("Bad address"))
-+_S(EFAULT, N_("Bad address"))
- #endif
- #ifdef ENOTBLK
- /*
- TRANS A file that isn't a block special file was given in a situation that
- TRANS requires one. For example, trying to mount an ordinary file as a file
- TRANS system in Unix gives this error. */
--_S(ERR_MAP(ENOTBLK), N_("Block device required"))
-+_S(ENOTBLK, N_("Block device required"))
- #endif
- #ifdef EBUSY
- /*
- TRANS A system resource that can't be shared is already in use.
- TRANS For example, if you try to delete a file that is the root of a currently
- TRANS mounted filesystem, you get this error. */
--_S(ERR_MAP(EBUSY), N_("Device or resource busy"))
-+_S(EBUSY, N_("Device or resource busy"))
- #endif
- #ifdef EEXIST
- /*
- TRANS An existing file was specified in a context where it only
- TRANS makes sense to specify a new file. */
--_S(ERR_MAP(EEXIST), N_("File exists"))
-+_S(EEXIST, N_("File exists"))
- #endif
- #ifdef EXDEV
- /*
- TRANS An attempt to make an improper link across file systems was detected.
- TRANS This happens not only when you use @code{link} (@pxref{Hard Links}) but
- TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}). */
--_S(ERR_MAP(EXDEV), N_("Invalid cross-device link"))
-+_S(EXDEV, N_("Invalid cross-device link"))
- #endif
- #ifdef ENODEV
- /*
- TRANS The wrong type of device was given to a function that expects a
- TRANS particular sort of device. */
--_S(ERR_MAP(ENODEV), N_("No such device"))
-+_S(ENODEV, N_("No such device"))
- #endif
- #ifdef ENOTDIR
- /*
- TRANS A file that isn't a directory was specified when a directory is required. */
--_S(ERR_MAP(ENOTDIR), N_("Not a directory"))
-+_S(ENOTDIR, N_("Not a directory"))
- #endif
- #ifdef EISDIR
- /*
- TRANS You cannot open a directory for writing,
- TRANS or create or remove hard links to it. */
--_S(ERR_MAP(EISDIR), N_("Is a directory"))
-+_S(EISDIR, N_("Is a directory"))
- #endif
- #ifdef EINVAL
- /*
- TRANS This is used to indicate various kinds of problems
- TRANS with passing the wrong argument to a library function. */
--_S(ERR_MAP(EINVAL), N_("Invalid argument"))
-+_S(EINVAL, N_("Invalid argument"))
- #endif
- #ifdef EMFILE
- /*
-@@ -157,20 +154,20 @@ TRANS In BSD and GNU, the number of open
- TRANS limit that can usually be increased. If you get this error, you might
- TRANS want to increase the @code{RLIMIT_NOFILE} limit or make it unlimited;
- TRANS @pxref{Limits on Resources}. */
--_S(ERR_MAP(EMFILE), N_("Too many open files"))
-+_S(EMFILE, N_("Too many open files"))
- #endif
- #ifdef ENFILE
- /*
- TRANS There are too many distinct file openings in the entire system. Note
- TRANS that any number of linked channels count as just one file opening; see
- TRANS @ref{Linked Channels}. This error never occurs on @gnuhurdsystems{}. */
--_S(ERR_MAP(ENFILE), N_("Too many open files in system"))
-+_S(ENFILE, N_("Too many open files in system"))
- #endif
- #ifdef ENOTTY
- /*
- TRANS Inappropriate I/O control operation, such as trying to set terminal
- TRANS modes on an ordinary file. */
--_S(ERR_MAP(ENOTTY), N_("Inappropriate ioctl for device"))
-+_S(ENOTTY, N_("Inappropriate ioctl for device"))
- #endif
- #ifdef ETXTBSY
- /*
-@@ -179,35 +176,35 @@ TRANS write to a file that is currently
- TRANS debugger to run a program is considered having it open for writing and
- TRANS will cause this error. (The name stands for ``text file busy''.) This
- TRANS is not an error on @gnuhurdsystems{}; the text is copied as necessary. */
--_S(ERR_MAP(ETXTBSY), N_("Text file busy"))
-+_S(ETXTBSY, N_("Text file busy"))
- #endif
- #ifdef EFBIG
- /*
- TRANS The size of a file would be larger than allowed by the system. */
--_S(ERR_MAP(EFBIG), N_("File too large"))
-+_S(EFBIG, N_("File too large"))
- #endif
- #ifdef ENOSPC
- /*
- TRANS Write operation on a file failed because the
- TRANS disk is full. */
--_S(ERR_MAP(ENOSPC), N_("No space left on device"))
-+_S(ENOSPC, N_("No space left on device"))
- #endif
- #ifdef ESPIPE
- /*
- TRANS Invalid seek operation (such as on a pipe). */
--_S(ERR_MAP(ESPIPE), N_("Illegal seek"))
-+_S(ESPIPE, N_("Illegal seek"))
- #endif
- #ifdef EROFS
- /*
- TRANS An attempt was made to modify something on a read-only file system. */
--_S(ERR_MAP(EROFS), N_("Read-only file system"))
-+_S(EROFS, N_("Read-only file system"))
- #endif
- #ifdef EMLINK
- /*
- TRANS The link count of a single file would become too large.
- TRANS @code{rename} can cause this error if the file being renamed already has
- TRANS as many links as it can take (@pxref{Renaming Files}). */
--_S(ERR_MAP(EMLINK), N_("Too many links"))
-+_S(EMLINK, N_("Too many links"))
- #endif
- #ifdef EPIPE
- /*
-@@ -216,19 +213,19 @@ TRANS Every library function that return
- TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
- TRANS or blocked. Thus, your program will never actually see @code{EPIPE}
- TRANS unless it has handled or blocked @code{SIGPIPE}. */
--_S(ERR_MAP(EPIPE), N_("Broken pipe"))
-+_S(EPIPE, N_("Broken pipe"))
- #endif
- #ifdef EDOM
- /*
- TRANS Used by mathematical functions when an argument value does
- TRANS not fall into the domain over which the function is defined. */
--_S(ERR_MAP(EDOM), N_("Numerical argument out of domain"))
-+_S(EDOM, N_("Numerical argument out of domain"))
- #endif
- #ifdef ERANGE
- /*
- TRANS Used by mathematical functions when the result value is
- TRANS not representable because of overflow or underflow. */
--_S(ERR_MAP(ERANGE), N_("Numerical result out of range"))
-+_S(ERANGE, N_("Numerical result out of range"))
- #endif
- #ifdef EAGAIN
- /*
-@@ -261,7 +258,7 @@ TRANS Such shortages are usually fairly
- TRANS so usually an interactive program should report the error to the user
- TRANS and return to its command loop.
- TRANS @end itemize */
--_S(ERR_MAP(EAGAIN), N_("Resource temporarily unavailable"))
-+_S(EAGAIN, N_("Resource temporarily unavailable"))
- #endif
- #ifdef EINPROGRESS
- /*
-@@ -273,47 +270,47 @@ TRANS the operation has begun and will t
- TRANS the object before the call completes return @code{EALREADY}. You can
- TRANS use the @code{select} function to find out when the pending operation
- TRANS has completed; @pxref{Waiting for I/O}. */
--_S(ERR_MAP(EINPROGRESS), N_("Operation now in progress"))
-+_S(EINPROGRESS, N_("Operation now in progress"))
- #endif
- #ifdef EALREADY
- /*
- TRANS An operation is already in progress on an object that has non-blocking
- TRANS mode selected. */
--_S(ERR_MAP(EALREADY), N_("Operation already in progress"))
-+_S(EALREADY, N_("Operation already in progress"))
- #endif
- #ifdef ENOTSOCK
- /*
- TRANS A file that isn't a socket was specified when a socket is required. */
--_S(ERR_MAP(ENOTSOCK), N_("Socket operation on non-socket"))
-+_S(ENOTSOCK, N_("Socket operation on non-socket"))
- #endif
- #ifdef EMSGSIZE
- /*
- TRANS The size of a message sent on a socket was larger than the supported
- TRANS maximum size. */
--_S(ERR_MAP(EMSGSIZE), N_("Message too long"))
-+_S(EMSGSIZE, N_("Message too long"))
- #endif
- #ifdef EPROTOTYPE
- /*
- TRANS The socket type does not support the requested communications protocol. */
--_S(ERR_MAP(EPROTOTYPE), N_("Protocol wrong type for socket"))
-+_S(EPROTOTYPE, N_("Protocol wrong type for socket"))
- #endif
- #ifdef ENOPROTOOPT
- /*
- TRANS You specified a socket option that doesn't make sense for the
- TRANS particular protocol being used by the socket. @xref{Socket Options}. */
--_S(ERR_MAP(ENOPROTOOPT), N_("Protocol not available"))
-+_S(ENOPROTOOPT, N_("Protocol not available"))
- #endif
- #ifdef EPROTONOSUPPORT
- /*
- TRANS The socket domain does not support the requested communications protocol
- TRANS (perhaps because the requested protocol is completely invalid).
- TRANS @xref{Creating a Socket}. */
--_S(ERR_MAP(EPROTONOSUPPORT), N_("Protocol not supported"))
-+_S(EPROTONOSUPPORT, N_("Protocol not supported"))
- #endif
- #ifdef ESOCKTNOSUPPORT
- /*
- TRANS The socket type is not supported. */
--_S(ERR_MAP(ESOCKTNOSUPPORT), N_("Socket type not supported"))
-+_S(ESOCKTNOSUPPORT, N_("Socket type not supported"))
- #endif
- #ifdef EOPNOTSUPP
- /*
-@@ -323,71 +320,71 @@ TRANS implemented for all communications
- TRANS error can happen for many calls when the object does not support the
- TRANS particular operation; it is a generic indication that the server knows
- TRANS nothing to do for that call. */
--_S(ERR_MAP(EOPNOTSUPP), N_("Operation not supported"))
-+_S(EOPNOTSUPP, N_("Operation not supported"))
- #endif
- #ifdef EPFNOSUPPORT
- /*
- TRANS The socket communications protocol family you requested is not supported. */
--_S(ERR_MAP(EPFNOSUPPORT), N_("Protocol family not supported"))
-+_S(EPFNOSUPPORT, N_("Protocol family not supported"))
- #endif
- #ifdef EAFNOSUPPORT
- /*
- TRANS The address family specified for a socket is not supported; it is
- TRANS inconsistent with the protocol being used on the socket. @xref{Sockets}. */
--_S(ERR_MAP(EAFNOSUPPORT), N_("Address family not supported by protocol"))
-+_S(EAFNOSUPPORT, N_("Address family not supported by protocol"))
- #endif
- #ifdef EADDRINUSE
- /*
- TRANS The requested socket address is already in use. @xref{Socket Addresses}. */
--_S(ERR_MAP(EADDRINUSE), N_("Address already in use"))
-+_S(EADDRINUSE, N_("Address already in use"))
- #endif
- #ifdef EADDRNOTAVAIL
- /*
- TRANS The requested socket address is not available; for example, you tried
- TRANS to give a socket a name that doesn't match the local host name.
- TRANS @xref{Socket Addresses}. */
--_S(ERR_MAP(EADDRNOTAVAIL), N_("Cannot assign requested address"))
-+_S(EADDRNOTAVAIL, N_("Cannot assign requested address"))
- #endif
- #ifdef ENETDOWN
- /*
- TRANS A socket operation failed because the network was down. */
--_S(ERR_MAP(ENETDOWN), N_("Network is down"))
-+_S(ENETDOWN, N_("Network is down"))
- #endif
- #ifdef ENETUNREACH
- /*
- TRANS A socket operation failed because the subnet containing the remote host
- TRANS was unreachable. */
--_S(ERR_MAP(ENETUNREACH), N_("Network is unreachable"))
-+_S(ENETUNREACH, N_("Network is unreachable"))
- #endif
- #ifdef ENETRESET
- /*
- TRANS A network connection was reset because the remote host crashed. */
--_S(ERR_MAP(ENETRESET), N_("Network dropped connection on reset"))
-+_S(ENETRESET, N_("Network dropped connection on reset"))
- #endif
- #ifdef ECONNABORTED
- /*
- TRANS A network connection was aborted locally. */
--_S(ERR_MAP(ECONNABORTED), N_("Software caused connection abort"))
-+_S(ECONNABORTED, N_("Software caused connection abort"))
- #endif
- #ifdef ECONNRESET
- /*
- TRANS A network connection was closed for reasons outside the control of the
- TRANS local host, such as by the remote machine rebooting or an unrecoverable
- TRANS protocol violation. */
--_S(ERR_MAP(ECONNRESET), N_("Connection reset by peer"))
-+_S(ECONNRESET, N_("Connection reset by peer"))
- #endif
- #ifdef ENOBUFS
- /*
- TRANS The kernel's buffers for I/O operations are all in use. In GNU, this
- TRANS error is always synonymous with @code{ENOMEM}; you may get one or the
- TRANS other from network operations. */
--_S(ERR_MAP(ENOBUFS), N_("No buffer space available"))
-+_S(ENOBUFS, N_("No buffer space available"))
- #endif
- #ifdef EISCONN
- /*
- TRANS You tried to connect a socket that is already connected.
- TRANS @xref{Connecting}. */
--_S(ERR_MAP(EISCONN), N_("Transport endpoint is already connected"))
-+_S(EISCONN, N_("Transport endpoint is already connected"))
- #endif
- #ifdef ENOTCONN
- /*
-@@ -395,74 +392,74 @@ TRANS The socket is not connected to any
- TRANS try to transmit data over a socket, without first specifying a
- TRANS destination for the data. For a connectionless socket (for datagram
- TRANS protocols, such as UDP), you get @code{EDESTADDRREQ} instead. */
--_S(ERR_MAP(ENOTCONN), N_("Transport endpoint is not connected"))
-+_S(ENOTCONN, N_("Transport endpoint is not connected"))
- #endif
- #ifdef EDESTADDRREQ
- /*
- TRANS No default destination address was set for the socket. You get this
- TRANS error when you try to transmit data over a connectionless socket,
- TRANS without first specifying a destination for the data with @code{connect}. */
--_S(ERR_MAP(EDESTADDRREQ), N_("Destination address required"))
-+_S(EDESTADDRREQ, N_("Destination address required"))
- #endif
- #ifdef ESHUTDOWN
- /*
- TRANS The socket has already been shut down. */
--_S(ERR_MAP(ESHUTDOWN), N_("Cannot send after transport endpoint shutdown"))
-+_S(ESHUTDOWN, N_("Cannot send after transport endpoint shutdown"))
- #endif
- #ifdef ETOOMANYREFS
--_S(ERR_MAP(ETOOMANYREFS), N_("Too many references: cannot splice"))
-+_S(ETOOMANYREFS, N_("Too many references: cannot splice"))
- #endif
- #ifdef ETIMEDOUT
- /*
- TRANS A socket operation with a specified timeout received no response during
- TRANS the timeout period. */
--_S(ERR_MAP(ETIMEDOUT), N_("Connection timed out"))
-+_S(ETIMEDOUT, N_("Connection timed out"))
- #endif
- #ifdef ECONNREFUSED
- /*
- TRANS A remote host refused to allow the network connection (typically because
- TRANS it is not running the requested service). */
--_S(ERR_MAP(ECONNREFUSED), N_("Connection refused"))
-+_S(ECONNREFUSED, N_("Connection refused"))
- #endif
- #ifdef ELOOP
- /*
- TRANS Too many levels of symbolic links were encountered in looking up a file name.
- TRANS This often indicates a cycle of symbolic links. */
--_S(ERR_MAP(ELOOP), N_("Too many levels of symbolic links"))
-+_S(ELOOP, N_("Too many levels of symbolic links"))
- #endif
- #ifdef ENAMETOOLONG
- /*
- TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
- TRANS Files}) or host name too long (in @code{gethostname} or
- TRANS @code{sethostname}; @pxref{Host Identification}). */
--_S(ERR_MAP(ENAMETOOLONG), N_("File name too long"))
-+_S(ENAMETOOLONG, N_("File name too long"))
- #endif
- #ifdef EHOSTDOWN
- /*
- TRANS The remote host for a requested network connection is down. */
--_S(ERR_MAP(EHOSTDOWN), N_("Host is down"))
-+_S(EHOSTDOWN, N_("Host is down"))
- #endif
- /*
- TRANS The remote host for a requested network connection is not reachable. */
- #ifdef EHOSTUNREACH
--_S(ERR_MAP(EHOSTUNREACH), N_("No route to host"))
-+_S(EHOSTUNREACH, N_("No route to host"))
- #endif
- #ifdef ENOTEMPTY
- /*
- TRANS Directory not empty, where an empty directory was expected. Typically,
- TRANS this error occurs when you are trying to delete a directory. */
--_S(ERR_MAP(ENOTEMPTY), N_("Directory not empty"))
-+_S(ENOTEMPTY, N_("Directory not empty"))
- #endif
- #ifdef EUSERS
- /*
- TRANS The file quota system is confused because there are too many users.
- TRANS @c This can probably happen in a GNU system when using NFS. */
--_S(ERR_MAP(EUSERS), N_("Too many users"))
-+_S(EUSERS, N_("Too many users"))
- #endif
- #ifdef EDQUOT
- /*
- TRANS The user's disk quota was exceeded. */
--_S(ERR_MAP(EDQUOT), N_("Disk quota exceeded"))
-+_S(EDQUOT, N_("Disk quota exceeded"))
- #endif
- #ifdef ESTALE
- /*
-@@ -471,7 +468,7 @@ TRANS file system which is due to file s
- TRANS for NFS file systems or corruption in other file systems.
- TRANS Repairing this condition usually requires unmounting, possibly repairing
- TRANS and remounting the file system. */
--_S(ERR_MAP(ESTALE), N_("Stale file handle"))
-+_S(ESTALE, N_("Stale file handle"))
- #endif
- #ifdef EREMOTE
- /*
-@@ -479,7 +476,7 @@ TRANS An attempt was made to NFS-mount a
- TRANS already specifies an NFS-mounted file.
- TRANS (This is an error on some operating systems, but we expect it to work
- TRANS properly on @gnuhurdsystems{}, making this error code impossible.) */
--_S(ERR_MAP(EREMOTE), N_("Object is remote"))
-+_S(EREMOTE, N_("Object is remote"))
- #endif
- #ifdef ENOLCK
- /*
-@@ -487,7 +484,7 @@ TRANS This is used by the file locking f
- TRANS @ref{File Locks}. This error is never generated by @gnuhurdsystems{}, but
- TRANS it can result from an operation to an NFS server running another
- TRANS operating system. */
--_S(ERR_MAP(ENOLCK), N_("No locks available"))
-+_S(ENOLCK, N_("No locks available"))
- #endif
- #ifdef ENOSYS
- /*
-@@ -496,46 +493,46 @@ TRANS not implemented at all, either in
- TRANS operating system. When you get this error, you can be sure that this
- TRANS particular function will always fail with @code{ENOSYS} unless you
- TRANS install a new version of the C library or the operating system. */
--_S(ERR_MAP(ENOSYS), N_("Function not implemented"))
-+_S(ENOSYS, N_("Function not implemented"))
- #endif
- #ifdef EILSEQ
- /*
- TRANS While decoding a multibyte character the function came along an invalid
- TRANS or an incomplete sequence of bytes or the given wide character is invalid. */
--_S(ERR_MAP(EILSEQ), N_("Invalid or incomplete multibyte or wide character"))
-+_S(EILSEQ, N_("Invalid or incomplete multibyte or wide character"))
- #endif
- #ifdef EBADMSG
--_S(ERR_MAP(EBADMSG), N_("Bad message"))
-+_S(EBADMSG, N_("Bad message"))
- #endif
- #ifdef EIDRM
--_S(ERR_MAP(EIDRM), N_("Identifier removed"))
-+_S(EIDRM, N_("Identifier removed"))
- #endif
- #ifdef EMULTIHOP
--_S(ERR_MAP(EMULTIHOP), N_("Multihop attempted"))
-+_S(EMULTIHOP, N_("Multihop attempted"))
- #endif
- #ifdef ENODATA
--_S(ERR_MAP(ENODATA), N_("No data available"))
-+_S(ENODATA, N_("No data available"))
- #endif
- #ifdef ENOLINK
--_S(ERR_MAP(ENOLINK), N_("Link has been severed"))
-+_S(ENOLINK, N_("Link has been severed"))
- #endif
- #ifdef ENOMSG
--_S(ERR_MAP(ENOMSG), N_("No message of desired type"))
-+_S(ENOMSG, N_("No message of desired type"))
- #endif
- #ifdef ENOSR
--_S(ERR_MAP(ENOSR), N_("Out of streams resources"))
-+_S(ENOSR, N_("Out of streams resources"))
- #endif
- #ifdef ENOSTR
--_S(ERR_MAP(ENOSTR), N_("Device not a stream"))
-+_S(ENOSTR, N_("Device not a stream"))
- #endif
- #ifdef EOVERFLOW
--_S(ERR_MAP(EOVERFLOW), N_("Value too large for defined data type"))
-+_S(EOVERFLOW, N_("Value too large for defined data type"))
- #endif
- #ifdef EPROTO
--_S(ERR_MAP(EPROTO), N_("Protocol error"))
-+_S(EPROTO, N_("Protocol error"))
- #endif
- #ifdef ETIME
--_S(ERR_MAP(ETIME), N_("Timer expired"))
-+_S(ETIME, N_("Timer expired"))
- #endif
- #ifdef ECANCELED
- /*
-@@ -543,148 +540,148 @@ TRANS An asynchronous operation was canc
- TRANS completed. @xref{Asynchronous I/O}. When you call @code{aio_cancel},
- TRANS the normal result is for the operations affected to complete with this
- TRANS error; @pxref{Cancel AIO Operations}. */
--_S(ERR_MAP(ECANCELED), N_("Operation canceled"))
-+_S(ECANCELED, N_("Operation canceled"))
- #endif
- #ifdef EOWNERDEAD
--_S(ERR_MAP(EOWNERDEAD), N_("Owner died"))
-+_S(EOWNERDEAD, N_("Owner died"))
- #endif
- #ifdef ENOTRECOVERABLE
--_S(ERR_MAP(ENOTRECOVERABLE), N_("State not recoverable"))
-+_S(ENOTRECOVERABLE, N_("State not recoverable"))
- #endif
- #ifdef ERESTART
--_S(ERR_MAP(ERESTART), N_("Interrupted system call should be restarted"))
-+_S(ERESTART, N_("Interrupted system call should be restarted"))
- #endif
- #ifdef ECHRNG
--_S(ERR_MAP(ECHRNG), N_("Channel number out of range"))
-+_S(ECHRNG, N_("Channel number out of range"))
- #endif
- #ifdef EL2NSYNC
--_S(ERR_MAP(EL2NSYNC), N_("Level 2 not synchronized"))
-+_S(EL2NSYNC, N_("Level 2 not synchronized"))
- #endif
- #ifdef EL3HLT
--_S(ERR_MAP(EL3HLT), N_("Level 3 halted"))
-+_S(EL3HLT, N_("Level 3 halted"))
- #endif
- #ifdef EL3RST
--_S(ERR_MAP(EL3RST), N_("Level 3 reset"))
-+_S(EL3RST, N_("Level 3 reset"))
- #endif
- #ifdef ELNRNG
--_S(ERR_MAP(ELNRNG), N_("Link number out of range"))
-+_S(ELNRNG, N_("Link number out of range"))
- #endif
- #ifdef EUNATCH
--_S(ERR_MAP(EUNATCH), N_("Protocol driver not attached"))
-+_S(EUNATCH, N_("Protocol driver not attached"))
- #endif
- #ifdef ENOCSI
--_S(ERR_MAP(ENOCSI), N_("No CSI structure available"))
-+_S(ENOCSI, N_("No CSI structure available"))
- #endif
- #ifdef EL2HLT
--_S(ERR_MAP(EL2HLT), N_("Level 2 halted"))
-+_S(EL2HLT, N_("Level 2 halted"))
- #endif
- #ifdef EBADE
--_S(ERR_MAP(EBADE), N_("Invalid exchange"))
-+_S(EBADE, N_("Invalid exchange"))
- #endif
- #ifdef EBADR
--_S(ERR_MAP(EBADR), N_("Invalid request descriptor"))
-+_S(EBADR, N_("Invalid request descriptor"))
- #endif
- #ifdef EXFULL
--_S(ERR_MAP(EXFULL), N_("Exchange full"))
-+_S(EXFULL, N_("Exchange full"))
- #endif
- #ifdef ENOANO
--_S(ERR_MAP(ENOANO), N_("No anode"))
-+_S(ENOANO, N_("No anode"))
- #endif
- #ifdef EBADRQC
--_S(ERR_MAP(EBADRQC), N_("Invalid request code"))
-+_S(EBADRQC, N_("Invalid request code"))
- #endif
- #ifdef EBADSLT
--_S(ERR_MAP(EBADSLT), N_("Invalid slot"))
-+_S(EBADSLT, N_("Invalid slot"))
- #endif
- #ifdef EBFONT
--_S(ERR_MAP(EBFONT), N_("Bad font file format"))
-+_S(EBFONT, N_("Bad font file format"))
- #endif
- #ifdef ENONET
--_S(ERR_MAP(ENONET), N_("Machine is not on the network"))
-+_S(ENONET, N_("Machine is not on the network"))
- #endif
- #ifdef ENOPKG
--_S(ERR_MAP(ENOPKG), N_("Package not installed"))
-+_S(ENOPKG, N_("Package not installed"))
- #endif
- #ifdef EADV
--_S(ERR_MAP(EADV), N_("Advertise error"))
-+_S(EADV, N_("Advertise error"))
- #endif
- #ifdef ESRMNT
--_S(ERR_MAP(ESRMNT), N_("Srmount error"))
-+_S(ESRMNT, N_("Srmount error"))
- #endif
- #ifdef ECOMM
--_S(ERR_MAP(ECOMM), N_("Communication error on send"))
-+_S(ECOMM, N_("Communication error on send"))
- #endif
- #ifdef EDOTDOT
--_S(ERR_MAP(EDOTDOT), N_("RFS specific error"))
-+_S(EDOTDOT, N_("RFS specific error"))
- #endif
- #ifdef ENOTUNIQ
--_S(ERR_MAP(ENOTUNIQ), N_("Name not unique on network"))
-+_S(ENOTUNIQ, N_("Name not unique on network"))
- #endif
- #ifdef EBADFD
--_S(ERR_MAP(EBADFD), N_("File descriptor in bad state"))
-+_S(EBADFD, N_("File descriptor in bad state"))
- #endif
- #ifdef EREMCHG
--_S(ERR_MAP(EREMCHG), N_("Remote address changed"))
-+_S(EREMCHG, N_("Remote address changed"))
- #endif
- #ifdef ELIBACC
--_S(ERR_MAP(ELIBACC), N_("Can not access a needed shared library"))
-+_S(ELIBACC, N_("Can not access a needed shared library"))
- #endif
- #ifdef ELIBBAD
--_S(ERR_MAP(ELIBBAD), N_("Accessing a corrupted shared library"))
-+_S(ELIBBAD, N_("Accessing a corrupted shared library"))
- #endif
- #ifdef ELIBSCN
--_S(ERR_MAP(ELIBSCN), N_(".lib section in a.out corrupted"))
-+_S(ELIBSCN, N_(".lib section in a.out corrupted"))
- #endif
- #ifdef ELIBMAX
--_S(ERR_MAP(ELIBMAX), N_("Attempting to link in too many shared libraries"))
-+_S(ELIBMAX, N_("Attempting to link in too many shared libraries"))
- #endif
- #ifdef ELIBEXEC
--_S(ERR_MAP(ELIBEXEC), N_("Cannot exec a shared library directly"))
-+_S(ELIBEXEC, N_("Cannot exec a shared library directly"))
- #endif
- #ifdef ESTRPIPE
--_S(ERR_MAP(ESTRPIPE), N_("Streams pipe error"))
-+_S(ESTRPIPE, N_("Streams pipe error"))
- #endif
- #ifdef EUCLEAN
--_S(ERR_MAP(EUCLEAN), N_("Structure needs cleaning"))
-+_S(EUCLEAN, N_("Structure needs cleaning"))
- #endif
- #ifdef ENOTNAM
--_S(ERR_MAP(ENOTNAM), N_("Not a XENIX named type file"))
-+_S(ENOTNAM, N_("Not a XENIX named type file"))
- #endif
- #ifdef ENAVAIL
--_S(ERR_MAP(ENAVAIL), N_("No XENIX semaphores available"))
-+_S(ENAVAIL, N_("No XENIX semaphores available"))
- #endif
- #ifdef EISNAM
--_S(ERR_MAP(EISNAM), N_("Is a named type file"))
-+_S(EISNAM, N_("Is a named type file"))
- #endif
- #ifdef EREMOTEIO
--_S(ERR_MAP(EREMOTEIO), N_("Remote I/O error"))
-+_S(EREMOTEIO, N_("Remote I/O error"))
- #endif
- #ifdef ENOMEDIUM
--_S(ERR_MAP(ENOMEDIUM), N_("No medium found"))
-+_S(ENOMEDIUM, N_("No medium found"))
- #endif
- #ifdef EMEDIUMTYPE
--_S(ERR_MAP(EMEDIUMTYPE), N_("Wrong medium type"))
-+_S(EMEDIUMTYPE, N_("Wrong medium type"))
- #endif
- #ifdef ENOKEY
--_S(ERR_MAP(ENOKEY), N_("Required key not available"))
-+_S(ENOKEY, N_("Required key not available"))
- #endif
- #ifdef EKEYEXPIRED
--_S(ERR_MAP(EKEYEXPIRED), N_("Key has expired"))
-+_S(EKEYEXPIRED, N_("Key has expired"))
- #endif
- #ifdef EKEYREVOKED
--_S(ERR_MAP(EKEYREVOKED), N_("Key has been revoked"))
-+_S(EKEYREVOKED, N_("Key has been revoked"))
- #endif
- #ifdef EKEYREJECTED
--_S(ERR_MAP(EKEYREJECTED), N_("Key was rejected by service"))
-+_S(EKEYREJECTED, N_("Key was rejected by service"))
- #endif
- #ifdef ERFKILL
--_S(ERR_MAP(ERFKILL), N_("Operation not possible due to RF-kill"))
-+_S(ERFKILL, N_("Operation not possible due to RF-kill"))
- #endif
- #ifdef EHWPOISON
--_S(ERR_MAP(EHWPOISON), N_("Memory page has hardware error"))
-+_S(EHWPOISON, N_("Memory page has hardware error"))
- #endif
- #ifdef EBADRPC
--_S(ERR_MAP(EBADRPC), N_("RPC struct is bad"))
-+_S(EBADRPC, N_("RPC struct is bad"))
- #endif
- #ifdef EFTYPE
- /*
-@@ -693,40 +690,40 @@ TRANS operation, or a data file had the
- TRANS
- TRANS On some systems @code{chmod} returns this error if you try to set the
- TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}. */
--_S(ERR_MAP(EFTYPE), N_("Inappropriate file type or format"))
-+_S(EFTYPE, N_("Inappropriate file type or format"))
- #endif
- #ifdef EPROCUNAVAIL
--_S(ERR_MAP(EPROCUNAVAIL), N_("RPC bad procedure for program"))
-+_S(EPROCUNAVAIL, N_("RPC bad procedure for program"))
- #endif
- #ifdef EAUTH
--_S(ERR_MAP(EAUTH), N_("Authentication error"))
-+_S(EAUTH, N_("Authentication error"))
- #endif
- #ifdef EDIED
- /*
- TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
- TRANS translated by a program and the translator program dies while starting
- TRANS up, before it has connected to the file. */
--_S(ERR_MAP(EDIED), N_("Translator died"))
-+_S(EDIED, N_("Translator died"))
- #endif
- #ifdef ERPCMISMATCH
--_S(ERR_MAP(ERPCMISMATCH), N_("RPC version wrong"))
-+_S(ERPCMISMATCH, N_("RPC version wrong"))
- #endif
- #ifdef EGREGIOUS
- /*
- TRANS You did @strong{what}? */
--_S(ERR_MAP(EGREGIOUS), N_("You really blew it this time"))
-+_S(EGREGIOUS, N_("You really blew it this time"))
- #endif
- #ifdef EPROCLIM
- /*
- TRANS This means that the per-user limit on new process would be exceeded by
- TRANS an attempted @code{fork}. @xref{Limits on Resources}, for details on
- TRANS the @code{RLIMIT_NPROC} limit. */
--_S(ERR_MAP(EPROCLIM), N_("Too many processes"))
-+_S(EPROCLIM, N_("Too many processes"))
- #endif
- #ifdef EGRATUITOUS
- /*
- TRANS This error code has no purpose. */
--_S(ERR_MAP(EGRATUITOUS), N_("Gratuitous error"))
-+_S(EGRATUITOUS, N_("Gratuitous error"))
- #endif
- #if defined (ENOTSUP) && ENOTSUP != EOPNOTSUPP
- /*
-@@ -742,10 +739,10 @@ TRANS values.
- TRANS
- TRANS If the entire function is not available at all in the implementation,
- TRANS it returns @code{ENOSYS} instead. */
--_S(ERR_MAP(ENOTSUP), N_("Not supported"))
-+_S(ENOTSUP, N_("Not supported"))
- #endif
- #ifdef EPROGMISMATCH
--_S(ERR_MAP(EPROGMISMATCH), N_("RPC program version wrong"))
-+_S(EPROGMISMATCH, N_("RPC program version wrong"))
- #endif
- #ifdef EBACKGROUND
- /*
-@@ -755,7 +752,7 @@ TRANS foreground process group of the te
- TRANS error because functions such as @code{read} and @code{write} translate
- TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal. @xref{Job Control},
- TRANS for information on process groups and these signals. */
--_S(ERR_MAP(EBACKGROUND), N_("Inappropriate operation for background process"))
-+_S(EBACKGROUND, N_("Inappropriate operation for background process"))
- #endif
- #ifdef EIEIO
- /*
-@@ -773,7 +770,7 @@ TRANS @c "bought the farm" means "died".
- TRANS @c
- TRANS @c Translators, please do not translate this litteraly, translate it into
- TRANS @c an idiomatic funny way of saying that the computer died. */
--_S(ERR_MAP(EIEIO), N_("Computer bought the farm"))
-+_S(EIEIO, N_("Computer bought the farm"))
- #endif
- #if defined (EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
- /*
-@@ -782,18 +779,18 @@ TRANS The values are always the same, on
- TRANS
- TRANS C libraries in many older Unix systems have @code{EWOULDBLOCK} as a
- TRANS separate error code. */
--_S(ERR_MAP(EWOULDBLOCK), N_("Operation would block"))
-+_S(EWOULDBLOCK, N_("Operation would block"))
- #endif
- #ifdef ENEEDAUTH
--_S(ERR_MAP(ENEEDAUTH), N_("Need authenticator"))
-+_S(ENEEDAUTH, N_("Need authenticator"))
- #endif
- #ifdef ED
- /*
- TRANS The experienced user will know what is wrong.
- TRANS @c This error code is a joke. Its perror text is part of the joke.
- TRANS @c Don't change it. */
--_S(ERR_MAP(ED), N_("?"))
-+_S(ED, N_("?"))
- #endif
- #ifdef EPROGUNAVAIL
--_S(ERR_MAP(EPROGUNAVAIL), N_("RPC program not available"))
-+_S(EPROGUNAVAIL, N_("RPC program not available"))
- #endif
-diff -pruN glibc-2.32.orig/sysdeps/i386/dl-machine.h glibc-2.32/sysdeps/i386/dl-machine.h
---- glibc-2.32.orig/sysdeps/i386/dl-machine.h 2021-09-18 21:02:32.707184853 +1000
-+++ glibc-2.32/sysdeps/i386/dl-machine.h 2021-09-18 21:03:05.313302322 +1000
-@@ -338,16 +338,22 @@ elf_machine_rel (struct link_map *map, c
- {
- # ifndef RTLD_BOOTSTRAP
- if (sym_map != map
-- && sym_map->l_type != lt_executable
- && !sym_map->l_relocated)
- {
- const char *strtab
- = (const char *) D_PTR (map, l_info[DT_STRTAB]);
-- _dl_error_printf ("\
-+ if (sym_map->l_type == lt_executable)
-+ _dl_fatal_printf ("\
-+%s: IFUNC symbol '%s' referenced in '%s' is defined in the executable \
-+and creates an unsatisfiable circular dependency.\n",
-+ RTLD_PROGNAME, strtab + refsym->st_name,
-+ map->l_name);
-+ else
-+ _dl_error_printf ("\
- %s: Relink `%s' with `%s' for IFUNC symbol `%s'\n",
-- RTLD_PROGNAME, map->l_name,
-- sym_map->l_name,
-- strtab + refsym->st_name);
-+ RTLD_PROGNAME, map->l_name,
-+ sym_map->l_name,
-+ strtab + refsym->st_name);
- }
- # endif
- value = ((Elf32_Addr (*) (void)) value) ();
-diff -pruN glibc-2.32.orig/sysdeps/powerpc/powerpc64/backtrace.c glibc-2.32/sysdeps/powerpc/powerpc64/backtrace.c
---- glibc-2.32.orig/sysdeps/powerpc/powerpc64/backtrace.c 2021-09-18 21:02:32.723185402 +1000
-+++ glibc-2.32/sysdeps/powerpc/powerpc64/backtrace.c 2021-09-18 21:03:05.313302322 +1000
-@@ -54,11 +54,22 @@ struct signal_frame_64 {
- /* We don't care about the rest, since the IP value is at 'uc' field. */
- };
-
-+/* Test if the address match to the inside the trampoline code.
-+ Up to and including kernel 5.8, returning from an interrupt or syscall to a
-+ signal handler starts execution directly at the handler's entry point, with
-+ LR set to address of the sigreturn trampoline (the vDSO symbol).
-+ Newer kernels will branch to signal handler from the trampoline instead, so
-+ checking the stacktrace against the vDSO entrypoint does not work in such
-+ case.
-+ The vDSO branches with a 'bctrl' instruction, so checking either the
-+ vDSO address itself and the next instruction should cover all kernel
-+ versions. */
- static inline bool
- is_sigtramp_address (void *nip)
- {
- #ifdef HAVE_SIGTRAMP_RT64
-- if (nip == GLRO (dl_vdso_sigtramp_rt64))
-+ if (nip == GLRO (dl_vdso_sigtramp_rt64) ||
-+ nip == GLRO (dl_vdso_sigtramp_rt64) + 4)
- return true;
- #endif
- return false;
-diff -pruN glibc-2.32.orig/sysdeps/s390/configure glibc-2.32/sysdeps/s390/configure
---- glibc-2.32.orig/sysdeps/s390/configure 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/configure 2021-09-18 21:03:05.313302322 +1000
-@@ -123,7 +123,9 @@ void testinsn (char *buf)
- __asm__ (".machine \"arch13\" \n\t"
- ".machinemode \"zarch_nohighgprs\" \n\t"
- "lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
-@@ -271,7 +273,9 @@ else
- void testinsn (char *buf)
- {
- __asm__ ("lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c
-diff -pruN glibc-2.32.orig/sysdeps/s390/configure.ac glibc-2.32/sysdeps/s390/configure.ac
---- glibc-2.32.orig/sysdeps/s390/configure.ac 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/configure.ac 2021-09-18 21:03:05.313302322 +1000
-@@ -88,7 +88,9 @@ void testinsn (char *buf)
- __asm__ (".machine \"arch13\" \n\t"
- ".machinemode \"zarch_nohighgprs\" \n\t"
- "lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- dnl test, if assembler supports S390 arch13 instructions
-@@ -195,7 +197,9 @@ cat > conftest.c <<\EOF
- void testinsn (char *buf)
- {
- __asm__ ("lghi %%r0,16 \n\t"
-- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0");
-+ "mvcrl 0(%0),32(%0) \n\t"
-+ "vstrs %%v20,%%v20,%%v20,%%v20,0,2"
-+ : : "a" (buf) : "memory", "r0");
- }
- EOF
- dnl test, if assembler supports S390 arch13 zarch instructions as default
-diff -pruN glibc-2.32.orig/sysdeps/s390/memmove.c glibc-2.32/sysdeps/s390/memmove.c
---- glibc-2.32.orig/sysdeps/s390/memmove.c 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/memmove.c 2021-09-18 21:03:05.313302322 +1000
-@@ -43,7 +43,7 @@ extern __typeof (__redirect_memmove) MEM
- s390_libc_ifunc_expr (__redirect_memmove, memmove,
- ({
- s390_libc_ifunc_expr_stfle_init ();
-- (HAVE_MEMMOVE_ARCH13
-+ (HAVE_MEMMOVE_ARCH13 && (hwcap & HWCAP_S390_VXRS_EXT2)
- && S390_IS_ARCH13_MIE3 (stfle_bits))
- ? MEMMOVE_ARCH13
- : (HAVE_MEMMOVE_Z13 && (hwcap & HWCAP_S390_VX))
-diff -pruN glibc-2.32.orig/sysdeps/s390/multiarch/ifunc-impl-list.c glibc-2.32/sysdeps/s390/multiarch/ifunc-impl-list.c
---- glibc-2.32.orig/sysdeps/s390/multiarch/ifunc-impl-list.c 2021-09-18 21:02:32.727185539 +1000
-+++ glibc-2.32/sysdeps/s390/multiarch/ifunc-impl-list.c 2021-09-18 21:03:05.313302322 +1000
-@@ -171,7 +171,8 @@ __libc_ifunc_impl_list (const char *name
- IFUNC_IMPL (i, name, memmove,
- # if HAVE_MEMMOVE_ARCH13
- IFUNC_IMPL_ADD (array, i, memmove,
-- S390_IS_ARCH13_MIE3 (stfle_bits),
-+ ((dl_hwcap & HWCAP_S390_VXRS_EXT2)
-+ && S390_IS_ARCH13_MIE3 (stfle_bits)),
- MEMMOVE_ARCH13)
- # endif
- # if HAVE_MEMMOVE_Z13
-diff -pruN glibc-2.32.orig/sysdeps/sh/be/sh4/fpu/Implies glibc-2.32/sysdeps/sh/be/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/sh/be/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/sh/be/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/sh/le/sh4/fpu/Implies glibc-2.32/sysdeps/sh/le/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/sh/le/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/sh/le/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/aarch64/cpu-features.h glibc-2.32/sysdeps/unix/sysv/linux/aarch64/cpu-features.h
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/aarch64/cpu-features.h 2021-09-18 21:02:32.731185676 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/aarch64/cpu-features.h 2021-09-18 21:03:05.313302322 +1000
-@@ -54,6 +54,10 @@
- && MIDR_PARTNUM(midr) == 0x000)
- #define IS_NEOVERSE_N1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
- && MIDR_PARTNUM(midr) == 0xd0c)
-+#define IS_NEOVERSE_N2(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
-+ && MIDR_PARTNUM(midr) == 0xd49)
-+#define IS_NEOVERSE_V1(midr) (MIDR_IMPLEMENTOR(midr) == 'A' \
-+ && MIDR_PARTNUM(midr) == 0xd40)
-
- #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \
- && MIDR_PARTNUM(midr) == 0x000)
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.32/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/Makefile 2021-09-18 21:02:32.731185676 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/Makefile 2021-09-18 21:03:05.313302322 +1000
-@@ -100,7 +100,7 @@ tests += tst-clone tst-clone2 tst-clone3
- tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \
- test-errno-linux tst-memfd_create tst-mlock2 tst-pkey \
- tst-rlimit-infinity tst-ofdlocks tst-gettid tst-gettid-kill \
-- tst-tgkill
-+ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux
- tests-internal += tst-ofdlocks-compat tst-sigcontext-get_pc
-
- CFLAGS-tst-sigcontext-get_pc.c = -fasynchronous-unwind-tables
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/mq_notify.c glibc-2.32/sysdeps/unix/sysv/linux/mq_notify.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/mq_notify.c 2021-09-18 21:02:32.736185847 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/mq_notify.c 2021-09-18 21:09:50.680196980 +1000
-@@ -132,9 +132,12 @@ helper_thread (void *arg)
- to wait until it is done with it. */
- (void) __pthread_barrier_wait (¬ify_barrier);
- }
-- else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
-- /* The only state we keep is the copy of the thread attributes. */
-- free (data.attr);
-+ else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED && data.attr != NULL)
-+ {
-+ /* The only state we keep is the copy of the thread attributes. */
-+ pthread_attr_destroy (data.attr);
-+ free (data.attr);
-+ }
- }
- return NULL;
- }
-@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sig
- if (data.attr == NULL)
- return -1;
-
-- memcpy (data.attr, notification->sigev_notify_attributes,
-- sizeof (pthread_attr_t));
-+ int ret = __pthread_attr_copy (data.attr,
-+ notification->sigev_notify_attributes);
-+ if (ret != 0)
-+ {
-+ free (data.attr);
-+ __set_errno (ret);
-+ return -1;
-+ }
- }
-
- /* Construct the new request. */
-@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sig
- int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se);
-
- /* If it failed, free the allocated memory. */
-- if (__glibc_unlikely (retval != 0))
-- free (data.attr);
-+ if (retval != 0 && data.attr != NULL)
-+ {
-+ pthread_attr_destroy (data.attr);
-+ free (data.attr);
-+ }
-
- return retval;
- }
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/msgctl.c glibc-2.32/sysdeps/unix/sysv/linux/msgctl.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/msgctl.c 2021-09-18 21:02:32.736185847 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/msgctl.c 2021-09-18 21:03:05.313302322 +1000
-@@ -90,8 +90,15 @@ __msgctl64 (int msqid, int cmd, struct _
- struct kernel_msqid64_ds ksemid, *arg = NULL;
- if (buf != NULL)
- {
-- msqid64_to_kmsqid64 (buf, &ksemid);
-- arg = &ksemid;
-+ /* This is a Linux extension where kernel returns a 'struct msginfo'
-+ instead. */
-+ if (cmd == IPC_INFO || cmd == MSG_INFO)
-+ arg = (struct kernel_msqid64_ds *) buf;
-+ else
-+ {
-+ msqid64_to_kmsqid64 (buf, &ksemid);
-+ arg = &ksemid;
-+ }
- }
- # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
- if (cmd == IPC_SET)
-@@ -169,8 +176,15 @@ __msgctl (int msqid, int cmd, struct msq
- struct __msqid64_ds msqid64, *buf64 = NULL;
- if (buf != NULL)
- {
-- msqid_to_msqid64 (&msqid64, buf);
-- buf64 = &msqid64;
-+ /* This is a Linux extension where kernel returns a 'struct msginfo'
-+ instead. */
-+ if (cmd == IPC_INFO || cmd == MSG_INFO)
-+ buf64 = (struct __msqid64_ds *) buf;
-+ else
-+ {
-+ msqid_to_msqid64 (&msqid64, buf);
-+ buf64 = &msqid64;
-+ }
- }
-
- int ret = __msgctl64 (msqid, cmd, buf64);
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/semctl.c glibc-2.32/sysdeps/unix/sysv/linux/semctl.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/semctl.c 2021-09-18 21:02:32.739185950 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/semctl.c 2021-09-18 21:03:05.313302322 +1000
-@@ -102,6 +102,7 @@ semun64_to_ksemun64 (int cmd, union semu
- r.array = semun64.array;
- break;
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_STAT:
- case IPC_SET:
- r.buf = buf;
-@@ -150,6 +151,7 @@ __semctl64 (int semid, int semnum, int c
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-@@ -238,6 +240,7 @@ semun_to_semun64 (int cmd, union semun s
- r.array = semun.array;
- break;
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_STAT:
- case IPC_SET:
- r.buf = semid64;
-@@ -267,6 +270,7 @@ __semctl (int semid, int semnum, int cmd
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-@@ -321,6 +325,7 @@ __semctl_mode16 (int semid, int semnum,
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-@@ -354,6 +359,7 @@ __old_semctl (int semid, int semnum, int
- case IPC_STAT: /* arg.buf */
- case IPC_SET:
- case SEM_STAT:
-+ case SEM_STAT_ANY:
- case IPC_INFO: /* arg.__buf */
- case SEM_INFO:
- va_start (ap, cmd);
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies glibc-2.32/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/sh/be/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+unix/sysv/linux/sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies glibc-2.32/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/sh/le/sh4/fpu/Implies 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1 @@
-+unix/sysv/linux/sh/sh4/fpu
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/shmctl.c glibc-2.32/sysdeps/unix/sysv/linux/shmctl.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/shmctl.c 2021-09-18 21:02:32.740185984 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/shmctl.c 2021-09-18 21:03:05.313302322 +1000
-@@ -90,8 +90,15 @@ __shmctl64 (int shmid, int cmd, struct _
- struct kernel_shmid64_ds kshmid, *arg = NULL;
- if (buf != NULL)
- {
-- shmid64_to_kshmid64 (buf, &kshmid);
-- arg = &kshmid;
-+ /* This is a Linux extension where kernel expects either a
-+ 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */
-+ if (cmd == IPC_INFO || cmd == SHM_INFO)
-+ arg = (struct kernel_shmid64_ds *) buf;
-+ else
-+ {
-+ shmid64_to_kshmid64 (buf, &kshmid);
-+ arg = &kshmid;
-+ }
- }
- # ifdef __ASSUME_SYSVIPC_BROKEN_MODE_T
- if (cmd == IPC_SET)
-@@ -107,7 +114,6 @@ __shmctl64 (int shmid, int cmd, struct _
-
- switch (cmd)
- {
-- case IPC_INFO:
- case IPC_STAT:
- case SHM_STAT:
- case SHM_STAT_ANY:
-@@ -168,8 +174,15 @@ __shmctl (int shmid, int cmd, struct shm
- struct __shmid64_ds shmid64, *buf64 = NULL;
- if (buf != NULL)
- {
-- shmid_to_shmid64 (&shmid64, buf);
-- buf64 = &shmid64;
-+ /* This is a Linux extension where kernel expects either a
-+ 'struct shminfo' (IPC_INFO) or 'struct shm_info' (SHM_INFO). */
-+ if (cmd == IPC_INFO || cmd == SHM_INFO)
-+ buf64 = (struct __shmid64_ds *) buf;
-+ else
-+ {
-+ shmid_to_shmid64 (&shmid64, buf);
-+ buf64 = &shmid64;
-+ }
- }
-
- int ret = __shmctl64 (shmid, cmd, buf64);
-@@ -178,7 +191,6 @@ __shmctl (int shmid, int cmd, struct shm
-
- switch (cmd)
- {
-- case IPC_INFO:
- case IPC_STAT:
- case SHM_STAT:
- case SHM_STAT_ANY:
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvmsg-linux.c 2021-09-18 21:03:05.313302322 +1000
-@@ -0,0 +1,177 @@
-+/* Basic tests for Linux SYSV message queue extensions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <sys/ipc.h>
-+#include <sys/msg.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+
-+#include <support/check.h>
-+#include <support/temp_file.h>
-+
-+#define MSGQ_MODE 0644
-+
-+/* These are for the temporary file we generate. */
-+static char *name;
-+static int msqid;
-+
-+static void
-+remove_msq (void)
-+{
-+ /* Enforce message queue removal in case of early test failure.
-+ Ignore error since the msg may already have being removed. */
-+ msgctl (msqid, IPC_RMID, NULL);
-+}
-+
-+static void
-+do_prepare (int argc, char *argv[])
-+{
-+ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvmsg.", &name) != -1);
-+}
-+
-+#define PREPARE do_prepare
-+
-+struct test_msginfo
-+{
-+ int msgmax;
-+ int msgmnb;
-+ int msgmni;
-+};
-+
-+/* It tries to obtain some system-wide SysV messsage queue information from
-+ /proc to check against IPC_INFO/MSG_INFO. The /proc only returns the
-+ tunables value of MSGMAX, MSGMNB, and MSGMNI.
-+
-+ The kernel also returns constant value for MSGSSZ, MSGSEG and also MSGMAP,
-+ MSGPOOL, and MSGTQL (for IPC_INFO). The issue to check them is they might
-+ change over kernel releases. */
-+
-+static int
-+read_proc_file (const char *file)
-+{
-+ FILE *f = fopen (file, "r");
-+ if (f == NULL)
-+ FAIL_UNSUPPORTED ("/proc is not mounted or %s is not available", file);
-+
-+ int v;
-+ int r = fscanf (f, "%d", & v);
-+ TEST_VERIFY_EXIT (r == 1);
-+
-+ fclose (f);
-+ return v;
-+}
-+
-+
-+/* Check if the message queue with IDX (index into the kernel's internal
-+ array) matches the one with KEY. The CMD is either MSG_STAT or
-+ MSG_STAT_ANY. */
-+
-+static bool
-+check_msginfo (int idx, key_t key, int cmd)
-+{
-+ struct msqid_ds msginfo;
-+ int mid = msgctl (idx, cmd, &msginfo);
-+ /* Ignore unused array slot returned by the kernel or information from
-+ unknown message queue. */
-+ if ((mid == -1 && errno == EINVAL) || mid != msqid)
-+ return false;
-+
-+ if (mid == -1)
-+ FAIL_EXIT1 ("msgctl with %s failed: %m",
-+ cmd == MSG_STAT ? "MSG_STAT" : "MSG_STAT_ANY");
-+
-+ TEST_COMPARE (msginfo.msg_perm.__key, key);
-+ TEST_COMPARE (msginfo.msg_perm.mode, MSGQ_MODE);
-+ TEST_COMPARE (msginfo.msg_qnum, 0);
-+
-+ return true;
-+}
-+
-+static int
-+do_test (void)
-+{
-+ atexit (remove_msq);
-+
-+ key_t key = ftok (name, 'G');
-+ if (key == -1)
-+ FAIL_EXIT1 ("ftok failed: %m");
-+
-+ msqid = msgget (key, MSGQ_MODE | IPC_CREAT);
-+ if (msqid == -1)
-+ FAIL_EXIT1 ("msgget failed: %m");
-+
-+ struct test_msginfo tipcinfo;
-+ tipcinfo.msgmax = read_proc_file ("/proc/sys/kernel/msgmax");
-+ tipcinfo.msgmnb = read_proc_file ("/proc/sys/kernel/msgmnb");
-+ tipcinfo.msgmni = read_proc_file ("/proc/sys/kernel/msgmni");
-+
-+ int msqidx;
-+
-+ {
-+ struct msginfo ipcinfo;
-+ msqidx = msgctl (msqid, IPC_INFO, (struct msqid_ds *) &ipcinfo);
-+ if (msqidx == -1)
-+ FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax);
-+ TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb);
-+ TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni);
-+ }
-+
-+ /* Same as before but with MSG_INFO. */
-+ {
-+ struct msginfo ipcinfo;
-+ msqidx = msgctl (msqid, MSG_INFO, (struct msqid_ds *) &ipcinfo);
-+ if (msqidx == -1)
-+ FAIL_EXIT1 ("msgctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.msgmax, tipcinfo.msgmax);
-+ TEST_COMPARE (ipcinfo.msgmnb, tipcinfo.msgmnb);
-+ TEST_COMPARE (ipcinfo.msgmni, tipcinfo.msgmni);
-+ }
-+
-+ /* We check if the created message queue shows in global list. */
-+ bool found = false;
-+ for (int i = 0; i <= msqidx; i++)
-+ {
-+ /* We can't tell apart if MSG_STAT_ANY is not supported (kernel older
-+ than 4.17) or if the index used is invalid. So it just check if the
-+ value returned from a valid call matches the created message
-+ queue. */
-+ check_msginfo (i, key, MSG_STAT_ANY);
-+
-+ if (check_msginfo (i, key, MSG_STAT))
-+ {
-+ found = true;
-+ break;
-+ }
-+ }
-+
-+ if (!found)
-+ FAIL_EXIT1 ("msgctl with MSG_STAT/MSG_STAT_ANY could not find the "
-+ "created message queue");
-+
-+ if (msgctl (msqid, IPC_RMID, NULL) == -1)
-+ FAIL_EXIT1 ("msgctl failed");
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvsem-linux.c 2021-09-18 21:03:05.314302356 +1000
-@@ -0,0 +1,184 @@
-+/* Basic tests for Linux SYSV semaphore extensions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <sys/ipc.h>
-+#include <sys/sem.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+
-+#include <support/check.h>
-+#include <support/temp_file.h>
-+
-+/* These are for the temporary file we generate. */
-+static char *name;
-+static int semid;
-+
-+static void
-+remove_sem (void)
-+{
-+ /* Enforce message queue removal in case of early test failure.
-+ Ignore error since the sem may already have being removed. */
-+ semctl (semid, 0, IPC_RMID, 0);
-+}
-+
-+static void
-+do_prepare (int argc, char *argv[])
-+{
-+ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvsem.", &name) != -1);
-+}
-+
-+#define PREPARE do_prepare
-+
-+#define SEM_MODE 0644
-+
-+union semun
-+{
-+ int val;
-+ struct semid_ds *buf;
-+ unsigned short *array;
-+ struct seminfo *__buf;
-+};
-+
-+struct test_seminfo
-+{
-+ int semmsl;
-+ int semmns;
-+ int semopm;
-+ int semmni;
-+};
-+
-+/* It tries to obtain some system-wide SysV semaphore information from /proc
-+ to check against IPC_INFO/SEM_INFO. The /proc only returns the tunables
-+ value of SEMMSL, SEMMNS, SEMOPM, and SEMMNI.
-+
-+ The kernel also returns constant value for SEMVMX, SEMMNU, SEMMAP, SEMUME,
-+ and also SEMUSZ and SEMAEM (for IPC_INFO). The issue to check them is they
-+ might change over kernel releases. */
-+
-+static void
-+read_sem_stat (struct test_seminfo *tseminfo)
-+{
-+ FILE *f = fopen ("/proc/sys/kernel/sem", "r");
-+ if (f == NULL)
-+ FAIL_UNSUPPORTED ("/proc is not mounted or /proc/sys/kernel/sem is not "
-+ "available");
-+
-+ int r = fscanf (f, "%d %d %d %d",
-+ &tseminfo->semmsl, &tseminfo->semmns, &tseminfo->semopm,
-+ &tseminfo->semmni);
-+ TEST_VERIFY_EXIT (r == 4);
-+
-+ fclose (f);
-+}
-+
-+
-+/* Check if the semaphore with IDX (index into the kernel's internal array)
-+ matches the one with KEY. The CMD is either SEM_STAT or SEM_STAT_ANY. */
-+
-+static bool
-+check_seminfo (int idx, key_t key, int cmd)
-+{
-+ struct semid_ds seminfo;
-+ int sid = semctl (idx, 0, cmd, (union semun) { .buf = &seminfo });
-+ /* Ignore unused array slot returned by the kernel or information from
-+ unknown semaphores. */
-+ if ((sid == -1 && errno == EINVAL) || sid != semid)
-+ return false;
-+
-+ if (sid == -1)
-+ FAIL_EXIT1 ("semctl with SEM_STAT failed (errno=%d)", errno);
-+
-+ TEST_COMPARE (seminfo.sem_perm.__key, key);
-+ TEST_COMPARE (seminfo.sem_perm.mode, SEM_MODE);
-+ TEST_COMPARE (seminfo.sem_nsems, 1);
-+
-+ return true;
-+}
-+
-+static int
-+do_test (void)
-+{
-+ atexit (remove_sem);
-+
-+ key_t key = ftok (name, 'G');
-+ if (key == -1)
-+ FAIL_EXIT1 ("ftok failed: %m");
-+
-+ semid = semget (key, 1, IPC_CREAT | IPC_EXCL | SEM_MODE);
-+ if (semid == -1)
-+ FAIL_EXIT1 ("semget failed: %m");
-+
-+ struct test_seminfo tipcinfo;
-+ read_sem_stat (&tipcinfo);
-+
-+ int semidx;
-+
-+ {
-+ struct seminfo ipcinfo;
-+ semidx = semctl (semid, 0, IPC_INFO, (union semun) { .__buf = &ipcinfo });
-+ if (semidx == -1)
-+ FAIL_EXIT1 ("semctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl);
-+ TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns);
-+ TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm);
-+ TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni);
-+ }
-+
-+ /* Same as before but with SEM_INFO. */
-+ {
-+ struct seminfo ipcinfo;
-+ semidx = semctl (semid, 0, SEM_INFO, (union semun) { .__buf = &ipcinfo });
-+ if (semidx == -1)
-+ FAIL_EXIT1 ("semctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.semmsl, tipcinfo.semmsl);
-+ TEST_COMPARE (ipcinfo.semmns, tipcinfo.semmns);
-+ TEST_COMPARE (ipcinfo.semopm, tipcinfo.semopm);
-+ TEST_COMPARE (ipcinfo.semmni, tipcinfo.semmni);
-+ }
-+
-+ /* We check if the created semaphore shows in the system-wide status. */
-+ bool found = false;
-+ for (int i = 0; i <= semidx; i++)
-+ {
-+ /* We can't tell apart if SEM_STAT_ANY is not supported (kernel older
-+ than 4.17) or if the index used is invalid. So it just check if
-+ value returned from a valid call matches the created semaphore. */
-+ check_seminfo (i, key, SEM_STAT_ANY);
-+
-+ if (check_seminfo (i, key, SEM_STAT))
-+ {
-+ found = true;
-+ break;
-+ }
-+ }
-+
-+ if (!found)
-+ FAIL_EXIT1 ("semctl with SEM_STAT/SEM_STAT_ANY could not find the "
-+ "created semaphore");
-+
-+ if (semctl (semid, 0, IPC_RMID, 0) == -1)
-+ FAIL_EXIT1 ("semctl failed: %m");
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/tst-sysvshm-linux.c 2021-09-18 21:03:05.314302356 +1000
-@@ -0,0 +1,185 @@
-+/* Basic tests for Linux SYSV shared memory extensions.
-+ Copyright (C) 2020 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, see
-+ <https://www.gnu.org/licenses/>. */
-+
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#include <errno.h>
-+#include <stdlib.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <limits.h>
-+
-+#include <support/check.h>
-+#include <support/temp_file.h>
-+
-+#define SHM_MODE 0644
-+
-+/* These are for the temporary file we generate. */
-+static char *name;
-+static int shmid;
-+static long int pgsz;
-+
-+static void
-+remove_shm (void)
-+{
-+ /* Enforce message queue removal in case of early test failure.
-+ Ignore error since the shm may already have being removed. */
-+ shmctl (shmid, IPC_RMID, NULL);
-+}
-+
-+static void
-+do_prepare (int argc, char *argv[])
-+{
-+ TEST_VERIFY_EXIT (create_temp_file ("tst-sysvshm.", &name) != -1);
-+}
-+
-+#define PREPARE do_prepare
-+
-+struct test_shminfo
-+{
-+ unsigned long int shmall;
-+ unsigned long int shmmax;
-+ unsigned long int shmmni;
-+};
-+
-+/* It tries to obtain some system-wide SysV shared memory information from
-+ /proc to check against IPC_INFO/SHM_INFO. The /proc only returns the
-+ tunables value of SHMALL, SHMMAX, and SHMMNI. */
-+
-+static uint64_t
-+read_proc_file (const char *file)
-+{
-+ FILE *f = fopen (file, "r");
-+ if (f == NULL)
-+ FAIL_UNSUPPORTED ("/proc is not mounted or %s is not available", file);
-+
-+ /* Handle 32-bit binaries running on 64-bit kernels. */
-+ uint64_t v;
-+ int r = fscanf (f, "%" SCNu64, &v);
-+ TEST_VERIFY_EXIT (r == 1);
-+
-+ fclose (f);
-+ return v;
-+}
-+
-+
-+/* Check if the message queue with IDX (index into the kernel's internal
-+ array) matches the one with KEY. The CMD is either SHM_STAT or
-+ SHM_STAT_ANY. */
-+
-+static bool
-+check_shminfo (int idx, key_t key, int cmd)
-+{
-+ struct shmid_ds shminfo;
-+ int sid = shmctl (idx, cmd, &shminfo);
-+ /* Ignore unused array slot returned by the kernel or information from
-+ unknown message queue. */
-+ if ((sid == -1 && errno == EINVAL) || sid != shmid)
-+ return false;
-+
-+ if (sid == -1)
-+ FAIL_EXIT1 ("shmctl with %s failed: %m",
-+ cmd == SHM_STAT ? "SHM_STAT" : "SHM_STAT_ANY");
-+
-+ TEST_COMPARE (shminfo.shm_perm.__key, key);
-+ TEST_COMPARE (shminfo.shm_perm.mode, SHM_MODE);
-+ TEST_COMPARE (shminfo.shm_segsz, pgsz);
-+
-+ return true;
-+}
-+
-+static int
-+do_test (void)
-+{
-+ atexit (remove_shm);
-+
-+ pgsz = sysconf (_SC_PAGESIZE);
-+ if (pgsz == -1)
-+ FAIL_EXIT1 ("sysconf (_SC_PAGESIZE) failed: %m");
-+
-+ key_t key = ftok (name, 'G');
-+ if (key == -1)
-+ FAIL_EXIT1 ("ftok failed: %m");
-+
-+ shmid = shmget (key, pgsz, IPC_CREAT | IPC_EXCL | SHM_MODE);
-+ if (shmid == -1)
-+ FAIL_EXIT1 ("shmget failed: %m");
-+
-+ struct test_shminfo tipcinfo;
-+ {
-+ uint64_t v = read_proc_file ("/proc/sys/kernel/shmmax");
-+#if LONG_MAX == INT_MAX
-+ /* Kernel explicit clamp the value for shmmax on compat symbol (32-bit
-+ binaries running on 64-bit kernels). */
-+ if (v > INT_MAX)
-+ v = INT_MAX;
-+#endif
-+ tipcinfo.shmmax = v;
-+ }
-+ tipcinfo.shmall = read_proc_file ("/proc/sys/kernel/shmall");
-+ tipcinfo.shmmni = read_proc_file ("/proc/sys/kernel/shmmni");
-+
-+ int shmidx;
-+
-+ /* Note: SHM_INFO does not return a shminfo, but rather a 'struct shm_info'.
-+ It is tricky to verify its values since the syscall returns system wide
-+ resources consumed by shared memory. The shmctl implementation handles
-+ SHM_INFO as IPC_INFO, so the IPC_INFO test should validate SHM_INFO as
-+ well. */
-+
-+ {
-+ struct shminfo ipcinfo;
-+ shmidx = shmctl (shmid, IPC_INFO, (struct shmid_ds *) &ipcinfo);
-+ if (shmidx == -1)
-+ FAIL_EXIT1 ("shmctl with IPC_INFO failed: %m");
-+
-+ TEST_COMPARE (ipcinfo.shmall, tipcinfo.shmall);
-+ TEST_COMPARE (ipcinfo.shmmax, tipcinfo.shmmax);
-+ TEST_COMPARE (ipcinfo.shmmni, tipcinfo.shmmni);
-+ }
-+
-+ /* We check if the created shared memory shows in the global list. */
-+ bool found = false;
-+ for (int i = 0; i <= shmidx; i++)
-+ {
-+ /* We can't tell apart if SHM_STAT_ANY is not supported (kernel older
-+ than 4.17) or if the index used is invalid. So it just check if
-+ value returned from a valid call matches the created message
-+ queue. */
-+ check_shminfo (i, key, SHM_STAT_ANY);
-+
-+ if (check_shminfo (i, key, SHM_STAT))
-+ {
-+ found = true;
-+ break;
-+ }
-+ }
-+
-+ if (!found)
-+ FAIL_EXIT1 ("shmctl with SHM_STAT/SHM_STAT_ANY could not find the "
-+ "created shared memory");
-+
-+ if (shmctl (shmid, IPC_RMID, NULL) == -1)
-+ FAIL_EXIT1 ("shmctl failed");
-+
-+ return 0;
-+}
-+
-+#include <support/test-driver.c>
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/64/configure glibc-2.32/sysdeps/unix/sysv/linux/x86_64/64/configure
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/64/configure 2021-09-18 21:02:32.741186019 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/x86_64/64/configure 2021-09-18 21:03:05.314302356 +1000
-@@ -4,10 +4,10 @@
- test -n "$libc_cv_slibdir" ||
- case "$prefix" in
- /usr | /usr/)
-- libc_cv_slibdir='/lib64'
-- libc_cv_rtlddir='/lib64'
-+ libc_cv_slibdir='/lib'
-+ libc_cv_rtlddir='/lib'
- if test "$libdir" = '${exec_prefix}/lib'; then
-- libdir='${exec_prefix}/lib64';
-+ libdir='${exec_prefix}/lib';
- # Locale data can be shared between 32-bit and 64-bit libraries.
- libc_cv_complocaledir='${exec_prefix}/lib/locale'
- fi
-diff -pruN glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h glibc-2.32/sysdeps/unix/sysv/linux/x86_64/ldconfig.h
---- glibc-2.32.orig/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/unix/sysv/linux/x86_64/ldconfig.h 2021-09-18 21:03:05.314302356 +1000
-@@ -18,9 +18,9 @@
- #include <sysdeps/generic/ldconfig.h>
-
- #define SYSDEP_KNOWN_INTERPRETER_NAMES \
-- { "/lib/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
-+ { "/lib32/ld-linux.so.2", FLAG_ELF_LIBC6 }, \
- { "/libx32/ld-linux-x32.so.2", FLAG_ELF_LIBC6 }, \
-- { "/lib64/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
-+ { "/lib/ld-linux-x86-64.so.2", FLAG_ELF_LIBC6 },
- #define SYSDEP_KNOWN_LIBRARY_NAMES \
- { "libc.so.6", FLAG_ELF_LIBC6 }, \
- { "libm.so.6", FLAG_ELF_LIBC6 },
-diff -pruN glibc-2.32.orig/sysdeps/x86/cacheinfo.c glibc-2.32/sysdeps/x86/cacheinfo.c
---- glibc-2.32.orig/sysdeps/x86/cacheinfo.c 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/cacheinfo.c 2021-09-18 21:03:05.314302356 +1000
-@@ -808,7 +808,7 @@ init_cacheinfo (void)
- threads = 1 << ((ecx >> 12) & 0x0f);
- }
-
-- if (threads == 0)
-+ if (threads == 0 || cpu_features->basic.family >= 0x17)
- {
- /* If APIC ID width is not available, use logical
- processor count. */
-@@ -823,8 +823,22 @@ init_cacheinfo (void)
- if (threads > 0)
- shared /= threads;
-
-- /* Account for exclusive L2 and L3 caches. */
-- shared += core;
-+ /* Get shared cache per ccx for Zen architectures. */
-+ if (cpu_features->basic.family >= 0x17)
-+ {
-+ unsigned int eax;
-+
-+ /* Get number of threads share the L3 cache in CCX. */
-+ __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
-+
-+ unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
-+ shared *= threads_per_ccx;
-+ }
-+ else
-+ {
-+ /* Account for exclusive L2 and L3 caches. */
-+ shared += core;
-+ }
- }
- }
-
-@@ -854,14 +868,20 @@ init_cacheinfo (void)
- __x86_shared_cache_size = shared;
- }
-
-- /* The large memcpy micro benchmark in glibc shows that 6 times of
-- shared cache size is the approximate value above which non-temporal
-- store becomes faster on a 8-core processor. This is the 3/4 of the
-- total shared cache size. */
-+ /* The default setting for the non_temporal threshold is 3/4 of one
-+ thread's share of the chip's cache. For most Intel and AMD processors
-+ with an initial release date between 2017 and 2020, a thread's typical
-+ share of the cache is from 500 KBytes to 2 MBytes. Using the 3/4
-+ threshold leaves 125 KBytes to 500 KBytes of the thread's data
-+ in cache after a maximum temporal copy, which will maintain
-+ in cache a reasonable portion of the thread's stack and other
-+ active data. If the threshold is set higher than one thread's
-+ share of the cache, it has a substantial risk of negatively
-+ impacting the performance of other threads running on the chip. */
- __x86_shared_non_temporal_threshold
- = (cpu_features->non_temporal_threshold != 0
- ? cpu_features->non_temporal_threshold
-- : __x86_shared_cache_size * threads * 3 / 4);
-+ : __x86_shared_cache_size * 3 / 4);
-
- /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8. */
- unsigned int minimum_rep_movsb_threshold;
-diff -pruN glibc-2.32.orig/sysdeps/x86/dl-cet.c glibc-2.32/sysdeps/x86/dl-cet.c
---- glibc-2.32.orig/sysdeps/x86/dl-cet.c 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/dl-cet.c 2021-09-18 21:03:05.314302356 +1000
-@@ -47,7 +47,10 @@ dl_cet_check (struct link_map *m, const
- /* No legacy object check if both IBT and SHSTK are always on. */
- if (enable_ibt_type == cet_always_on
- && enable_shstk_type == cet_always_on)
-- return;
-+ {
-+ THREAD_SETMEM (THREAD_SELF, header.feature_1, GL(dl_x86_feature_1));
-+ return;
-+ }
-
- /* Check if IBT is enabled by kernel. */
- bool ibt_enabled
-diff -pruN glibc-2.32.orig/sysdeps/x86/dl-prop.h glibc-2.32/sysdeps/x86/dl-prop.h
---- glibc-2.32.orig/sysdeps/x86/dl-prop.h 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/dl-prop.h 2021-09-18 21:03:05.314302356 +1000
-@@ -145,15 +145,15 @@ _dl_process_cet_property_note (struct li
- }
-
- static inline void __attribute__ ((unused))
--_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph)
-+_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph)
- {
- const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr);
- _dl_process_cet_property_note (l, note, ph->p_memsz, ph->p_align);
- }
-
- static inline int __attribute__ ((always_inline))
--_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz,
-- void *data)
-+_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type,
-+ uint32_t datasz, void *data)
- {
- return 0;
- }
-diff -pruN glibc-2.32.orig/sysdeps/x86/Makefile glibc-2.32/sysdeps/x86/Makefile
---- glibc-2.32.orig/sysdeps/x86/Makefile 2021-09-18 21:02:32.742186053 +1000
-+++ glibc-2.32/sysdeps/x86/Makefile 2021-09-18 21:03:05.314302356 +1000
-@@ -12,6 +12,12 @@ endif
- ifeq ($(subdir),setjmp)
- gen-as-const-headers += jmp_buf-ssp.sym
- sysdep_routines += __longjmp_cancel
-+ifneq ($(enable-cet),no)
-+ifneq ($(have-tunables),no)
-+tests += tst-setjmp-cet
-+tst-setjmp-cet-ENV = GLIBC_TUNABLES=glibc.cpu.x86_ibt=on:glibc.cpu.x86_shstk=on
-+endif
-+endif
- endif
-
- ifeq ($(subdir),string)
-diff -pruN glibc-2.32.orig/sysdeps/x86/tst-setjmp-cet.c glibc-2.32/sysdeps/x86/tst-setjmp-cet.c
---- glibc-2.32.orig/sysdeps/x86/tst-setjmp-cet.c 1970-01-01 10:00:00.000000000 +1000
-+++ glibc-2.32/sysdeps/x86/tst-setjmp-cet.c 2021-09-18 21:03:05.314302356 +1000
-@@ -0,0 +1 @@
-+#include <setjmp/tst-setjmp.c>
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/configure glibc-2.32/sysdeps/x86_64/configure
---- glibc-2.32.orig/sysdeps/x86_64/configure 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/configure 2021-09-18 21:03:05.314302356 +1000
-@@ -107,39 +107,6 @@ if test x"$build_mathvec" = xnotset; the
- build_mathvec=yes
- fi
-
--if test "$static_pie" = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker static PIE support" >&5
--$as_echo_n "checking for linker static PIE support... " >&6; }
--if ${libc_cv_ld_static_pie+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- cat > conftest.s <<\EOF
-- .text
-- .global _start
-- .weak foo
--_start:
-- leaq foo(%rip), %rax
--EOF
-- libc_cv_pie_option="-Wl,-pie"
-- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&5'
-- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; }; then
-- libc_cv_ld_static_pie=yes
-- else
-- libc_cv_ld_static_pie=no
-- fi
--rm -f conftest*
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_static_pie" >&5
--$as_echo "$libc_cv_ld_static_pie" >&6; }
-- if test "$libc_cv_ld_static_pie" != yes; then
-- as_fn_error $? "linker support for static PIE needed" "$LINENO" 5
-- fi
--fi
--
- $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
-
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/configure.ac glibc-2.32/sysdeps/x86_64/configure.ac
---- glibc-2.32.orig/sysdeps/x86_64/configure.ac 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/configure.ac 2021-09-18 21:03:05.314302356 +1000
-@@ -53,31 +53,6 @@ if test x"$build_mathvec" = xnotset; the
- build_mathvec=yes
- fi
-
--dnl Check if linker supports static PIE with the fix for
--dnl
--dnl https://sourceware.org/bugzilla/show_bug.cgi?id=21782
--dnl
--if test "$static_pie" = yes; then
-- AC_CACHE_CHECK(for linker static PIE support, libc_cv_ld_static_pie, [dnl
--cat > conftest.s <<\EOF
-- .text
-- .global _start
-- .weak foo
--_start:
-- leaq foo(%rip), %rax
--EOF
-- libc_cv_pie_option="-Wl,-pie"
-- if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&AS_MESSAGE_LOG_FD); then
-- libc_cv_ld_static_pie=yes
-- else
-- libc_cv_ld_static_pie=no
-- fi
--rm -f conftest*])
-- if test "$libc_cv_ld_static_pie" != yes; then
-- AC_MSG_ERROR([linker support for static PIE needed])
-- fi
--fi
--
- dnl It is always possible to access static and hidden symbols in an
- dnl position independent way.
- AC_DEFINE(PI_STATIC_AND_HIDDEN)
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/dl-machine.h glibc-2.32/sysdeps/x86_64/dl-machine.h
---- glibc-2.32.orig/sysdeps/x86_64/dl-machine.h 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/dl-machine.h 2021-09-18 21:03:05.314302356 +1000
-@@ -315,16 +315,22 @@ elf_machine_rela (struct link_map *map,
- {
- # ifndef RTLD_BOOTSTRAP
- if (sym_map != map
-- && sym_map->l_type != lt_executable
- && !sym_map->l_relocated)
- {
- const char *strtab
- = (const char *) D_PTR (map, l_info[DT_STRTAB]);
-- _dl_error_printf ("\
-+ if (sym_map->l_type == lt_executable)
-+ _dl_fatal_printf ("\
-+%s: IFUNC symbol '%s' referenced in '%s' is defined in the executable \
-+and creates an unsatisfiable circular dependency.\n",
-+ RTLD_PROGNAME, strtab + refsym->st_name,
-+ map->l_name);
-+ else
-+ _dl_error_printf ("\
- %s: Relink `%s' with `%s' for IFUNC symbol `%s'\n",
-- RTLD_PROGNAME, map->l_name,
-- sym_map->l_name,
-- strtab + refsym->st_name);
-+ RTLD_PROGNAME, map->l_name,
-+ sym_map->l_name,
-+ strtab + refsym->st_name);
- }
- # endif
- value = ((ElfW(Addr) (*) (void)) value) ();
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h glibc-2.32/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h
---- glibc-2.32.orig/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h 2021-09-18 21:02:32.743186087 +1000
-+++ glibc-2.32/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h 2021-09-18 21:03:05.314302356 +1000
-@@ -32,7 +32,7 @@ IFUNC_SELECTOR (void)
- && CPU_FEATURE_USABLE_P (cpu_features, AVX2))
- return OPTIMIZE (fma);
-
-- if (CPU_FEATURE_USABLE_P (cpu_features, FMA))
-+ if (CPU_FEATURE_USABLE_P (cpu_features, FMA4))
- return OPTIMIZE (fma4);
-
- return OPTIMIZE (sse2);
-diff -pruN glibc-2.32.orig/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S glibc-2.32/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S
---- glibc-2.32.orig/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S 2021-09-18 21:02:32.745186156 +1000
-+++ glibc-2.32/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S 2021-09-18 21:03:05.314302356 +1000
-@@ -56,6 +56,13 @@
- # endif
- #endif
-
-+/* Avoid short distance rep movsb only with non-SSE vector. */
-+#ifndef AVOID_SHORT_DISTANCE_REP_MOVSB
-+# define AVOID_SHORT_DISTANCE_REP_MOVSB (VEC_SIZE > 16)
-+#else
-+# define AVOID_SHORT_DISTANCE_REP_MOVSB 0
-+#endif
-+
- #ifndef PREFETCH
- # define PREFETCH(addr) prefetcht0 addr
- #endif
-@@ -243,7 +250,21 @@ L(movsb):
- cmpq %r9, %rdi
- /* Avoid slow backward REP MOVSB. */
- jb L(more_8x_vec_backward)
-+# if AVOID_SHORT_DISTANCE_REP_MOVSB
-+ movq %rdi, %rcx
-+ subq %rsi, %rcx
-+ jmp 2f
-+# endif
- 1:
-+# if AVOID_SHORT_DISTANCE_REP_MOVSB
-+ movq %rsi, %rcx
-+ subq %rdi, %rcx
-+2:
-+/* Avoid "rep movsb" if RCX, the distance between source and destination,
-+ is N*4GB + [1..63] with N >= 0. */
-+ cmpl $63, %ecx
-+ jbe L(more_2x_vec) /* Avoid "rep movsb" if ECX <= 63. */
-+# endif
- mov %RDX_LP, %RCX_LP
- rep movsb
- L(nop):
-diff -pruN glibc-2.32.orig/sysvipc/test-sysvsem.c glibc-2.32/sysvipc/test-sysvsem.c
---- glibc-2.32.orig/sysvipc/test-sysvsem.c 2021-09-18 21:02:32.746186190 +1000
-+++ glibc-2.32/sysvipc/test-sysvsem.c 2021-09-18 21:03:05.314302356 +1000
-@@ -20,6 +20,7 @@
- #include <stdlib.h>
- #include <errno.h>
- #include <string.h>
-+#include <stdbool.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
- #include <sys/sem.h>
-diff -pruN glibc-2.32.orig/version.h glibc-2.32/version.h
---- glibc-2.32.orig/version.h 2021-09-18 21:02:32.746186190 +1000
-+++ glibc-2.32/version.h 2021-09-18 21:03:05.314302356 +1000
-@@ -1,4 +1,4 @@
- /* This file just defines the current version number of libc. */
-
--#define RELEASE "release"
-+#define RELEASE "stable"
- #define VERSION "2.32"
diff --git a/glibc-32/glibc-c-utf8-locale-1.patch b/glibc-32/glibc-c-utf8-locale-1.patch
new file mode 100644
index 00000000..3b800647
--- /dev/null
+++ b/glibc-32/glibc-c-utf8-locale-1.patch
@@ -0,0 +1,980 @@
+commit f5117c6504888fab5423282a4607c552b90fd3f9
+Author: Carlos O'Donell <carlos(a)redhat.com>
+Date: Thu Jul 29 22:45:39 2021 -0400
+
+ Add 'codepoint_collation' support for LC_COLLATE.
+
+ Support a new directive 'codepoint_collation' in the LC_COLLATE
+ section of a locale source file. This new directive causes all
+ collation rules to be dropped and instead STRCMP (strcmp or
+ wcscmp) is used for collation of the input character set. This
+ is required to allow for a C.UTF-8 that contains zero collation
+ rules (minimal size) and sorts using code point sorting.
+
+ To date the only implementation of a locale with zero collation
+ rules is the C/POSIX locale. The C/POSIX locale provides
+ identity tables for _NL_COLLATE_COLLSEQMB and
+ _NL_COLLATE_COLLSEQWC that map to ASCII even though it has zero
+ rules. This has lead to existing fnmatch, regexec, and regcomp
+ implementations that require these tables. It is not correct
+ to use these tables when nrules == 0, but the conservative fix
+ is to provide these tables when nrules == 0. This assures that
+ existing static applications using a new C.UTF-8 locale with
+ 'codepoint_collation' at least have functional range expressions
+ with ASCII e.g. [0-9] or [a-z]. Such static applications would
+ not have the fixes to fnmatch, regexec and regcomp that avoid
+ the use of the tables when nrules == 0. Future fixes to fnmatch,
+ regexec, and regcomp would allow range expressions to use the
+ full set of code points for such ranges.
+
+ Tested on x86_64 and i686 without regression.
+
+ Reviewed-by: Florian Weimer <fweimer(a)redhat.com>
+
+diff --git a/locale/C-collate-seq.c b/locale/C-collate-seq.c
+new file mode 100644
+index 0000000000000000..4fb82cb8357936b6
+--- /dev/null
++++ b/locale/C-collate-seq.c
+@@ -0,0 +1,100 @@
++/* Copyright (C) 1995-2021 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <stdint.h>
++
++static const char collseqmb[] =
++{
++ '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
++ '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
++ '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
++ '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
++ '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
++ '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
++ '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
++ '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
++ '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
++ '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
++ '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
++ '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
++ '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
++ '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
++ '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
++ '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
++ '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
++ '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
++ '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
++ '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
++ '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
++ '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
++ '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
++ '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
++ '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
++ '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
++ '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
++ '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
++ '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
++ '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
++ '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
++ '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
++};
++
++/* This table must be 256 bytes in size. We index bytes into the
++ table to find the collation sequence. */
++_Static_assert (sizeof (collseqmb) == 256);
++
++static const uint32_t collseqwc[] =
++{
++ 8, 1, 8, 0x0, 0xff,
++ /* 1st-level table */
++ 6 * sizeof (uint32_t),
++ /* 2nd-level table */
++ 7 * sizeof (uint32_t),
++ /* 3rd-level table */
++ L'\x00', L'\x01', L'\x02', L'\x03', L'\x04', L'\x05', L'\x06', L'\x07',
++ L'\x08', L'\x09', L'\x0a', L'\x0b', L'\x0c', L'\x0d', L'\x0e', L'\x0f',
++ L'\x10', L'\x11', L'\x12', L'\x13', L'\x14', L'\x15', L'\x16', L'\x17',
++ L'\x18', L'\x19', L'\x1a', L'\x1b', L'\x1c', L'\x1d', L'\x1e', L'\x1f',
++ L'\x20', L'\x21', L'\x22', L'\x23', L'\x24', L'\x25', L'\x26', L'\x27',
++ L'\x28', L'\x29', L'\x2a', L'\x2b', L'\x2c', L'\x2d', L'\x2e', L'\x2f',
++ L'\x30', L'\x31', L'\x32', L'\x33', L'\x34', L'\x35', L'\x36', L'\x37',
++ L'\x38', L'\x39', L'\x3a', L'\x3b', L'\x3c', L'\x3d', L'\x3e', L'\x3f',
++ L'\x40', L'\x41', L'\x42', L'\x43', L'\x44', L'\x45', L'\x46', L'\x47',
++ L'\x48', L'\x49', L'\x4a', L'\x4b', L'\x4c', L'\x4d', L'\x4e', L'\x4f',
++ L'\x50', L'\x51', L'\x52', L'\x53', L'\x54', L'\x55', L'\x56', L'\x57',
++ L'\x58', L'\x59', L'\x5a', L'\x5b', L'\x5c', L'\x5d', L'\x5e', L'\x5f',
++ L'\x60', L'\x61', L'\x62', L'\x63', L'\x64', L'\x65', L'\x66', L'\x67',
++ L'\x68', L'\x69', L'\x6a', L'\x6b', L'\x6c', L'\x6d', L'\x6e', L'\x6f',
++ L'\x70', L'\x71', L'\x72', L'\x73', L'\x74', L'\x75', L'\x76', L'\x77',
++ L'\x78', L'\x79', L'\x7a', L'\x7b', L'\x7c', L'\x7d', L'\x7e', L'\x7f',
++ L'\x80', L'\x81', L'\x82', L'\x83', L'\x84', L'\x85', L'\x86', L'\x87',
++ L'\x88', L'\x89', L'\x8a', L'\x8b', L'\x8c', L'\x8d', L'\x8e', L'\x8f',
++ L'\x90', L'\x91', L'\x92', L'\x93', L'\x94', L'\x95', L'\x96', L'\x97',
++ L'\x98', L'\x99', L'\x9a', L'\x9b', L'\x9c', L'\x9d', L'\x9e', L'\x9f',
++ L'\xa0', L'\xa1', L'\xa2', L'\xa3', L'\xa4', L'\xa5', L'\xa6', L'\xa7',
++ L'\xa8', L'\xa9', L'\xaa', L'\xab', L'\xac', L'\xad', L'\xae', L'\xaf',
++ L'\xb0', L'\xb1', L'\xb2', L'\xb3', L'\xb4', L'\xb5', L'\xb6', L'\xb7',
++ L'\xb8', L'\xb9', L'\xba', L'\xbb', L'\xbc', L'\xbd', L'\xbe', L'\xbf',
++ L'\xc0', L'\xc1', L'\xc2', L'\xc3', L'\xc4', L'\xc5', L'\xc6', L'\xc7',
++ L'\xc8', L'\xc9', L'\xca', L'\xcb', L'\xcc', L'\xcd', L'\xce', L'\xcf',
++ L'\xd0', L'\xd1', L'\xd2', L'\xd3', L'\xd4', L'\xd5', L'\xd6', L'\xd7',
++ L'\xd8', L'\xd9', L'\xda', L'\xdb', L'\xdc', L'\xdd', L'\xde', L'\xdf',
++ L'\xe0', L'\xe1', L'\xe2', L'\xe3', L'\xe4', L'\xe5', L'\xe6', L'\xe7',
++ L'\xe8', L'\xe9', L'\xea', L'\xeb', L'\xec', L'\xed', L'\xee', L'\xef',
++ L'\xf0', L'\xf1', L'\xf2', L'\xf3', L'\xf4', L'\xf5', L'\xf6', L'\xf7',
++ L'\xf8', L'\xf9', L'\xfa', L'\xfb', L'\xfc', L'\xfd', L'\xfe', L'\xff'
++};
+diff --git a/locale/C-collate.c b/locale/C-collate.c
+index 76d9373683314943..120ce0a40aeb9a0f 100644
+--- a/locale/C-collate.c
++++ b/locale/C-collate.c
+@@ -20,83 +20,7 @@
+ #include <stdint.h>
+ #include "localeinfo.h"
+
+-static const char collseqmb[] =
+-{
+- '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
+- '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
+- '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
+- '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
+- '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
+- '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
+- '\x30', '\x31', '\x32', '\x33', '\x34', '\x35', '\x36', '\x37',
+- '\x38', '\x39', '\x3a', '\x3b', '\x3c', '\x3d', '\x3e', '\x3f',
+- '\x40', '\x41', '\x42', '\x43', '\x44', '\x45', '\x46', '\x47',
+- '\x48', '\x49', '\x4a', '\x4b', '\x4c', '\x4d', '\x4e', '\x4f',
+- '\x50', '\x51', '\x52', '\x53', '\x54', '\x55', '\x56', '\x57',
+- '\x58', '\x59', '\x5a', '\x5b', '\x5c', '\x5d', '\x5e', '\x5f',
+- '\x60', '\x61', '\x62', '\x63', '\x64', '\x65', '\x66', '\x67',
+- '\x68', '\x69', '\x6a', '\x6b', '\x6c', '\x6d', '\x6e', '\x6f',
+- '\x70', '\x71', '\x72', '\x73', '\x74', '\x75', '\x76', '\x77',
+- '\x78', '\x79', '\x7a', '\x7b', '\x7c', '\x7d', '\x7e', '\x7f',
+- '\x80', '\x81', '\x82', '\x83', '\x84', '\x85', '\x86', '\x87',
+- '\x88', '\x89', '\x8a', '\x8b', '\x8c', '\x8d', '\x8e', '\x8f',
+- '\x90', '\x91', '\x92', '\x93', '\x94', '\x95', '\x96', '\x97',
+- '\x98', '\x99', '\x9a', '\x9b', '\x9c', '\x9d', '\x9e', '\x9f',
+- '\xa0', '\xa1', '\xa2', '\xa3', '\xa4', '\xa5', '\xa6', '\xa7',
+- '\xa8', '\xa9', '\xaa', '\xab', '\xac', '\xad', '\xae', '\xaf',
+- '\xb0', '\xb1', '\xb2', '\xb3', '\xb4', '\xb5', '\xb6', '\xb7',
+- '\xb8', '\xb9', '\xba', '\xbb', '\xbc', '\xbd', '\xbe', '\xbf',
+- '\xc0', '\xc1', '\xc2', '\xc3', '\xc4', '\xc5', '\xc6', '\xc7',
+- '\xc8', '\xc9', '\xca', '\xcb', '\xcc', '\xcd', '\xce', '\xcf',
+- '\xd0', '\xd1', '\xd2', '\xd3', '\xd4', '\xd5', '\xd6', '\xd7',
+- '\xd8', '\xd9', '\xda', '\xdb', '\xdc', '\xdd', '\xde', '\xdf',
+- '\xe0', '\xe1', '\xe2', '\xe3', '\xe4', '\xe5', '\xe6', '\xe7',
+- '\xe8', '\xe9', '\xea', '\xeb', '\xec', '\xed', '\xee', '\xef',
+- '\xf0', '\xf1', '\xf2', '\xf3', '\xf4', '\xf5', '\xf6', '\xf7',
+- '\xf8', '\xf9', '\xfa', '\xfb', '\xfc', '\xfd', '\xfe', '\xff'
+-};
+-
+-static const uint32_t collseqwc[] =
+-{
+- 8, 1, 8, 0x0, 0xff,
+- /* 1st-level table */
+- 6 * sizeof (uint32_t),
+- /* 2nd-level table */
+- 7 * sizeof (uint32_t),
+- /* 3rd-level table */
+- L'\x00', L'\x01', L'\x02', L'\x03', L'\x04', L'\x05', L'\x06', L'\x07',
+- L'\x08', L'\x09', L'\x0a', L'\x0b', L'\x0c', L'\x0d', L'\x0e', L'\x0f',
+- L'\x10', L'\x11', L'\x12', L'\x13', L'\x14', L'\x15', L'\x16', L'\x17',
+- L'\x18', L'\x19', L'\x1a', L'\x1b', L'\x1c', L'\x1d', L'\x1e', L'\x1f',
+- L'\x20', L'\x21', L'\x22', L'\x23', L'\x24', L'\x25', L'\x26', L'\x27',
+- L'\x28', L'\x29', L'\x2a', L'\x2b', L'\x2c', L'\x2d', L'\x2e', L'\x2f',
+- L'\x30', L'\x31', L'\x32', L'\x33', L'\x34', L'\x35', L'\x36', L'\x37',
+- L'\x38', L'\x39', L'\x3a', L'\x3b', L'\x3c', L'\x3d', L'\x3e', L'\x3f',
+- L'\x40', L'\x41', L'\x42', L'\x43', L'\x44', L'\x45', L'\x46', L'\x47',
+- L'\x48', L'\x49', L'\x4a', L'\x4b', L'\x4c', L'\x4d', L'\x4e', L'\x4f',
+- L'\x50', L'\x51', L'\x52', L'\x53', L'\x54', L'\x55', L'\x56', L'\x57',
+- L'\x58', L'\x59', L'\x5a', L'\x5b', L'\x5c', L'\x5d', L'\x5e', L'\x5f',
+- L'\x60', L'\x61', L'\x62', L'\x63', L'\x64', L'\x65', L'\x66', L'\x67',
+- L'\x68', L'\x69', L'\x6a', L'\x6b', L'\x6c', L'\x6d', L'\x6e', L'\x6f',
+- L'\x70', L'\x71', L'\x72', L'\x73', L'\x74', L'\x75', L'\x76', L'\x77',
+- L'\x78', L'\x79', L'\x7a', L'\x7b', L'\x7c', L'\x7d', L'\x7e', L'\x7f',
+- L'\x80', L'\x81', L'\x82', L'\x83', L'\x84', L'\x85', L'\x86', L'\x87',
+- L'\x88', L'\x89', L'\x8a', L'\x8b', L'\x8c', L'\x8d', L'\x8e', L'\x8f',
+- L'\x90', L'\x91', L'\x92', L'\x93', L'\x94', L'\x95', L'\x96', L'\x97',
+- L'\x98', L'\x99', L'\x9a', L'\x9b', L'\x9c', L'\x9d', L'\x9e', L'\x9f',
+- L'\xa0', L'\xa1', L'\xa2', L'\xa3', L'\xa4', L'\xa5', L'\xa6', L'\xa7',
+- L'\xa8', L'\xa9', L'\xaa', L'\xab', L'\xac', L'\xad', L'\xae', L'\xaf',
+- L'\xb0', L'\xb1', L'\xb2', L'\xb3', L'\xb4', L'\xb5', L'\xb6', L'\xb7',
+- L'\xb8', L'\xb9', L'\xba', L'\xbb', L'\xbc', L'\xbd', L'\xbe', L'\xbf',
+- L'\xc0', L'\xc1', L'\xc2', L'\xc3', L'\xc4', L'\xc5', L'\xc6', L'\xc7',
+- L'\xc8', L'\xc9', L'\xca', L'\xcb', L'\xcc', L'\xcd', L'\xce', L'\xcf',
+- L'\xd0', L'\xd1', L'\xd2', L'\xd3', L'\xd4', L'\xd5', L'\xd6', L'\xd7',
+- L'\xd8', L'\xd9', L'\xda', L'\xdb', L'\xdc', L'\xdd', L'\xde', L'\xdf',
+- L'\xe0', L'\xe1', L'\xe2', L'\xe3', L'\xe4', L'\xe5', L'\xe6', L'\xe7',
+- L'\xe8', L'\xe9', L'\xea', L'\xeb', L'\xec', L'\xed', L'\xee', L'\xef',
+- L'\xf0', L'\xf1', L'\xf2', L'\xf3', L'\xf4', L'\xf5', L'\xf6', L'\xf7',
+- L'\xf8', L'\xf9', L'\xfa', L'\xfb', L'\xfc', L'\xfd', L'\xfe', L'\xff'
+-};
++#include "C-collate-seq.c"
+
+ const struct __locale_data _nl_C_LC_COLLATE attribute_hidden =
+ {
+diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
+index b6406b775d3a81ad..0f314e40c4305dea 100644
+--- a/locale/programs/ld-collate.c
++++ b/locale/programs/ld-collate.c
+@@ -24,6 +24,7 @@
+ #include <wchar.h>
+ #include <stdint.h>
+ #include <sys/param.h>
++#include <array_length.h>
+
+ #include "localedef.h"
+ #include "charmap.h"
+@@ -195,6 +196,9 @@ struct name_list
+ /* The real definition of the struct for the LC_COLLATE locale. */
+ struct locale_collate_t
+ {
++ /* Does the locale use code points to compare the encoding? */
++ bool codepoint_collation;
++
+ int col_weight_max;
+ int cur_weight_max;
+
+@@ -1510,6 +1514,7 @@ collate_startup (struct linereader *ldfile, struct localedef_t *locale,
+ obstack_init (&collate->mempool);
+
+ collate->col_weight_max = -1;
++ collate->codepoint_collation = false;
+ }
+ else
+ /* Reuse the copy_locale's data structures. */
+@@ -1568,6 +1573,10 @@ collate_finish (struct localedef_t *locale, const struct charmap_t *charmap)
+ return;
+ }
+
++ /* No data required. */
++ if (collate->codepoint_collation)
++ return;
++
+ /* If this assertion is hit change the type in `element_t'. */
+ assert (nrules <= sizeof (runp->used_in_level) * 8);
+
+@@ -2092,6 +2101,10 @@ add_to_tablewc (uint32_t ch, struct element_t *runp)
+ }
+ }
+
++/* Include the C locale identity tables for _NL_COLLATE_COLLSEQMB and
++ _NL_COLLATE_COLLSEQWC. */
++#include "C-collate-seq.c"
++
+ void
+ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ const char *output_path)
+@@ -2115,7 +2128,7 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ add_locale_uint32 (&file, nrules);
+
+ /* If we have no LC_COLLATE data emit only the number of rules as zero. */
+- if (collate == NULL)
++ if (collate == NULL || collate->codepoint_collation)
+ {
+ size_t idx;
+ for (idx = 1; idx < nelems; idx++)
+@@ -2123,6 +2136,17 @@ collate_output (struct localedef_t *locale, const struct charmap_t *charmap,
+ /* The words have to be handled specially. */
+ if (idx == _NL_ITEM_INDEX (_NL_COLLATE_SYMB_HASH_SIZEMB))
+ add_locale_uint32 (&file, 0);
++ else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_CODESET)
++ && collate != NULL)
++ /* A valid LC_COLLATE must have a code set name. */
++ add_locale_string (&file, charmap->code_set_name);
++ else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQMB)
++ && collate != NULL)
++ add_locale_raw_data (&file, collseqmb, sizeof (collseqmb));
++ else if (idx == _NL_ITEM_INDEX (_NL_COLLATE_COLLSEQWC)
++ && collate != NULL)
++ add_locale_uint32_array (&file, collseqwc,
++ array_length (collseqwc));
+ else
+ add_locale_empty (&file);
+ }
+@@ -2672,6 +2696,10 @@ collate_read (struct linereader *ldfile, struct localedef_t *result,
+
+ switch (nowtok)
+ {
++ case tok_codepoint_collation:
++ collate->codepoint_collation = true;
++ break;
++
+ case tok_copy:
+ /* Allow copying other locales. */
+ now = lr_token (ldfile, charmap, result, NULL, verbose);
+@@ -3742,9 +3770,11 @@ error while adding equivalent collating symbol"));
+ /* Next we assume `LC_COLLATE'. */
+ if (!ignore_content)
+ {
+- if (state == 0 && copy_locale == NULL)
++ if (state == 0
++ && copy_locale == NULL
++ && !collate->codepoint_collation)
+ /* We must either see a copy statement or have
+- ordering values. */
++ ordering values, or codepoint_collation. */
+ lr_error (ldfile,
+ _("%s: empty category description not allowed"),
+ "LC_COLLATE");
+diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf
+index bcded15ddb4c44bb..2e59eb9ac014134b 100644
+--- a/locale/programs/locfile-kw.gperf
++++ b/locale/programs/locfile-kw.gperf
+@@ -54,6 +54,7 @@ translit_end, tok_translit_end, 0
+ translit_ignore, tok_translit_ignore, 0
+ default_missing, tok_default_missing, 0
+ LC_COLLATE, tok_lc_collate, 0
++codepoint_collation, tok_codepoint_collation, 0
+ coll_weight_max, tok_coll_weight_max, 0
+ section-symbol, tok_section_symbol, 0
+ collating-element, tok_collating_element, 0
+diff --git a/locale/programs/locfile-kw.h b/locale/programs/locfile-kw.h
+index bc1cb8f0845852ad..fe6335692bd422cd 100644
+--- a/locale/programs/locfile-kw.h
++++ b/locale/programs/locfile-kw.h
+@@ -54,7 +54,7 @@
+ #line 24 "locfile-kw.gperf"
+ struct keyword_t ;
+
+-#define TOTAL_KEYWORDS 178
++#define TOTAL_KEYWORDS 179
+ #define MIN_WORD_LENGTH 3
+ #define MAX_WORD_LENGTH 22
+ #define MIN_HASH_VALUE 3
+@@ -134,92 +134,92 @@ locfile_hash (register const char *str, register size_t len)
+ #line 31 "locfile-kw.gperf"
+ {"END", tok_end, 0},
+ {""}, {""},
+-#line 70 "locfile-kw.gperf"
++#line 71 "locfile-kw.gperf"
+ {"IGNORE", tok_ignore, 0},
+-#line 129 "locfile-kw.gperf"
++#line 130 "locfile-kw.gperf"
+ {"LC_TIME", tok_lc_time, 0},
+ #line 30 "locfile-kw.gperf"
+ {"LC_CTYPE", tok_lc_ctype, 0},
+ {""},
+-#line 168 "locfile-kw.gperf"
++#line 169 "locfile-kw.gperf"
+ {"LC_ADDRESS", tok_lc_address, 0},
+-#line 153 "locfile-kw.gperf"
++#line 154 "locfile-kw.gperf"
+ {"LC_MESSAGES", tok_lc_messages, 0},
+-#line 161 "locfile-kw.gperf"
++#line 162 "locfile-kw.gperf"
+ {"LC_NAME", tok_lc_name, 0},
+-#line 158 "locfile-kw.gperf"
++#line 159 "locfile-kw.gperf"
+ {"LC_PAPER", tok_lc_paper, 0},
+-#line 186 "locfile-kw.gperf"
++#line 187 "locfile-kw.gperf"
+ {"LC_MEASUREMENT", tok_lc_measurement, 0},
+ #line 56 "locfile-kw.gperf"
+ {"LC_COLLATE", tok_lc_collate, 0},
+ {""},
+-#line 188 "locfile-kw.gperf"
++#line 189 "locfile-kw.gperf"
+ {"LC_IDENTIFICATION", tok_lc_identification, 0},
+-#line 201 "locfile-kw.gperf"
++#line 202 "locfile-kw.gperf"
+ {"revision", tok_revision, 0},
+-#line 69 "locfile-kw.gperf"
++#line 70 "locfile-kw.gperf"
+ {"UNDEFINED", tok_undefined, 0},
+-#line 125 "locfile-kw.gperf"
++#line 126 "locfile-kw.gperf"
+ {"LC_NUMERIC", tok_lc_numeric, 0},
+-#line 82 "locfile-kw.gperf"
++#line 83 "locfile-kw.gperf"
+ {"LC_MONETARY", tok_lc_monetary, 0},
+-#line 181 "locfile-kw.gperf"
++#line 182 "locfile-kw.gperf"
+ {"LC_TELEPHONE", tok_lc_telephone, 0},
+ {""}, {""}, {""},
+-#line 75 "locfile-kw.gperf"
++#line 76 "locfile-kw.gperf"
+ {"define", tok_define, 0},
+-#line 154 "locfile-kw.gperf"
++#line 155 "locfile-kw.gperf"
+ {"yesexpr", tok_yesexpr, 0},
+-#line 141 "locfile-kw.gperf"
++#line 142 "locfile-kw.gperf"
+ {"era_year", tok_era_year, 0},
+ {""},
+ #line 54 "locfile-kw.gperf"
+ {"translit_ignore", tok_translit_ignore, 0},
+-#line 156 "locfile-kw.gperf"
++#line 157 "locfile-kw.gperf"
+ {"yesstr", tok_yesstr, 0},
+ {""},
+-#line 89 "locfile-kw.gperf"
++#line 90 "locfile-kw.gperf"
+ {"negative_sign", tok_negative_sign, 0},
+ {""},
+-#line 137 "locfile-kw.gperf"
++#line 138 "locfile-kw.gperf"
+ {"t_fmt", tok_t_fmt, 0},
+-#line 159 "locfile-kw.gperf"
++#line 160 "locfile-kw.gperf"
+ {"height", tok_height, 0},
+ {""}, {""},
+ #line 52 "locfile-kw.gperf"
+ {"translit_start", tok_translit_start, 0},
+-#line 136 "locfile-kw.gperf"
++#line 137 "locfile-kw.gperf"
+ {"d_fmt", tok_d_fmt, 0},
+ {""},
+ #line 53 "locfile-kw.gperf"
+ {"translit_end", tok_translit_end, 0},
+-#line 94 "locfile-kw.gperf"
++#line 95 "locfile-kw.gperf"
+ {"n_cs_precedes", tok_n_cs_precedes, 0},
+-#line 144 "locfile-kw.gperf"
++#line 145 "locfile-kw.gperf"
+ {"era_t_fmt", tok_era_t_fmt, 0},
+ #line 39 "locfile-kw.gperf"
+ {"space", tok_space, 0},
+-#line 72 "locfile-kw.gperf"
+- {"reorder-end", tok_reorder_end, 0},
+ #line 73 "locfile-kw.gperf"
++ {"reorder-end", tok_reorder_end, 0},
++#line 74 "locfile-kw.gperf"
+ {"reorder-sections-after", tok_reorder_sections_after, 0},
+ {""},
+-#line 142 "locfile-kw.gperf"
++#line 143 "locfile-kw.gperf"
+ {"era_d_fmt", tok_era_d_fmt, 0},
+-#line 189 "locfile-kw.gperf"
++#line 190 "locfile-kw.gperf"
+ {"title", tok_title, 0},
+ {""}, {""},
+-#line 149 "locfile-kw.gperf"
++#line 150 "locfile-kw.gperf"
+ {"timezone", tok_timezone, 0},
+ {""},
+-#line 74 "locfile-kw.gperf"
++#line 75 "locfile-kw.gperf"
+ {"reorder-sections-end", tok_reorder_sections_end, 0},
+ {""}, {""}, {""},
+-#line 95 "locfile-kw.gperf"
++#line 96 "locfile-kw.gperf"
+ {"n_sep_by_space", tok_n_sep_by_space, 0},
+ {""}, {""},
+-#line 100 "locfile-kw.gperf"
++#line 101 "locfile-kw.gperf"
+ {"int_n_cs_precedes", tok_int_n_cs_precedes, 0},
+ {""}, {""}, {""},
+ #line 26 "locfile-kw.gperf"
+@@ -233,147 +233,147 @@ locfile_hash (register const char *str, register size_t len)
+ {"print", tok_print, 0},
+ #line 44 "locfile-kw.gperf"
+ {"xdigit", tok_xdigit, 0},
+-#line 110 "locfile-kw.gperf"
++#line 111 "locfile-kw.gperf"
+ {"duo_n_cs_precedes", tok_duo_n_cs_precedes, 0},
+-#line 127 "locfile-kw.gperf"
++#line 128 "locfile-kw.gperf"
+ {"thousands_sep", tok_thousands_sep, 0},
+-#line 197 "locfile-kw.gperf"
++#line 198 "locfile-kw.gperf"
+ {"territory", tok_territory, 0},
+ #line 36 "locfile-kw.gperf"
+ {"digit", tok_digit, 0},
+ {""}, {""},
+-#line 92 "locfile-kw.gperf"
++#line 93 "locfile-kw.gperf"
+ {"p_cs_precedes", tok_p_cs_precedes, 0},
+ {""}, {""},
+-#line 62 "locfile-kw.gperf"
++#line 63 "locfile-kw.gperf"
+ {"script", tok_script, 0},
+ #line 29 "locfile-kw.gperf"
+ {"include", tok_include, 0},
+ {""},
+-#line 78 "locfile-kw.gperf"
++#line 79 "locfile-kw.gperf"
+ {"else", tok_else, 0},
+-#line 184 "locfile-kw.gperf"
++#line 185 "locfile-kw.gperf"
+ {"int_select", tok_int_select, 0},
+ {""}, {""}, {""},
+-#line 132 "locfile-kw.gperf"
++#line 133 "locfile-kw.gperf"
+ {"week", tok_week, 0},
+ #line 33 "locfile-kw.gperf"
+ {"upper", tok_upper, 0},
+ {""}, {""},
+-#line 194 "locfile-kw.gperf"
++#line 195 "locfile-kw.gperf"
+ {"tel", tok_tel, 0},
+-#line 93 "locfile-kw.gperf"
++#line 94 "locfile-kw.gperf"
+ {"p_sep_by_space", tok_p_sep_by_space, 0},
+-#line 160 "locfile-kw.gperf"
++#line 161 "locfile-kw.gperf"
+ {"width", tok_width, 0},
+ {""},
+-#line 98 "locfile-kw.gperf"
++#line 99 "locfile-kw.gperf"
+ {"int_p_cs_precedes", tok_int_p_cs_precedes, 0},
+ {""}, {""},
+ #line 41 "locfile-kw.gperf"
+ {"punct", tok_punct, 0},
+ {""}, {""},
+-#line 101 "locfile-kw.gperf"
++#line 102 "locfile-kw.gperf"
+ {"int_n_sep_by_space", tok_int_n_sep_by_space, 0},
+ {""}, {""}, {""},
+-#line 108 "locfile-kw.gperf"
++#line 109 "locfile-kw.gperf"
+ {"duo_p_cs_precedes", tok_duo_p_cs_precedes, 0},
+ #line 48 "locfile-kw.gperf"
+ {"charconv", tok_charconv, 0},
+ {""},
+ #line 47 "locfile-kw.gperf"
+ {"class", tok_class, 0},
+-#line 114 "locfile-kw.gperf"
+- {"duo_int_n_cs_precedes", tok_duo_int_n_cs_precedes, 0},
+ #line 115 "locfile-kw.gperf"
++ {"duo_int_n_cs_precedes", tok_duo_int_n_cs_precedes, 0},
++#line 116 "locfile-kw.gperf"
+ {"duo_int_n_sep_by_space", tok_duo_int_n_sep_by_space, 0},
+-#line 111 "locfile-kw.gperf"
++#line 112 "locfile-kw.gperf"
+ {"duo_n_sep_by_space", tok_duo_n_sep_by_space, 0},
+-#line 119 "locfile-kw.gperf"
++#line 120 "locfile-kw.gperf"
+ {"duo_int_n_sign_posn", tok_duo_int_n_sign_posn, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+-#line 58 "locfile-kw.gperf"
++#line 59 "locfile-kw.gperf"
+ {"section-symbol", tok_section_symbol, 0},
+-#line 185 "locfile-kw.gperf"
++#line 186 "locfile-kw.gperf"
+ {"int_prefix", tok_int_prefix, 0},
+ {""}, {""}, {""}, {""},
+ #line 42 "locfile-kw.gperf"
+ {"graph", tok_graph, 0},
+ {""}, {""},
+-#line 99 "locfile-kw.gperf"
++#line 100 "locfile-kw.gperf"
+ {"int_p_sep_by_space", tok_int_p_sep_by_space, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 112 "locfile-kw.gperf"
+- {"duo_int_p_cs_precedes", tok_duo_int_p_cs_precedes, 0},
+ #line 113 "locfile-kw.gperf"
++ {"duo_int_p_cs_precedes", tok_duo_int_p_cs_precedes, 0},
++#line 114 "locfile-kw.gperf"
+ {"duo_int_p_sep_by_space", tok_duo_int_p_sep_by_space, 0},
+-#line 109 "locfile-kw.gperf"
++#line 110 "locfile-kw.gperf"
+ {"duo_p_sep_by_space", tok_duo_p_sep_by_space, 0},
+-#line 118 "locfile-kw.gperf"
++#line 119 "locfile-kw.gperf"
+ {"duo_int_p_sign_posn", tok_duo_int_p_sign_posn, 0},
+-#line 157 "locfile-kw.gperf"
++#line 158 "locfile-kw.gperf"
+ {"nostr", tok_nostr, 0},
+ {""}, {""},
+-#line 140 "locfile-kw.gperf"
++#line 141 "locfile-kw.gperf"
+ {"era", tok_era, 0},
+ {""},
+-#line 84 "locfile-kw.gperf"
++#line 85 "locfile-kw.gperf"
+ {"currency_symbol", tok_currency_symbol, 0},
+ {""},
+-#line 167 "locfile-kw.gperf"
++#line 168 "locfile-kw.gperf"
+ {"name_ms", tok_name_ms, 0},
+-#line 165 "locfile-kw.gperf"
+- {"name_mrs", tok_name_mrs, 0},
+ #line 166 "locfile-kw.gperf"
++ {"name_mrs", tok_name_mrs, 0},
++#line 167 "locfile-kw.gperf"
+ {"name_miss", tok_name_miss, 0},
+-#line 83 "locfile-kw.gperf"
++#line 84 "locfile-kw.gperf"
+ {"int_curr_symbol", tok_int_curr_symbol, 0},
+-#line 190 "locfile-kw.gperf"
++#line 191 "locfile-kw.gperf"
+ {"source", tok_source, 0},
+-#line 164 "locfile-kw.gperf"
++#line 165 "locfile-kw.gperf"
+ {"name_mr", tok_name_mr, 0},
+-#line 163 "locfile-kw.gperf"
++#line 164 "locfile-kw.gperf"
+ {"name_gen", tok_name_gen, 0},
+-#line 202 "locfile-kw.gperf"
++#line 203 "locfile-kw.gperf"
+ {"date", tok_date, 0},
+ {""}, {""},
+-#line 191 "locfile-kw.gperf"
++#line 192 "locfile-kw.gperf"
+ {"address", tok_address, 0},
+-#line 162 "locfile-kw.gperf"
++#line 163 "locfile-kw.gperf"
+ {"name_fmt", tok_name_fmt, 0},
+ #line 32 "locfile-kw.gperf"
+ {"copy", tok_copy, 0},
+-#line 103 "locfile-kw.gperf"
++#line 104 "locfile-kw.gperf"
+ {"int_n_sign_posn", tok_int_n_sign_posn, 0},
+ {""}, {""},
+-#line 131 "locfile-kw.gperf"
++#line 132 "locfile-kw.gperf"
+ {"day", tok_day, 0},
+-#line 105 "locfile-kw.gperf"
++#line 106 "locfile-kw.gperf"
+ {"duo_currency_symbol", tok_duo_currency_symbol, 0},
+ {""}, {""}, {""},
+-#line 150 "locfile-kw.gperf"
++#line 151 "locfile-kw.gperf"
+ {"date_fmt", tok_date_fmt, 0},
+-#line 64 "locfile-kw.gperf"
++#line 65 "locfile-kw.gperf"
+ {"order_end", tok_order_end, 0},
+-#line 117 "locfile-kw.gperf"
++#line 118 "locfile-kw.gperf"
+ {"duo_n_sign_posn", tok_duo_n_sign_posn, 0},
+ {""},
+-#line 170 "locfile-kw.gperf"
++#line 171 "locfile-kw.gperf"
+ {"country_name", tok_country_name, 0},
+-#line 71 "locfile-kw.gperf"
++#line 72 "locfile-kw.gperf"
+ {"reorder-after", tok_reorder_after, 0},
+ {""}, {""},
+-#line 155 "locfile-kw.gperf"
++#line 156 "locfile-kw.gperf"
+ {"noexpr", tok_noexpr, 0},
+ #line 50 "locfile-kw.gperf"
+ {"tolower", tok_tolower, 0},
+-#line 198 "locfile-kw.gperf"
++#line 199 "locfile-kw.gperf"
+ {"audience", tok_audience, 0},
+ {""}, {""}, {""},
+ #line 49 "locfile-kw.gperf"
+ {"toupper", tok_toupper, 0},
+-#line 68 "locfile-kw.gperf"
++#line 69 "locfile-kw.gperf"
+ {"position", tok_position, 0},
+ {""},
+ #line 40 "locfile-kw.gperf"
+@@ -381,196 +381,197 @@ locfile_hash (register const char *str, register size_t len)
+ {""},
+ #line 27 "locfile-kw.gperf"
+ {"comment_char", tok_comment_char, 0},
+-#line 88 "locfile-kw.gperf"
++#line 89 "locfile-kw.gperf"
+ {"positive_sign", tok_positive_sign, 0},
+ {""}, {""}, {""}, {""},
+-#line 61 "locfile-kw.gperf"
++#line 62 "locfile-kw.gperf"
+ {"symbol-equivalence", tok_symbol_equivalence, 0},
+ {""},
+-#line 102 "locfile-kw.gperf"
++#line 103 "locfile-kw.gperf"
+ {"int_p_sign_posn", tok_int_p_sign_posn, 0},
+-#line 175 "locfile-kw.gperf"
++#line 176 "locfile-kw.gperf"
+ {"country_car", tok_country_car, 0},
+ {""}, {""},
+-#line 104 "locfile-kw.gperf"
++#line 105 "locfile-kw.gperf"
+ {"duo_int_curr_symbol", tok_duo_int_curr_symbol, 0},
+ {""}, {""},
+-#line 135 "locfile-kw.gperf"
++#line 136 "locfile-kw.gperf"
+ {"d_t_fmt", tok_d_t_fmt, 0},
+ {""}, {""},
+-#line 116 "locfile-kw.gperf"
++#line 117 "locfile-kw.gperf"
+ {"duo_p_sign_posn", tok_duo_p_sign_posn, 0},
+-#line 187 "locfile-kw.gperf"
++#line 188 "locfile-kw.gperf"
+ {"measurement", tok_measurement, 0},
+-#line 176 "locfile-kw.gperf"
++#line 177 "locfile-kw.gperf"
+ {"country_isbn", tok_country_isbn, 0},
+ #line 37 "locfile-kw.gperf"
+ {"outdigit", tok_outdigit, 0},
+ {""}, {""},
+-#line 143 "locfile-kw.gperf"
++#line 144 "locfile-kw.gperf"
+ {"era_d_t_fmt", tok_era_d_t_fmt, 0},
+ {""}, {""}, {""},
+ #line 34 "locfile-kw.gperf"
+ {"lower", tok_lower, 0},
+-#line 183 "locfile-kw.gperf"
++#line 184 "locfile-kw.gperf"
+ {"tel_dom_fmt", tok_tel_dom_fmt, 0},
+-#line 171 "locfile-kw.gperf"
++#line 172 "locfile-kw.gperf"
+ {"country_post", tok_country_post, 0},
+-#line 148 "locfile-kw.gperf"
++#line 149 "locfile-kw.gperf"
+ {"cal_direction", tok_cal_direction, 0},
+- {""},
+-#line 139 "locfile-kw.gperf"
++#line 57 "locfile-kw.gperf"
++ {"codepoint_collation", tok_codepoint_collation, 0},
++#line 140 "locfile-kw.gperf"
+ {"t_fmt_ampm", tok_t_fmt_ampm, 0},
+-#line 91 "locfile-kw.gperf"
++#line 92 "locfile-kw.gperf"
+ {"frac_digits", tok_frac_digits, 0},
+ {""}, {""},
+-#line 177 "locfile-kw.gperf"
++#line 178 "locfile-kw.gperf"
+ {"lang_name", tok_lang_name, 0},
+-#line 90 "locfile-kw.gperf"
++#line 91 "locfile-kw.gperf"
+ {"int_frac_digits", tok_int_frac_digits, 0},
+ {""},
+-#line 121 "locfile-kw.gperf"
++#line 122 "locfile-kw.gperf"
+ {"uno_valid_to", tok_uno_valid_to, 0},
+-#line 126 "locfile-kw.gperf"
++#line 127 "locfile-kw.gperf"
+ {"decimal_point", tok_decimal_point, 0},
+ {""},
+-#line 133 "locfile-kw.gperf"
++#line 134 "locfile-kw.gperf"
+ {"abmon", tok_abmon, 0},
+ {""}, {""}, {""}, {""},
+-#line 107 "locfile-kw.gperf"
++#line 108 "locfile-kw.gperf"
+ {"duo_frac_digits", tok_duo_frac_digits, 0},
+-#line 182 "locfile-kw.gperf"
++#line 183 "locfile-kw.gperf"
+ {"tel_int_fmt", tok_tel_int_fmt, 0},
+-#line 123 "locfile-kw.gperf"
++#line 124 "locfile-kw.gperf"
+ {"duo_valid_to", tok_duo_valid_to, 0},
+-#line 146 "locfile-kw.gperf"
++#line 147 "locfile-kw.gperf"
+ {"first_weekday", tok_first_weekday, 0},
+ {""},
+-#line 130 "locfile-kw.gperf"
++#line 131 "locfile-kw.gperf"
+ {"abday", tok_abday, 0},
+ {""},
+-#line 200 "locfile-kw.gperf"
++#line 201 "locfile-kw.gperf"
+ {"abbreviation", tok_abbreviation, 0},
+-#line 147 "locfile-kw.gperf"
++#line 148 "locfile-kw.gperf"
+ {"first_workday", tok_first_workday, 0},
+ {""}, {""},
+-#line 97 "locfile-kw.gperf"
++#line 98 "locfile-kw.gperf"
+ {"n_sign_posn", tok_n_sign_posn, 0},
+ {""}, {""}, {""},
+-#line 145 "locfile-kw.gperf"
++#line 146 "locfile-kw.gperf"
+ {"alt_digits", tok_alt_digits, 0},
+ {""}, {""},
+-#line 128 "locfile-kw.gperf"
++#line 129 "locfile-kw.gperf"
+ {"grouping", tok_grouping, 0},
+ {""},
+ #line 45 "locfile-kw.gperf"
+ {"blank", tok_blank, 0},
+ {""}, {""},
+-#line 196 "locfile-kw.gperf"
++#line 197 "locfile-kw.gperf"
+ {"language", tok_language, 0},
+-#line 120 "locfile-kw.gperf"
++#line 121 "locfile-kw.gperf"
+ {"uno_valid_from", tok_uno_valid_from, 0},
+ {""},
+-#line 199 "locfile-kw.gperf"
++#line 200 "locfile-kw.gperf"
+ {"application", tok_application, 0},
+ {""},
+-#line 80 "locfile-kw.gperf"
++#line 81 "locfile-kw.gperf"
+ {"elifndef", tok_elifndef, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 122 "locfile-kw.gperf"
++#line 123 "locfile-kw.gperf"
+ {"duo_valid_from", tok_duo_valid_from, 0},
+-#line 57 "locfile-kw.gperf"
++#line 58 "locfile-kw.gperf"
+ {"coll_weight_max", tok_coll_weight_max, 0},
+ {""},
+-#line 79 "locfile-kw.gperf"
++#line 80 "locfile-kw.gperf"
+ {"elifdef", tok_elifdef, 0},
+-#line 67 "locfile-kw.gperf"
++#line 68 "locfile-kw.gperf"
+ {"backward", tok_backward, 0},
+-#line 106 "locfile-kw.gperf"
++#line 107 "locfile-kw.gperf"
+ {"duo_int_frac_digits", tok_duo_int_frac_digits, 0},
+ {""}, {""}, {""}, {""}, {""}, {""},
+-#line 96 "locfile-kw.gperf"
++#line 97 "locfile-kw.gperf"
+ {"p_sign_posn", tok_p_sign_posn, 0},
+ {""},
+-#line 203 "locfile-kw.gperf"
++#line 204 "locfile-kw.gperf"
+ {"category", tok_category, 0},
+ {""}, {""}, {""}, {""},
+-#line 134 "locfile-kw.gperf"
++#line 135 "locfile-kw.gperf"
+ {"mon", tok_mon, 0},
+ {""},
+-#line 124 "locfile-kw.gperf"
++#line 125 "locfile-kw.gperf"
+ {"conversion_rate", tok_conversion_rate, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 63 "locfile-kw.gperf"
++#line 64 "locfile-kw.gperf"
+ {"order_start", tok_order_start, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 178 "locfile-kw.gperf"
++#line 179 "locfile-kw.gperf"
+ {"lang_ab", tok_lang_ab, 0},
+-#line 180 "locfile-kw.gperf"
++#line 181 "locfile-kw.gperf"
+ {"lang_lib", tok_lang_lib, 0},
+ {""}, {""}, {""},
+-#line 192 "locfile-kw.gperf"
++#line 193 "locfile-kw.gperf"
+ {"contact", tok_contact, 0},
+ {""}, {""}, {""},
+-#line 173 "locfile-kw.gperf"
++#line 174 "locfile-kw.gperf"
+ {"country_ab3", tok_country_ab3, 0},
+ {""}, {""}, {""},
+-#line 193 "locfile-kw.gperf"
++#line 194 "locfile-kw.gperf"
+ {"email", tok_email, 0},
+-#line 172 "locfile-kw.gperf"
++#line 173 "locfile-kw.gperf"
+ {"country_ab2", tok_country_ab2, 0},
+ {""}, {""}, {""},
+ #line 55 "locfile-kw.gperf"
+ {"default_missing", tok_default_missing, 0},
+ {""}, {""},
+-#line 195 "locfile-kw.gperf"
++#line 196 "locfile-kw.gperf"
+ {"fax", tok_fax, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 174 "locfile-kw.gperf"
++#line 175 "locfile-kw.gperf"
+ {"country_num", tok_country_num, 0},
+ {""}, {""}, {""}, {""}, {""}, {""},
+ #line 51 "locfile-kw.gperf"
+ {"map", tok_map, 0},
+-#line 65 "locfile-kw.gperf"
++#line 66 "locfile-kw.gperf"
+ {"from", tok_from, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 86 "locfile-kw.gperf"
++#line 87 "locfile-kw.gperf"
+ {"mon_thousands_sep", tok_mon_thousands_sep, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""},
+-#line 81 "locfile-kw.gperf"
++#line 82 "locfile-kw.gperf"
+ {"endif", tok_endif, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 151 "locfile-kw.gperf"
++#line 152 "locfile-kw.gperf"
+ {"alt_mon", tok_alt_mon, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 76 "locfile-kw.gperf"
++#line 77 "locfile-kw.gperf"
+ {"undef", tok_undef, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 59 "locfile-kw.gperf"
++#line 60 "locfile-kw.gperf"
+ {"collating-element", tok_collating_element, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 152 "locfile-kw.gperf"
++#line 153 "locfile-kw.gperf"
+ {"ab_alt_mon", tok_ab_alt_mon, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 66 "locfile-kw.gperf"
++#line 67 "locfile-kw.gperf"
+ {"forward", tok_forward, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""},
+-#line 85 "locfile-kw.gperf"
++#line 86 "locfile-kw.gperf"
+ {"mon_decimal_point", tok_mon_decimal_point, 0},
+ {""}, {""},
+-#line 169 "locfile-kw.gperf"
++#line 170 "locfile-kw.gperf"
+ {"postal_fmt", tok_postal_fmt, 0},
+ {""}, {""}, {""}, {""}, {""},
+-#line 60 "locfile-kw.gperf"
++#line 61 "locfile-kw.gperf"
+ {"collating-symbol", tok_collating_symbol, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+@@ -583,15 +584,15 @@ locfile_hash (register const char *str, register size_t len)
+ #line 38 "locfile-kw.gperf"
+ {"alnum", tok_alnum, 0},
+ {""},
+-#line 87 "locfile-kw.gperf"
++#line 88 "locfile-kw.gperf"
+ {"mon_grouping", tok_mon_grouping, 0},
+ {""},
+-#line 179 "locfile-kw.gperf"
++#line 180 "locfile-kw.gperf"
+ {"lang_term", tok_lang_term, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""},
+-#line 77 "locfile-kw.gperf"
++#line 78 "locfile-kw.gperf"
+ {"ifdef", tok_ifdef, 0},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+@@ -599,7 +600,7 @@ locfile_hash (register const char *str, register size_t len)
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
+ {""}, {""}, {""}, {""},
+-#line 138 "locfile-kw.gperf"
++#line 139 "locfile-kw.gperf"
+ {"am_pm", tok_am_pm, 0}
+ };
+
+diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h
+index 414ad3076223e971..f57d594e8d25c06f 100644
+--- a/locale/programs/locfile-token.h
++++ b/locale/programs/locfile-token.h
+@@ -91,6 +91,7 @@ enum token_t
+ tok_translit_ignore,
+ tok_default_missing,
+ tok_lc_collate,
++ tok_codepoint_collation,
+ tok_coll_weight_max,
+ tok_section_symbol,
+ tok_collating_element,
diff --git a/glibc-32/glibc-c-utf8-locale-2.patch b/glibc-32/glibc-c-utf8-locale-2.patch
new file mode 100644
index 00000000..7064b8e8
--- /dev/null
+++ b/glibc-32/glibc-c-utf8-locale-2.patch
@@ -0,0 +1,1437 @@
+commit 466f2be6c08070e9113ae2fdc7acd5d8828cba50
+Author: Carlos O'Donell <carlos(a)redhat.com>
+Date: Wed Sep 1 15:19:19 2021 -0400
+
+ Add generic C.UTF-8 locale (Bug 17318)
+
+ We add a new C.UTF-8 locale. This locale is not builtin to glibc, but
+ is provided as a distinct locale. The locale provides full support for
+ UTF-8 and this includes full code point sorting via STRCMP-based
+ collation (strcmp or wcscmp).
+
+ The collation uses a new keyword 'codepoint_collation' which drops all
+ collation rules and generates an empty zero rules collation to enable
+ STRCMP usage in collation. This ensures that we get full code point
+ sorting for C.UTF-8 with a minimal 1406 bytes of overhead (LC_COLLATE
+ structure information and ASCII collating tables).
+
+ The new locale is added to SUPPORTED. Minimal test data for specific
+ code points (minus those not supported by collate-test) is provided in
+ C.UTF-8.in, and this verifies code point sorting is working reasonably
+ across the range. The locale was tested manually with the full set of
+ code points without failure.
+
+ The locale is harmonized with locales already shipping in various
+ downstream distributions. A new tst-iconv9 test is added which verifies
+ the C.UTF-8 locale is generally usable.
+
+ Testing for fnmatch, regexec, and recomp is provided by extending
+ bug-regex1, bugregex19, bug-regex4, bug-regex6, transbug, tst-fnmatch,
+ tst-regcomp-truncated, and tst-regex to use C.UTF-8.
+
+ Tested on x86_64 or i686 without regression.
+
+ Reviewed-by: Florian Weimer <fweimer(a)redhat.com>
+
+diff --git a/iconv/Makefile b/iconv/Makefile
+index 07d77c9ecaafba1f..9993f2d3f3cd7498 100644
+--- a/iconv/Makefile
++++ b/iconv/Makefile
+@@ -43,8 +43,19 @@ CFLAGS-charmap.c += -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
+ CFLAGS-linereader.c += -DNO_TRANSLITERATION
+ CFLAGS-simple-hash.c += -I../locale
+
+-tests = tst-iconv1 tst-iconv2 tst-iconv3 tst-iconv4 tst-iconv5 tst-iconv6 \
+- tst-iconv7 tst-iconv8 tst-iconv-mt tst-iconv-opt
++tests = \
++ tst-iconv1 \
++ tst-iconv2 \
++ tst-iconv3 \
++ tst-iconv4 \
++ tst-iconv5 \
++ tst-iconv6 \
++ tst-iconv7 \
++ tst-iconv8 \
++ tst-iconv9 \
++ tst-iconv-mt \
++ tst-iconv-opt \
++ # tests
+
+ others = iconv_prog iconvconfig
+ install-others-programs = $(inst_bindir)/iconv
+@@ -83,10 +94,15 @@ endif
+ include ../Rules
+
+ ifeq ($(run-built-tests),yes)
+-LOCALES := en_US.UTF-8
++# We have to generate locales (list sorted alphabetically)
++LOCALES := \
++ C.UTF-8 \
++ en_US.UTF-8 \
++ # LOCALES
+ include ../gen-locales.mk
+
+ $(objpfx)tst-iconv-opt.out: $(gen-locales)
++$(objpfx)tst-iconv9.out: $(gen-locales)
+ endif
+
+ $(inst_bindir)/iconv: $(objpfx)iconv_prog $(+force)
+diff --git a/iconv/tst-iconv9.c b/iconv/tst-iconv9.c
+new file mode 100644
+index 0000000000000000..c46b1833d87b8e55
+--- /dev/null
++++ b/iconv/tst-iconv9.c
+@@ -0,0 +1,87 @@
++/* Verify that using C.UTF-8 works.
++
++ Copyright (C) 2021 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, see
++ <https://www.gnu.org/licenses/>. */
++
++#include <iconv.h>
++#include <stddef.h>
++#include <stdio.h>
++#include <string.h>
++#include <support/support.h>
++#include <support/check.h>
++
++/* This test does two things:
++ (1) Verify that we have likely included translit_combining in C.UTF-8.
++ (2) Verify default_missing is '?' as expected. */
++
++/* ISO-8859-1 encoding of "fÃŒr". */
++char iso88591_in[] = { 0x66, 0xfc, 0x72, 0x0 };
++/* ASCII transliteration is "fur" with C.UTF-8 translit_combining. */
++char ascii_exp[] = { 0x66, 0x75, 0x72, 0x0 };
++
++/* First 3-byte UTF-8 code point. */
++char utf8_in[] = { 0xe0, 0xa0, 0x80, 0x0 };
++/* There is no ASCII transliteration for SAMARITAN LETTER ALAF
++ so we get default_missing used which is '?'. */
++char default_missing_exp[] = { 0x3f, 0x0 };
++
++static int
++do_test (void)
++{
++ char ascii_out[5];
++ iconv_t cd;
++ char *inbuf;
++ char *outbuf;
++ size_t inbytes;
++ size_t outbytes;
++ size_t n;
++
++ /* The C.UTF-8 locale should include translit_combining, which provides
++ the transliteration for "LATIN SMALL LETTER U WITH DIAERESIS" which
++ is not provided by locale/C-translit.h.in. */
++ xsetlocale (LC_ALL, "C.UTF-8");
++
++ /* From ISO-8859-1 to ASCII. */
++ cd = iconv_open ("ASCII//TRANSLIT,IGNORE", "ISO-8859-1");
++ TEST_VERIFY (cd != (iconv_t) -1);
++ inbuf = iso88591_in;
++ inbytes = 3;
++ outbuf = ascii_out;
++ outbytes = 3;
++ n = iconv (cd, &inbuf, &inbytes, &outbuf, &outbytes);
++ TEST_VERIFY (n != -1);
++ *outbuf = '\0';
++ TEST_COMPARE_BLOB (ascii_out, 3, ascii_exp, 3);
++ TEST_VERIFY (iconv_close (cd) == 0);
++
++ /* From UTF-8 to ASCII. */
++ cd = iconv_open ("ASCII//TRANSLIT,IGNORE", "UTF-8");
++ TEST_VERIFY (cd != (iconv_t) -1);
++ inbuf = utf8_in;
++ inbytes = 3;
++ outbuf = ascii_out;
++ outbytes = 3;
++ n = iconv (cd, &inbuf, &inbytes, &outbuf, &outbytes);
++ TEST_VERIFY (n != -1);
++ *outbuf = '\0';
++ TEST_COMPARE_BLOB (ascii_out, 1, default_missing_exp, 1);
++ TEST_VERIFY (iconv_close (cd) == 0);
++
++ return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/localedata/C.UTF-8.in b/localedata/C.UTF-8.in
+new file mode 100644
+index 0000000000000000..c31dcc2aa045ee61
+--- /dev/null
++++ b/localedata/C.UTF-8.in
+@@ -0,0 +1,157 @@
++ ; <U1>
++ ; <U2>
++ ; <U3>
++ ; <U4>
++ ; <U5>
++ ; <U6>
++ ; <U7>
++ ; <U8>
++ ; <UE>
++ ; <UF>
++ ; <U10>
++ ; <U11>
++ ; <U12>
++ ; <U13>
++ ; <U14>
++ ; <U15>
++ ; <U16>
++ ; <U17>
++ ; <U18>
++ ; <U19>
++ ; <U1A>
++ ; <U1B>
++ ; <U1C>
++ ; <U1D>
++ ; <U1E>
++ ; <U1F>
++! ; <U21>
++" ; <U22>
++# ; <U23>
++$ ; <U24>
++% ; <U25>
++& ; <U26>
++' ; <U27>
++) ; <U29>
++* ; <U2A>
+++ ; <U2B>
++, ; <U2C>
++- ; <U2D>
++. ; <U2E>
++/ ; <U2F>
++0 ; <U30>
++1 ; <U31>
++2 ; <U32>
++3 ; <U33>
++4 ; <U34>
++5 ; <U35>
++6 ; <U36>
++7 ; <U37>
++8 ; <U38>
++9 ; <U39>
++< ; <U3C>
++= ; <U3D>
++> ; <U3E>
++? ; <U3F>
++@ ; <U40>
++A ; <U41>
++B ; <U42>
++C ; <U43>
++D ; <U44>
++E ; <U45>
++F ; <U46>
++G ; <U47>
++H ; <U48>
++I ; <U49>
++J ; <U4A>
++K ; <U4B>
++L ; <U4C>
++M ; <U4D>
++N ; <U4E>
++O ; <U4F>
++P ; <U50>
++Q ; <U51>
++R ; <U52>
++S ; <U53>
++T ; <U54>
++U ; <U55>
++V ; <U56>
++W ; <U57>
++X ; <U58>
++Y ; <U59>
++Z ; <U5A>
++[ ; <U5B>
++\ ; <U5C>
++] ; <U5D>
++^ ; <U5E>
++_ ; <U5F>
++` ; <U60>
++a ; <U61>
++b ; <U62>
++c ; <U63>
++d ; <U64>
++e ; <U65>
++f ; <U66>
++g ; <U67>
++h ; <U68>
++i ; <U69>
++j ; <U6A>
++k ; <U6B>
++l ; <U6C>
++m ; <U6D>
++n ; <U6E>
++o ; <U6F>
++p ; <U70>
++q ; <U71>
++r ; <U72>
++s ; <U73>
++t ; <U74>
++u ; <U75>
++v ; <U76>
++w ; <U77>
++x ; <U78>
++y ; <U79>
++z ; <U7A>
++{ ; <U7B>
++| ; <U7C>
++} ; <U7D>
++~ ; <U7E>
++ ; <U7F>
++Â ; <U80>
++ÿ ; <UFF>
++Ä ; <U100>
++à¿¿ ; <UFFF>
++á ; <U1000>
++ￜ ; <UFFFD>
++ï¿¿ ; <UFFFF>
++ð ; <U10000>
++ð¿¿ ; <U1FFFF>
++ð ; <U20000>
++𯿿 ; <U2FFFF>
++ð° ; <U30000>
++ð¿¿Ÿ ; <U3FFFE>
++ñ ; <U40000>
++ñ¿¿ ; <U4FFFF>
++ñ ; <U50000>
++ñ¿¿ ; <U5FFFF>
++ñ ; <U60000>
++񯿿 ; <U6FFFF>
++ñ° ; <U70000>
++ñ¿¿¿ ; <U7FFFF>
++ò ; <U80000>
++ò¿¿ ; <U8FFFF>
++ò ; <U90000>
++ò¿¿ ; <U9FFFF>
++ò ; <UA0000>
++򯿿 ; <UAFFFF>
++ò° ; <UB0000>
++ò¿¿¿ ; <UBFFFF>
++ó ; <UC0001>
++ó¿ ; <UCFFCC>
++ó ; <UD000E>
++ó¿¿ ; <UDFFFF>
++ó ; <UE0001>
++󯿿 ; <UEFFFF>
++ó° ; <UF0001>
++ó¿¿¿ ; <UFFFFF>
++ô ; <U100001>
++ô¿¿ ; <U10FFFF>
+diff --git a/localedata/Makefile b/localedata/Makefile
+index 0341528b0407ae3b..c9dd5a954e8194cc 100644
+--- a/localedata/Makefile
++++ b/localedata/Makefile
+@@ -47,6 +47,7 @@ test-input := \
+ bg_BG.UTF-8 \
+ br_FR.UTF-8 \
+ bs_BA.UTF-8 \
++ C.UTF-8 \
+ ckb_IQ.UTF-8 \
+ cmn_TW.UTF-8 \
+ crh_UA.UTF-8 \
+@@ -206,6 +207,7 @@ LOCALES := \
+ bg_BG.UTF-8 \
+ br_FR.UTF-8 \
+ bs_BA.UTF-8 \
++ C.UTF-8 \
+ ckb_IQ.UTF-8 \
+ cmn_TW.UTF-8 \
+ crh_UA.UTF-8 \
+diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
+index 34f7a7c3fe2b6526..546ce6cea16a8fdb 100644
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
+@@ -79,6 +79,7 @@ brx_IN/UTF-8 \
+ bs_BA.UTF-8/UTF-8 \
+ bs_BA/ISO-8859-2 \
+ byn_ER/UTF-8 \
++C.UTF-8/UTF-8 \
+ ca_AD.UTF-8/UTF-8 \
+ ca_AD/ISO-8859-15 \
+ ca_ES.UTF-8/UTF-8 \
+diff --git a/localedata/locales/C b/localedata/locales/C
+new file mode 100644
+index 0000000000000000..ca801c79cf7e953e
+--- /dev/null
++++ b/localedata/locales/C
+@@ -0,0 +1,194 @@
++escape_char /
++comment_char %
++% Locale for C locale in UTF-8
++
++LC_IDENTIFICATION
++title "C locale"
++source ""
++address ""
++contact ""
++email "bug-glibc-locales(a)gnu.org"
++tel ""
++fax ""
++language ""
++territory ""
++revision "2.0"
++date "2020-06-28"
++category "i18n:2012";LC_IDENTIFICATION
++category "i18n:2012";LC_CTYPE
++category "i18n:2012";LC_COLLATE
++category "i18n:2012";LC_TIME
++category "i18n:2012";LC_NUMERIC
++category "i18n:2012";LC_MONETARY
++category "i18n:2012";LC_MESSAGES
++category "i18n:2012";LC_PAPER
++category "i18n:2012";LC_NAME
++category "i18n:2012";LC_ADDRESS
++category "i18n:2012";LC_TELEPHONE
++category "i18n:2012";LC_MEASUREMENT
++END LC_IDENTIFICATION
++
++LC_CTYPE
++% Include only the i18n character type classes without any of the
++% transliteration that i18n uses by default.
++copy "i18n_ctype"
++
++% Include the neutral transliterations. The builtin C and
++% POSIX locales have +1600 transliterations that are built into
++% the locales, and these are a superset of those.
++translit_start
++include "translit_neutral";""
++% We must use '?' for default_missing because the transliteration
++% framework includes it directly into the output and so it must
++% be compatible with ASCII if that is the target character set.
++default_missing <U003F>
++translit_end
++
++% Include the transliterations that can convert combined characters.
++% These are generally expected by users.
++translit_start
++include "translit_combining";""
++translit_end
++
++END LC_CTYPE
++
++LC_COLLATE
++% The keyword 'codepoint_collation' in any part of any LC_COLLATE
++% immediately discards all collation information and causes the
++% locale to use strcmp/wcscmp for collation comparison. This is
++% exactly what is needed for C (ASCII) or C.UTF-8.
++codepoint_collation
++END LC_COLLATE
++
++LC_MONETARY
++
++% This is the 14652 i18n fdcc-set definition for the LC_MONETARY
++% category (except for the int_curr_symbol and currency_symbol, they are
++% empty in the 14652 i18n fdcc-set definition and also empty in
++% glibc/locale/C-monetary.c.).
++int_curr_symbol ""
++currency_symbol ""
++mon_decimal_point "."
++mon_thousands_sep ""
++mon_grouping -1
++positive_sign ""
++negative_sign "-"
++int_frac_digits -1
++frac_digits -1
++p_cs_precedes -1
++int_p_sep_by_space -1
++p_sep_by_space -1
++n_cs_precedes -1
++int_n_sep_by_space -1
++n_sep_by_space -1
++p_sign_posn -1
++n_sign_posn -1
++%
++END LC_MONETARY
++
++LC_NUMERIC
++% This is the POSIX Locale definition for
++% the LC_NUMERIC category.
++%
++decimal_point "."
++thousands_sep ""
++grouping -1
++END LC_NUMERIC
++
++LC_TIME
++% This is the POSIX Locale definition for the LC_TIME category with the
++% exception that time is per ISO 8601 and 24-hour.
++%
++% Abbreviated weekday names (%a)
++abday "Sun";"Mon";"Tue";"Wed";"Thu";"Fri";"Sat"
++
++% Full weekday names (%A)
++day "Sunday";"Monday";"Tuesday";"Wednesday";"Thursday";/
++ "Friday";"Saturday"
++
++% Abbreviated month names (%b)
++abmon "Jan";"Feb";"Mar";"Apr";"May";"Jun";"Jul";"Aug";"Sep";/
++ "Oct";"Nov";"Dec"
++
++% Full month names (%B)
++mon "January";"February";"March";"April";"May";"June";"July";/
++ "August";"September";"October";"November";"December"
++
++% Week description, consists of three fields:
++% 1. Number of days in a week.
++% 2. Gregorian date that is a first weekday (19971130 for Sunday, 19971201 for Monday).
++% 3. The weekday number to be contained in the first week of the year.
++%
++% ISO 8601 conforming applications should use the values 7, 19971201 (a
++% Monday), and 4 (Thursday), respectively.
++week 7;19971201;4
++first_weekday 1
++first_workday 2
++
++% Appropriate date and time representation (%c)
++d_t_fmt "%a %b %e %H:%M:%S %Y"
++
++% Appropriate date representation (%x)
++d_fmt "%m/%d/%y"
++
++% Appropriate time representation (%X)
++t_fmt "%H:%M:%S"
++
++% Appropriate AM/PM time representation (%r)
++t_fmt_ampm "%I:%M:%S %p"
++
++% Equivalent of AM/PM (%p)
++am_pm "AM";"PM"
++
++% Appropriate date representation (date(1))
++date_fmt "%a %b %e %H:%M:%S %Z %Y"
++END LC_TIME
++
++LC_MESSAGES
++% This is the POSIX Locale definition for
++% the LC_NUMERIC category.
++%
++yesexpr "^[yY]"
++noexpr "^[nN]"
++yesstr "Yes"
++nostr "No"
++END LC_MESSAGES
++
++LC_PAPER
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_PAPER category.
++% (A4 paper, this is also used in the built in C/POSIX
++% locale in glibc/locale/C-paper.c)
++height 297
++width 210
++END LC_PAPER
++
++LC_NAME
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_NAME category.
++% (also used in the built in C/POSIX locale in glibc/locale/C-name.c)
++name_fmt "%p%t%g%t%m%t%f"
++END LC_NAME
++
++LC_ADDRESS
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_ADDRESS category.
++% (also used in the built in C/POSIX locale in glibc/locale/C-address.c)
++postal_fmt "%a%N%f%N%d%N%b%N%s %h %e %r%N%C-%z %T%N%c%N"
++END LC_ADDRESS
++
++LC_TELEPHONE
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_TELEPHONE category.
++% "+%c %a %l"
++tel_int_fmt "+%c %a %l"
++% (also used in the built in C/POSIX locale in glibc/locale/C-telephone.c)
++END LC_TELEPHONE
++
++LC_MEASUREMENT
++% This is the ISO/IEC 14652 "i18n" definition for
++% the LC_MEASUREMENT category.
++% (same as in the built in C/POSIX locale in glibc/locale/C-measurement.c)
++%metric
++measurement 1
++END LC_MEASUREMENT
+diff --git a/posix/Makefile b/posix/Makefile
+index 059efb3cd2706cbe..a5229777eeb0e067 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -190,9 +190,19 @@ $(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
+ $(evaluate-test)
+ endif
+
+-LOCALES := cs_CZ.UTF-8 da_DK.ISO-8859-1 de_DE.ISO-8859-1 de_DE.UTF-8 \
+- en_US.UTF-8 es_US.ISO-8859-1 es_US.UTF-8 ja_JP.EUC-JP tr_TR.UTF-8 \
+- cs_CZ.ISO-8859-2
++LOCALES := \
++ cs_CZ.ISO-8859-2 \
++ cs_CZ.UTF-8 \
++ C.UTF-8 \
++ da_DK.ISO-8859-1 \
++ de_DE.ISO-8859-1 \
++ de_DE.UTF-8 \
++ en_US.UTF-8 \
++ es_US.ISO-8859-1 \
++ es_US.UTF-8 \
++ ja_JP.EUC-JP \
++ tr_TR.UTF-8 \
++ # LOCALES
+ include ../gen-locales.mk
+
+ $(objpfx)bug-regex1.out: $(gen-locales)
+diff --git a/posix/bug-regex1.c b/posix/bug-regex1.c
+index 38eb543951862492..7e9f4ec430a95631 100644
+--- a/posix/bug-regex1.c
++++ b/posix/bug-regex1.c
+@@ -41,6 +41,26 @@ main (void)
+ puts (" -> OK");
+ }
+
++ puts ("in C.UTF-8 locale");
++ setlocale (LC_ALL, "C.UTF-8");
++ s = re_compile_pattern ("[an\371]*n", 7, ®ex);
++ if (s != NULL)
++ {
++ puts ("re_compile_pattern return non-NULL value");
++ result = 1;
++ }
++ else
++ {
++ match = re_match (®ex, "an", 2, 0, ®s);
++ if (match != 2)
++ {
++ printf ("re_match returned %d, expected 2\n", match);
++ result = 1;
++ }
++ else
++ puts (" -> OK");
++ }
++
+ puts ("in de_DE.ISO-8859-1 locale");
+ setlocale (LC_ALL, "de_DE.ISO-8859-1");
+ s = re_compile_pattern ("[anù]*n", 7, ®ex);
+diff --git a/posix/bug-regex19.c b/posix/bug-regex19.c
+index b3fee0a7302c3263..e00ff60a14f994bf 100644
+--- a/posix/bug-regex19.c
++++ b/posix/bug-regex19.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <locale.h>
+ #include <libc-diag.h>
++#include <support/support.h>
+
+ #define BRE RE_SYNTAX_POSIX_BASIC
+ #define ERE RE_SYNTAX_POSIX_EXTENDED
+@@ -407,8 +408,8 @@ do_mb_tests (const struct test_s *test)
+ return 0;
+ }
+
+-int
+-main (void)
++static int
++do_test (void)
+ {
+ size_t i;
+ int ret = 0;
+@@ -417,20 +418,17 @@ main (void)
+
+ for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
+ {
+- if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL)
+- {
+- puts ("setlocale de_DE.ISO-8859-1 failed");
+- ret = 1;
+- }
++ xsetlocale (LC_ALL, "de_DE.ISO-8859-1");
+ ret |= do_one_test (&tests[i], "");
+- if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
+- {
+- puts ("setlocale de_DE.UTF-8 failed");
+- ret = 1;
+- }
++ xsetlocale (LC_ALL, "de_DE.UTF-8");
++ ret |= do_one_test (&tests[i], "UTF-8 ");
++ ret |= do_mb_tests (&tests[i]);
++ xsetlocale (LC_ALL, "C.UTF-8");
+ ret |= do_one_test (&tests[i], "UTF-8 ");
+ ret |= do_mb_tests (&tests[i]);
+ }
+
+ return ret;
+ }
++
++#include <support/test-driver.c>
+diff --git a/posix/bug-regex4.c b/posix/bug-regex4.c
+index 8d5ae11567889301..6475833c525176b2 100644
+--- a/posix/bug-regex4.c
++++ b/posix/bug-regex4.c
+@@ -32,8 +32,33 @@ main (void)
+
+ memset (®ex, '\0', sizeof (regex));
+
++ printf ("INFO: Checking C.\n");
+ setlocale (LC_ALL, "C");
+
++ s = re_compile_pattern ("ab[cde]", 7, ®ex);
++ if (s != NULL)
++ {
++ puts ("re_compile_pattern returned non-NULL value");
++ result = 1;
++ }
++ else
++ {
++ match[0] = re_search_2 (®ex, "xyabez", 6, "", 0, 1, 5, NULL, 6);
++ match[1] = re_search_2 (®ex, NULL, 0, "abc", 3, 0, 3, NULL, 3);
++ match[2] = re_search_2 (®ex, "xya", 3, "bd", 2, 2, 3, NULL, 5);
++ if (match[0] != 2 || match[1] != 0 || match[2] != 2)
++ {
++ printf ("re_search_2 returned %d,%d,%d, expected 2,0,2\n",
++ match[0], match[1], match[2]);
++ result = 1;
++ }
++ else
++ puts (" -> OK");
++ }
++
++ printf ("INFO: Checking C.UTF-8.\n");
++ setlocale (LC_ALL, "C.UTF-8");
++
+ s = re_compile_pattern ("ab[cde]", 7, ®ex);
+ if (s != NULL)
+ {
+diff --git a/posix/bug-regex6.c b/posix/bug-regex6.c
+index 2bdf2126a49ee99b..0929b69b83c91e5e 100644
+--- a/posix/bug-regex6.c
++++ b/posix/bug-regex6.c
+@@ -30,7 +30,7 @@ main (int argc, char *argv[])
+ regex_t re;
+ regmatch_t mat[10];
+ int i, j, ret = 0;
+- const char *locales[] = { "C", "de_DE.UTF-8" };
++ const char *locales[] = { "C", "C.UTF-8", "de_DE.UTF-8" };
+ const char *string = "http://www.regex.com/pattern/matching.html#intro";
+ regmatch_t expect[10] = {
+ { 0, 48 }, { 0, 5 }, { 0, 4 }, { 5, 20 }, { 7, 20 }, { 20, 42 },
+diff --git a/posix/transbug.c b/posix/transbug.c
+index d0983b4d44d04fd2..b240177cf72326ff 100644
+--- a/posix/transbug.c
++++ b/posix/transbug.c
+@@ -116,16 +116,32 @@ do_test (void)
+ static const char lower[] = "[[:lower:]]+";
+ static const char upper[] = "[[:upper:]]+";
+ struct re_registers regs[4];
++ int result = 0;
+
++#define CHECK(exp) \
++ if (exp) { puts (#exp); result = 1; }
++
++ printf ("INFO: Checking C.\n");
+ setlocale (LC_ALL, "C");
+
+ (void) re_set_syntax (RE_SYNTAX_GNU_AWK);
+
+- int result;
+-#define CHECK(exp) \
+- if (exp) { puts (#exp); result = 1; }
++ result |= run_test (lower, regs);
++ result |= run_test (upper, ®s[2]);
++ if (! result)
++ {
++ CHECK (regs[0].start[0] != regs[2].start[0]);
++ CHECK (regs[0].end[0] != regs[2].end[0]);
++ CHECK (regs[1].start[0] != regs[3].start[0]);
++ CHECK (regs[1].end[0] != regs[3].end[0]);
++ }
++
++ printf ("INFO: Checking C.UTF-8.\n");
++ setlocale (LC_ALL, "C.UTF-8");
++
++ (void) re_set_syntax (RE_SYNTAX_GNU_AWK);
+
+- result = run_test (lower, regs);
++ result |= run_test (lower, regs);
+ result |= run_test (upper, ®s[2]);
+ if (! result)
+ {
+diff --git a/posix/tst-fnmatch.input b/posix/tst-fnmatch.input
+index 67aac5aadafd8aeb..6ff5318032e0afb2 100644
+--- a/posix/tst-fnmatch.input
++++ b/posix/tst-fnmatch.input
+@@ -472,6 +472,397 @@ C "\\" "[Z-\\]]" 0
+ C "]" "[Z-\\]]" 0
+ C "-" "[Z-\\]]" NOMATCH
+
++# B.6 004(C)
++C.UTF-8 "!#%+,-./01234567889" "!#%+,-./01234567889" 0
++C.UTF-8 ":;=@ABCDEFGHIJKLMNO" ":;=@ABCDEFGHIJKLMNO" 0
++C.UTF-8 "PQRSTUVWXYZ]abcdefg" "PQRSTUVWXYZ]abcdefg" 0
++C.UTF-8 "hijklmnopqrstuvwxyz" "hijklmnopqrstuvwxyz" 0
++C.UTF-8 "^_{}~" "^_{}~" 0
++
++# B.6 005(C)
++C.UTF-8 "\"$&'()" "\\\"\\$\\&\\'\\(\\)" 0
++C.UTF-8 "*?[\\`|" "\\*\\?\\[\\\\\\`\\|" 0
++C.UTF-8 "<>" "\\<\\>" 0
++
++# B.6 006(C)
++C.UTF-8 "?*[" "[?*[][?*[][?*[]" 0
++C.UTF-8 "a/b" "?/b" 0
++
++# B.6 007(C)
++C.UTF-8 "a/b" "a?b" 0
++C.UTF-8 "a/b" "a/?" 0
++C.UTF-8 "aa/b" "?/b" NOMATCH
++C.UTF-8 "aa/b" "a?b" NOMATCH
++C.UTF-8 "a/bb" "a/?" NOMATCH
++
++# B.6 009(C)
++C.UTF-8 "abc" "[abc]" NOMATCH
++C.UTF-8 "x" "[abc]" NOMATCH
++C.UTF-8 "a" "[abc]" 0
++C.UTF-8 "[" "[[abc]" 0
++C.UTF-8 "a" "[][abc]" 0
++C.UTF-8 "a]" "[]a]]" 0
++
++# B.6 010(C)
++C.UTF-8 "xyz" "[!abc]" NOMATCH
++C.UTF-8 "x" "[!abc]" 0
++C.UTF-8 "a" "[!abc]" NOMATCH
++
++# B.6 011(C)
++C.UTF-8 "]" "[][abc]" 0
++C.UTF-8 "abc]" "[][abc]" NOMATCH
++C.UTF-8 "[]abc" "[][]abc" NOMATCH
++C.UTF-8 "]" "[!]]" NOMATCH
++C.UTF-8 "aa]" "[!]a]" NOMATCH
++C.UTF-8 "]" "[!a]" 0
++C.UTF-8 "]]" "[!a]]" 0
++
++# B.6 012(C)
++C.UTF-8 "a" "[[.a.]]" 0
++C.UTF-8 "-" "[[.-.]]" 0
++C.UTF-8 "-" "[[.-.][.].]]" 0
++C.UTF-8 "-" "[[.].][.-.]]" 0
++C.UTF-8 "-" "[[.-.][=u=]]" 0
++C.UTF-8 "-" "[[.-.][:alpha:]]" 0
++C.UTF-8 "a" "[![.a.]]" NOMATCH
++
++# B.6 013(C)
++C.UTF-8 "a" "[[.b.]]" NOMATCH
++C.UTF-8 "a" "[[.b.][.c.]]" NOMATCH
++C.UTF-8 "a" "[[.b.][=b=]]" NOMATCH
++
++
++# B.6 015(C)
++C.UTF-8 "a" "[[=a=]]" 0
++C.UTF-8 "b" "[[=a=]b]" 0
++C.UTF-8 "b" "[[=a=][=b=]]" 0
++C.UTF-8 "a" "[[=a=][=b=]]" 0
++C.UTF-8 "a" "[[=a=][.b.]]" 0
++C.UTF-8 "a" "[[=a=][:digit:]]" 0
++
++# B.6 016(C)
++C.UTF-8 "=" "[[=a=]b]" NOMATCH
++C.UTF-8 "]" "[[=a=]b]" NOMATCH
++C.UTF-8 "a" "[[=b=][=c=]]" NOMATCH
++C.UTF-8 "a" "[[=b=][.].]]" NOMATCH
++C.UTF-8 "a" "[[=b=][:digit:]]" NOMATCH
++
++# B.6 017(C)
++C.UTF-8 "a" "[[:alnum:]]" 0
++C.UTF-8 "a" "[![:alnum:]]" NOMATCH
++C.UTF-8 "-" "[[:alnum:]]" NOMATCH
++C.UTF-8 "a]a" "[[:alnum:]]a" NOMATCH
++C.UTF-8 "-" "[[:alnum:]-]" 0
++C.UTF-8 "aa" "[[:alnum:]]a" 0
++C.UTF-8 "-" "[![:alnum:]]" 0
++C.UTF-8 "]" "[!][:alnum:]]" NOMATCH
++C.UTF-8 "[" "[![:alnum:][]" NOMATCH
++C.UTF-8 "a" "[[:alnum:]]" 0
++C.UTF-8 "b" "[[:alnum:]]" 0
++C.UTF-8 "c" "[[:alnum:]]" 0
++C.UTF-8 "d" "[[:alnum:]]" 0
++C.UTF-8 "e" "[[:alnum:]]" 0
++C.UTF-8 "f" "[[:alnum:]]" 0
++C.UTF-8 "g" "[[:alnum:]]" 0
++C.UTF-8 "h" "[[:alnum:]]" 0
++C.UTF-8 "i" "[[:alnum:]]" 0
++C.UTF-8 "j" "[[:alnum:]]" 0
++C.UTF-8 "k" "[[:alnum:]]" 0
++C.UTF-8 "l" "[[:alnum:]]" 0
++C.UTF-8 "m" "[[:alnum:]]" 0
++C.UTF-8 "n" "[[:alnum:]]" 0
++C.UTF-8 "o" "[[:alnum:]]" 0
++C.UTF-8 "p" "[[:alnum:]]" 0
++C.UTF-8 "q" "[[:alnum:]]" 0
++C.UTF-8 "r" "[[:alnum:]]" 0
++C.UTF-8 "s" "[[:alnum:]]" 0
++C.UTF-8 "t" "[[:alnum:]]" 0
++C.UTF-8 "u" "[[:alnum:]]" 0
++C.UTF-8 "v" "[[:alnum:]]" 0
++C.UTF-8 "w" "[[:alnum:]]" 0
++C.UTF-8 "x" "[[:alnum:]]" 0
++C.UTF-8 "y" "[[:alnum:]]" 0
++C.UTF-8 "z" "[[:alnum:]]" 0
++C.UTF-8 "A" "[[:alnum:]]" 0
++C.UTF-8 "B" "[[:alnum:]]" 0
++C.UTF-8 "C" "[[:alnum:]]" 0
++C.UTF-8 "D" "[[:alnum:]]" 0
++C.UTF-8 "E" "[[:alnum:]]" 0
++C.UTF-8 "F" "[[:alnum:]]" 0
++C.UTF-8 "G" "[[:alnum:]]" 0
++C.UTF-8 "H" "[[:alnum:]]" 0
++C.UTF-8 "I" "[[:alnum:]]" 0
++C.UTF-8 "J" "[[:alnum:]]" 0
++C.UTF-8 "K" "[[:alnum:]]" 0
++C.UTF-8 "L" "[[:alnum:]]" 0
++C.UTF-8 "M" "[[:alnum:]]" 0
++C.UTF-8 "N" "[[:alnum:]]" 0
++C.UTF-8 "O" "[[:alnum:]]" 0
++C.UTF-8 "P" "[[:alnum:]]" 0
++C.UTF-8 "Q" "[[:alnum:]]" 0
++C.UTF-8 "R" "[[:alnum:]]" 0
++C.UTF-8 "S" "[[:alnum:]]" 0
++C.UTF-8 "T" "[[:alnum:]]" 0
++C.UTF-8 "U" "[[:alnum:]]" 0
++C.UTF-8 "V" "[[:alnum:]]" 0
++C.UTF-8 "W" "[[:alnum:]]" 0
++C.UTF-8 "X" "[[:alnum:]]" 0
++C.UTF-8 "Y" "[[:alnum:]]" 0
++C.UTF-8 "Z" "[[:alnum:]]" 0
++C.UTF-8 "0" "[[:alnum:]]" 0
++C.UTF-8 "1" "[[:alnum:]]" 0
++C.UTF-8 "2" "[[:alnum:]]" 0
++C.UTF-8 "3" "[[:alnum:]]" 0
++C.UTF-8 "4" "[[:alnum:]]" 0
++C.UTF-8 "5" "[[:alnum:]]" 0
++C.UTF-8 "6" "[[:alnum:]]" 0
++C.UTF-8 "7" "[[:alnum:]]" 0
++C.UTF-8 "8" "[[:alnum:]]" 0
++C.UTF-8 "9" "[[:alnum:]]" 0
++C.UTF-8 "!" "[[:alnum:]]" NOMATCH
++C.UTF-8 "#" "[[:alnum:]]" NOMATCH
++C.UTF-8 "%" "[[:alnum:]]" NOMATCH
++C.UTF-8 "+" "[[:alnum:]]" NOMATCH
++C.UTF-8 "," "[[:alnum:]]" NOMATCH
++C.UTF-8 "-" "[[:alnum:]]" NOMATCH
++C.UTF-8 "." "[[:alnum:]]" NOMATCH
++C.UTF-8 "/" "[[:alnum:]]" NOMATCH
++C.UTF-8 ":" "[[:alnum:]]" NOMATCH
++C.UTF-8 ";" "[[:alnum:]]" NOMATCH
++C.UTF-8 "=" "[[:alnum:]]" NOMATCH
++C.UTF-8 "@" "[[:alnum:]]" NOMATCH
++C.UTF-8 "[" "[[:alnum:]]" NOMATCH
++C.UTF-8 "\\" "[[:alnum:]]" NOMATCH
++C.UTF-8 "]" "[[:alnum:]]" NOMATCH
++C.UTF-8 "^" "[[:alnum:]]" NOMATCH
++C.UTF-8 "_" "[[:alnum:]]" NOMATCH
++C.UTF-8 "{" "[[:alnum:]]" NOMATCH
++C.UTF-8 "}" "[[:alnum:]]" NOMATCH
++C.UTF-8 "~" "[[:alnum:]]" NOMATCH
++C.UTF-8 "\"" "[[:alnum:]]" NOMATCH
++C.UTF-8 "$" "[[:alnum:]]" NOMATCH
++C.UTF-8 "&" "[[:alnum:]]" NOMATCH
++C.UTF-8 "'" "[[:alnum:]]" NOMATCH
++C.UTF-8 "(" "[[:alnum:]]" NOMATCH
++C.UTF-8 ")" "[[:alnum:]]" NOMATCH
++C.UTF-8 "*" "[[:alnum:]]" NOMATCH
++C.UTF-8 "?" "[[:alnum:]]" NOMATCH
++C.UTF-8 "`" "[[:alnum:]]" NOMATCH
++C.UTF-8 "|" "[[:alnum:]]" NOMATCH
++C.UTF-8 "<" "[[:alnum:]]" NOMATCH
++C.UTF-8 ">" "[[:alnum:]]" NOMATCH
++C.UTF-8 "\t" "[[:cntrl:]]" 0
++C.UTF-8 "t" "[[:cntrl:]]" NOMATCH
++C.UTF-8 "t" "[[:lower:]]" 0
++C.UTF-8 "\t" "[[:lower:]]" NOMATCH
++C.UTF-8 "T" "[[:lower:]]" NOMATCH
++C.UTF-8 "\t" "[[:space:]]" 0
++C.UTF-8 "t" "[[:space:]]" NOMATCH
++C.UTF-8 "t" "[[:alpha:]]" 0
++C.UTF-8 "\t" "[[:alpha:]]" NOMATCH
++C.UTF-8 "0" "[[:digit:]]" 0
++C.UTF-8 "\t" "[[:digit:]]" NOMATCH
++C.UTF-8 "t" "[[:digit:]]" NOMATCH
++C.UTF-8 "\t" "[[:print:]]" NOMATCH
++C.UTF-8 "t" "[[:print:]]" 0
++C.UTF-8 "T" "[[:upper:]]" 0
++C.UTF-8 "\t" "[[:upper:]]" NOMATCH
++C.UTF-8 "t" "[[:upper:]]" NOMATCH
++C.UTF-8 "\t" "[[:blank:]]" 0
++C.UTF-8 "t" "[[:blank:]]" NOMATCH
++C.UTF-8 "\t" "[[:graph:]]" NOMATCH
++C.UTF-8 "t" "[[:graph:]]" 0
++C.UTF-8 "." "[[:punct:]]" 0
++C.UTF-8 "t" "[[:punct:]]" NOMATCH
++C.UTF-8 "\t" "[[:punct:]]" NOMATCH
++C.UTF-8 "0" "[[:xdigit:]]" 0
++C.UTF-8 "\t" "[[:xdigit:]]" NOMATCH
++C.UTF-8 "a" "[[:xdigit:]]" 0
++C.UTF-8 "A" "[[:xdigit:]]" 0
++C.UTF-8 "t" "[[:xdigit:]]" NOMATCH
++C.UTF-8 "a" "[[alpha]]" NOMATCH
++C.UTF-8 "a" "[[alpha:]]" NOMATCH
++C.UTF-8 "a]" "[[alpha]]" 0
++C.UTF-8 "a]" "[[alpha:]]" 0
++C.UTF-8 "a" "[[:alpha:][.b.]]" 0
++C.UTF-8 "a" "[[:alpha:][=b=]]" 0
++C.UTF-8 "a" "[[:alpha:][:digit:]]" 0
++C.UTF-8 "a" "[[:digit:][:alpha:]]" 0
++
++# B.6 018(C)
++C.UTF-8 "a" "[a-c]" 0
++C.UTF-8 "b" "[a-c]" 0
++C.UTF-8 "c" "[a-c]" 0
++C.UTF-8 "a" "[b-c]" NOMATCH
++C.UTF-8 "d" "[b-c]" NOMATCH
++C.UTF-8 "B" "[a-c]" NOMATCH
++C.UTF-8 "b" "[A-C]" NOMATCH
++C.UTF-8 "" "[a-c]" NOMATCH
++C.UTF-8 "as" "[a-ca-z]" NOMATCH
++C.UTF-8 "a" "[[.a.]-c]" 0
++C.UTF-8 "a" "[a-[.c.]]" 0
++C.UTF-8 "a" "[[.a.]-[.c.]]" 0
++C.UTF-8 "b" "[[.a.]-c]" 0
++C.UTF-8 "b" "[a-[.c.]]" 0
++C.UTF-8 "b" "[[.a.]-[.c.]]" 0
++C.UTF-8 "c" "[[.a.]-c]" 0
++C.UTF-8 "c" "[a-[.c.]]" 0
++C.UTF-8 "c" "[[.a.]-[.c.]]" 0
++C.UTF-8 "d" "[[.a.]-c]" NOMATCH
++C.UTF-8 "d" "[a-[.c.]]" NOMATCH
++C.UTF-8 "d" "[[.a.]-[.c.]]" NOMATCH
++
++# B.6 019(C)
++C.UTF-8 "a" "[c-a]" NOMATCH
++C.UTF-8 "a" "[[.c.]-a]" NOMATCH
++C.UTF-8 "a" "[c-[.a.]]" NOMATCH
++C.UTF-8 "a" "[[.c.]-[.a.]]" NOMATCH
++C.UTF-8 "c" "[c-a]" NOMATCH
++C.UTF-8 "c" "[[.c.]-a]" NOMATCH
++C.UTF-8 "c" "[c-[.a.]]" NOMATCH
++C.UTF-8 "c" "[[.c.]-[.a.]]" NOMATCH
++
++# B.6 020(C)
++C.UTF-8 "a" "[a-c0-9]" 0
++C.UTF-8 "d" "[a-c0-9]" NOMATCH
++C.UTF-8 "B" "[a-c0-9]" NOMATCH
++
++# B.6 021(C)
++C.UTF-8 "-" "[-a]" 0
++C.UTF-8 "a" "[-b]" NOMATCH
++C.UTF-8 "-" "[!-a]" NOMATCH
++C.UTF-8 "a" "[!-b]" 0
++C.UTF-8 "-" "[a-c-0-9]" 0
++C.UTF-8 "b" "[a-c-0-9]" 0
++C.UTF-8 "a:" "a[0-9-a]" NOMATCH
++C.UTF-8 "a:" "a[09-a]" 0
++
++# B.6 024(C)
++C.UTF-8 "" "*" 0
++C.UTF-8 "asd/sdf" "*" 0
++
++# B.6 025(C)
++C.UTF-8 "as" "[a-c][a-z]" 0
++C.UTF-8 "as" "??" 0
++
++# B.6 026(C)
++C.UTF-8 "asd/sdf" "as*df" 0
++C.UTF-8 "asd/sdf" "as*" 0
++C.UTF-8 "asd/sdf" "*df" 0
++C.UTF-8 "asd/sdf" "as*dg" NOMATCH
++C.UTF-8 "asdf" "as*df" 0
++C.UTF-8 "asdf" "as*df?" NOMATCH
++C.UTF-8 "asdf" "as*??" 0
++C.UTF-8 "asdf" "a*???" 0
++C.UTF-8 "asdf" "*????" 0
++C.UTF-8 "asdf" "????*" 0
++C.UTF-8 "asdf" "??*?" 0
++
++# B.6 027(C)
++C.UTF-8 "/" "/" 0
++C.UTF-8 "/" "/*" 0
++C.UTF-8 "/" "*/" 0
++C.UTF-8 "/" "/?" NOMATCH
++C.UTF-8 "/" "?/" NOMATCH
++C.UTF-8 "/" "?" 0
++C.UTF-8 "." "?" 0
++C.UTF-8 "/." "??" 0
++C.UTF-8 "/" "[!a-c]" 0
++C.UTF-8 "." "[!a-c]" 0
++
++# B.6 029(C)
++C.UTF-8 "/" "/" 0 PATHNAME
++C.UTF-8 "//" "//" 0 PATHNAME
++C.UTF-8 "/.a" "/*" 0 PATHNAME
++C.UTF-8 "/.a" "/?a" 0 PATHNAME
++C.UTF-8 "/.a" "/[!a-z]a" 0 PATHNAME
++C.UTF-8 "/.a/.b" "/*/?b" 0 PATHNAME
++
++# B.6 030(C)
++C.UTF-8 "/" "?" NOMATCH PATHNAME
++C.UTF-8 "/" "*" NOMATCH PATHNAME
++C.UTF-8 "a/b" "a?b" NOMATCH PATHNAME
++C.UTF-8 "/.a/.b" "/*b" NOMATCH PATHNAME
++
++# B.6 031(C)
++C.UTF-8 "/$" "\\/\\$" 0
++C.UTF-8 "/[" "\\/\\[" 0
++C.UTF-8 "/[" "\\/[" 0
++C.UTF-8 "/[]" "\\/\\[]" 0
++
++# B.6 032(C)
++C.UTF-8 "/$" "\\/\\$" NOMATCH NOESCAPE
++C.UTF-8 "/\\$" "\\/\\$" NOMATCH NOESCAPE
++C.UTF-8 "\\/\\$" "\\/\\$" 0 NOESCAPE
++
++# B.6 033(C)
++C.UTF-8 ".asd" ".*" 0 PERIOD
++C.UTF-8 "/.asd" "*" 0 PERIOD
++C.UTF-8 "/as/.df" "*/?*f" 0 PERIOD
++C.UTF-8 "..asd" ".[!a-z]*" 0 PERIOD
++
++# B.6 034(C)
++C.UTF-8 ".asd" "*" NOMATCH PERIOD
++C.UTF-8 ".asd" "?asd" NOMATCH PERIOD
++C.UTF-8 ".asd" "[!a-z]*" NOMATCH PERIOD
++
++# B.6 035(C)
++C.UTF-8 "/." "/." 0 PATHNAME|PERIOD
++C.UTF-8 "/.a./.b." "/.*/.*" 0 PATHNAME|PERIOD
++C.UTF-8 "/.a./.b." "/.??/.??" 0 PATHNAME|PERIOD
++
++# B.6 036(C)
++C.UTF-8 "/." "*" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/." "/*" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/." "/?" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/." "/[!a-z]" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/a./.b." "/*/*" NOMATCH PATHNAME|PERIOD
++C.UTF-8 "/a./.b." "/??/???" NOMATCH PATHNAME|PERIOD
++
++# Some home-grown tests.
++C.UTF-8 "foobar" "foo*[abc]z" NOMATCH
++C.UTF-8 "foobaz" "foo*[abc][xyz]" 0
++C.UTF-8 "foobaz" "foo?*[abc][xyz]" 0
++C.UTF-8 "foobaz" "foo?*[abc][x/yz]" 0
++C.UTF-8 "foobaz" "foo?*[abc]/[xyz]" NOMATCH PATHNAME
++C.UTF-8 "a" "a/" NOMATCH PATHNAME
++C.UTF-8 "a/" "a" NOMATCH PATHNAME
++C.UTF-8 "//a" "/a" NOMATCH PATHNAME
++C.UTF-8 "/a" "//a" NOMATCH PATHNAME
++C.UTF-8 "az" "[a-]z" 0
++C.UTF-8 "bz" "[ab-]z" 0
++C.UTF-8 "cz" "[ab-]z" NOMATCH
++C.UTF-8 "-z" "[ab-]z" 0
++C.UTF-8 "az" "[-a]z" 0
++C.UTF-8 "bz" "[-ab]z" 0
++C.UTF-8 "cz" "[-ab]z" NOMATCH
++C.UTF-8 "-z" "[-ab]z" 0
++C.UTF-8 "\\" "[\\\\-a]" 0
++C.UTF-8 "_" "[\\\\-a]" 0
++C.UTF-8 "a" "[\\\\-a]" 0
++C.UTF-8 "-" "[\\\\-a]" NOMATCH
++C.UTF-8 "\\" "[\\]-a]" NOMATCH
++C.UTF-8 "_" "[\\]-a]" 0
++C.UTF-8 "a" "[\\]-a]" 0
++C.UTF-8 "]" "[\\]-a]" 0
++C.UTF-8 "-" "[\\]-a]" NOMATCH
++C.UTF-8 "\\" "[!\\\\-a]" NOMATCH
++C.UTF-8 "_" "[!\\\\-a]" NOMATCH
++C.UTF-8 "a" "[!\\\\-a]" NOMATCH
++C.UTF-8 "-" "[!\\\\-a]" 0
++C.UTF-8 "!" "[\\!-]" 0
++C.UTF-8 "-" "[\\!-]" 0
++C.UTF-8 "\\" "[\\!-]" NOMATCH
++C.UTF-8 "Z" "[Z-\\\\]" 0
++C.UTF-8 "[" "[Z-\\\\]" 0
++C.UTF-8 "\\" "[Z-\\\\]" 0
++C.UTF-8 "-" "[Z-\\\\]" NOMATCH
++C.UTF-8 "Z" "[Z-\\]]" 0
++C.UTF-8 "[" "[Z-\\]]" 0
++C.UTF-8 "\\" "[Z-\\]]" 0
++C.UTF-8 "]" "[Z-\\]]" 0
++C.UTF-8 "-" "[Z-\\]]" NOMATCH
++
+ # Following are tests outside the scope of IEEE 2003.2 since they are using
+ # locales other than the C locale. The main focus of the tests is on the
+ # handling of ranges and the recognition of character (vs bytes).
+@@ -677,7 +1068,6 @@ C "x/y" "*" 0 PATHNAME|LEADING_DIR
+ C "x/y/z" "*" 0 PATHNAME|LEADING_DIR
+ C "x" "*x" 0 PATHNAME|LEADING_DIR
+
+-en_US.UTF-8 "\366.csv" "*.csv" 0
+ C "x/y" "*x" 0 PATHNAME|LEADING_DIR
+ C "x/y/z" "*x" 0 PATHNAME|LEADING_DIR
+ C "x" "x*" 0 PATHNAME|LEADING_DIR
+@@ -693,6 +1083,33 @@ C "x" "x?y" NOMATCH PATHNAME|LEADING_DIR
+ C "x/y" "x?y" NOMATCH PATHNAME|LEADING_DIR
+ C "x/y/z" "x?y" NOMATCH PATHNAME|LEADING_DIR
+
++# Duplicate the "Test of GNU extensions." tests but for C.UTF-8.
++C.UTF-8 "x" "x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "*x" 0 PATHNAME|LEADING_DIR
++
++C.UTF-8 "x/y" "*x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "*x" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "x*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x*" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "a" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "a" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "a" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x" "x/y" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x/y" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x/y" 0 PATHNAME|LEADING_DIR
++C.UTF-8 "x" "x?y" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y" "x?y" NOMATCH PATHNAME|LEADING_DIR
++C.UTF-8 "x/y/z" "x?y" NOMATCH PATHNAME|LEADING_DIR
++
++# Bug 14185
++en_US.UTF-8 "\366.csv" "*.csv" 0
++
+ # ksh style matching.
+ C "abcd" "?@(a|b)*@(c)d" 0 EXTMATCH
+ C "/dev/udp/129.22.8.102/45" "/dev/@(tcp|udp)/*/*" 0 PATHNAME|EXTMATCH
+@@ -822,3 +1239,133 @@ C "" "" 0
+ C "" "" 0 EXTMATCH
+ C "" "*([abc])" 0 EXTMATCH
+ C "" "?([abc])" 0 EXTMATCH
++
++# Duplicate the "ksh style matching." for C.UTF-8.
++C.UTF-8 "abcd" "?@(a|b)*@(c)d" 0 EXTMATCH
++C.UTF-8 "/dev/udp/129.22.8.102/45" "/dev/@(tcp|udp)/*/*" 0 PATHNAME|EXTMATCH
++C.UTF-8 "12" "[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "12abc" "[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "1" "[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "07" "+([0-7])" 0 EXTMATCH
++C.UTF-8 "0377" "+([0-7])" 0 EXTMATCH
++C.UTF-8 "09" "+([0-7])" NOMATCH EXTMATCH
++C.UTF-8 "paragraph" "para@(chute|graph)" 0 EXTMATCH
++C.UTF-8 "paramour" "para@(chute|graph)" NOMATCH EXTMATCH
++C.UTF-8 "para991" "para?([345]|99)1" 0 EXTMATCH
++C.UTF-8 "para381" "para?([345]|99)1" NOMATCH EXTMATCH
++C.UTF-8 "paragraph" "para*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "para" "para*([0-9])" 0 EXTMATCH
++C.UTF-8 "para13829383746592" "para*([0-9])" 0 EXTMATCH
++C.UTF-8 "paragraph" "para+([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "para" "para+([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "para987346523" "para+([0-9])" 0 EXTMATCH
++C.UTF-8 "paragraph" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "para.38" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "para.graph" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "para39" "para!(*.[0-9])" 0 EXTMATCH
++C.UTF-8 "" "*(0|1|3|5|7|9)" 0 EXTMATCH
++C.UTF-8 "137577991" "*(0|1|3|5|7|9)" 0 EXTMATCH
++C.UTF-8 "2468" "*(0|1|3|5|7|9)" NOMATCH EXTMATCH
++C.UTF-8 "1358" "*(0|1|3|5|7|9)" NOMATCH EXTMATCH
++C.UTF-8 "file.c" "*.c?(c)" 0 EXTMATCH
++C.UTF-8 "file.C" "*.c?(c)" NOMATCH EXTMATCH
++C.UTF-8 "file.cc" "*.c?(c)" 0 EXTMATCH
++C.UTF-8 "file.ccc" "*.c?(c)" NOMATCH EXTMATCH
++C.UTF-8 "parse.y" "!(*.c|*.h|Makefile.in|config*|README)" 0 EXTMATCH
++C.UTF-8 "shell.c" "!(*.c|*.h|Makefile.in|config*|README)" NOMATCH EXTMATCH
++C.UTF-8 "Makefile" "!(*.c|*.h|Makefile.in|config*|README)" 0 EXTMATCH
++C.UTF-8 "VMS.FILE;1" "*\;[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "VMS.FILE;0" "*\;[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "VMS.FILE;" "*\;[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "VMS.FILE;139" "*\;[1-9]*([0-9])" 0 EXTMATCH
++C.UTF-8 "VMS.FILE;1N" "*\;[1-9]*([0-9])" NOMATCH EXTMATCH
++C.UTF-8 "abcfefg" "ab**(e|f)" 0 EXTMATCH
++C.UTF-8 "abcfefg" "ab**(e|f)g" 0 EXTMATCH
++C.UTF-8 "ab" "ab*+(e|f)" NOMATCH EXTMATCH
++C.UTF-8 "abef" "ab***ef" 0 EXTMATCH
++C.UTF-8 "abef" "ab**" 0 EXTMATCH
++C.UTF-8 "fofo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "ffo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "foooofo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "foooofof" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "fooofoofofooo" "*(f*(o))" 0 EXTMATCH
++C.UTF-8 "foooofof" "*(f+(o))" NOMATCH EXTMATCH
++C.UTF-8 "xfoooofof" "*(f*(o))" NOMATCH EXTMATCH
++C.UTF-8 "foooofofx" "*(f*(o))" NOMATCH EXTMATCH
++C.UTF-8 "ofxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofooofoofofooo" "*(f*(o))" NOMATCH EXTMATCH
++C.UTF-8 "foooxfooxfoxfooox" "*(f*(o)x)" 0 EXTMATCH
++C.UTF-8 "foooxfooxofoxfooox" "*(f*(o)x)" NOMATCH EXTMATCH
++C.UTF-8 "foooxfooxfxfooox" "*(f*(o)x)" 0 EXTMATCH
++C.UTF-8 "ofxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxoo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxofo" "*(*(of*(o)x)o)" NOMATCH EXTMATCH
++C.UTF-8 "ofoooxoofxoofoooxoofxooofxofxo" "*(*(of*(o)x)o)" 0 EXTMATCH
++C.UTF-8 "aac" "*(@(a))a@(c)" 0 EXTMATCH
++C.UTF-8 "ac" "*(@(a))a@(c)" 0 EXTMATCH
++C.UTF-8 "c" "*(@(a))a@(c)" NOMATCH EXTMATCH
++C.UTF-8 "aaac" "*(@(a))a@(c)" 0 EXTMATCH
++C.UTF-8 "baaac" "*(@(a))a@(c)" NOMATCH EXTMATCH
++C.UTF-8 "abcd" "?@(a|b)*@(c)d" 0 EXTMATCH
++C.UTF-8 "abcd" "@(ab|a*@(b))*(c)d" 0 EXTMATCH
++C.UTF-8 "acd" "@(ab|a*(b))*(c)d" 0 EXTMATCH
++C.UTF-8 "abbcd" "@(ab|a*(b))*(c)d" 0 EXTMATCH
++C.UTF-8 "effgz" "@(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "efgz" "@(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "egz" "@(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "egzefffgzbcdij" "*(b+(c)d|e*(f)g?|?(h)i@(j|k))" 0 EXTMATCH
++C.UTF-8 "egz" "@(b+(c)d|e+(f)g?|?(h)i@(j|k))" NOMATCH EXTMATCH
++C.UTF-8 "ofoofo" "*(of+(o))" 0 EXTMATCH
++C.UTF-8 "oxfoxoxfox" "*(oxf+(ox))" 0 EXTMATCH
++C.UTF-8 "oxfoxfox" "*(oxf+(ox))" NOMATCH EXTMATCH
++C.UTF-8 "ofoofo" "*(of+(o)|f)" 0 EXTMATCH
++C.UTF-8 "foofoofo" "@(foo|f|fo)*(f|of+(o))" 0 EXTMATCH
++C.UTF-8 "oofooofo" "*(of|oof+(o))" 0 EXTMATCH
++C.UTF-8 "fffooofoooooffoofffooofff" "*(*(f)*(o))" 0 EXTMATCH
++C.UTF-8 "fofoofoofofoo" "*(fo|foo)" 0 EXTMATCH
++C.UTF-8 "foo" "!(x)" 0 EXTMATCH
++C.UTF-8 "foo" "!(x)*" 0 EXTMATCH
++C.UTF-8 "foo" "!(foo)" NOMATCH EXTMATCH
++C.UTF-8 "foo" "!(foo)*" 0 EXTMATCH
++C.UTF-8 "foobar" "!(foo)" 0 EXTMATCH
++C.UTF-8 "foobar" "!(foo)*" 0 EXTMATCH
++C.UTF-8 "moo.cow" "!(*.*).!(*.*)" 0 EXTMATCH
++C.UTF-8 "mad.moo.cow" "!(*.*).!(*.*)" NOMATCH EXTMATCH
++C.UTF-8 "mucca.pazza" "mu!(*(c))?.pa!(*(z))?" NOMATCH EXTMATCH
++C.UTF-8 "fff" "!(f)" 0 EXTMATCH
++C.UTF-8 "fff" "*(!(f))" 0 EXTMATCH
++C.UTF-8 "fff" "+(!(f))" 0 EXTMATCH
++C.UTF-8 "ooo" "!(f)" 0 EXTMATCH
++C.UTF-8 "ooo" "*(!(f))" 0 EXTMATCH
++C.UTF-8 "ooo" "+(!(f))" 0 EXTMATCH
++C.UTF-8 "foo" "!(f)" 0 EXTMATCH
++C.UTF-8 "foo" "*(!(f))" 0 EXTMATCH
++C.UTF-8 "foo" "+(!(f))" 0 EXTMATCH
++C.UTF-8 "f" "!(f)" NOMATCH EXTMATCH
++C.UTF-8 "f" "*(!(f))" NOMATCH EXTMATCH
++C.UTF-8 "f" "+(!(f))" NOMATCH EXTMATCH
++C.UTF-8 "foot" "@(!(z*)|*x)" 0 EXTMATCH
++C.UTF-8 "zoot" "@(!(z*)|*x)" NOMATCH EXTMATCH
++C.UTF-8 "foox" "@(!(z*)|*x)" 0 EXTMATCH
++C.UTF-8 "zoox" "@(!(z*)|*x)" 0 EXTMATCH
++C.UTF-8 "foo" "*(!(foo))" 0 EXTMATCH
++C.UTF-8 "foob" "!(foo)b*" NOMATCH EXTMATCH
++C.UTF-8 "foobb" "!(foo)b*" 0 EXTMATCH
++C.UTF-8 "[" "*([a[])" 0 EXTMATCH
++C.UTF-8 "]" "*([]a[])" 0 EXTMATCH
++C.UTF-8 "a" "*([]a[])" 0 EXTMATCH
++C.UTF-8 "b" "*([!]a[])" 0 EXTMATCH
++C.UTF-8 "[" "*([!]a[]|[[])" 0 EXTMATCH
++C.UTF-8 "]" "*([!]a[]|[]])" 0 EXTMATCH
++C.UTF-8 "[" "!([!]a[])" 0 EXTMATCH
++C.UTF-8 "]" "!([!]a[])" 0 EXTMATCH
++C.UTF-8 ")" "*([)])" 0 EXTMATCH
++C.UTF-8 "*" "*([*(])" 0 EXTMATCH
++C.UTF-8 "abcd" "*!(|a)cd" 0 EXTMATCH
++C.UTF-8 "ab/.a" "+([abc])/*" NOMATCH EXTMATCH|PATHNAME|PERIOD
++C.UTF-8 "" "" 0
++C.UTF-8 "" "" 0 EXTMATCH
++C.UTF-8 "" "*([abc])" 0 EXTMATCH
++C.UTF-8 "" "?([abc])" 0 EXTMATCH
+diff --git a/posix/tst-regcomp-truncated.c b/posix/tst-regcomp-truncated.c
+index 84195fcd2ec153b8..da3f97799e37c607 100644
+--- a/posix/tst-regcomp-truncated.c
++++ b/posix/tst-regcomp-truncated.c
+@@ -37,6 +37,7 @@
+ static const char locales[][17] =
+ {
+ "C",
++ "C.UTF-8",
+ "en_US.UTF-8",
+ "de_DE.ISO-8859-1",
+ };
+diff --git a/posix/tst-regex.c b/posix/tst-regex.c
+index e7c2b05e8666a16e..531128de2a9176fa 100644
+--- a/posix/tst-regex.c
++++ b/posix/tst-regex.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <regex.h>
++#include <support/support.h>
+
+
+ #if defined _POSIX_CPUTIME && _POSIX_CPUTIME >= 0
+@@ -58,7 +59,7 @@ do_test (void)
+ const char *file;
+ int fd;
+ struct stat st;
+- int result;
++ int result = 0;
+ char *inmem;
+ char *outmem;
+ size_t inlen;
+@@ -123,7 +124,7 @@ do_test (void)
+
+ /* Run the actual tests. All tests are run in a single-byte and a
+ multi-byte locale. */
+- result = test_expr ("[Àáà âéÚêÃìîñöóòÎÌúùû]", 4, 4);
++ result |= test_expr ("[Àáà âéÚêÃìîñöóòÎÌúùû]", 4, 4);
+ result |= test_expr ("G.ran", 2, 3);
+ result |= test_expr ("G.\\{1\\}ran", 2, 3);
+ result |= test_expr ("G.*ran", 3, 44);
+@@ -143,19 +144,33 @@ do_test (void)
+ static int
+ test_expr (const char *expr, int expected, int expectedicase)
+ {
+- int result;
++ int result = 0;
+ char *inmem;
+ char *outmem;
+ size_t inlen;
+ size_t outlen;
+ char *uexpr;
+
+- /* First test: search with an UTF-8 locale. */
+- if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
+- error (EXIT_FAILURE, 0, "cannot set locale de_DE.UTF-8");
++ /* First test: search with basic C.UTF-8 locale. */
++ printf ("INFO: Testing C.UTF-8.\n");
++ xsetlocale (LC_ALL, "C.UTF-8");
+
+ printf ("\nTest \"%s\" with multi-byte locale\n", expr);
+- result = run_test (expr, mem, memlen, 0, expected);
++ result |= run_test (expr, mem, memlen, 0, expected);
++ printf ("\nTest \"%s\" with multi-byte locale, case insensitive\n", expr);
++ result |= run_test (expr, mem, memlen, 1, expectedicase);
++ printf ("\nTest \"%s\" backwards with multi-byte locale\n", expr);
++ result |= run_test_backwards (expr, mem, memlen, 0, expected);
++ printf ("\nTest \"%s\" backwards with multi-byte locale, case insensitive\n",
++ expr);
++ result |= run_test_backwards (expr, mem, memlen, 1, expectedicase);
++
++ /* Second test: search with an UTF-8 locale. */
++ printf ("INFO: Testing de_DE.UTF-8.\n");
++ xsetlocale (LC_ALL, "de_DE.UTF-8");
++
++ printf ("\nTest \"%s\" with multi-byte locale\n", expr);
++ result |= run_test (expr, mem, memlen, 0, expected);
+ printf ("\nTest \"%s\" with multi-byte locale, case insensitive\n", expr);
+ result |= run_test (expr, mem, memlen, 1, expectedicase);
+ printf ("\nTest \"%s\" backwards with multi-byte locale\n", expr);
+@@ -165,8 +180,8 @@ test_expr (const char *expr, int expected, int expectedicase)
+ result |= run_test_backwards (expr, mem, memlen, 1, expectedicase);
+
+ /* Second test: search with an ISO-8859-1 locale. */
+- if (setlocale (LC_ALL, "de_DE.ISO-8859-1") == NULL)
+- error (EXIT_FAILURE, 0, "cannot set locale de_DE.ISO-8859-1");
++ printf ("INFO: Testing de_DE.ISO-8859-1.\n");
++ xsetlocale (LC_ALL, "de_DE.ISO-8859-1");
+
+ inmem = (char *) expr;
+ inlen = strlen (expr);
diff --git a/glibc-32/glibc-python3.patch b/glibc-32/glibc-python3.patch
new file mode 100644
index 00000000..aaf45cc5
--- /dev/null
+++ b/glibc-32/glibc-python3.patch
@@ -0,0 +1,30 @@
+Use python3 for installed executable python scripts.
+
+Fedora is a Python3-only distribution:
+https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
+
+This fixes build failures where builders may strictly enforce only
+python3 during a transitional phase.
+
+Author: Carlos O'Donell <carlos(a)redhat.com>
+
+diff --git a/benchtests/scripts/compare_bench.py b/benchtests/scripts/compare_bench.py
+index 6fcbd0803808e5ca..d43db393d63433bc 100755
+--- a/benchtests/scripts/compare_bench.py
++++ b/benchtests/scripts/compare_bench.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2015-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
+diff --git a/benchtests/scripts/import_bench.py b/benchtests/scripts/import_bench.py
+index a799b4e1b7dc6f30..3286e267168e83bf 100644
+--- a/benchtests/scripts/import_bench.py
++++ b/benchtests/scripts/import_bench.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ # Copyright (C) 2015-2021 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
1
0
commit 027b6899ff5f09fe79d0276ec43174d5069f87b7
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:31:16 2021 +0100
libffi: 3.3 -> 3.4.2
diff --git a/libffi/.footprint b/libffi/.footprint
index 8ce65a28..c7f8bb1f 100644
--- a/libffi/.footprint
+++ b/libffi/.footprint
@@ -5,9 +5,9 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libffi.a
-rwxr-xr-x root/root usr/lib/libffi.la
-lrwxrwxrwx root/root usr/lib/libffi.so -> libffi.so.7.1.0
-lrwxrwxrwx root/root usr/lib/libffi.so.7 -> libffi.so.7.1.0
--rwxr-xr-x root/root usr/lib/libffi.so.7.1.0
+lrwxrwxrwx root/root usr/lib/libffi.so -> libffi.so.8.1.0
+lrwxrwxrwx root/root usr/lib/libffi.so.8 -> libffi.so.8.1.0
+-rwxr-xr-x root/root usr/lib/libffi.so.8.1.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libffi.pc
drwxr-xr-x root/root usr/share/
diff --git a/libffi/.signature b/libffi/.signature
index 7be9403d..35aecf90 100644
--- a/libffi/.signature
+++ b/libffi/.signature
@@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqpvODbAYO6WrgiPqQ7ZYWdIYSev9t4yVlJaLE3Ec5hPVyovdn+eQoyDjxil45+/TZf4bLq4wrJPY847LKOnaBAA=
-SHA256 (Pkgfile) = e88b9ec66a3139ed185b736657b58c1927dd1ec45e7f1b2affb3dbf746a8d9aa
-SHA256 (.footprint) = 5288452378090453d6bf63360dfd7c522e7a1dd8efaa6bf70daf7a1e92656eb7
-SHA256 (libffi-3.3.tar.gz) = 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
+RWRJc1FUaeVeqndmHaYXWVdCySWAYqC/CuscYZSEaWDbqp1djgBdobXX5oUqiiZLBsTlRAh+EnZF6DXyHabAEQpsqFlqj+F3awg=
+SHA256 (Pkgfile) = 33d05290ad8bad6918bca31b22a7f70de067055f6783b92d317a740d16beb541
+SHA256 (.footprint) = 549d5b1f9ebc1e43d6c6edc12eff89c3577496351bf557bc5298e696d1010422
+SHA256 (libffi-3.4.2.tar.gz) = 540fb721619a6aba3bdeef7d940d8e9e0e6d2c193595bc243241b77ff9e93620
diff --git a/libffi/Pkgfile b/libffi/Pkgfile
index b3384af0..8e40cc1c 100644
--- a/libffi/Pkgfile
+++ b/libffi/Pkgfile
@@ -3,9 +3,9 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=libffi
-version=3.3
+version=3.4.2
release=1
-source=(https://sourceware.org/pub/$name/$name-$version.tar.gz)
+source=(https://github.com/libffi/libffi/releases/download/v$version/libffi-$version.tar.gz)
build() {
cd $name-$version
1
0
commit 34dccf45ba2e6e1781a41b9cc3fd5a8565f1e95c
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sat Dec 11 19:30:48 2021 +0100
libnsl: 1.3.0 -> 2.0.0
diff --git a/libnsl/.footprint b/libnsl/.footprint
index 52b4fc3b..feba345a 100644
--- a/libnsl/.footprint
+++ b/libnsl/.footprint
@@ -1,13 +1,6 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/rpcsvc/
--rw-r--r-- root/root usr/include/rpcsvc/nis.h
--rw-r--r-- root/root usr/include/rpcsvc/nis.x
--rw-r--r-- root/root usr/include/rpcsvc/nis_callback.h
--rw-r--r-- root/root usr/include/rpcsvc/nis_callback.x
--rw-r--r-- root/root usr/include/rpcsvc/nis_object.x
--rw-r--r-- root/root usr/include/rpcsvc/nis_tags.h
--rw-r--r-- root/root usr/include/rpcsvc/nislib.h
-rw-r--r-- root/root usr/include/rpcsvc/yp.h
-rw-r--r-- root/root usr/include/rpcsvc/yp.x
-rw-r--r-- root/root usr/include/rpcsvc/yp_prot.h
@@ -18,8 +11,8 @@ drwxr-xr-x root/root usr/include/rpcsvc/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libnsl.a
-rwxr-xr-x root/root usr/lib/libnsl.la
-lrwxrwxrwx root/root usr/lib/libnsl.so -> libnsl.so.2.0.1
-lrwxrwxrwx root/root usr/lib/libnsl.so.2 -> libnsl.so.2.0.1
--rwxr-xr-x root/root usr/lib/libnsl.so.2.0.1
+lrwxrwxrwx root/root usr/lib/libnsl.so -> libnsl.so.3.0.0
+lrwxrwxrwx root/root usr/lib/libnsl.so.3 -> libnsl.so.3.0.0
+-rwxr-xr-x root/root usr/lib/libnsl.so.3.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libnsl.pc
diff --git a/libnsl/.signature b/libnsl/.signature
index e88038ea..9233233e 100644
--- a/libnsl/.signature
+++ b/libnsl/.signature
@@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqpUAGSM7NAiMWMJIG/10Aps63YudcopooN9dYzaRdYfwEQqyIde2jnhtT+YA602qj0L9kuB6HI33Kc21mWeGlQU=
-SHA256 (Pkgfile) = 21f3bfb4c65e215f4aa4145e7bd7824c4660666ac36e20f7557852139e4c7973
-SHA256 (.footprint) = e661db31d0cc493371e0efa53963ae26a967f46209b2cacf2638cce2480cec0d
-SHA256 (libnsl-1.3.0.tar.xz) = eac3062957fa302c62eff4aed718a07bacbf9ceb0a058289f12a19bfdda3c8e2
+RWRJc1FUaeVeql5WuyzRCs5x5C5ei741bzyVBdtpvuSPQMmzsgZoumcTDshNOXhKovWtoPd1fL1mWrBQ8m5yMY6sVvkHgTAaMwc=
+SHA256 (Pkgfile) = 42963efa0219e7d9873fb9ca2f7b57c7fd4d5ebe75541e0182ab53905837ee79
+SHA256 (.footprint) = 38f0afbdfac0c23ab732a17ebb485af02e6f8e89692d00d2e6d22da1ec9cb0b0
+SHA256 (libnsl-2.0.0.tar.xz) = 2da075ef1893ebdfc5f074f83ac811873dc06fd5c62bc9a4729fd2e27a40341a
diff --git a/libnsl/Pkgfile b/libnsl/Pkgfile
index ff5404f9..6c0a3fde 100644
--- a/libnsl/Pkgfile
+++ b/libnsl/Pkgfile
@@ -3,14 +3,14 @@
# Maintainer: CRUX System Team, core-ports at crux dot nu
name=libnsl
-version=1.3.0
+version=2.0.0
release=1
source=(https://github.com/thkukuk/$name/releases/download/v$version/$name-…
build() {
cd $name-$version
autoreconf -fi
- ./configure --prefix=/usr
+ ./configure --prefix=/usr
make
make DESTDIR=$PKG install
}
1
0
commit f337e0f99ba696251f92e423d372ac011492c0c5
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sun Jan 9 05:01:45 2022 +0100
iptables: new dependency: nftables
diff --git a/iptables/.footprint b/iptables/.footprint
index 47ffcfef..f1602b7c 100644
--- a/iptables/.footprint
+++ b/iptables/.footprint
@@ -1,6 +1,8 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/iptables-xml -> /usr/sbin/xtables-legacy-multi
+drwxr-xr-x root/root usr/etc/
+-rw-r--r-- root/root usr/etc/ethertypes
drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/libipq.h
drwxr-xr-x root/root usr/include/libiptc/
@@ -35,6 +37,23 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libiptc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/xtables.pc
drwxr-xr-x root/root usr/lib/xtables/
+-rwxr-xr-x root/root usr/lib/xtables/libarpt_mangle.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_802_3.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_among.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_arp.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_arpreply.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_dnat.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_ip.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_ip6.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_log.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_mark.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_mark_m.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_nflog.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_pkttype.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_redirect.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_snat.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_stp.so
+-rwxr-xr-x root/root usr/lib/xtables/libebt_vlan.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_DNAT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_DNPT.so
-rwxr-xr-x root/root usr/lib/xtables/libip6t_HL.so
@@ -144,21 +163,45 @@ lrwxrwxrwx root/root usr/lib/xtables/libxt_state.so -> libxt_conntrack.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_u32.so
-rwxr-xr-x root/root usr/lib/xtables/libxt_udp.so
drwxr-xr-x root/root usr/sbin/
+lrwxrwxrwx root/root usr/sbin/arptables -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/arptables-nft -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/arptables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/arptables-nft-save -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/arptables-restore -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/arptables-save -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ebtables -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ebtables-nft -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ebtables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ebtables-nft-save -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ebtables-restore -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ebtables-save -> xtables-nft-multi
lrwxrwxrwx root/root usr/sbin/ip6tables -> xtables-legacy-multi
lrwxrwxrwx root/root usr/sbin/ip6tables-apply -> iptables-apply
lrwxrwxrwx root/root usr/sbin/ip6tables-legacy -> xtables-legacy-multi
lrwxrwxrwx root/root usr/sbin/ip6tables-legacy-restore -> xtables-legacy-multi
lrwxrwxrwx root/root usr/sbin/ip6tables-legacy-save -> xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/ip6tables-nft -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ip6tables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/ip6tables-nft-save -> xtables-nft-multi
lrwxrwxrwx root/root usr/sbin/ip6tables-restore -> xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/ip6tables-restore-translate -> xtables-nft-multi
lrwxrwxrwx root/root usr/sbin/ip6tables-save -> xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/ip6tables-translate -> xtables-nft-multi
lrwxrwxrwx root/root usr/sbin/iptables -> xtables-legacy-multi
-rwxr-xr-x root/root usr/sbin/iptables-apply
lrwxrwxrwx root/root usr/sbin/iptables-legacy -> xtables-legacy-multi
lrwxrwxrwx root/root usr/sbin/iptables-legacy-restore -> xtables-legacy-multi
lrwxrwxrwx root/root usr/sbin/iptables-legacy-save -> xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/iptables-nft -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/iptables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx root/root usr/sbin/iptables-nft-save -> xtables-nft-multi
lrwxrwxrwx root/root usr/sbin/iptables-restore -> xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/iptables-restore-translate -> xtables-nft-multi
lrwxrwxrwx root/root usr/sbin/iptables-save -> xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/iptables-translate -> xtables-nft-multi
-rwxr-xr-x root/root usr/sbin/xtables-legacy-multi
+lrwxrwxrwx root/root usr/sbin/xtables-monitor -> xtables-nft-multi
+-rwxr-xr-x root/root usr/sbin/xtables-nft-multi
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
@@ -176,12 +219,24 @@ drwxr-xr-x root/root usr/share/man/man3/
-rw-r--r-- root/root usr/share/man/man3/ipq_set_verdict.3.gz
-rw-r--r-- root/root usr/share/man/man3/libipq.3.gz
drwxr-xr-x root/root usr/share/man/man8/
+-rw-r--r-- root/root usr/share/man/man8/arptables-nft-restore.8.gz
+-rw-r--r-- root/root usr/share/man/man8/arptables-nft-save.8.gz
+-rw-r--r-- root/root usr/share/man/man8/arptables-nft.8.gz
+-rw-r--r-- root/root usr/share/man/man8/ebtables-nft.8.gz
-rw-r--r-- root/root usr/share/man/man8/ip6tables-apply.8.gz
+-rw-r--r-- root/root usr/share/man/man8/ip6tables-restore-translate.8.gz
-rw-r--r-- root/root usr/share/man/man8/ip6tables-restore.8.gz
-rw-r--r-- root/root usr/share/man/man8/ip6tables-save.8.gz
+-rw-r--r-- root/root usr/share/man/man8/ip6tables-translate.8.gz
-rw-r--r-- root/root usr/share/man/man8/ip6tables.8.gz
-rw-r--r-- root/root usr/share/man/man8/iptables-apply.8.gz
-rw-r--r-- root/root usr/share/man/man8/iptables-extensions.8.gz
+-rw-r--r-- root/root usr/share/man/man8/iptables-restore-translate.8.gz
-rw-r--r-- root/root usr/share/man/man8/iptables-restore.8.gz
-rw-r--r-- root/root usr/share/man/man8/iptables-save.8.gz
+-rw-r--r-- root/root usr/share/man/man8/iptables-translate.8.gz
-rw-r--r-- root/root usr/share/man/man8/iptables.8.gz
+-rw-r--r-- root/root usr/share/man/man8/xtables-legacy.8.gz
+-rw-r--r-- root/root usr/share/man/man8/xtables-monitor.8.gz
+-rw-r--r-- root/root usr/share/man/man8/xtables-nft.8.gz
+-rw-r--r-- root/root usr/share/man/man8/xtables-translate.8.gz
diff --git a/iptables/.signature b/iptables/.signature
index 60f3b546..04139310 100644
--- a/iptables/.signature
+++ b/iptables/.signature
@@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqv2CU1v1kr0hfaEcdjkjhYQ8KlXSKbN4P3TGZTP0O6ysmGgalz/I1Sp8Ji89/bIR4BHZEylBnsx2j++nF9hoJQ8=
-SHA256 (Pkgfile) = a466ad5c646387a665046684e940fdc62c8ed2f58d78a97655f8626b4c41ca46
-SHA256 (.footprint) = 06545581d424fe7df1b48f8da1162c59d1061d4e41828c3580e363d83bdcb6ad
+RWRJc1FUaeVeqsyW5yZfPPala0qUtHDUDBA0Ehb9USlnP4CG2HQcH7v4GE9nKyPvp2dN54Z/kfESA//5ihVXdkp4is4yS3jg0g4=
+SHA256 (Pkgfile) = e2386aaabb372eee747a52e0f38c5cefe46e1e4c94e2080fe20369662791d76b
+SHA256 (.footprint) = 004c7c5f2f7477484e27797055e46b36c14965dcc9d3105dcc6267d33d861d4c
SHA256 (iptables-1.8.7.tar.bz2) = c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0
diff --git a/iptables/Pkgfile b/iptables/Pkgfile
index bad00775..f8e59b27 100644
--- a/iptables/Pkgfile
+++ b/iptables/Pkgfile
@@ -1,20 +1,20 @@
# Description: A Linux kernel packet filter control tool
# URL: https://www.iptables.org/
# Maintainer: CRUX System Team, core-ports at crux dot nu
+# Depends on: nftables
name=iptables
version=1.8.7
-release=2
+release=3
source=(https://www.netfilter.org/projects/$name/files/$name-$version.tar.b…
build () {
cd $name-$version
- prt-get isinst nftables || PKGMK_IPTABLES="--disable-nftables"
-
./configure --prefix=/usr $PKGMK_IPTABLES \
--libexecdir=/usr/lib \
- --enable-libipq
+ --enable-libipq \
+ --enable-nftables
make
make DESTDIR=$PKG install
1
0
commit e64d9c7d19935cb232e47aea3cc1ab9b4d29cc53
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sun Jan 9 04:44:18 2022 +0100
nftables: initial commit, version 1.0.1
diff --git a/nftables/.footprint b/nftables/.footprint
new file mode 100644
index 00000000..861c6905
--- /dev/null
+++ b/nftables/.footprint
@@ -0,0 +1,57 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/nft
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/nftables/
+-rw-r--r-- root/root usr/include/nftables/libnftables.h
+drwxr-xr-x root/root usr/lib/
+-rw-r--r-- root/root usr/lib/libnftables.a
+-rwxr-xr-x root/root usr/lib/libnftables.la
+lrwxrwxrwx root/root usr/lib/libnftables.so -> libnftables.so.1.1.0
+lrwxrwxrwx root/root usr/lib/libnftables.so.1 -> libnftables.so.1.1.0
+-rwxr-xr-x root/root usr/lib/libnftables.so.1.1.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/libnftables.pc
+drwxr-xr-x root/root usr/lib/python3.10/
+drwxr-xr-x root/root usr/lib/python3.10/site-packages/
+drwxr-xr-x root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/
+drwxr-xr-x root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/EGG-INFO/
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/EGG-INFO/PKG-INFO
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/EGG-INFO/SOURCES.txt
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/EGG-INFO/dependency_links.txt
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/EGG-INFO/not-zip-safe
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/EGG-INFO/top_level.txt
+drwxr-xr-x root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/__init__.py
+drwxr-xr-x root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/__pycache__/
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/__pycache__/__init__.cpython-310.pyc
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/__pycache__/nftables.cpython-310.opt-1.pyc
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/__pycache__/nftables.cpython-310.pyc
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/nftables.py
+-rw-r--r-- root/root usr/lib/python3.10/site-packages/nftables-0.1-py3.10.egg/nftables/schema.json
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man3/
+-rw-r--r-- root/root usr/share/man/man3/libnftables.3.gz
+drwxr-xr-x root/root usr/share/man/man5/
+-rw-r--r-- root/root usr/share/man/man5/libnftables-json.5.gz
+drwxr-xr-x root/root usr/share/man/man8/
+-rw-r--r-- root/root usr/share/man/man8/nft.8.gz
+drwxr-xr-x root/root usr/share/nftables/
+-rw-r--r-- root/root usr/share/nftables/all-in-one.nft
+-rw-r--r-- root/root usr/share/nftables/arp-filter.nft
+-rw-r--r-- root/root usr/share/nftables/bridge-filter.nft
+-rw-r--r-- root/root usr/share/nftables/inet-filter.nft
+-rw-r--r-- root/root usr/share/nftables/inet-nat.nft
+-rw-r--r-- root/root usr/share/nftables/ipv4-filter.nft
+-rw-r--r-- root/root usr/share/nftables/ipv4-mangle.nft
+-rw-r--r-- root/root usr/share/nftables/ipv4-nat.nft
+-rw-r--r-- root/root usr/share/nftables/ipv4-raw.nft
+-rw-r--r-- root/root usr/share/nftables/ipv6-filter.nft
+-rw-r--r-- root/root usr/share/nftables/ipv6-mangle.nft
+-rw-r--r-- root/root usr/share/nftables/ipv6-nat.nft
+-rw-r--r-- root/root usr/share/nftables/ipv6-raw.nft
+-rw-r--r-- root/root usr/share/nftables/netdev-ingress.nft
+drwxr-xr-x root/root usr/share/nftables/osf/
+-rw-r--r-- root/root usr/share/nftables/osf/pf.os
diff --git a/nftables/.signature b/nftables/.signature
new file mode 100644
index 00000000..749fa821
--- /dev/null
+++ b/nftables/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/core.pub
+RWRJc1FUaeVeqogPxfWxHmHLzZOS7iUdEFqChjchFvdL7/iIJIfJXCqN6eH66mWi1cwAa4aanIR8lwMxfqRb9jFgiNK8/Z6wkAM=
+SHA256 (Pkgfile) = 6fe03a82d92a8d6ffc341640447ee0d0917d3ef31b4cae4c7918f3ad0c1776b8
+SHA256 (.footprint) = 3eea0a22379683df5e19a85c598de3239f0d164f12dab13fd92f47f8814bb8ec
+SHA256 (nftables-1.0.1.tar.bz2) = 3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423
diff --git a/nftables/Pkgfile b/nftables/Pkgfile
new file mode 100644
index 00000000..c1b16c48
--- /dev/null
+++ b/nftables/Pkgfile
@@ -0,0 +1,29 @@
+# Description: firewalling, NAT, and packet mangling for linux
+# URL: https://netfilter.org/projects/nftables/
+# Maintainer: CRUX System Team, core-ports at crux dot nu
+# Depends on: jansson libedit libgmp libnftnl python3
+
+name=nftables
+version=1.0.1
+release=1
+source=(https://www.netfilter.org/pub/nftables/nftables-$version.tar.bz2)
+
+build() {
+ ls
+ cd $name-$version
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/usr/share \
+ --with-json \
+ --with-cli=readline \
+ --disable-debug
+ make
+ make DESTDIR=$PKG install
+
+ /usr/bin/python3 -m compileall -d / $PKG/usr/lib
+ /usr/bin/python3 -O -m compileall -d / $PKG/usr/lib
+
+ rm -r $PKG/usr/share/doc
+}
1
0
commit 371e414b97a301a57b654ffd240c134330fe3861
Author: Tim Biermann <tbier(a)posteo.de>
Date: Sun Jan 9 04:43:44 2022 +0100
libnftnl: initial commit, version 1.2.1
diff --git a/libnftnl/.footprint b/libnftnl/.footprint
new file mode 100644
index 00000000..0c24758a
--- /dev/null
+++ b/libnftnl/.footprint
@@ -0,0 +1,23 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/libnftnl/
+-rw-r--r-- root/root usr/include/libnftnl/batch.h
+-rw-r--r-- root/root usr/include/libnftnl/chain.h
+-rw-r--r-- root/root usr/include/libnftnl/common.h
+-rw-r--r-- root/root usr/include/libnftnl/expr.h
+-rw-r--r-- root/root usr/include/libnftnl/flowtable.h
+-rw-r--r-- root/root usr/include/libnftnl/gen.h
+-rw-r--r-- root/root usr/include/libnftnl/object.h
+-rw-r--r-- root/root usr/include/libnftnl/rule.h
+-rw-r--r-- root/root usr/include/libnftnl/ruleset.h
+-rw-r--r-- root/root usr/include/libnftnl/set.h
+-rw-r--r-- root/root usr/include/libnftnl/table.h
+-rw-r--r-- root/root usr/include/libnftnl/trace.h
+-rw-r--r-- root/root usr/include/libnftnl/udata.h
+drwxr-xr-x root/root usr/lib/
+-rwxr-xr-x root/root usr/lib/libnftnl.la
+lrwxrwxrwx root/root usr/lib/libnftnl.so -> libnftnl.so.11.6.0
+lrwxrwxrwx root/root usr/lib/libnftnl.so.11 -> libnftnl.so.11.6.0
+-rwxr-xr-x root/root usr/lib/libnftnl.so.11.6.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/libnftnl.pc
diff --git a/libnftnl/.signature b/libnftnl/.signature
new file mode 100644
index 00000000..3b64e736
--- /dev/null
+++ b/libnftnl/.signature
@@ -0,0 +1,5 @@
+untrusted comment: verify with /etc/ports/core.pub
+RWRJc1FUaeVeqvoTeTmpHOOOWcMxCS8E4S9dUYnaUeIEmF8+TYhWM9GBgG3BHWKLxl/1XJAOhdjU+4SboF/x7XlaqiCI5XUu0QE=
+SHA256 (Pkgfile) = c4a7735eb6ddf74720a333986128384b211de91ca1df17fa700d40ef2b8611e1
+SHA256 (.footprint) = 881affe152fa8ce229a6bbac47e52e9c3431693811432c8d505e0c2813d6adda
+SHA256 (libnftnl-1.2.1.tar.bz2) = 7508a5c414fab13e3cb3ce8262d0ce4f02c1590a8e4f8628ab497b5b4585937c
diff --git a/libnftnl/Pkgfile b/libnftnl/Pkgfile
new file mode 100644
index 00000000..91c4d623
--- /dev/null
+++ b/libnftnl/Pkgfile
@@ -0,0 +1,17 @@
+# Description: libnftnl is a userspace library providing a low-level netlink programming interface (API) to the in-kernel nf_tables subsystem
+# URL: https://netfilter.org/projects/libnftnl/
+# Maintainer: CRUX System Team, core-ports at crux dot nu
+# Depends on: libmnl
+
+name=libnftnl
+version=1.2.1
+release=1
+source=(https://www.netfilter.org/pub/libnftnl/libnftnl-$version.tar.bz2)
+
+build() {
+ cd $name-$version
+
+ ./configure --prefix=/usr
+ make
+ make DESTDIR=$PKG install
+}
1
0