crux-commits

Download

crux-commits@lists.crux.nu

January 2022

1 participants
999 discussions

ports/core (3.7): xz: syntax
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 09a813490cee42e63e794ff616409c1be9fdd139 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Dec 13 11:45:34 2021 +0100 xz: syntax diff --git a/xz/.signature b/xz/.signature index a9c9de78..a55f05d9 100644 --- a/xz/.signature +++ b/xz/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqr7ktnsoEF77pOHiwpenfq+iYgsaZ6rLlzoiK9mCZzSl7PIG/EEj47aNZt5V3ewbEHZBlM3sP311yq96sIixDQ4= -SHA256 (Pkgfile) = 43f6e16efcc516ac29fc7c20b51f06ec1236c7fdfb915b20d594ffb0d45cde98 +RWRJc1FUaeVeqp4yS0K9eAoPiMTwfbm7IhOrtFFs8x/Nh/lTuZULmzSOsixd7SelcoJrKG1rE5yOjKIZBxWIusXteE6a9VHD+Qo= +SHA256 (Pkgfile) = 8a416327f3ea6e42fb3ae38fe300d5bc4af3541760f0de9cf1f44144bd889df6 SHA256 (.footprint) = 389b0d29304cb69bf30a0612e7d9566b6ec64f9a87d754f77c0309df780138ef SHA256 (xz-5.2.5.tar.xz) = 3e1e518ffc912f86608a8cb35e4bd41ad1aec210df2a47aaa1f95e7f5576ef56 diff --git a/xz/Pkgfile b/xz/Pkgfile index e205a901..e9cf41be 100644 --- a/xz/Pkgfile +++ b/xz/Pkgfile @@ -1,6 +1,6 @@ # Description: Compression utility using the lzma algorithm, successor of lzma-utils -# URL: https://tukaani.org/xz/ -# Maintainer: CRUX System Team, core-ports at crux dot nu +# URL: https://tukaani.org/xz/ +# Maintainer: CRUX System Team, core-ports at crux dot nu name=xz version=5.2.5 @@ -8,9 +8,9 @@ release=1 source=(https://tukaani.org/xz/$name-$version.tar.xz) build() { - cd $name-$version - ./configure --prefix=/usr --disable-nls - make - make DESTDIR=$PKG install - rm -r $PKG/usr/share/doc/ + cd $name-$version + ./configure --prefix=/usr --disable-nls + make + make DESTDIR=$PKG install + rm -r $PKG/usr/share/doc/ }

1 0

ports/core (3.7): zlib: use https and syntax
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 68422934ea85e18ba7b4f4f4424c5e7ac3c7184a Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Dec 13 11:44:49 2021 +0100 zlib: use https and syntax diff --git a/zlib/.signature b/zlib/.signature index d64c3ad6..5828400e 100644 --- a/zlib/.signature +++ b/zlib/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqjgK98lQ+LJKST2ix1Q2la4pPQ5q2/IHke6BAuTzRiaJjU1bNfDbo6xfdVCX0neAJekelxCAqyYhHLofd+lysQQ= -SHA256 (Pkgfile) = cef61211132b95baf91c3751bf17bf3a54e10589df73676ced4662cba62dc015 +RWRJc1FUaeVeqvWsFcswDXFdH7Rpkk7qqXvFI4FRSMdAZUZn37Z5olgK6xmqxS/TFUHJSlAIOqC2eVOuK1cT2oCd/yYmFLXfVAM= +SHA256 (Pkgfile) = d9a5bc091d5c4a77db0e7b9d88cdb2e79abc2984eea69253785ed48f0d126d5a SHA256 (.footprint) = 92224a169d5da8d98e3d78a12414eb65b03112b5bb355fd42b92b69ac71fa90c SHA256 (zlib-1.2.11.tar.gz) = c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 diff --git a/zlib/Pkgfile b/zlib/Pkgfile index b3d346e4..9ad3567e 100644 --- a/zlib/Pkgfile +++ b/zlib/Pkgfile @@ -1,17 +1,17 @@ # Description: A compression/decompression Library -# URL: http://www.zlib.net/ -# Maintainer: CRUX System Team, core-ports at crux dot nu +# URL: https://www.zlib.net/ +# Maintainer: CRUX System Team, core-ports at crux dot nu name=zlib version=1.2.11 release=1 -source=(http://www.zlib.net/$name-$version.tar.gz) +source=(https://www.zlib.net/$name-$version.tar.gz) build() { - cd $name-$version - ./configure --prefix=/usr --sharedlibdir=/lib - make - make DESTDIR=$PKG install - ln -sf ../../lib/libz.so.$version $PKG/usr/lib/libz.so - rm $PKG/lib/libz.so + cd $name-$version + ./configure --prefix=/usr --sharedlibdir=/lib + make + make DESTDIR=$PKG install + ln -sf ../../lib/libz.so.$version $PKG/usr/lib/libz.so + rm $PKG/lib/libz.so }

1 0

ports/core (3.7): zstd: sorted depends on line
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 83c5da796225c3d19273be4bcc1ad3e873861a15 Author: Tim Biermann <tbier(a)posteo.de> Date: Mon Dec 13 11:43:41 2021 +0100 zstd: sorted depends on line diff --git a/zstd/.signature b/zstd/.signature index e1d8df52..568f9c7b 100644 --- a/zstd/.signature +++ b/zstd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqhvFSiD2Lr5PsT/plaJp96Oq0hRhbfOvZK9VUSOH3wTGBZd92ylbaUf3r5eSl4XzQM6NlkyuduhrTgjyRmMJogE= -SHA256 (Pkgfile) = afb94a3a12ad8cc4db8de14b9376c18a4372452d44a51c22e8b1454d2722e214 +RWRJc1FUaeVeqk/3pBVFqstKFYMiMVJu/8rylRGi4rPUXXDcw+KDySfvMksBCo+ZblNbYY/XYUNb08wjglA6Q9LRjxQ2N7DDpAM= +SHA256 (Pkgfile) = d3cd12b4a58b9d5d5ce55b9246bb68d9bc5cc7b4ae05f4f62bfc7b4abc3bbda5 SHA256 (.footprint) = ce6915c420ebde9a00c2bc5044f14d577fbe59d1f12e7df567890c35ebfa4a02 SHA256 (zstd-v1.5.0.tar.gz) = 0d9ade222c64e912d6957b11c923e214e2e010a18f39bec102f572e693ba2867 diff --git a/zstd/Pkgfile b/zstd/Pkgfile index 7209bf3f..ade77959 100644 --- a/zstd/Pkgfile +++ b/zstd/Pkgfile @@ -1,7 +1,7 @@ # Description: Real-time compression algorithm with high compression ratios # URL: https://facebook.github.io/zstd/ # Maintainer: CRUX system team, core-ports at crux dot nu -# Depends on: zlib xz +# Depends on: xz zlib name=zstd version=1.5.0

1 0

ports/core (3.7): python3: 3.10.0 -> 3.10.1
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 3c6aaac1c334e0b308544d2271fc298666d8eaa2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sun Dec 12 18:27:35 2021 +0100 python3: 3.10.0 -> 3.10.1 diff --git a/python3/.footprint b/python3/.footprint index 2cd79777..963d3000 100644 --- a/python3/.footprint +++ b/python3/.footprint @@ -1840,8 +1840,8 @@ drwxr-xr-x root/root usr/lib/python3.10/ensurepip/_bundled/__pycache__/ -rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-1.pyc -rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.opt-2.pyc -rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/__pycache__/__init__.cpython-310.pyc --rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl --rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl +-rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/pip-21.2.4-py3-none-any.whl +-rw-r--r-- root/root usr/lib/python3.10/ensurepip/_bundled/setuptools-58.1.0-py3-none-any.whl -rw-r--r-- root/root usr/lib/python3.10/ensurepip/_uninstall.py -rw-r--r-- root/root usr/lib/python3.10/enum.py -rw-r--r-- root/root usr/lib/python3.10/filecmp.py @@ -2340,9 +2340,9 @@ drwxr-xr-x root/root usr/lib/python3.10/lib-dynload/ -rwxr-xr-x root/root usr/lib/python3.10/lib-dynload/zlib.cpython-310-x86_64-linux-gnu.so drwxr-xr-x root/root usr/lib/python3.10/lib2to3/ -rw-r--r-- root/root usr/lib/python3.10/lib2to3/Grammar.txt --rw-r--r-- root/root usr/lib/python3.10/lib2to3/Grammar3.10.0.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.10/lib2to3/Grammar3.10.1.final.0.pickle -rw-r--r-- root/root usr/lib/python3.10/lib2to3/PatternGrammar.txt --rw-r--r-- root/root usr/lib/python3.10/lib2to3/PatternGrammar3.10.0.final.0.pickle +-rw-r--r-- root/root usr/lib/python3.10/lib2to3/PatternGrammar3.10.1.final.0.pickle -rw-r--r-- root/root usr/lib/python3.10/lib2to3/__init__.py -rw-r--r-- root/root usr/lib/python3.10/lib2to3/__main__.py drwxr-xr-x root/root usr/lib/python3.10/lib2to3/__pycache__/ diff --git a/python3/.signature b/python3/.signature index 8f1be7a6..7cda0c88 100644 --- a/python3/.signature +++ b/python3/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqlutToFwbEC089uKNYyo+K/Smt1lpn/5QQyxc0jBovEgMpuj3fwNGki0tfqV2peZOmwxsb/cuVFpJ8rvSyz55Qg= -SHA256 (Pkgfile) = 8c3b97b3176415011a4d5e1be094105ba325a86465c8d31078ba20a36f3ec3b1 -SHA256 (.footprint) = 1644ea1620a64c4db60c700f2e6bd3cf69da615264fe440970294f79439f0b20 -SHA256 (Python-3.10.0.tar.xz) = 5a99f8e7a6a11a7b98b4e75e0d1303d3832cada5534068f69c7b6222a7b1b002 +RWRJc1FUaeVeqiwnawTORsp0wU9jwb3VYW6P/HC8Afh/JPYjK1UebLd90NUCBXur6qnM606YchQwURHDhQTUW9SElIxjlt1GTQo= +SHA256 (Pkgfile) = 595044226ded42748966cf4ca709db3cc03af7cb75a34fd9bbb56eed2b1dac28 +SHA256 (.footprint) = f3a73b29f327cbc21a76364b66f35f1a7f348184b7346facab99c34f08441afe +SHA256 (Python-3.10.1.tar.xz) = a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177 diff --git a/python3/Pkgfile b/python3/Pkgfile index a1e61b43..729285dd 100644 --- a/python3/Pkgfile +++ b/python3/Pkgfile @@ -4,13 +4,24 @@ # Depends on: bzip2 expat gdbm libffi libnsl libtirpc mpdecimal sqlite3 xz name=python3 -version=3.10.0 +version=3.10.1 release=1 source=(https://www.python.org/ftp/python/${version%rc*}/Python-$version.ta… build() { cd Python-$version + # PGO and LTO make python go brrrrr + sed -i -e "s|-flto |-flto=4 |g" configure configure.ac + CFLAGS="${CFLAGS/-O2/-O3}" + local _pgojobs=$(nproc) + export PROFILE_TASK="-m test -j${_pgojobs} --pgo-extended -x test_gdb -u-network" + PROFILE_TASK+=" -x test_socket -x test_asyncio -x test_httpservers -x test_logging -x test_multiprocessing_fork -x test_xmlrpc" + local -x LC_ALL=C.utf8 + export SETUPTOOLS_USE_DISTUTILS=stdlib + local -x COLUMNS=80 + local -x PYTHONDONTWRITEBYTECODE= + # Ensure that we are using the system copy of various libraries rm -r Modules/expat rm -r Modules/_ctypes/{darwin,libffi}* @@ -23,16 +34,19 @@ build() { ./configure \ --prefix=/usr \ --enable-shared \ + --enable-optimizations \ --enable-ipv6 \ --enable-loadable-sqlite-extensions \ --with-computed-gotos \ + --with-lto \ --with-system-expat \ --with-system-ffi \ --with-system-libmpdec \ + --with-tzpath=/usr/share/zoneinfo \ --without-ensurepip - make - make -j1 DESTDIR=$PKG altinstall maninstall + make EXTRA_CFLAGS="$CFLAGS" + make -j1 EXTRA_CFLAGS="$CFLAGS" DESTDIR=$PKG altinstall maninstall ln -s 2to3-${version%.*} $PKG/usr/bin/2to3 ln -s python${version%.*} $PKG/usr/bin/python3

1 0

ports/core (3.7): glibc-32: included upstream fixes
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 9686d5573bdd39f2c31c27082b8bd98b3cebd77a Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Dec 11 22:59:48 2021 +0100 glibc-32: included upstream fixes diff --git a/glibc-32/.signature b/glibc-32/.signature index 58f95f12..70c87f01 100644 --- a/glibc-32/.signature +++ b/glibc-32/.signature @@ -1,10 +1,11 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqqIvfNfyoGIl3dJWeU+KOTOKkWvyJpUsCaumvqsUo08Gd66SzkGuMdBJ4qYBU1BI/SCmLS1faxl+je8FS/rAIws= -SHA256 (Pkgfile) = 344f3dce94b58f4108dd81e696ed2005138ab6558ddb75131e3943a7602d473b +RWRJc1FUaeVeqrneHjowycLr7W204qXt5Wf3z/w3P42URNoZQg+kIhdH+H6rnVPZcJSAbumo5a5L5RKfobLZiNQr5hAieTyOyg0= +SHA256 (Pkgfile) = 68d47984366f1181f91cfb699012fe591e176a30f4981d2317811874343dbbc9 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 (glibc-2.34-upstream-fixes.patch) = 54e965200314f627a3412dd723d31e44a56ae9a156fce066d2a742caa86c0a36 SHA256 (lib32.conf) = 2f174d2bcefe1c29327690514f34d6970fffdd54398320ca23a11b5f1e3c9b2d diff --git a/glibc-32/Pkgfile b/glibc-32/Pkgfile index 2e780f06..489ea204 100644 --- a/glibc-32/Pkgfile +++ b/glibc-32/Pkgfile @@ -4,11 +4,11 @@ name=glibc-32 version=2.34 -release=1 +release=2 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 + glibc-python3.patch glibc-2.34-upstream-fixes.patch lib32.conf) build() { @@ -18,6 +18,7 @@ build() { make INSTALL_HDR_PATH=$PKG/usr headers_install chown root:root $PKG/usr + patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-2.34-upstream-fixes.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 diff --git a/glibc-32/glibc-2.34-upstream-fixes.patch b/glibc-32/glibc-2.34-upstream-fixes.patch new file mode 100644 index 00000000..02585341 --- /dev/null +++ b/glibc-32/glibc-2.34-upstream-fixes.patch @@ -0,0 +1,4387 @@ +diff --git a/NEWS b/NEWS +index 3c610744c9..698964bb9e 100644 +--- a/NEWS ++++ b/NEWS +@@ -4,6 +4,25 @@ See the end for copying conditions. + + Please send GNU C library bug reports via <https://sourceware.org/bugzilla/> + using `glibc' in the "product" field. ++ ++Version 2.34.1 ++ ++The following bugs are resolved with this release: ++ ++ [12889] nptl: Fix race between pthread_kill and thread exit ++ [19193] nptl: pthread_kill, pthread_cancel should not fail after exit ++ [28036] Incorrect types for pthread_mutexattr_set/getrobust_np ++ [28182] _TIME_BITS=64 in C++ has issues with fcntl, ioctl, prctl ++ [28310] Do not use affinity mask for sysconf (_SC_NPROCESSORS_CONF) ++ [28340] ld.so crashes while loading a DSO with a read-only dynamic section ++ [28357] deadlock between pthread_create and ELF constructors ++ [28361] nptl: Avoid setxid deadlock with blocked signals in thread exit ++ [28407] pthread_kill assumes that kill and tgkill are equivalent ++ [28524] Conversion from ISO-2022-JP-3 with iconv may emit spurious NULs ++ [28607] Masked signals are delivered on thread exit ++ [28532] powerpc64[le]: CFI for assembly templated syscalls is incorrect ++ [28678] nptl/tst-create1 hangs sporadically ++ + + Version 2.34 + +diff --git a/bits/stdlib-bsearch.h b/bits/stdlib-bsearch.h +index 4132dc6af0..e2fcea6e17 100644 +--- a/bits/stdlib-bsearch.h ++++ b/bits/stdlib-bsearch.h +@@ -29,14 +29,23 @@ bsearch (const void *__key, const void *__base, size_t __nmemb, size_t __size, + while (__l < __u) + { + __idx = (__l + __u) / 2; +- __p = (void *) (((const char *) __base) + (__idx * __size)); ++ __p = (const void *) (((const char *) __base) + (__idx * __size)); + __comparison = (*__compar) (__key, __p); + if (__comparison < 0) + __u = __idx; + else if (__comparison > 0) + __l = __idx + 1; + else +- return (void *) __p; ++ { ++#if __GNUC_PREREQ(4, 6) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wcast-qual" ++#endif ++ return (void *) __p; ++#if __GNUC_PREREQ(4, 6) ++# pragma GCC diagnostic pop ++#endif ++ } + } + + return NULL; +diff --git a/elf/Makefile b/elf/Makefile +index d05f410592..118d579c42 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-tls-ie tst-tls-ie-dlmopen argv0test \ + tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ + tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ +- tst-dl-is_dso ++ tst-dl-is_dso tst-ro-dynamic + # reldep9 + tests-internal += loadtest unload unload2 circleload1 \ + neededtest neededtest2 neededtest3 neededtest4 \ +@@ -357,7 +357,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + libmarkermod4-1 libmarkermod4-2 libmarkermod4-3 libmarkermod4-4 \ + tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ + tst-auxvalmod \ +- tst-dlmopen-gethostbyname-mod \ ++ tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ + + # Most modules build with _ISOMAC defined, but those filtered out + # depend on internal headers. +@@ -399,8 +399,9 @@ endif + modules-execstack-yes = tst-execstack-mod + extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) + +-# filtmod1.so, tst-big-note-lib.so have special rules. +-modules-names-nobuild := filtmod1 tst-big-note-lib ++# filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special ++# rules. ++modules-names-nobuild := filtmod1 tst-big-note-lib tst-ro-dynamic-mod + + tests += $(tests-static) + +@@ -1906,3 +1907,10 @@ $(objpfx)tst-getauxval-static.out: $(objpfx)tst-auxvalmod.so + tst-getauxval-static-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx) + + $(objpfx)tst-dlmopen-gethostbyname.out: $(objpfx)tst-dlmopen-gethostbyname-mod.so ++ ++$(objpfx)tst-ro-dynamic: $(objpfx)tst-ro-dynamic-mod.so ++$(objpfx)tst-ro-dynamic-mod.so: $(objpfx)tst-ro-dynamic-mod.os \ ++ tst-ro-dynamic-mod.map ++ $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ ++ -Wl,--script=tst-ro-dynamic-mod.map \ ++ $(objpfx)tst-ro-dynamic-mod.os +diff --git a/elf/dl-close.c b/elf/dl-close.c +index f39001cab9..cd7b9c9fe8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -549,6 +549,9 @@ _dl_close_worker (struct link_map *map, bool force) + size_t tls_free_end; + tls_free_start = tls_free_end = NO_TLS_OFFSET; + ++ /* Protects global and module specitic TLS state. */ ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); ++ + /* We modify the list of loaded objects. */ + __rtld_lock_lock_recursive (GL(dl_load_write_lock)); + +@@ -784,6 +787,9 @@ _dl_close_worker (struct link_map *map, bool force) + GL(dl_tls_static_used) = tls_free_start; + } + ++ /* TLS is cleaned up for the unloaded modules. */ ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); ++ + #ifdef SHARED + /* Auditing checkpoint: we have deleted all objects. */ + if (__glibc_unlikely (do_audit)) +diff --git a/elf/dl-load.c b/elf/dl-load.c +index 650e4edc35..0976977fbd 100644 +--- a/elf/dl-load.c ++++ b/elf/dl-load.c +@@ -1130,6 +1130,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + struct loadcmd loadcmds[l->l_phnum]; + size_t nloadcmds = 0; + bool has_holes = false; ++ bool empty_dynamic = false; + + /* The struct is initialized to zero so this is not necessary: + l->l_ld = 0; +@@ -1142,13 +1143,16 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + segments are mapped in. We record the addresses it says + verbatim, and later correct for the run-time load address. */ + case PT_DYNAMIC: +- if (ph->p_filesz) ++ if (ph->p_filesz == 0) ++ empty_dynamic = true; /* Usually separate debuginfo. */ ++ else + { + /* Debuginfo only files from "objcopy --only-keep-debug" + contain a PT_DYNAMIC segment with p_filesz == 0. Skip + such a segment to avoid a crash later. */ + l->l_ld = (void *) ph->p_vaddr; + l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn)); ++ l->l_ld_readonly = (ph->p_flags & PF_W) == 0; + } + break; + +@@ -1264,6 +1268,13 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + goto lose; + } + ++ /* This check recognizes most separate debuginfo files. */ ++ if (__glibc_unlikely ((l->l_ld == 0 && type == ET_DYN) || empty_dynamic)) ++ { ++ errstring = N_("object file has no dynamic section"); ++ goto lose; ++ } ++ + /* Length of the sections to be loaded. */ + maplength = loadcmds[nloadcmds - 1].allocend - loadcmds[0].mapstart; + +@@ -1281,18 +1292,10 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + } + } + +- if (l->l_ld == 0) +- { +- if (__glibc_unlikely (type == ET_DYN)) +- { +- errstring = N_("object file has no dynamic section"); +- goto lose; +- } +- } +- else ++ if (l->l_ld != 0) + l->l_ld = (ElfW(Dyn) *) ((ElfW(Addr)) l->l_ld + l->l_addr); + +- elf_get_dynamic_info (l, NULL); ++ elf_get_dynamic_info (l); + + /* Make sure we are not dlopen'ing an object that has the + DF_1_NOOPEN flag set, or a PIE object. */ +diff --git a/elf/dl-open.c b/elf/dl-open.c +index ec386626f9..bc68e2c376 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -66,6 +66,9 @@ struct dl_open_args + libc_map value in the namespace in case of a dlopen failure. */ + bool libc_already_loaded; + ++ /* Set to true if the end of dl_open_worker_begin was reached. */ ++ bool worker_continue; ++ + /* Original parameters to the program and the current environment. */ + int argc; + char **argv; +@@ -482,7 +485,7 @@ call_dl_init (void *closure) + } + + static void +-dl_open_worker (void *a) ++dl_open_worker_begin (void *a) + { + struct dl_open_args *args = a; + const char *file = args->file; +@@ -774,6 +777,36 @@ dl_open_worker (void *a) + _dl_call_libc_early_init (libc_map, false); + } + ++ args->worker_continue = true; ++} ++ ++static void ++dl_open_worker (void *a) ++{ ++ struct dl_open_args *args = a; ++ ++ args->worker_continue = false; ++ ++ { ++ /* Protects global and module specific TLS state. */ ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); ++ ++ struct dl_exception ex; ++ int err = _dl_catch_exception (&ex, dl_open_worker_begin, args); ++ ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); ++ ++ if (__glibc_unlikely (ex.errstring != NULL)) ++ /* Reraise the error. */ ++ _dl_signal_exception (err, &ex, NULL); ++ } ++ ++ if (!args->worker_continue) ++ return; ++ ++ int mode = args->mode; ++ struct link_map *new = args->map; ++ + /* Run the initializer functions of new objects. Temporarily + disable the exception handler, so that lazy binding failures are + fatal. */ +@@ -886,7 +919,7 @@ no more namespaces available for dlmopen()")); + /* Avoid keeping around a dangling reference to the libc.so link + map in case it has been cached in libc_map. */ + if (!args.libc_already_loaded) +- GL(dl_ns)[nsid].libc_map = NULL; ++ GL(dl_ns)[args.nsid].libc_map = NULL; + + /* Remove the object from memory. It may be in an inconsistent + state if relocation failed, for example. */ +diff --git a/elf/dl-reloc-static-pie.c b/elf/dl-reloc-static-pie.c +index d5bd2f31e9..2fb02d7276 100644 +--- a/elf/dl-reloc-static-pie.c ++++ b/elf/dl-reloc-static-pie.c +@@ -40,7 +40,17 @@ _dl_relocate_static_pie (void) + + /* Read our own dynamic section and fill in the info array. */ + main_map->l_ld = ((void *) main_map->l_addr + elf_machine_dynamic ()); +- elf_get_dynamic_info (main_map, NULL); ++ ++ const ElfW(Phdr) *ph, *phdr = GL(dl_phdr); ++ size_t phnum = GL(dl_phnum); ++ for (ph = phdr; ph < &phdr[phnum]; ++ph) ++ if (ph->p_type == PT_DYNAMIC) ++ { ++ main_map->l_ld_readonly = (ph->p_flags & PF_W) == 0; ++ break; ++ } ++ ++ elf_get_dynamic_info (main_map); + + # ifdef ELF_MACHINE_BEFORE_RTLD_RELOC + ELF_MACHINE_BEFORE_RTLD_RELOC (main_map->l_info); +diff --git a/elf/dl-support.c b/elf/dl-support.c +index 0155718175..d8c06ba7eb 100644 +--- a/elf/dl-support.c ++++ b/elf/dl-support.c +@@ -229,6 +229,13 @@ __rtld_lock_define_initialized_recursive (, _dl_load_lock) + list of loaded objects while an object is added to or removed from + that list. */ + __rtld_lock_define_initialized_recursive (, _dl_load_write_lock) ++ /* This lock protects global and module specific TLS related data. ++ E.g. it is held in dlopen and dlclose when GL(dl_tls_generation), ++ GL(dl_tls_max_dtv_idx) or GL(dl_tls_dtv_slotinfo_list) are ++ accessed and when TLS related relocations are processed for a ++ module. It was introduced to keep pthread_create accessing TLS ++ state that is being set up. */ ++__rtld_lock_define_initialized_recursive (, _dl_load_tls_lock) + + + #ifdef HAVE_AUX_VECTOR +diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c +index d47bef1340..2c684c2db2 100644 +--- a/elf/dl-sysdep.c ++++ b/elf/dl-sysdep.c +@@ -317,7 +317,7 @@ _dl_show_auxv (void) + [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, + [AT_RANDOM - 2] = { "RANDOM: 0x", hex }, + [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex }, +- [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ ", dec }, ++ [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec }, + [AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec }, + [AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex }, + [AT_L1D_CACHESIZE - 2] = { "L1D_CACHESIZE: ", dec }, +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index 423e380f7c..40263cf586 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -532,7 +532,7 @@ _dl_allocate_tls_init (void *result) + size_t maxgen = 0; + + /* Protects global dynamic TLS related state. */ +- __rtld_lock_lock_recursive (GL(dl_load_lock)); ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); + + /* Check if the current dtv is big enough. */ + if (dtv[-1].counter < GL(dl_tls_max_dtv_idx)) +@@ -606,7 +606,7 @@ _dl_allocate_tls_init (void *result) + listp = listp->next; + assert (listp != NULL); + } +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + + /* The DTV version is up-to-date now. */ + dtv[0].counter = maxgen; +@@ -745,7 +745,7 @@ _dl_update_slotinfo (unsigned long int req_modid) + + Here the dtv needs to be updated to new_gen generation count. + +- This code may be called during TLS access when GL(dl_load_lock) ++ This code may be called during TLS access when GL(dl_load_tls_lock) + is not held. In that case the user code has to synchronize with + dlopen and dlclose calls of relevant modules. A module m is + relevant if the generation of m <= new_gen and dlclose of m is +@@ -867,11 +867,11 @@ tls_get_addr_tail (GET_ADDR_ARGS, dtv_t *dtv, struct link_map *the_map) + if (__glibc_unlikely (the_map->l_tls_offset + != FORCED_DYNAMIC_TLS_OFFSET)) + { +- __rtld_lock_lock_recursive (GL(dl_load_lock)); ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); + if (__glibc_likely (the_map->l_tls_offset == NO_TLS_OFFSET)) + { + the_map->l_tls_offset = FORCED_DYNAMIC_TLS_OFFSET; +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + } + else if (__glibc_likely (the_map->l_tls_offset + != FORCED_DYNAMIC_TLS_OFFSET)) +@@ -883,7 +883,7 @@ tls_get_addr_tail (GET_ADDR_ARGS, dtv_t *dtv, struct link_map *the_map) + #else + # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" + #endif +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + + dtv[GET_ADDR_MODULE].pointer.to_free = NULL; + dtv[GET_ADDR_MODULE].pointer.val = p; +@@ -891,7 +891,7 @@ tls_get_addr_tail (GET_ADDR_ARGS, dtv_t *dtv, struct link_map *the_map) + return (char *) p + GET_ADDR_OFFSET; + } + else +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + } + struct dtv_pointer result = allocate_and_init (the_map); + dtv[GET_ADDR_MODULE].pointer = result; +@@ -962,7 +962,7 @@ _dl_tls_get_addr_soft (struct link_map *l) + return NULL; + + dtv_t *dtv = THREAD_DTV (); +- /* This may be called without holding the GL(dl_load_lock). Reading ++ /* This may be called without holding the GL(dl_load_tls_lock). Reading + arbitrary gen value is fine since this is best effort code. */ + size_t gen = atomic_load_relaxed (&GL(dl_tls_generation)); + if (__glibc_unlikely (dtv[0].counter != gen)) +diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h +index d8ec32377d..4aa2058abf 100644 +--- a/elf/get-dynamic-info.h ++++ b/elf/get-dynamic-info.h +@@ -28,7 +28,7 @@ static + auto + #endif + inline void __attribute__ ((unused, always_inline)) +-elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) ++elf_get_dynamic_info (struct link_map *l) + { + #if __ELF_NATIVE_CLASS == 32 + typedef Elf32_Word d_tag_utype; +@@ -69,28 +69,15 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) + info[i] = dyn; + } + +-#define DL_RO_DYN_TEMP_CNT 8 +- +-#ifndef DL_RO_DYN_SECTION + /* Don't adjust .dynamic unnecessarily. */ +- if (l->l_addr != 0) ++ if (l->l_addr != 0 && dl_relocate_ld (l)) + { + ElfW(Addr) l_addr = l->l_addr; +- int cnt = 0; + + # define ADJUST_DYN_INFO(tag) \ + do \ + if (info[tag] != NULL) \ +- { \ +- if (temp) \ +- { \ +- temp[cnt].d_tag = info[tag]->d_tag; \ +- temp[cnt].d_un.d_ptr = info[tag]->d_un.d_ptr + l_addr; \ +- info[tag] = temp + cnt++; \ +- } \ +- else \ +- info[tag]->d_un.d_ptr += l_addr; \ +- } \ ++ info[tag]->d_un.d_ptr += l_addr; \ + while (0) + + ADJUST_DYN_INFO (DT_HASH); +@@ -107,9 +94,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) + ADJUST_DYN_INFO (VERSYMIDX (DT_VERSYM)); + ADJUST_DYN_INFO (ADDRIDX (DT_GNU_HASH)); + # undef ADJUST_DYN_INFO +- assert (cnt <= DL_RO_DYN_TEMP_CNT); + } +-#endif + if (info[DT_PLTREL] != NULL) + { + #if ELF_MACHINE_NO_RELA +diff --git a/elf/ldconfig.c b/elf/ldconfig.c +index 1037e8d0cf..b8893637f8 100644 +--- a/elf/ldconfig.c ++++ b/elf/ldconfig.c +@@ -503,7 +503,11 @@ add_dir_1 (const char *line, const char *from_file, int from_line) + entry->path[--i] = '\0'; + + if (i == 0) +- return; ++ { ++ free (entry->path); ++ free (entry); ++ return; ++ } + + char *path = entry->path; + if (opt_chroot != NULL) +diff --git a/elf/rtld.c b/elf/rtld.c +index d733359eaf..d83ac1bdc4 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -322,6 +322,7 @@ struct rtld_global _rtld_global = + #ifdef _LIBC_REENTRANT + ._dl_load_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER, + ._dl_load_write_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER, ++ ._dl_load_tls_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER, + #endif + ._dl_nns = 1, + ._dl_ns = +@@ -463,6 +464,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info) + #ifndef DONT_USE_BOOTSTRAP_MAP + GL(dl_rtld_map).l_addr = info->l.l_addr; + GL(dl_rtld_map).l_ld = info->l.l_ld; ++ GL(dl_rtld_map).l_ld_readonly = info->l.l_ld_readonly; + memcpy (GL(dl_rtld_map).l_info, info->l.l_info, + sizeof GL(dl_rtld_map).l_info); + GL(dl_rtld_map).l_mach = info->l.l_mach; +@@ -546,7 +548,8 @@ _dl_start (void *arg) + + /* Read our own dynamic section and fill in the info array. */ + bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic (); +- elf_get_dynamic_info (&bootstrap_map, NULL); ++ bootstrap_map.l_ld_readonly = DL_RO_DYN_SECTION; ++ elf_get_dynamic_info (&bootstrap_map); + + #if NO_TLS_OFFSET != 0 + bootstrap_map.l_tls_offset = NO_TLS_OFFSET; +@@ -1468,6 +1471,7 @@ dl_main (const ElfW(Phdr) *phdr, + /* This tells us where to find the dynamic section, + which tells us everything we need to do. */ + main_map->l_ld = (void *) main_map->l_addr + ph->p_vaddr; ++ main_map->l_ld_readonly = (ph->p_flags & PF_W) == 0; + break; + case PT_INTERP: + /* This "interpreter segment" was used by the program loader to +@@ -1613,7 +1617,7 @@ dl_main (const ElfW(Phdr) *phdr, + if (! rtld_is_main) + { + /* Extract the contents of the dynamic section for easy access. */ +- elf_get_dynamic_info (main_map, NULL); ++ elf_get_dynamic_info (main_map); + + /* If the main map is libc.so, update the base namespace to + refer to this map. If libc.so is loaded later, this happens +diff --git a/elf/setup-vdso.h b/elf/setup-vdso.h +index 86c491e49c..f44748bc98 100644 +--- a/elf/setup-vdso.h ++++ b/elf/setup-vdso.h +@@ -33,8 +33,6 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), + 0, LM_ID_BASE); + if (__glibc_likely (l != NULL)) + { +- static ElfW(Dyn) dyn_temp[DL_RO_DYN_TEMP_CNT] attribute_relro; +- + l->l_phdr = ((const void *) GLRO(dl_sysinfo_dso) + + GLRO(dl_sysinfo_dso)->e_phoff); + l->l_phnum = GLRO(dl_sysinfo_dso)->e_phnum; +@@ -45,6 +43,7 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), + { + l->l_ld = (void *) ph->p_vaddr; + l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn)); ++ l->l_ld_readonly = (ph->p_flags & PF_W) == 0; + } + else if (ph->p_type == PT_LOAD) + { +@@ -65,7 +64,7 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), + l->l_map_end += l->l_addr; + l->l_text_end += l->l_addr; + l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr); +- elf_get_dynamic_info (l, dyn_temp); ++ elf_get_dynamic_info (l); + _dl_setup_hash (l); + l->l_relocated = 1; + +diff --git a/elf/tst-ro-dynamic-mod.c b/elf/tst-ro-dynamic-mod.c +new file mode 100644 +index 0000000000..6d99925964 +--- /dev/null ++++ b/elf/tst-ro-dynamic-mod.c +@@ -0,0 +1,19 @@ ++/* Test case for DSO with readonly dynamic section. ++ 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/>. */ ++ ++int foo = -1; +diff --git a/elf/tst-ro-dynamic-mod.map b/elf/tst-ro-dynamic-mod.map +new file mode 100644 +index 0000000000..2fe4a2998c +--- /dev/null ++++ b/elf/tst-ro-dynamic-mod.map +@@ -0,0 +1,16 @@ ++SECTIONS ++{ ++ . = SIZEOF_HEADERS; ++ .dynamic : { *(.dynamic) } :text :dynamic ++ .rodata : { *(.data*) *(.bss*) } :text ++ /DISCARD/ : { ++ *(.note.gnu.property) ++ } ++ .note : { *(.note.*) } :text :note ++} ++PHDRS ++{ ++ text PT_LOAD FLAGS(5) FILEHDR PHDRS; ++ dynamic PT_DYNAMIC FLAGS(4); ++ note PT_NOTE FLAGS(4); ++} +diff --git a/elf/tst-ro-dynamic.c b/elf/tst-ro-dynamic.c +new file mode 100644 +index 0000000000..3a18f8789a +--- /dev/null ++++ b/elf/tst-ro-dynamic.c +@@ -0,0 +1,31 @@ ++/* Test case for DSO with readonly dynamic section. ++ 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 <support/check.h> ++#include <support/test-driver.h> ++ ++extern int foo; ++ ++static int ++do_test (void) ++{ ++ TEST_COMPARE (foo, -1); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c +index 62bee28769..cc391d8f93 100644 +--- a/iconv/gconv_conf.c ++++ b/iconv/gconv_conf.c +@@ -478,7 +478,7 @@ __gconv_read_conf (void) + __gconv_get_path (); + + for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt) +- gconv_parseconfdir (__gconv_path_elem[cnt].name, ++ gconv_parseconfdir (NULL, __gconv_path_elem[cnt].name, + __gconv_path_elem[cnt].len); + #endif + +diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h +index a4153e54c6..a586268abc 100644 +--- a/iconv/gconv_parseconfdir.h ++++ b/iconv/gconv_parseconfdir.h +@@ -39,7 +39,6 @@ + /* Name of the file containing the module information in the directories + along the path. */ + static const char gconv_conf_filename[] = "gconv-modules"; +-static const char gconv_conf_dirname[] = "gconv-modules.d"; + + static void add_alias (char *); + static void add_module (char *, const char *, size_t, int); +@@ -110,19 +109,28 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len) + return true; + } + ++/* Prefix DIR (with length DIR_LEN) with PREFIX if the latter is non-NULL and ++ parse configuration in it. */ ++ + static __always_inline bool +-gconv_parseconfdir (const char *dir, size_t dir_len) ++gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len) + { +- /* No slash needs to be inserted between dir and gconv_conf_filename; +- dir already ends in a slash. */ +- char *buf = malloc (dir_len + sizeof (gconv_conf_dirname)); ++ /* No slash needs to be inserted between dir and gconv_conf_filename; dir ++ already ends in a slash. The additional 2 is to accommodate the ".d" ++ when looking for configuration files in gconv-modules.d. */ ++ size_t buflen = dir_len + sizeof (gconv_conf_filename) + 2; ++ char *buf = malloc (buflen + (prefix != NULL ? strlen (prefix) : 0)); ++ char *cp = buf; + bool found = false; + + if (buf == NULL) + return false; + +- char *cp = mempcpy (mempcpy (buf, dir, dir_len), gconv_conf_filename, +- sizeof (gconv_conf_filename)); ++ if (prefix != NULL) ++ cp = stpcpy (cp, prefix); ++ ++ cp = mempcpy (mempcpy (cp, dir, dir_len), gconv_conf_filename, ++ sizeof (gconv_conf_filename)); + + /* Read the gconv-modules configuration file first. */ + found = read_conf_file (buf, dir, dir_len); +@@ -153,12 +161,11 @@ gconv_parseconfdir (const char *dir, size_t dir_len) + struct stat64 st; + if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) + continue; +- if (ent->d_type == DT_UNKNOWN +- && (lstat64 (conf, &st) == -1 +- || !S_ISREG (st.st_mode))) +- continue; + +- found |= read_conf_file (conf, dir, dir_len); ++ if (ent->d_type != DT_UNKNOWN ++ || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode))) ++ found |= read_conf_file (conf, dir, dir_len); ++ + free (conf); + } + } +diff --git a/iconv/iconv_charmap.c b/iconv/iconv_charmap.c +index e2d53fee3c..a8b6b56124 100644 +--- a/iconv/iconv_charmap.c ++++ b/iconv/iconv_charmap.c +@@ -234,6 +234,8 @@ charmap_conversion (const char *from_code, struct charmap_t *from_charmap, + while (++remaining < argc); + + /* All done. */ ++ if (output != stdout) ++ fclose (output); + free_table (cvtbl); + return status; + } +diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c +index 783b2bbdbb..273a71f673 100644 +--- a/iconv/iconvconfig.c ++++ b/iconv/iconvconfig.c +@@ -653,13 +653,21 @@ add_module (char *rp, const char *directory, + static int + handle_dir (const char *dir) + { ++ char *newp = NULL; + size_t dirlen = strlen (dir); + bool found = false; + +- char *fulldir = xasprintf ("%s%s%s", dir[0] == '/' ? prefix : "", +- dir, dir[dirlen - 1] != '/' ? "/" : ""); ++ /* End directory path with a '/' if it doesn't already. */ ++ if (dir[dirlen - 1] != '/') ++ { ++ newp = xmalloc (dirlen + 2); ++ memcpy (newp, dir, dirlen); ++ newp[dirlen++] = '/'; ++ newp[dirlen] = '\0'; ++ dir = newp; ++ } + +- found = gconv_parseconfdir (fulldir, strlen (fulldir)); ++ found = gconv_parseconfdir (dir[0] == '/' ? prefix : NULL, dir, dirlen); + + if (!found) + { +@@ -671,7 +679,7 @@ handle_dir (const char *dir) + "configuration files with names ending in .conf."); + } + +- free (fulldir); ++ free (newp); + + return found ? 0 : 1; + } +diff --git a/iconvdata/Makefile b/iconvdata/Makefile +index c216f959df..d5507a048c 100644 +--- a/iconvdata/Makefile ++++ b/iconvdata/Makefile +@@ -1,4 +1,5 @@ + # Copyright (C) 1997-2021 Free Software Foundation, Inc. ++# Copyright (C) The GNU Toolchain Authors. + # This file is part of the GNU C Library. + + # The GNU C Library is free software; you can redistribute it and/or +@@ -74,7 +75,7 @@ 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-iconv13 bug-iconv14 ++ bug-iconv13 bug-iconv14 bug-iconv15 + ifeq ($(have-thread-library),yes) + tests += bug-iconv3 + endif +@@ -327,6 +328,8 @@ $(objpfx)bug-iconv12.out: $(addprefix $(objpfx), $(gconv-modules)) \ + $(addprefix $(objpfx),$(modules.so)) + $(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \ + $(addprefix $(objpfx),$(modules.so)) ++$(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \ ++ $(addprefix $(objpfx),$(modules.so)) + + $(objpfx)iconv-test.out: run-iconv-test.sh \ + $(addprefix $(objpfx), $(gconv-modules)) \ +diff --git a/iconvdata/bug-iconv15.c b/iconvdata/bug-iconv15.c +new file mode 100644 +index 0000000000..cc04bd0313 +--- /dev/null ++++ b/iconvdata/bug-iconv15.c +@@ -0,0 +1,60 @@ ++/* Bug 28524: Conversion from ISO-2022-JP-3 with iconv ++ may emit spurious NUL character on state reset. ++ Copyright (C) The GNU Toolchain Authors. ++ 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 <stddef.h> ++#include <iconv.h> ++#include <support/check.h> ++ ++static int ++do_test (void) ++{ ++ char in[] = "\x1b(I"; ++ char *inbuf = in; ++ size_t inleft = sizeof (in) - 1; ++ char out[1]; ++ char *outbuf = out; ++ size_t outleft = sizeof (out); ++ iconv_t cd; ++ ++ cd = iconv_open ("UTF8", "ISO-2022-JP-3"); ++ TEST_VERIFY_EXIT (cd != (iconv_t) -1); ++ ++ /* First call to iconv should alter internal state. ++ Now, JISX0201_Kana_set is selected and ++ state value != ASCII_set. */ ++ TEST_VERIFY (iconv (cd, &inbuf, &inleft, &outbuf, &outleft) != (size_t) -1); ++ ++ /* No bytes should have been added to ++ the output buffer at this point. */ ++ TEST_VERIFY (outbuf == out); ++ TEST_VERIFY (outleft == sizeof (out)); ++ ++ /* Second call shall emit spurious NUL character in unpatched glibc. */ ++ TEST_VERIFY (iconv (cd, NULL, NULL, &outbuf, &outleft) != (size_t) -1); ++ ++ /* No characters are expected to be produced. */ ++ TEST_VERIFY (outbuf == out); ++ TEST_VERIFY (outleft == sizeof (out)); ++ ++ TEST_VERIFY_EXIT (iconv_close (cd) != -1); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c +index c8ba88cdc9..5fc0c0f739 100644 +--- a/iconvdata/iso-2022-jp-3.c ++++ b/iconvdata/iso-2022-jp-3.c +@@ -1,5 +1,6 @@ + /* Conversion module for ISO-2022-JP-3. + Copyright (C) 1998-2021 Free Software Foundation, Inc. ++ Copyright (C) The GNU Toolchain Authors. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper(a)cygnus.com>, 1998, + and Bruno Haible <bruno(a)clisp.org>, 2002. +@@ -81,20 +82,31 @@ enum + the output state to the initial state. This has to be done during the + flushing. */ + #define EMIT_SHIFT_TO_INIT \ +- if (data->__statep->__count != ASCII_set) \ ++ if ((data->__statep->__count & ~7) != ASCII_set) \ + { \ + if (FROM_DIRECTION) \ + { \ +- if (__glibc_likely (outbuf + 4 <= outend)) \ ++ uint32_t ch = data->__statep->__count >> 6; \ ++ \ ++ if (__glibc_unlikely (ch != 0)) \ + { \ +- /* Write out the last character. */ \ +- *((uint32_t *) outbuf) = data->__statep->__count >> 6; \ +- outbuf += sizeof (uint32_t); \ +- data->__statep->__count = ASCII_set; \ ++ if (__glibc_likely (outbuf + 4 <= outend)) \ ++ { \ ++ /* Write out the last character. */ \ ++ put32u (outbuf, ch); \ ++ outbuf += 4; \ ++ data->__statep->__count &= 7; \ ++ data->__statep->__count |= ASCII_set; \ ++ } \ ++ else \ ++ /* We don't have enough room in the output buffer. */ \ ++ status = __GCONV_FULL_OUTPUT; \ + } \ + else \ +- /* We don't have enough room in the output buffer. */ \ +- status = __GCONV_FULL_OUTPUT; \ ++ { \ ++ data->__statep->__count &= 7; \ ++ data->__statep->__count |= ASCII_set; \ ++ } \ + } \ + else \ + { \ +diff --git a/include/link.h b/include/link.h +index 4af16cb596..c46aced9f7 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -205,6 +205,7 @@ struct link_map + unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be + freed, ie. not allocated with + the dummy malloc in ld.so. */ ++ unsigned int l_ld_readonly:1; /* Nonzero if dynamic section is readonly. */ + + /* NODELETE status of the map. Only valid for maps of type + lt_loaded. Lazy binding sets l_nodelete_active directly, +@@ -342,6 +343,8 @@ struct link_map + unsigned long long int l_serial; + }; + ++#include <dl-relocate-ld.h> ++ + /* Information used by audit modules. For most link maps, this data + immediate follows the link map in memory. For the dynamic linker, + it is allocated separately. See link_map_audit_state in +diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h +index 7388356a19..c490561581 100644 +--- a/include/sys/sysinfo.h ++++ b/include/sys/sysinfo.h +@@ -9,10 +9,15 @@ + extern int __get_nprocs_conf (void); + libc_hidden_proto (__get_nprocs_conf) + +-/* Return number of available processors. */ ++/* Return number of available processors (not all of them will be ++ available to the caller process). */ + extern int __get_nprocs (void); + libc_hidden_proto (__get_nprocs) + ++/* Return the number of available processors which the process can ++ be scheduled. */ ++extern int __get_nprocs_sched (void) attribute_hidden; ++ + /* Return number of physical pages of memory in the system. */ + extern long int __get_phys_pages (void); + libc_hidden_proto (__get_phys_pages) +diff --git a/io/fcntl.h b/io/fcntl.h +index 8917a73b42..1c96f98f4d 100644 +--- a/io/fcntl.h ++++ b/io/fcntl.h +@@ -187,10 +187,10 @@ extern int fcntl64 (int __fd, int __cmd, ...); + # endif + #else /* __USE_TIME_BITS64 */ + # ifdef __REDIRECT +-extern int __REDIRECT (fcntl, (int __fd, int __request, ...), +- __fcntl_time64) __THROW; +-extern int __REDIRECT (fcntl64, (int __fd, int __request, ...), +- __fcntl_time64) __THROW; ++extern int __REDIRECT_NTH (fcntl, (int __fd, int __request, ...), ++ __fcntl_time64); ++extern int __REDIRECT_NTH (fcntl64, (int __fd, int __request, ...), ++ __fcntl_time64); + # else + extern int __fcntl_time64 (int __fd, int __request, ...) __THROW; + # define fcntl64 __fcntl_time64 +diff --git a/io/tst-closefrom.c b/io/tst-closefrom.c +index d4c187073c..395ec0d894 100644 +--- a/io/tst-closefrom.c ++++ b/io/tst-closefrom.c +@@ -24,31 +24,22 @@ + #include <support/check.h> + #include <support/descriptors.h> + #include <support/xunistd.h> ++#include <support/support.h> + + #include <array_length.h> + + #define NFDS 100 + +-static int +-open_multiple_temp_files (void) +-{ +- /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = xopen ("/dev/null", O_RDONLY, 0600); +- for (int i = 1; i <= NFDS; i++) +- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), lowfd + i); +- return lowfd; +-} +- + static int + closefrom_test (void) + { + struct support_descriptors *descrs = support_descriptors_list (); + +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + +- const int maximum_fd = lowfd + NFDS; ++ const int maximum_fd = lowfd + NFDS - 1; + const int half_fd = lowfd + NFDS / 2; +- const int gap = maximum_fd / 4; ++ const int gap = lowfd + NFDS / 4; + + /* Close half of the descriptors and check result. */ + closefrom (half_fd); +@@ -58,7 +49,7 @@ closefrom_test (void) + TEST_COMPARE (fcntl (i, F_GETFL), -1); + TEST_COMPARE (errno, EBADF); + } +- for (int i = 0; i < half_fd; i++) ++ for (int i = lowfd; i < half_fd; i++) + TEST_VERIFY (fcntl (i, F_GETFL) > -1); + + /* Create some gaps, close up to a threshold, and check result. */ +@@ -74,7 +65,7 @@ closefrom_test (void) + TEST_COMPARE (fcntl (i, F_GETFL), -1); + TEST_COMPARE (errno, EBADF); + } +- for (int i = 0; i < gap; i++) ++ for (int i = lowfd; i < gap; i++) + TEST_VERIFY (fcntl (i, F_GETFL) > -1); + + /* Close the remmaining but the last one. */ +diff --git a/malloc/arena.c b/malloc/arena.c +index 667484630e..f1f0af8648 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -879,7 +879,7 @@ arena_get2 (size_t size, mstate avoid_arena) + narenas_limit = mp_.arena_max; + else if (narenas > mp_.arena_test) + { +- int n = __get_nprocs (); ++ int n = __get_nprocs_sched (); + + if (n >= 1) + narenas_limit = NARENAS_FROM_NCORES (n); +diff --git a/malloc/malloc-debug.c b/malloc/malloc-debug.c +index 9922ef5f25..3d7e6d44fd 100644 +--- a/malloc/malloc-debug.c ++++ b/malloc/malloc-debug.c +@@ -1,5 +1,6 @@ + /* Malloc debug DSO. + Copyright (C) 2021 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -399,17 +400,17 @@ strong_alias (__debug_calloc, calloc) + size_t + malloc_usable_size (void *mem) + { ++ if (mem == NULL) ++ return 0; ++ + if (__is_malloc_debug_enabled (MALLOC_MCHECK_HOOK)) + return mcheck_usable_size (mem); + if (__is_malloc_debug_enabled (MALLOC_CHECK_HOOK)) + return malloc_check_get_size (mem); + +- if (mem != NULL) +- { +- mchunkptr p = mem2chunk (mem); +- if (DUMPED_MAIN_ARENA_CHUNK (p)) +- return chunksize (p) - SIZE_SZ; +- } ++ mchunkptr p = mem2chunk (mem); ++ if (DUMPED_MAIN_ARENA_CHUNK (p)) ++ return chunksize (p) - SIZE_SZ; + + return musable (mem); + } +diff --git a/malloc/malloc.c b/malloc/malloc.c +index e065785af7..7882c70f0a 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -1,5 +1,6 @@ + /* Malloc implementation for multiple threads without lock contention. + Copyright (C) 1996-2021 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. + Contributed by Wolfram Gloger <wg(a)malloc.de> + and Doug Lea <dl(a)cs.oswego.edu>, 2001. +@@ -5009,20 +5010,13 @@ __malloc_trim (size_t s) + static size_t + musable (void *mem) + { +- mchunkptr p; +- if (mem != 0) +- { +- size_t result = 0; +- +- p = mem2chunk (mem); ++ mchunkptr p = mem2chunk (mem); + +- if (chunk_is_mmapped (p)) +- result = chunksize (p) - CHUNK_HDR_SZ; +- else if (inuse (p)) +- result = memsize (p); ++ if (chunk_is_mmapped (p)) ++ return chunksize (p) - CHUNK_HDR_SZ; ++ else if (inuse (p)) ++ return memsize (p); + +- return result; +- } + return 0; + } + +@@ -5030,10 +5024,9 @@ musable (void *mem) + size_t + __malloc_usable_size (void *m) + { +- size_t result; +- +- result = musable (m); +- return result; ++ if (m == NULL) ++ return 0; ++ return musable (m); + } + #endif + +diff --git a/malloc/tst-malloc-usable.c b/malloc/tst-malloc-usable.c +index a1074b782a..b0d702be10 100644 +--- a/malloc/tst-malloc-usable.c ++++ b/malloc/tst-malloc-usable.c +@@ -2,6 +2,7 @@ + MALLOC_CHECK_ exported to a positive value. + + Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -21,29 +22,24 @@ + #include <malloc.h> + #include <string.h> + #include <stdio.h> ++#include <support/support.h> ++#include <support/check.h> + + static int + do_test (void) + { + size_t usable_size; + void *p = malloc (7); +- if (!p) +- { +- printf ("memory allocation failed\n"); +- return 1; +- } + ++ TEST_VERIFY_EXIT (p != NULL); + usable_size = malloc_usable_size (p); +- if (usable_size != 7) +- { +- printf ("malloc_usable_size: expected 7 but got %zu\n", usable_size); +- return 1; +- } +- ++ TEST_COMPARE (usable_size, 7); + memset (p, 0, usable_size); + free (p); ++ ++ TEST_COMPARE (malloc_usable_size (NULL), 0); ++ + return 0; + } + +-#define TEST_FUNCTION do_test () +-#include "../test-skeleton.c" ++#include "support/test-driver.c" +diff --git a/misc/getsysstats.c b/misc/getsysstats.c +index 0eedface6d..57d93601e2 100644 +--- a/misc/getsysstats.c ++++ b/misc/getsysstats.c +@@ -45,6 +45,12 @@ weak_alias (__get_nprocs, get_nprocs) + link_warning (get_nprocs, "warning: get_nprocs will always return 1") + + ++int ++__get_nprocs_sched (void) ++{ ++ return 1; ++} ++ + long int + __get_phys_pages (void) + { +diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h +index 6884d9925f..9945c1e918 100644 +--- a/misc/sys/ioctl.h ++++ b/misc/sys/ioctl.h +@@ -42,8 +42,8 @@ __BEGIN_DECLS + extern int ioctl (int __fd, unsigned long int __request, ...) __THROW; + #else + # ifdef __REDIRECT +-extern int __REDIRECT (ioctl, (int __fd, unsigned long int __request, ...), +- __ioctl_time64) __THROW; ++extern int __REDIRECT_NTH (ioctl, (int __fd, unsigned long int __request, ...), ++ __ioctl_time64); + # else + extern int __ioctl_time64 (int __fd, unsigned long int __request, ...) __THROW; + # define ioctl __ioctl_time64 +diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c +index cfe37a3443..50065bc9bd 100644 +--- a/nptl/allocatestack.c ++++ b/nptl/allocatestack.c +@@ -32,6 +32,7 @@ + #include <futex-internal.h> + #include <kernel-features.h> + #include <nptl-stack.h> ++#include <libc-lock.h> + + /* Default alignment of stack. */ + #ifndef STACK_ALIGN +@@ -127,6 +128,8 @@ get_cached_stack (size_t *sizep, void **memp) + /* No pending event. */ + result->nextevent = NULL; + ++ result->exiting = false; ++ __libc_lock_init (result->exit_lock); + result->tls_state = (struct tls_internal_t) { 0 }; + + /* Clear the DTV. */ +diff --git a/nptl/descr.h b/nptl/descr.h +index c85778d449..4de84138fb 100644 +--- a/nptl/descr.h ++++ b/nptl/descr.h +@@ -396,6 +396,12 @@ struct pthread + PTHREAD_CANCEL_ASYNCHRONOUS). */ + unsigned char canceltype; + ++ /* Used in __pthread_kill_internal to detected a thread that has ++ exited or is about to exit. exit_lock must only be acquired ++ after blocking signals. */ ++ bool exiting; ++ int exit_lock; /* A low-level lock (for use with __libc_lock_init etc). */ ++ + /* Used on strsignal. */ + struct tls_internal_t tls_state; + +diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c +index cc25ff21f3..9bac6e3b76 100644 +--- a/nptl/pthread_cancel.c ++++ b/nptl/pthread_cancel.c +@@ -62,10 +62,11 @@ __pthread_cancel (pthread_t th) + { + volatile struct pthread *pd = (volatile struct pthread *) th; + +- /* Make sure the descriptor is valid. */ +- if (INVALID_TD_P (pd)) +- /* Not a valid thread handle. */ +- return ESRCH; ++ if (pd->tid == 0) ++ /* The thread has already exited on the kernel side. Its outcome ++ (regular exit, other cancelation) has already been ++ determined. */ ++ return 0; + + static int init_sigcancel = 0; + if (atomic_load_relaxed (&init_sigcancel) == 0) +diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c +index d8ec299cb1..3db0c9fdf4 100644 +--- a/nptl/pthread_create.c ++++ b/nptl/pthread_create.c +@@ -37,6 +37,7 @@ + #include <sys/single_threaded.h> + #include <version.h> + #include <clone_internal.h> ++#include <futex-internal.h> + + #include <shlib-compat.h> + +@@ -406,8 +407,6 @@ start_thread (void *arg) + unwind_buf.priv.data.prev = NULL; + unwind_buf.priv.data.cleanup = NULL; + +- __libc_signal_restore_set (&pd->sigmask); +- + /* Allow setxid from now onwards. */ + if (__glibc_unlikely (atomic_exchange_acq (&pd->setxid_futex, 0) == -2)) + futex_wake (&pd->setxid_futex, 1, FUTEX_PRIVATE); +@@ -417,6 +416,8 @@ start_thread (void *arg) + /* Store the new cleanup handler info. */ + THREAD_SETMEM (pd, cleanup_jmp_buf, &unwind_buf); + ++ __libc_signal_restore_set (&pd->sigmask); ++ + LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg); + + /* Run the code the user provided. */ +@@ -485,6 +486,27 @@ start_thread (void *arg) + /* This was the last thread. */ + exit (0); + ++ /* This prevents sending a signal from this thread to itself during ++ its final stages. This must come after the exit call above ++ because atexit handlers must not run with signals blocked. ++ ++ Do not block SIGSETXID. The setxid handshake below expects the ++ signal to be delivered. (SIGSETXID cannot run application code, ++ nor does it use pthread_kill.) Reuse the pd->sigmask space for ++ computing the signal mask, to save stack space. */ ++ __sigfillset (&pd->sigmask); ++ __sigdelset (&pd->sigmask, SIGSETXID); ++ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &pd->sigmask, NULL, ++ __NSIG_BYTES); ++ ++ /* Tell __pthread_kill_internal that this thread is about to exit. ++ If there is a __pthread_kill_internal in progress, this delays ++ the thread exit until the signal has been queued by the kernel ++ (so that the TID used to send it remains valid). */ ++ __libc_lock_lock (pd->exit_lock); ++ pd->exiting = true; ++ __libc_lock_unlock (pd->exit_lock); ++ + #ifndef __ASSUME_SET_ROBUST_LIST + /* If this thread has any robust mutexes locked, handle them now. */ + # if __PTHREAD_MUTEX_HAVE_PREV +diff --git a/nptl/pthread_kill.c b/nptl/pthread_kill.c +index f79a2b26fc..35bf1f973e 100644 +--- a/nptl/pthread_kill.c ++++ b/nptl/pthread_kill.c +@@ -16,39 +16,66 @@ + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + ++#include <libc-lock.h> + #include <unistd.h> + #include <pthreadP.h> + #include <shlib-compat.h> + +-int +-__pthread_kill_internal (pthread_t threadid, int signo) ++/* Sends SIGNO to THREADID. If the thread is about to exit or has ++ already exited on the kernel side, return NO_TID. Otherwise return ++ 0 or an error code. */ ++static int ++__pthread_kill_implementation (pthread_t threadid, int signo, int no_tid) + { +- pid_t tid; + struct pthread *pd = (struct pthread *) threadid; +- + if (pd == THREAD_SELF) +- /* It is a special case to handle raise() implementation after a vfork +- call (which does not update the PD tid field). */ +- tid = INLINE_SYSCALL_CALL (gettid); +- else +- /* Force load of pd->tid into local variable or register. Otherwise +- if a thread exits between ESRCH test and tgkill, we might return +- EINVAL, because pd->tid would be cleared by the kernel. */ +- tid = atomic_forced_read (pd->tid); +- +- int val; +- if (__glibc_likely (tid > 0)) + { +- pid_t pid = __getpid (); +- +- val = INTERNAL_SYSCALL_CALL (tgkill, pid, tid, signo); +- val = (INTERNAL_SYSCALL_ERROR_P (val) +- ? INTERNAL_SYSCALL_ERRNO (val) : 0); ++ /* Use the actual TID from the kernel, so that it refers to the ++ current thread even if called after vfork. There is no ++ signal blocking in this case, so that the signal is delivered ++ immediately, before __pthread_kill_internal returns: a signal ++ sent to the thread itself needs to be delivered ++ synchronously. (It is unclear if Linux guarantees the ++ delivery of all pending signals after unblocking in the code ++ below. POSIX only guarantees delivery of a single signal, ++ which may not be the right one.) */ ++ pid_t tid = INTERNAL_SYSCALL_CALL (gettid); ++ int ret = INTERNAL_SYSCALL_CALL (tgkill, __getpid (), tid, signo); ++ return INTERNAL_SYSCALL_ERROR_P (ret) ? INTERNAL_SYSCALL_ERRNO (ret) : 0; + } ++ ++ /* Block all signals, as required by pd->exit_lock. */ ++ sigset_t old_mask; ++ __libc_signal_block_all (&old_mask); ++ __libc_lock_lock (pd->exit_lock); ++ ++ int ret; ++ if (pd->exiting) ++ /* The thread is about to exit (or has exited). Sending the ++ signal is either not observable (the target thread has already ++ blocked signals at this point), or it will fail, or it might be ++ delivered to a new, unrelated thread that has reused the TID. ++ So do not actually send the signal. */ ++ ret = no_tid; + else +- val = ESRCH; ++ { ++ ret = INTERNAL_SYSCALL_CALL (tgkill, __getpid (), pd->tid, signo); ++ ret = INTERNAL_SYSCALL_ERROR_P (ret) ? INTERNAL_SYSCALL_ERRNO (ret) : 0; ++ } ++ ++ __libc_lock_unlock (pd->exit_lock); ++ __libc_signal_restore_set (&old_mask); + +- return val; ++ return ret; ++} ++ ++int ++__pthread_kill_internal (pthread_t threadid, int signo) ++{ ++ /* Do not report an error in the no-tid case because the threadid ++ argument is still valid (the thread ID lifetime has not ended), ++ and ESRCH (for example) would be misleading. */ ++ return __pthread_kill_implementation (threadid, signo, 0); + } + + int +@@ -61,6 +88,7 @@ __pthread_kill (pthread_t threadid, int signo) + + return __pthread_kill_internal (threadid, signo); + } ++ + /* Some architectures (for instance arm) might pull raise through libgcc, so + avoid the symbol version if it ends up being used on ld.so. */ + #if !IS_IN(rtld) +@@ -68,6 +96,17 @@ libc_hidden_def (__pthread_kill) + versioned_symbol (libc, __pthread_kill, pthread_kill, GLIBC_2_34); + + # if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) +-compat_symbol (libc, __pthread_kill, pthread_kill, GLIBC_2_0); ++/* Variant which returns ESRCH in the no-TID case, for backwards ++ compatibility. */ ++int ++attribute_compat_text_section ++__pthread_kill_esrch (pthread_t threadid, int signo) ++{ ++ if (__is_internal_signal (signo)) ++ return EINVAL; ++ ++ return __pthread_kill_implementation (threadid, signo, ESRCH); ++} ++compat_symbol (libc, __pthread_kill_esrch, pthread_kill, GLIBC_2_0); + # endif + #endif +diff --git a/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf b/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf +new file mode 100644 +index 0000000000..5b0c6a4199 +--- /dev/null ++++ b/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf +@@ -0,0 +1 @@ ++hosts: files +diff --git a/posix/Makefile b/posix/Makefile +index 059efb3cd2..09460a28e8 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -107,7 +107,8 @@ tests := test-errno tstgetopt testfnm runtests runptests \ + tst-sysconf-empty-chroot tst-glob_symlinks tst-fexecve \ + tst-glob-tilde test-ssize-max tst-spawn4 bug-regex37 \ + bug-regex38 tst-regcomp-truncated tst-spawn-chdir \ +- tst-wordexp-nocmd tst-execveat tst-spawn5 ++ tst-wordexp-nocmd tst-execveat tst-spawn5 \ ++ tst-sched_getaffinity + + # Test for the glob symbol version that was replaced in glibc 2.27. + ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes) +diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h +index f0831386c7..622adeb2b2 100644 +--- a/posix/bits/unistd.h ++++ b/posix/bits/unistd.h +@@ -199,10 +199,9 @@ __NTH (readlinkat (int __fd, const char *__restrict __path, + #endif + + extern char *__getcwd_chk (char *__buf, size_t __size, size_t __buflen) +- __THROW __wur __attr_access ((__write_only__, 1, 2)); ++ __THROW __wur; + extern char *__REDIRECT_NTH (__getcwd_alias, +- (char *__buf, size_t __size), getcwd) +- __wur __attr_access ((__write_only__, 1, 2)); ++ (char *__buf, size_t __size), getcwd) __wur; + extern char *__REDIRECT_NTH (__getcwd_chk_warn, + (char *__buf, size_t __size, size_t __buflen), + __getcwd_chk) +diff --git a/posix/fork.c b/posix/fork.c +index c471f7b15f..021691b9b7 100644 +--- a/posix/fork.c ++++ b/posix/fork.c +@@ -99,6 +99,9 @@ __libc_fork (void) + /* Reset the lock the dynamic loader uses to protect its data. */ + __rtld_lock_initialize (GL(dl_load_lock)); + ++ /* Reset the lock protecting dynamic TLS related data. */ ++ __rtld_lock_initialize (GL(dl_load_tls_lock)); ++ + reclaim_stacks (); + + /* Run the handlers registered for the child. */ +diff --git a/posix/tst-sched_getaffinity.c b/posix/tst-sched_getaffinity.c +new file mode 100644 +index 0000000000..db9d517a96 +--- /dev/null ++++ b/posix/tst-sched_getaffinity.c +@@ -0,0 +1,48 @@ ++/* Tests for sched_getaffinity with large buffers. ++ 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 <array_length.h> ++#include <sched.h> ++#include <support/check.h> ++ ++/* NB: this test may fail on system with more than 32k cpus. */ ++ ++static int ++do_test (void) ++{ ++ /* The values are larger than the default cpu_set_t. */ ++ const int bufsize[] = { 1<<11, 1<<12, 1<<13, 1<<14, 1<<15, 1<<16, 1<<17 }; ++ int cpucount[array_length (bufsize)]; ++ ++ for (int i = 0; i < array_length (bufsize); i++) ++ { ++ cpu_set_t *cpuset = CPU_ALLOC (bufsize[i]); ++ TEST_VERIFY (cpuset != NULL); ++ size_t size = CPU_ALLOC_SIZE (bufsize[i]); ++ TEST_COMPARE (sched_getaffinity (0, size, cpuset), 0); ++ cpucount[i] = CPU_COUNT_S (size, cpuset); ++ CPU_FREE (cpuset); ++ } ++ ++ for (int i = 0; i < array_length (cpucount) - 1; i++) ++ TEST_COMPARE (cpucount[i], cpucount[i + 1]); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/posix/tst-spawn5.c b/posix/tst-spawn5.c +index ac66738004..a95199af6b 100644 +--- a/posix/tst-spawn5.c ++++ b/posix/tst-spawn5.c +@@ -47,17 +47,6 @@ static int initial_argv_count; + + #define NFDS 100 + +-static int +-open_multiple_temp_files (void) +-{ +- /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = xopen ("/dev/null", O_RDONLY, 0600); +- for (int i = 1; i <= NFDS; i++) +- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), +- lowfd + i); +- return lowfd; +-} +- + static int + parse_fd (const char *str) + { +@@ -185,7 +174,7 @@ spawn_closefrom_test (posix_spawn_file_actions_t *fa, int lowfd, int highfd, + static void + do_test_closefrom (void) + { +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + const int half_fd = lowfd + NFDS / 2; + + /* Close half of the descriptors and check result. */ +diff --git a/posix/unistd.h b/posix/unistd.h +index 3dca65732f..8224c5fbc9 100644 +--- a/posix/unistd.h ++++ b/posix/unistd.h +@@ -528,8 +528,7 @@ extern int fchdir (int __fd) __THROW __wur; + an array is allocated with `malloc'; the array is SIZE + bytes long, unless SIZE == 0, in which case it is as + big as necessary. */ +-extern char *getcwd (char *__buf, size_t __size) __THROW __wur +- __attr_access ((__write_only__, 1, 2)); ++extern char *getcwd (char *__buf, size_t __size) __THROW __wur; + + #ifdef __USE_GNU + /* Return a malloc'd string containing the current directory name. +diff --git a/rt/Makefile b/rt/Makefile +index 113cea03a5..910e775995 100644 +--- a/rt/Makefile ++++ b/rt/Makefile +@@ -74,6 +74,7 @@ tests := tst-shm tst-timer tst-timer2 \ + tst-aio7 tst-aio8 tst-aio9 tst-aio10 \ + tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \ + tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 tst-mqueue9 \ ++ tst-bz28213 \ + tst-timer3 tst-timer4 tst-timer5 \ + tst-cpuclock2 tst-cputimer1 tst-cputimer2 tst-cputimer3 \ + tst-shm-cancel \ +diff --git a/rt/tst-bz28213.c b/rt/tst-bz28213.c +new file mode 100644 +index 0000000000..0c096b5a0a +--- /dev/null ++++ b/rt/tst-bz28213.c +@@ -0,0 +1,101 @@ ++/* Bug 28213: test for NULL pointer dereference in mq_notify. ++ Copyright (C) The GNU Toolchain Authors. ++ 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 <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <unistd.h> ++#include <mqueue.h> ++#include <signal.h> ++#include <stdlib.h> ++#include <string.h> ++#include <support/check.h> ++ ++static mqd_t m = -1; ++static const char msg[] = "hello"; ++ ++static void ++check_bz28213_cb (union sigval sv) ++{ ++ char buf[sizeof (msg)]; ++ ++ (void) sv; ++ ++ TEST_VERIFY_EXIT ((size_t) mq_receive (m, buf, sizeof (buf), NULL) ++ == sizeof (buf)); ++ TEST_VERIFY_EXIT (memcmp (buf, msg, sizeof (buf)) == 0); ++ ++ exit (0); ++} ++ ++static void ++check_bz28213 (void) ++{ ++ struct sigevent sev; ++ ++ memset (&sev, '\0', sizeof (sev)); ++ sev.sigev_notify = SIGEV_THREAD; ++ sev.sigev_notify_function = check_bz28213_cb; ++ ++ /* Step 1: Register & unregister notifier. ++ Helper thread should receive NOTIFY_REMOVED notification. ++ In a vulnerable version of glibc, NULL pointer dereference follows. */ ++ TEST_VERIFY_EXIT (mq_notify (m, &sev) == 0); ++ TEST_VERIFY_EXIT (mq_notify (m, NULL) == 0); ++ ++ /* Step 2: Once again, register notification. ++ Try to send one message. ++ Test is considered successful, if the callback does exit (0). */ ++ TEST_VERIFY_EXIT (mq_notify (m, &sev) == 0); ++ TEST_VERIFY_EXIT (mq_send (m, msg, sizeof (msg), 1) == 0); ++ ++ /* Wait... */ ++ pause (); ++} ++ ++static int ++do_test (void) ++{ ++ static const char m_name[] = "/bz28213_queue"; ++ struct mq_attr m_attr; ++ ++ memset (&m_attr, '\0', sizeof (m_attr)); ++ m_attr.mq_maxmsg = 1; ++ m_attr.mq_msgsize = sizeof (msg); ++ ++ m = mq_open (m_name, ++ O_RDWR | O_CREAT | O_EXCL, ++ 0600, ++ &m_attr); ++ ++ if (m < 0) ++ { ++ if (errno == ENOSYS) ++ FAIL_UNSUPPORTED ("POSIX message queues are not implemented\n"); ++ FAIL_EXIT1 ("Failed to create POSIX message queue: %m\n"); ++ } ++ ++ TEST_VERIFY_EXIT (mq_unlink (m_name) == 0); ++ ++ check_bz28213 (); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py +index 5a77af90a6..86537fa800 100755 +--- a/scripts/build-many-glibcs.py ++++ b/scripts/build-many-glibcs.py +@@ -782,7 +782,7 @@ class Context(object): + 'gcc': 'vcs-11', + 'glibc': 'vcs-mainline', + 'gmp': '6.2.1', +- 'linux': '5.13', ++ 'linux': '5.14', + 'mpc': '1.2.1', + 'mpfr': '4.1.0', + 'mig': 'vcs-mainline', +diff --git a/support/Makefile b/support/Makefile +index a462781718..2a0731796f 100644 +--- a/support/Makefile ++++ b/support/Makefile +@@ -66,6 +66,7 @@ libsupport-routines = \ + support_path_support_time64 \ + support_process_state \ + support_ptrace \ ++ support-open-dev-null-range \ + support_openpty \ + support_paths \ + support_quote_blob \ +@@ -82,9 +83,10 @@ libsupport-routines = \ + support_test_compare_blob \ + support_test_compare_failure \ + support_test_compare_string \ +- support_write_file_string \ + support_test_main \ + support_test_verify_impl \ ++ support_wait_for_thread_exit \ ++ support_write_file_string \ + temp_file \ + timespec \ + timespec-time64 \ +@@ -264,6 +266,7 @@ tests = \ + tst-support_capture_subprocess \ + tst-support_descriptors \ + tst-support_format_dns_packet \ ++ tst-support-open-dev-null-range \ + tst-support-process_state \ + tst-support_quote_blob \ + tst-support_quote_string \ +diff --git a/support/support-open-dev-null-range.c b/support/support-open-dev-null-range.c +new file mode 100644 +index 0000000000..66a8504105 +--- /dev/null ++++ b/support/support-open-dev-null-range.c +@@ -0,0 +1,134 @@ ++/* Return a range of open file descriptors. ++ 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 <errno.h> ++#include <fcntl.h> ++#include <support/support.h> ++#include <support/check.h> ++#include <support/xunistd.h> ++#include <stdlib.h> ++#include <sys/resource.h> ++ ++static void ++increase_nofile (void) ++{ ++ struct rlimit rl; ++ if (getrlimit (RLIMIT_NOFILE, &rl) == -1) ++ FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m"); ++ ++ rl.rlim_cur += 128; ++ ++ if (setrlimit (RLIMIT_NOFILE, &rl) == 1) ++ FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m"); ++} ++ ++static int ++open_dev_null (int flags, mode_t mode) ++{ ++ int fd = open64 ("/dev/null", flags, mode); ++ if (fd >= 0) ++ return fd; ++ ++ if (fd < 0 && errno != EMFILE) ++ FAIL_EXIT1 ("open64 (\"/dev/null\", 0x%x, 0%o): %m", flags, mode); ++ ++ increase_nofile (); ++ ++ return xopen ("/dev/null", flags, mode); ++} ++ ++struct range ++{ ++ int lowfd; ++ size_t len; ++}; ++ ++struct range_list ++{ ++ size_t total; ++ size_t used; ++ struct range *ranges; ++}; ++ ++static void ++range_init (struct range_list *r) ++{ ++ r->total = 8; ++ r->used = 0; ++ r->ranges = xmalloc (r->total * sizeof (struct range)); ++} ++ ++static void ++range_add (struct range_list *r, int lowfd, size_t len) ++{ ++ if (r->used == r->total) ++ { ++ r->total *= 2; ++ r->ranges = xrealloc (r->ranges, r->total * sizeof (struct range)); ++ } ++ r->ranges[r->used].lowfd = lowfd; ++ r->ranges[r->used].len = len; ++ r->used++; ++} ++ ++static void ++range_close (struct range_list *r) ++{ ++ for (size_t i = 0; i < r->used; i++) ++ { ++ int minfd = r->ranges[i].lowfd; ++ int maxfd = r->ranges[i].lowfd + r->ranges[i].len; ++ for (int fd = minfd; fd < maxfd; fd++) ++ xclose (fd); ++ } ++ free (r->ranges); ++} ++ ++int ++support_open_dev_null_range (int num, int flags, mode_t mode) ++{ ++ /* We keep track of the ranges that hit an already opened descriptor, so ++ we close them after we get a working range. */ ++ struct range_list rl; ++ range_init (&rl); ++ ++ int lowfd = open_dev_null (flags, mode); ++ int prevfd = lowfd; ++ while (true) ++ { ++ int i = 1; ++ for (; i < num; i++) ++ { ++ int fd = open_dev_null (flags, mode); ++ if (fd != lowfd + i) ++ { ++ range_add (&rl, lowfd, prevfd - lowfd + 1); ++ ++ prevfd = lowfd = fd; ++ break; ++ } ++ prevfd = fd; ++ } ++ if (i == num) ++ break; ++ } ++ ++ range_close (&rl); ++ ++ return lowfd; ++} +diff --git a/support/support.h b/support/support.h +index 834dba9097..c219e0d9d1 100644 +--- a/support/support.h ++++ b/support/support.h +@@ -174,6 +174,10 @@ timer_t support_create_timer (uint64_t sec, long int nsec, bool repeat, + /* Disable the timer TIMER. */ + void support_delete_timer (timer_t timer); + ++/* Wait until all threads except the current thread have exited (as ++ far as the kernel is concerned). */ ++void support_wait_for_thread_exit (void); ++ + struct support_stack + { + void *stack; +@@ -193,6 +197,14 @@ struct support_stack support_stack_alloc (size_t size); + /* Deallocate the STACK. */ + void support_stack_free (struct support_stack *stack); + ++ ++/* Create a range of NUM opened '/dev/null' file descriptors using FLAGS and ++ MODE. The function takes care of restarting the open range if a file ++ descriptor is found within the specified range and also increases ++ RLIMIT_NOFILE if required. ++ The returned value is the lowest file descriptor number. */ ++int support_open_dev_null_range (int num, int flags, mode_t mode); ++ + __END_DECLS + + #endif /* SUPPORT_H */ +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index 27bfd19c93..0bacf6dbc2 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -170,6 +170,7 @@ copy_and_spawn_sgid (char *child_id, gid_t gid) + support_subprogram because we only want the program exit status, not the + contents. */ + ret = 0; ++ infd = outfd = -1; + + char * const args[] = {execname, child_id, NULL}; + +diff --git a/support/support_wait_for_thread_exit.c b/support/support_wait_for_thread_exit.c +new file mode 100644 +index 0000000000..5e3be421a7 +--- /dev/null ++++ b/support/support_wait_for_thread_exit.c +@@ -0,0 +1,75 @@ ++/* Wait until all threads except the current thread has exited. ++ 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 <dirent.h> ++#include <errno.h> ++#include <string.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <unistd.h> ++ ++void ++support_wait_for_thread_exit (void) ++{ ++#ifdef __linux__ ++ DIR *proc_self_task = opendir ("/proc/self/task"); ++ TEST_VERIFY_EXIT (proc_self_task != NULL); ++ ++ while (true) ++ { ++ errno = 0; ++ struct dirent *e = readdir (proc_self_task); ++ if (e == NULL && errno != 0) ++ FAIL_EXIT1 ("readdir: %m"); ++ if (e == NULL) ++ { ++ /* Only the main thread remains. Testing may continue. */ ++ closedir (proc_self_task); ++ return; ++ } ++ ++ /* In some kernels, "0" entries denote a thread that has just ++ exited. */ ++ if (strcmp (e->d_name, ".") == 0 || strcmp (e->d_name, "..") == 0 ++ || strcmp (e->d_name, "0") == 0) ++ continue; ++ ++ int task_tid = atoi (e->d_name); ++ if (task_tid <= 0) ++ FAIL_EXIT1 ("Invalid /proc/self/task entry: %s", e->d_name); ++ ++ if (task_tid == gettid ()) ++ /* The current thread. Keep scanning for other ++ threads. */ ++ continue; ++ ++ /* task_tid does not refer to this thread here, i.e., there is ++ another running thread. */ ++ ++ /* Small timeout to give the thread a chance to exit. */ ++ usleep (50 * 1000); ++ ++ /* Start scanning the directory from the start. */ ++ rewinddir (proc_self_task); ++ } ++#else ++ /* Use a large timeout because we cannot verify that the thread has ++ exited. */ ++ usleep (5 * 1000 * 1000); ++#endif ++} +diff --git a/support/tst-support-open-dev-null-range.c b/support/tst-support-open-dev-null-range.c +new file mode 100644 +index 0000000000..8e29def1ce +--- /dev/null ++++ b/support/tst-support-open-dev-null-range.c +@@ -0,0 +1,155 @@ ++/* Tests for support_open_dev_null_range. ++ 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 <errno.h> ++#include <dirent.h> ++#include <fcntl.h> ++#include <limits.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <support/xunistd.h> ++#include <sys/resource.h> ++#include <stdlib.h> ++ ++#ifndef PATH_MAX ++# define PATH_MAX 1024 ++#endif ++ ++#include <stdio.h> ++ ++static void ++check_path (int fd) ++{ ++ char *proc_fd_path = xasprintf ("/proc/self/fd/%d", fd); ++ char file_path[PATH_MAX]; ++ ssize_t file_path_length ++ = readlink (proc_fd_path, file_path, sizeof (file_path)); ++ free (proc_fd_path); ++ if (file_path_length < 0) ++ FAIL_EXIT1 ("readlink (%s, %p, %zu)", proc_fd_path, file_path, ++ sizeof (file_path)); ++ file_path[file_path_length] = '\0'; ++ TEST_COMPARE_STRING (file_path, "/dev/null"); ++} ++ ++static int ++number_of_opened_files (void) ++{ ++ DIR *fds = opendir ("/proc/self/fd"); ++ if (fds == NULL) ++ FAIL_EXIT1 ("opendir (\"/proc/self/fd\"): %m"); ++ ++ int r = 0; ++ while (true) ++ { ++ errno = 0; ++ struct dirent64 *e = readdir64 (fds); ++ if (e == NULL) ++ { ++ if (errno != 0) ++ FAIL_EXIT1 ("readdir: %m"); ++ break; ++ } ++ ++ if (e->d_name[0] == '.') ++ continue; ++ ++ char *endptr; ++ long int fd = strtol (e->d_name, &endptr, 10); ++ if (*endptr != '\0' || fd < 0 || fd > INT_MAX) ++ FAIL_EXIT1 ("readdir: invalid file descriptor name: /proc/self/fd/%s", ++ e->d_name); ++ ++ /* Skip the descriptor which is used to enumerate the ++ descriptors. */ ++ if (fd == dirfd (fds)) ++ continue; ++ ++ r = r + 1; ++ } ++ ++ closedir (fds); ++ ++ return r; ++} ++ ++static int ++do_test (void) ++{ ++ const int nfds1 = 8; ++ int lowfd = support_open_dev_null_range (nfds1, O_RDONLY, 0600); ++ for (int i = 0; i < nfds1; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd + i, F_GETFL) > -1); ++ check_path (lowfd + i); ++ } ++ ++ /* create some gaps. */ ++ xclose (lowfd + 1); ++ xclose (lowfd + 5); ++ xclose (lowfd + 6); ++ ++ const int nfds2 = 16; ++ int lowfd2 = support_open_dev_null_range (nfds2, O_RDONLY, 0600); ++ for (int i = 0; i < nfds2; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd2 + i, F_GETFL) > -1); ++ check_path (lowfd2 + i); ++ } ++ ++ /* Decrease the maximum number of files. */ ++ { ++ struct rlimit rl; ++ if (getrlimit (RLIMIT_NOFILE, &rl) == -1) ++ FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m"); ++ ++ rl.rlim_cur = number_of_opened_files (); ++ ++ if (setrlimit (RLIMIT_NOFILE, &rl) == 1) ++ FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m"); ++ } ++ ++ const int nfds3 = 16; ++ int lowfd3 = support_open_dev_null_range (nfds3, O_RDONLY, 0600); ++ for (int i = 0; i < nfds3; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd3 + i, F_GETFL) > -1); ++ check_path (lowfd3 + i); ++ } ++ ++ /* create a lot of gaps to trigger the range extension. */ ++ xclose (lowfd3 + 1); ++ xclose (lowfd3 + 3); ++ xclose (lowfd3 + 5); ++ xclose (lowfd3 + 7); ++ xclose (lowfd3 + 9); ++ xclose (lowfd3 + 11); ++ xclose (lowfd3 + 13); ++ ++ const int nfds4 = 16; ++ int lowfd4 = support_open_dev_null_range (nfds4, O_RDONLY, 0600); ++ for (int i = 0; i < nfds4; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd4 + i, F_GETFL) > -1); ++ check_path (lowfd4 + i); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/generic/dl-relocate-ld.h b/sysdeps/generic/dl-relocate-ld.h +new file mode 100644 +index 0000000000..cfb86c2d6a +--- /dev/null ++++ b/sysdeps/generic/dl-relocate-ld.h +@@ -0,0 +1,25 @@ ++/* Check if dynamic section should be relocated. Generic version. ++ 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/>. */ ++ ++#ifndef _DL_RELOCATE_LD_H ++#define _DL_RELOCATE_LD_H ++ ++/* The dynamic section is writable. */ ++#define DL_RO_DYN_SECTION 0 ++ ++#endif /* _DL_RELOCATE_LD_H */ +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 9c15259236..fcbbf69748 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -69,17 +69,24 @@ __BEGIN_DECLS + `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */ + #define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) + ++/* Return true if dynamic section in the shared library L should be ++ relocated. */ ++ ++static inline bool ++dl_relocate_ld (const struct link_map *l) ++{ ++ /* Don't relocate dynamic section if it is readonly */ ++ return !(l->l_ld_readonly || DL_RO_DYN_SECTION); ++} ++ + /* All references to the value of l_info[DT_PLTGOT], + l_info[DT_STRTAB], l_info[DT_SYMTAB], l_info[DT_RELA], + l_info[DT_REL], l_info[DT_JMPREL], and l_info[VERSYMIDX (DT_VERSYM)] + have to be accessed via the D_PTR macro. The macro is needed since for + most architectures the entry is already relocated - but for some not + and we need to relocate at access time. */ +-#ifdef DL_RO_DYN_SECTION +-# define D_PTR(map, i) ((map)->i->d_un.d_ptr + (map)->l_addr) +-#else +-# define D_PTR(map, i) (map)->i->d_un.d_ptr +-#endif ++#define D_PTR(map, i) \ ++ ((map)->i->d_un.d_ptr + (dl_relocate_ld (map) ? 0 : (map)->l_addr)) + + /* Result of the lookup functions and how to retrieve the base address. */ + typedef struct link_map *lookup_t; +@@ -372,6 +379,13 @@ struct rtld_global + list of loaded objects while an object is added to or removed + from that list. */ + __rtld_lock_define_recursive (EXTERN, _dl_load_write_lock) ++ /* This lock protects global and module specific TLS related data. ++ E.g. it is held in dlopen and dlclose when GL(dl_tls_generation), ++ GL(dl_tls_max_dtv_idx) or GL(dl_tls_dtv_slotinfo_list) are ++ accessed and when TLS related relocations are processed for a ++ module. It was introduced to keep pthread_create accessing TLS ++ state that is being set up. */ ++ __rtld_lock_define_recursive (EXTERN, _dl_load_tls_lock) + + /* Incremented whenever something may have been added to dl_loaded. */ + EXTERN unsigned long long _dl_load_adds; +@@ -1261,7 +1275,7 @@ extern int _dl_scope_free (void *) attribute_hidden; + + /* Add module to slot information data. If DO_ADD is false, only the + required memory is allocated. Must be called with GL +- (dl_load_lock) acquired. If the function has already been called ++ (dl_load_tls_lock) acquired. If the function has already been called + for the link map L with !do_add, then this function will not raise + an exception, otherwise it is possible that it encounters a memory + allocation failure. */ +diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c +index 1267f39da2..cc8023f979 100644 +--- a/sysdeps/mach/getsysstats.c ++++ b/sysdeps/mach/getsysstats.c +@@ -62,6 +62,12 @@ __get_nprocs (void) + libc_hidden_def (__get_nprocs) + weak_alias (__get_nprocs, get_nprocs) + ++int ++__get_nprocs_sched (void) ++{ ++ return __get_nprocs (); ++} ++ + /* Return the number of physical pages on the system. */ + long int + __get_phys_pages (void) +diff --git a/sysdeps/mips/dl-relocate-ld.h b/sysdeps/mips/dl-relocate-ld.h +new file mode 100644 +index 0000000000..376ad75dd1 +--- /dev/null ++++ b/sysdeps/mips/dl-relocate-ld.h +@@ -0,0 +1,25 @@ ++/* Check if dynamic section should be relocated. MIPS version. ++ 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/>. */ ++ ++#ifndef _DL_RELOCATE_LD_H ++#define _DL_RELOCATE_LD_H ++ ++/* The dynamic section is readonly. */ ++#define DL_RO_DYN_SECTION 1 ++ ++#endif /* _DL_RELOCATE_LD_H */ +diff --git a/sysdeps/mips/ldsodefs.h b/sysdeps/mips/ldsodefs.h +index 4db7c60e38..36fd09a8bd 100644 +--- a/sysdeps/mips/ldsodefs.h ++++ b/sysdeps/mips/ldsodefs.h +@@ -75,10 +75,6 @@ struct La_mips_64_retval; + struct La_mips_64_retval *, \ + const char *); + +-/* The MIPS ABI specifies that the dynamic section has to be read-only. */ +- +-#define DL_RO_DYN_SECTION 1 +- + #include_next <ldsodefs.h> + + /* The 64-bit MIPS ELF ABI uses an unusual reloc format. Each +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index f1b7f2bdc6..43146e91c9 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -933,7 +933,7 @@ extern int pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr, + # ifdef __USE_GNU + # ifdef __REDIRECT_NTH + extern int __REDIRECT_NTH (pthread_mutexattr_getrobust_np, +- (pthread_mutex_t *, int *), ++ (pthread_mutexattr_t *, int *), + pthread_mutexattr_getrobust) __nonnull ((1)) + __attribute_deprecated_msg__ ("\ + pthread_mutexattr_getrobust_np is deprecated, use pthread_mutexattr_getrobust"); +@@ -949,7 +949,7 @@ extern int pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr, + # ifdef __USE_GNU + # ifdef __REDIRECT_NTH + extern int __REDIRECT_NTH (pthread_mutexattr_setrobust_np, +- (pthread_mutex_t *, int), ++ (pthread_mutexattr_t *, int), + pthread_mutexattr_setrobust) __nonnull ((1)) + __attribute_deprecated_msg__ ("\ + pthread_mutexattr_setrobust_np is deprecated, use pthread_mutexattr_setrobust"); +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index 838a68f022..43dfc6739e 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2008,6 +2008,7 @@ gaiconf_init (void) + l = l->next; + } + free_prefixlist (labellist); ++ labellist = NULL; + + /* Sort the entries so that the most specific ones are at + the beginning. */ +@@ -2046,6 +2047,7 @@ gaiconf_init (void) + l = l->next; + } + free_prefixlist (precedencelist); ++ precedencelist = NULL; + + /* Sort the entries so that the most specific ones are at + the beginning. */ +diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h +index 589f7c8d18..cfcfa69f91 100644 +--- a/sysdeps/powerpc/powerpc64/sysdep.h ++++ b/sysdeps/powerpc/powerpc64/sysdep.h +@@ -275,12 +275,14 @@ LT_LABELSUFFIX(name,_name_end): ; \ + /* Allocate frame and save register */ + #define NVOLREG_SAVE \ + stdu r1,-SCV_FRAME_SIZE(r1); \ ++ cfi_adjust_cfa_offset(SCV_FRAME_SIZE); \ + std r31,SCV_FRAME_NVOLREG_SAVE(r1); \ +- cfi_adjust_cfa_offset(SCV_FRAME_SIZE); ++ cfi_rel_offset(r31,SCV_FRAME_NVOLREG_SAVE); + + /* Restore register and destroy frame */ + #define NVOLREG_RESTORE \ + ld r31,SCV_FRAME_NVOLREG_SAVE(r1); \ ++ cfi_restore(r31); \ + addi r1,r1,SCV_FRAME_SIZE; \ + cfi_adjust_cfa_offset(-SCV_FRAME_SIZE); + +@@ -331,13 +333,13 @@ LT_LABELSUFFIX(name,_name_end): ; \ + + #define DO_CALL_SCV \ + mflr r9; \ +- std r9,FRAME_LR_SAVE(r1); \ +- cfi_offset(lr,FRAME_LR_SAVE); \ ++ std r9,SCV_FRAME_SIZE+FRAME_LR_SAVE(r1); \ ++ cfi_rel_offset(lr,SCV_FRAME_SIZE+FRAME_LR_SAVE); \ + .machine "push"; \ + .machine "power9"; \ + scv 0; \ + .machine "pop"; \ +- ld r9,FRAME_LR_SAVE(r1); \ ++ ld r9,SCV_FRAME_SIZE+FRAME_LR_SAVE(r1); \ + mtlr r9; \ + cfi_restore(lr); + +diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile +index 42f9fc5072..c657101696 100644 +--- a/sysdeps/pthread/Makefile ++++ b/sysdeps/pthread/Makefile +@@ -89,7 +89,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ + tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \ + tst-join14 tst-join15 \ + tst-key1 tst-key2 tst-key3 tst-key4 \ +- tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \ ++ tst-kill1 tst-kill2 tst-kill3 tst-kill5 tst-kill6 \ + tst-locale1 tst-locale2 \ + tst-memstream \ + tst-mutex-errorcheck tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 \ +@@ -118,6 +118,14 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ + tst-unload \ + tst-unwind-thread \ + tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \ ++ tst-pthread-exit-signal \ ++ tst-pthread-setuid-loop \ ++ tst-pthread_cancel-exited \ ++ tst-pthread_cancel-select-loop \ ++ tst-pthread-raise-blocked-self \ ++ tst-pthread_kill-exited \ ++ tst-pthread_kill-exiting \ ++ # tests + + tests-time64 := \ + tst-abstime-time64 \ +@@ -145,15 +153,17 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \ + tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 + + ifeq ($(build-shared),yes) +-tests += tst-atfork2 tst-pt-tls4 tst-_res1 tst-fini1 ++tests += tst-atfork2 tst-pt-tls4 tst-_res1 tst-fini1 tst-create1 + tests-nolibpthread += tst-fini1 + endif + + modules-names += tst-atfork2mod tst-tls4moda tst-tls4modb \ +- tst-_res1mod1 tst-_res1mod2 tst-fini1mod ++ tst-_res1mod1 tst-_res1mod2 tst-fini1mod \ ++ tst-create1mod + test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) + + tst-atfork2mod.so-no-z-defs = yes ++tst-create1mod.so-no-z-defs = yes + + ifeq ($(build-shared),yes) + # Build all the modules even when not actually running test programs. +@@ -272,4 +282,8 @@ LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so + + CFLAGS-tst-unwind-thread.c += -funwind-tables + ++LDFLAGS-tst-create1 = -Wl,-export-dynamic ++$(objpfx)tst-create1: $(shared-thread-library) ++$(objpfx)tst-create1.out: $(objpfx)tst-create1mod.so ++ + endif +diff --git a/sysdeps/pthread/tst-create1.c b/sysdeps/pthread/tst-create1.c +new file mode 100644 +index 0000000000..763ded8d79 +--- /dev/null ++++ b/sysdeps/pthread/tst-create1.c +@@ -0,0 +1,123 @@ ++/* Verify that pthread_create does not deadlock when ctors take locks. ++ 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 <stdio.h> ++#include <support/xdlfcn.h> ++#include <support/xthread.h> ++ ++/* ++Check if ctor and pthread_create deadlocks in ++ ++thread 1: dlopen -> ctor -> lock(user_lock) ++thread 2: lock(user_lock) -> pthread_create ++ ++or in ++ ++thread 1: dlclose -> dtor -> lock(user_lock) ++thread 2: lock(user_lock) -> pthread_create ++*/ ++ ++static pthread_barrier_t bar_ctor; ++static pthread_barrier_t bar_ctor_finish; ++static pthread_barrier_t bar_dtor; ++static pthread_mutex_t user_lock = PTHREAD_MUTEX_INITIALIZER; ++ ++void ++ctor (void) ++{ ++ xpthread_barrier_wait (&bar_ctor); ++ dprintf (1, "thread 1: in ctor: started.\n"); ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 1: in ctor: locked user_lock.\n"); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 1: in ctor: unlocked user_lock.\n"); ++ dprintf (1, "thread 1: in ctor: done.\n"); ++ xpthread_barrier_wait (&bar_ctor_finish); ++} ++ ++void ++dtor (void) ++{ ++ xpthread_barrier_wait (&bar_dtor); ++ dprintf (1, "thread 1: in dtor: started.\n"); ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 1: in dtor: locked user_lock.\n"); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 1: in dtor: unlocked user_lock.\n"); ++ dprintf (1, "thread 1: in dtor: done.\n"); ++} ++ ++static void * ++thread3 (void *a) ++{ ++ dprintf (1, "thread 3: started.\n"); ++ dprintf (1, "thread 3: done.\n"); ++ return 0; ++} ++ ++static void * ++thread2 (void *a) ++{ ++ pthread_t t3; ++ dprintf (1, "thread 2: started.\n"); ++ ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 2: locked user_lock.\n"); ++ xpthread_barrier_wait (&bar_ctor); ++ t3 = xpthread_create (0, thread3, 0); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 2: unlocked user_lock.\n"); ++ xpthread_join (t3); ++ xpthread_barrier_wait (&bar_ctor_finish); ++ ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 2: locked user_lock.\n"); ++ xpthread_barrier_wait (&bar_dtor); ++ t3 = xpthread_create (0, thread3, 0); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 2: unlocked user_lock.\n"); ++ xpthread_join (t3); ++ ++ dprintf (1, "thread 2: done.\n"); ++ return 0; ++} ++ ++static void ++thread1 (void) ++{ ++ dprintf (1, "thread 1: started.\n"); ++ xpthread_barrier_init (&bar_ctor, NULL, 2); ++ xpthread_barrier_init (&bar_ctor_finish, NULL, 2); ++ xpthread_barrier_init (&bar_dtor, NULL, 2); ++ pthread_t t2 = xpthread_create (0, thread2, 0); ++ void *p = xdlopen ("tst-create1mod.so", RTLD_NOW | RTLD_GLOBAL); ++ dprintf (1, "thread 1: dlopen done.\n"); ++ xdlclose (p); ++ dprintf (1, "thread 1: dlclose done.\n"); ++ xpthread_join (t2); ++ dprintf (1, "thread 1: done.\n"); ++} ++ ++static int ++do_test (void) ++{ ++ thread1 (); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-create1mod.c b/sysdeps/pthread/tst-create1mod.c +new file mode 100644 +index 0000000000..62c9006961 +--- /dev/null ++++ b/sysdeps/pthread/tst-create1mod.c +@@ -0,0 +1,41 @@ ++/* Verify that pthread_create does not deadlock when ctors take locks. ++ 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 <stdio.h> ++ ++/* Require TLS setup for the module. */ ++__thread int tlsvar; ++ ++void ctor (void); ++void dtor (void); ++ ++static void __attribute__ ((constructor)) ++do_init (void) ++{ ++ dprintf (1, "constructor started: %d.\n", tlsvar++); ++ ctor (); ++ dprintf (1, "constructor done: %d.\n", tlsvar++); ++} ++ ++static void __attribute__ ((destructor)) ++do_end (void) ++{ ++ dprintf (1, "destructor started: %d.\n", tlsvar++); ++ dtor (); ++ dprintf (1, "destructor done: %d.\n", tlsvar++); ++} +diff --git a/sysdeps/pthread/tst-kill4.c b/sysdeps/pthread/tst-kill4.c +deleted file mode 100644 +index 9563939792..0000000000 +--- a/sysdeps/pthread/tst-kill4.c ++++ /dev/null +@@ -1,90 +0,0 @@ +-/* Copyright (C) 2003-2021 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Ulrich Drepper <drepper(a)redhat.com>, 2003. +- +- 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 <pthread.h> +-#include <signal.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +- +- +-static void * +-tf (void *a) +-{ +- return NULL; +-} +- +- +-int +-do_test (void) +-{ +- pthread_attr_t at; +- if (pthread_attr_init (&at) != 0) +- { +- puts ("attr_create failed"); +- exit (1); +- } +- +- /* Limit thread stack size, because if it is too large, pthread_join +- will free it immediately rather than put it into stack cache. */ +- if (pthread_attr_setstacksize (&at, 2 * 1024 * 1024) != 0) +- { +- puts ("setstacksize failed"); +- exit (1); +- } +- +- pthread_t th; +- if (pthread_create (&th, &at, tf, NULL) != 0) +- { +- puts ("create failed"); +- exit (1); +- } +- +- pthread_attr_destroy (&at); +- +- if (pthread_join (th, NULL) != 0) +- { +- puts ("join failed"); +- exit (1); +- } +- +- /* The following only works because we assume here something about +- the implementation. Namely, that the memory allocated for the +- thread descriptor is not going away, that the TID field is +- cleared and therefore the signal is sent to process 0, and that +- we can savely assume there is no other process with this ID at +- that time. */ +- int e = pthread_kill (th, 0); +- if (e == 0) +- { +- puts ("pthread_kill succeeded"); +- exit (1); +- } +- if (e != ESRCH) +- { +- puts ("pthread_kill didn't return ESRCH"); +- exit (1); +- } +- +- return 0; +-} +- +- +-#define TEST_FUNCTION do_test () +-#include "../test-skeleton.c" +diff --git a/sysdeps/pthread/tst-pthread-exit-signal.c b/sysdeps/pthread/tst-pthread-exit-signal.c +new file mode 100644 +index 0000000000..b4526fe663 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread-exit-signal.c +@@ -0,0 +1,45 @@ ++/* Test that pending signals are not delivered on thread exit (bug 28607). ++ 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/>. */ ++ ++/* Due to bug 28607, pthread_kill (or pthread_cancel) restored the ++ signal mask during during thread exit, triggering the delivery of a ++ blocked pending signal (SIGUSR1 in this test). */ ++ ++#include <support/xthread.h> ++#include <support/xsignal.h> ++ ++static void * ++threadfunc (void *closure) ++{ ++ sigset_t sigmask; ++ sigfillset (&sigmask); ++ xpthread_sigmask (SIG_SETMASK, &sigmask, NULL); ++ xpthread_kill (pthread_self (), SIGUSR1); ++ pthread_exit (NULL); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ pthread_t thr = xpthread_create (NULL, threadfunc, NULL); ++ xpthread_join (thr); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread-raise-blocked-self.c b/sysdeps/pthread/tst-pthread-raise-blocked-self.c +new file mode 100644 +index 0000000000..128e1a6071 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread-raise-blocked-self.c +@@ -0,0 +1,92 @@ ++/* Test that raise sends signal to current thread even if blocked. ++ 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 <signal.h> ++#include <support/check.h> ++#include <support/xsignal.h> ++#include <support/xthread.h> ++#include <pthread.h> ++#include <unistd.h> ++ ++/* Used to create a dummy thread ID distinct from all other thread ++ IDs. */ ++static void * ++noop (void *ignored) ++{ ++ return NULL; ++} ++ ++static volatile pthread_t signal_thread; ++ ++static void ++signal_handler (int signo) ++{ ++ signal_thread = pthread_self (); ++} ++ ++/* Used to ensure that waiting_thread has launched and can accept ++ signals. */ ++static pthread_barrier_t barrier; ++ ++static void * ++waiting_thread (void *ignored) ++{ ++ xpthread_barrier_wait (&barrier); ++ pause (); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xsignal (SIGUSR1, signal_handler); ++ xpthread_barrier_init (&barrier, NULL, 2); ++ ++ /* Distinct thread ID value to */ ++ pthread_t dummy = xpthread_create (NULL, noop, NULL); ++ signal_thread = dummy; ++ ++ pthread_t helper = xpthread_create (NULL, waiting_thread, NULL); ++ ++ /* Make sure that the thread is running. */ ++ xpthread_barrier_wait (&barrier); ++ ++ /* Block signals on this thread. */ ++ sigset_t set; ++ sigfillset (&set); ++ xpthread_sigmask (SIG_BLOCK, &set, NULL); ++ ++ /* Send the signal to this thread. It must not be delivered. */ ++ raise (SIGUSR1); ++ TEST_VERIFY (signal_thread == dummy); ++ ++ /* Wait a bit to give a chance for signal delivery (increases ++ chances of failure with bug 28407). */ ++ usleep (50 * 1000); ++ ++ /* Unblocking should cause synchronous delivery of the signal. */ ++ xpthread_sigmask (SIG_UNBLOCK, &set, NULL); ++ TEST_VERIFY (signal_thread == pthread_self ()); ++ ++ xpthread_cancel (helper); ++ xpthread_join (helper); ++ xpthread_join (dummy); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread-setuid-loop.c b/sysdeps/pthread/tst-pthread-setuid-loop.c +new file mode 100644 +index 0000000000..fda2a49b7f +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread-setuid-loop.c +@@ -0,0 +1,61 @@ ++/* Test that setuid, pthread_create, thread exit do not deadlock (bug 28361). ++ 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 <support/check.h> ++#include <support/xthread.h> ++#include <unistd.h> ++ ++/* How many threads to launch during each iteration. */ ++enum { threads = 4 }; ++ ++/* How many iterations to perform. This value seems to reproduce ++ bug 28361 in a bout one in three runs. */ ++enum { iterations = 5000 }; ++ ++/* Cache of the real user ID used by setuid_thread. */ ++static uid_t uid; ++ ++/* Start routine for the threads. */ ++static void * ++setuid_thread (void *closure) ++{ ++ TEST_COMPARE (setuid (uid), 0); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ /* The setxid machinery is still invoked even if the UID is ++ unchanged. (The kernel might reset other credentials as part of ++ the system call.) */ ++ uid = getuid (); ++ ++ for (int i = 0; i < iterations; ++i) ++ { ++ pthread_t thread_ids[threads]; ++ for (int j = 0; j < threads; ++j) ++ thread_ids[j] = xpthread_create (NULL, setuid_thread, NULL); ++ for (int j = 0; j < threads; ++j) ++ xpthread_join (thread_ids[j]); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_cancel-exited.c b/sysdeps/pthread/tst-pthread_cancel-exited.c +new file mode 100644 +index 0000000000..811c9bee07 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_cancel-exited.c +@@ -0,0 +1,45 @@ ++/* Test that pthread_kill succeeds for an exited thread. ++ 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/>. */ ++ ++/* This test verifies that pthread_kill returns 0 (and not ESRCH) for ++ a thread that has exited on the kernel side. */ ++ ++#include <stddef.h> ++#include <support/support.h> ++#include <support/xthread.h> ++ ++static void * ++noop_thread (void *closure) ++{ ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ pthread_t thr = xpthread_create (NULL, noop_thread, NULL); ++ ++ support_wait_for_thread_exit (); ++ ++ xpthread_cancel (thr); ++ xpthread_join (thr); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_cancel-select-loop.c b/sysdeps/pthread/tst-pthread_cancel-select-loop.c +new file mode 100644 +index 0000000000..a62087589c +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_cancel-select-loop.c +@@ -0,0 +1,87 @@ ++/* Test that pthread_cancel succeeds during thread exit. ++ 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/>. */ ++ ++/* This test tries to trigger an internal race condition in ++ pthread_cancel, where the cancellation signal is sent after the ++ thread has begun the cancellation process. This can result in a ++ spurious ESRCH error. For the original bug 12889, the window is ++ quite small, so the bug was not reproduced in every run. */ ++ ++#include <stdbool.h> ++#include <stddef.h> ++#include <support/check.h> ++#include <support/xthread.h> ++#include <support/xunistd.h> ++#include <sys/select.h> ++#include <unistd.h> ++ ++/* Set to true by timeout_thread_function when the test should ++ terminate. */ ++static bool timeout; ++ ++static void * ++timeout_thread_function (void *unused) ++{ ++ usleep (5 * 1000 * 1000); ++ __atomic_store_n (&timeout, true, __ATOMIC_RELAXED); ++ return NULL; ++} ++ ++/* Used for blocking the select function below. */ ++static int pipe_fds[2]; ++ ++static void * ++canceled_thread_function (void *unused) ++{ ++ while (true) ++ { ++ fd_set rfs; ++ fd_set wfs; ++ fd_set efs; ++ FD_ZERO (&rfs); ++ FD_ZERO (&wfs); ++ FD_ZERO (&efs); ++ FD_SET (pipe_fds[0], &rfs); ++ ++ /* If the cancellation request is recognized early, the thread ++ begins exiting while the cancellation signal arrives. */ ++ select (FD_SETSIZE, &rfs, &wfs, &efs, NULL); ++ } ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xpipe (pipe_fds); ++ pthread_t thr_timeout = xpthread_create (NULL, timeout_thread_function, NULL); ++ ++ while (!__atomic_load_n (&timeout, __ATOMIC_RELAXED)) ++ { ++ pthread_t thr = xpthread_create (NULL, canceled_thread_function, NULL); ++ xpthread_cancel (thr); ++ TEST_VERIFY (xpthread_join (thr) == PTHREAD_CANCELED); ++ } ++ ++ xpthread_join (thr_timeout); ++ xclose (pipe_fds[0]); ++ xclose (pipe_fds[1]); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_kill-exited.c b/sysdeps/pthread/tst-pthread_kill-exited.c +new file mode 100644 +index 0000000000..a2fddad526 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_kill-exited.c +@@ -0,0 +1,63 @@ ++/* Test that pthread_kill succeeds for an exited thread. ++ 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/>. */ ++ ++/* This test verifies that the default pthread_kill returns 0 (and not ++ ESRCH) for a thread that has exited on the kernel side. */ ++ ++#include <errno.h> ++#include <pthread.h> ++#include <shlib-compat.h> ++#include <signal.h> ++#include <stddef.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <support/xthread.h> ++ ++static void * ++noop_thread (void *closure) ++{ ++ return NULL; ++} ++ ++#if TEST_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) && PTHREAD_IN_LIBC ++extern __typeof (pthread_kill) compat_pthread_kill; ++compat_symbol_reference (libpthread, compat_pthread_kill, pthread_kill, ++ GLIBC_2_0); ++#endif ++ ++static int ++do_test (void) ++{ ++ pthread_t thr = xpthread_create (NULL, noop_thread, NULL); ++ ++ support_wait_for_thread_exit (); ++ ++ /* NB: Always uses the default symbol due to separate compilation. */ ++ xpthread_kill (thr, SIGUSR1); ++ ++#if TEST_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) && PTHREAD_IN_LIBC ++ /* Old binaries need the non-conforming ESRCH error code. */ ++ TEST_COMPARE (compat_pthread_kill (thr, SIGUSR1), ESRCH); ++#endif ++ ++ xpthread_join (thr); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_kill-exiting.c b/sysdeps/pthread/tst-pthread_kill-exiting.c +new file mode 100644 +index 0000000000..f803e94f11 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_kill-exiting.c +@@ -0,0 +1,123 @@ ++/* Test that pthread_kill succeeds during thread exit. ++ 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/>. */ ++ ++/* This test verifies that pthread_kill for a thread that is exiting ++ succeeds (with or without actually delivering the signal). */ ++ ++#include <array_length.h> ++#include <stdbool.h> ++#include <stddef.h> ++#include <support/xsignal.h> ++#include <support/xthread.h> ++#include <unistd.h> ++ ++/* Set to true by timeout_thread_function when the test should ++ terminate. */ ++static bool timeout; ++ ++static void * ++timeout_thread_function (void *unused) ++{ ++ usleep (1000 * 1000); ++ __atomic_store_n (&timeout, true, __ATOMIC_RELAXED); ++ return NULL; ++} ++ ++/* Used to synchronize the sending threads with the target thread and ++ main thread. */ ++static pthread_barrier_t barrier_1; ++static pthread_barrier_t barrier_2; ++ ++/* The target thread to which signals are to be sent. */ ++static pthread_t target_thread; ++ ++/* Set by the main thread to true after timeout has been set to ++ true. */ ++static bool exiting; ++ ++static void * ++sender_thread_function (void *unused) ++{ ++ while (true) ++ { ++ /* Wait until target_thread has been initialized. The target ++ thread and main thread participate in this barrier. */ ++ xpthread_barrier_wait (&barrier_1); ++ ++ if (exiting) ++ break; ++ ++ xpthread_kill (target_thread, SIGUSR1); ++ ++ /* Communicate that the signal has been sent. The main thread ++ participates in this barrier. */ ++ xpthread_barrier_wait (&barrier_2); ++ } ++ return NULL; ++} ++ ++static void * ++target_thread_function (void *unused) ++{ ++ target_thread = pthread_self (); ++ xpthread_barrier_wait (&barrier_1); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xsignal (SIGUSR1, SIG_IGN); ++ ++ pthread_t thr_timeout = xpthread_create (NULL, timeout_thread_function, NULL); ++ ++ pthread_t threads[4]; ++ xpthread_barrier_init (&barrier_1, NULL, array_length (threads) + 2); ++ xpthread_barrier_init (&barrier_2, NULL, array_length (threads) + 1); ++ ++ for (int i = 0; i < array_length (threads); ++i) ++ threads[i] = xpthread_create (NULL, sender_thread_function, NULL); ++ ++ while (!__atomic_load_n (&timeout, __ATOMIC_RELAXED)) ++ { ++ xpthread_create (NULL, target_thread_function, NULL); ++ ++ /* Wait for the target thread to be set up and signal sending to ++ start. */ ++ xpthread_barrier_wait (&barrier_1); ++ ++ /* Wait for signal sending to complete. */ ++ xpthread_barrier_wait (&barrier_2); ++ ++ xpthread_join (target_thread); ++ } ++ ++ exiting = true; ++ ++ /* Signal the sending threads to exit. */ ++ xpthread_create (NULL, target_thread_function, NULL); ++ xpthread_barrier_wait (&barrier_1); ++ ++ for (int i = 0; i < array_length (threads); ++i) ++ xpthread_join (threads[i]); ++ xpthread_join (thr_timeout); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/riscv/dl-relocate-ld.h b/sysdeps/riscv/dl-relocate-ld.h +new file mode 100644 +index 0000000000..2ab2b8ac6c +--- /dev/null ++++ b/sysdeps/riscv/dl-relocate-ld.h +@@ -0,0 +1,25 @@ ++/* Check if dynamic section should be relocated. RISC-V version. ++ 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/>. */ ++ ++#ifndef _DL_RELOCATE_LD_H ++#define _DL_RELOCATE_LD_H ++ ++/* The dynamic section is readonly for ABI compatibility. */ ++#define DL_RO_DYN_SECTION 1 ++ ++#endif /* _DL_RELOCATE_LD_H */ +diff --git a/sysdeps/riscv/ldsodefs.h b/sysdeps/riscv/ldsodefs.h +index 0c696714a7..8947ffe4b5 100644 +--- a/sysdeps/riscv/ldsodefs.h ++++ b/sysdeps/riscv/ldsodefs.h +@@ -38,11 +38,6 @@ struct La_riscv_retval; + struct La_riscv_retval *, \ + const char *); + +-/* Although the RISC-V ABI does not specify that the dynamic section has +- to be read-only, it needs to be kept for ABI compatibility. */ +- +-#define DL_RO_DYN_SECTION 1 +- + #include_next <ldsodefs.h> + + #endif +diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c +index c174e27b35..155f0bd99e 100644 +--- a/sysdeps/s390/dl-procinfo.c ++++ b/sysdeps/s390/dl-procinfo.c +@@ -46,13 +46,13 @@ + #if !defined PROCINFO_DECL && defined SHARED + ._dl_s390_cap_flags + #else +-PROCINFO_CLASS const char _dl_s390_cap_flags[21][9] ++PROCINFO_CLASS const char _dl_s390_cap_flags[23][9] + #endif + #ifndef PROCINFO_DECL + = { + "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", + "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt", +- "vxp2", "nnpa" ++ "vxp2", "nnpa", "pcimio", "sie" + } + #endif + #if !defined SHARED || defined PROCINFO_DECL +diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h +index 2d9c305808..e4e3e334a5 100644 +--- a/sysdeps/s390/dl-procinfo.h ++++ b/sysdeps/s390/dl-procinfo.h +@@ -21,7 +21,7 @@ + #define _DL_PROCINFO_H 1 + #include <ldsodefs.h> + +-#define _DL_HWCAP_COUNT 21 ++#define _DL_HWCAP_COUNT 23 + + #define _DL_PLATFORMS_COUNT 10 + +@@ -63,6 +63,8 @@ enum + HWCAP_S390_DFLT = 1 << 18, + HWCAP_S390_VXRS_PDE2 = 1 << 19, + HWCAP_S390_NNPA = 1 << 20, ++ HWCAP_S390_PCI_MIO = 1 << 21, ++ HWCAP_S390_SIE = 1 << 22, + }; + + #define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \ +diff --git a/sysdeps/s390/memmem-arch13.S b/sysdeps/s390/memmem-arch13.S +index c5c8d8c97e..58df8cdb14 100644 +--- a/sysdeps/s390/memmem-arch13.S ++++ b/sysdeps/s390/memmem-arch13.S +@@ -41,7 +41,7 @@ ENTRY(MEMMEM_ARCH13) + # error The arch13 variant of memmem needs the z13 variant of memmem! + # endif + clgfi %r5,9 +- jh MEMMEM_Z13 ++ jgh MEMMEM_Z13 + + aghik %r0,%r5,-1 /* vll needs highest index. */ + bc 4,0(%r14) /* cc==1: return if needle-len == 0. */ +diff --git a/sysdeps/s390/strstr-arch13.S b/sysdeps/s390/strstr-arch13.S +index c7183e627c..222a6de91a 100644 +--- a/sysdeps/s390/strstr-arch13.S ++++ b/sysdeps/s390/strstr-arch13.S +@@ -49,7 +49,7 @@ ENTRY(STRSTR_ARCH13) + # error The arch13 variant of strstr needs the z13 variant of strstr! + # endif + clgfi %r4,9 +- jh STRSTR_Z13 ++ jgh STRSTR_Z13 + + /* In case of a partial match, the vstrs instruction returns the index + of the partial match in a vector-register. Then we have to +diff --git a/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h b/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h +index e9eb707d0a..bedab1abba 100644 +--- a/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h +@@ -126,6 +126,7 @@ + #define __NR_mbind 235 + #define __NR_membarrier 283 + #define __NR_memfd_create 279 ++#define __NR_memfd_secret 447 + #define __NR_migrate_pages 238 + #define __NR_mincore 232 + #define __NR_mkdirat 34 +@@ -187,6 +188,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/alpha/arch-syscall.h b/sysdeps/unix/sysv/linux/alpha/arch-syscall.h +index bd6b7d4003..91354ed9e2 100644 +--- a/sysdeps/unix/sysv/linux/alpha/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/alpha/arch-syscall.h +@@ -337,6 +337,7 @@ + #define __NR_pwritev2 521 + #define __NR_query_module 347 + #define __NR_quotactl 148 ++#define __NR_quotactl_fd 553 + #define __NR_read 3 + #define __NR_readahead 379 + #define __NR_readlink 58 +diff --git a/sysdeps/unix/sysv/linux/arc/arch-syscall.h b/sysdeps/unix/sysv/linux/arc/arch-syscall.h +index 10650549c1..ff5c7eb36d 100644 +--- a/sysdeps/unix/sysv/linux/arc/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/arc/arch-syscall.h +@@ -190,6 +190,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/arm/arch-syscall.h b/sysdeps/unix/sysv/linux/arm/arch-syscall.h +index 85c9b236ce..5772333cee 100644 +--- a/sysdeps/unix/sysv/linux/arm/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/arm/arch-syscall.h +@@ -244,6 +244,7 @@ + #define __NR_pwritev 362 + #define __NR_pwritev2 393 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readlink 85 +diff --git a/sysdeps/unix/sysv/linux/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h +index 3b1ae418e0..31451c28d9 100644 +--- a/sysdeps/unix/sysv/linux/bits/mman-linux.h ++++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h +@@ -89,6 +89,10 @@ + # define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK. */ + # define MADV_COLD 20 /* Deactivate these pages. */ + # define MADV_PAGEOUT 21 /* Reclaim these pages. */ ++# define MADV_POPULATE_READ 22 /* Populate (prefault) page tables ++ readable. */ ++# define MADV_POPULATE_WRITE 23 /* Populate (prefault) page tables ++ writable. */ + # define MADV_HWPOISON 100 /* Poison a page for testing. */ + #endif + +diff --git a/sysdeps/unix/sysv/linux/bits/timex.h b/sysdeps/unix/sysv/linux/bits/timex.h +index ee37694e8f..4a5db6deca 100644 +--- a/sysdeps/unix/sysv/linux/bits/timex.h ++++ b/sysdeps/unix/sysv/linux/bits/timex.h +@@ -25,7 +25,7 @@ + + struct timex + { +-# ifdef __USE_TIME_BITS64 ++# if defined __USE_TIME_BITS64 || (__TIMESIZE == 64 && __WORDSIZE == 32) + unsigned int modes; /* mode selector */ + int :32; /* pad */ + long long offset; /* time offset (usec) */ +diff --git a/sysdeps/unix/sysv/linux/csky/arch-syscall.h b/sysdeps/unix/sysv/linux/csky/arch-syscall.h +index 24b0d1f94e..4af6d6202f 100644 +--- a/sysdeps/unix/sysv/linux/csky/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/csky/arch-syscall.h +@@ -199,6 +199,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c +index 1391e360b8..7fc6521942 100644 +--- a/sysdeps/unix/sysv/linux/getsysstats.c ++++ b/sysdeps/unix/sysv/linux/getsysstats.c +@@ -18,6 +18,8 @@ + <https://www.gnu.org/licenses/>. */ + + #include <array_length.h> ++#include <assert.h> ++#include <ctype.h> + #include <dirent.h> + #include <errno.h> + #include <ldsodefs.h> +@@ -29,61 +31,170 @@ + #include <sys/sysinfo.h> + #include <sysdep.h> + +-/* Compute the population count of the entire array. */ +-static int +-__get_nprocs_count (const unsigned long int *array, size_t length) ++int ++__get_nprocs_sched (void) + { +- int count = 0; +- for (size_t i = 0; i < length; ++i) +- if (__builtin_add_overflow (count, __builtin_popcountl (array[i]), +- &count)) +- return INT_MAX; +- return count; ++ enum ++ { ++ max_num_cpus = 32768, ++ cpu_bits_size = CPU_ALLOC_SIZE (32768) ++ }; ++ ++ /* This cannot use malloc because it is used on malloc initialization. */ ++ __cpu_mask cpu_bits[cpu_bits_size / sizeof (__cpu_mask)]; ++ int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, cpu_bits_size, ++ cpu_bits); ++ if (r > 0) ++ return CPU_COUNT_S (cpu_bits_size, (cpu_set_t*) cpu_bits); ++ else if (r == -EINVAL) ++ /* The input buffer is still not enough to store the number of cpus. This ++ is an arbitrary values assuming such systems should be rare and there ++ is no offline cpus. */ ++ return max_num_cpus; ++ /* Some other error. 2 is conservative (not a uniprocessor system, so ++ atomics are needed). */ ++ return 2; ++} ++ ++static char * ++next_line (int fd, char *const buffer, char **cp, char **re, ++ char *const buffer_end) ++{ ++ char *res = *cp; ++ char *nl = memchr (*cp, '\n', *re - *cp); ++ if (nl == NULL) ++ { ++ if (*cp != buffer) ++ { ++ if (*re == buffer_end) ++ { ++ memmove (buffer, *cp, *re - *cp); ++ *re = buffer + (*re - *cp); ++ *cp = buffer; ++ ++ ssize_t n = __read_nocancel (fd, *re, buffer_end - *re); ++ if (n < 0) ++ return NULL; ++ ++ *re += n; ++ ++ nl = memchr (*cp, '\n', *re - *cp); ++ while (nl == NULL && *re == buffer_end) ++ { ++ /* Truncate too long lines. */ ++ *re = buffer + 3 * (buffer_end - buffer) / 4; ++ n = __read_nocancel (fd, *re, buffer_end - *re); ++ if (n < 0) ++ return NULL; ++ ++ nl = memchr (*re, '\n', n); ++ **re = '\n'; ++ *re += n; ++ } ++ } ++ else ++ nl = memchr (*cp, '\n', *re - *cp); ++ ++ res = *cp; ++ } ++ ++ if (nl == NULL) ++ nl = *re - 1; ++ } ++ ++ *cp = nl + 1; ++ assert (*cp <= *re); ++ ++ return res == *re ? NULL : res; + } + +-/* __get_nprocs with a large buffer. */ + static int +-__get_nprocs_large (void) ++get_nproc_stat (char *buffer, size_t buffer_size) + { +- /* This code cannot use scratch_buffer because it is used during +- malloc initialization. */ +- size_t pagesize = GLRO (dl_pagesize); +- unsigned long int *page = __mmap (0, pagesize, PROT_READ | PROT_WRITE, +- MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); +- if (page == MAP_FAILED) +- return 2; +- int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, pagesize, page); +- int count; +- if (r > 0) +- count = __get_nprocs_count (page, pagesize / sizeof (unsigned long int)); +- else if (r == -EINVAL) +- /* One page is still not enough to store the bits. A more-or-less +- arbitrary value. This assumes t hat such large systems never +- happen in practice. */ +- count = GLRO (dl_pagesize) * CHAR_BIT; +- else +- count = 2; +- __munmap (page, GLRO (dl_pagesize)); +- return count; ++ char *buffer_end = buffer + buffer_size; ++ char *cp = buffer_end; ++ char *re = buffer_end; ++ ++ /* Default to an SMP system in case we cannot obtain an accurate ++ number. */ ++ int result = 2; ++ ++ const int flags = O_RDONLY | O_CLOEXEC; ++ int fd = __open_nocancel ("/proc/stat", flags); ++ if (fd != -1) ++ { ++ result = 0; ++ ++ char *l; ++ while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL) ++ /* The current format of /proc/stat has all the cpu* entries ++ at the front. We assume here that stays this way. */ ++ if (strncmp (l, "cpu", 3) != 0) ++ break; ++ else if (isdigit (l[3])) ++ ++result; ++ ++ __close_nocancel_nostatus (fd); ++ } ++ ++ return result; + } + + int + __get_nprocs (void) + { +- /* Fast path for most systems. The kernel expects a buffer size +- that is a multiple of 8. */ +- unsigned long int small_buffer[1024 / CHAR_BIT / sizeof (unsigned long int)]; +- int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, +- sizeof (small_buffer), small_buffer); +- if (r > 0) +- return __get_nprocs_count (small_buffer, r / sizeof (unsigned long int)); +- else if (r == -EINVAL) +- /* The kernel requests a larger buffer to store the data. */ +- return __get_nprocs_large (); +- else +- /* Some other error. 2 is conservative (not a uniprocessor +- system, so atomics are needed). */ +- return 2; ++ enum { buffer_size = 1024 }; ++ char buffer[buffer_size]; ++ char *buffer_end = buffer + buffer_size; ++ char *cp = buffer_end; ++ char *re = buffer_end; ++ ++ const int flags = O_RDONLY | O_CLOEXEC; ++ /* This file contains comma-separated ranges. */ ++ int fd = __open_nocancel ("/sys/devices/system/cpu/online", flags); ++ char *l; ++ int result = 0; ++ if (fd != -1) ++ { ++ l = next_line (fd, buffer, &cp, &re, buffer_end); ++ if (l != NULL) ++ do ++ { ++ char *endp; ++ unsigned long int n = strtoul (l, &endp, 10); ++ if (l == endp) ++ { ++ result = 0; ++ break; ++ } ++ ++ unsigned long int m = n; ++ if (*endp == '-') ++ { ++ l = endp + 1; ++ m = strtoul (l, &endp, 10); ++ if (l == endp) ++ { ++ result = 0; ++ break; ++ } ++ } ++ ++ result += m - n + 1; ++ ++ l = endp; ++ if (l < re && *l == ',') ++ ++l; ++ } ++ while (l < re && *l != '\n'); ++ ++ __close_nocancel_nostatus (fd); ++ ++ if (result > 0) ++ return result; ++ } ++ ++ return get_nproc_stat (buffer, buffer_size); + } + libc_hidden_def (__get_nprocs) + weak_alias (__get_nprocs, get_nprocs) +@@ -117,7 +228,9 @@ __get_nprocs_conf (void) + return count; + } + +- return 1; ++ enum { buffer_size = 1024 }; ++ char buffer[buffer_size]; ++ return get_nproc_stat (buffer, buffer_size); + } + libc_hidden_def (__get_nprocs_conf) + weak_alias (__get_nprocs_conf, get_nprocs_conf) +diff --git a/sysdeps/unix/sysv/linux/hppa/arch-syscall.h b/sysdeps/unix/sysv/linux/hppa/arch-syscall.h +index feb70abc3e..b07fc8549d 100644 +--- a/sysdeps/unix/sysv/linux/hppa/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/hppa/arch-syscall.h +@@ -231,6 +231,7 @@ + #define __NR_pwritev 316 + #define __NR_pwritev2 348 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 207 + #define __NR_readlink 85 +diff --git a/sysdeps/unix/sysv/linux/i386/arch-syscall.h b/sysdeps/unix/sysv/linux/i386/arch-syscall.h +index 3b1894a79b..6e4264698b 100644 +--- a/sysdeps/unix/sysv/linux/i386/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/i386/arch-syscall.h +@@ -183,6 +183,7 @@ + #define __NR_mbind 274 + #define __NR_membarrier 375 + #define __NR_memfd_create 356 ++#define __NR_memfd_secret 447 + #define __NR_migrate_pages 294 + #define __NR_mincore 218 + #define __NR_mkdir 39 +@@ -266,6 +267,7 @@ + #define __NR_pwritev2 379 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/ia64/arch-syscall.h b/sysdeps/unix/sysv/linux/ia64/arch-syscall.h +index fb388a5fa4..1ca706d721 100644 +--- a/sysdeps/unix/sysv/linux/ia64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/ia64/arch-syscall.h +@@ -218,6 +218,7 @@ + #define __NR_pwritev 1320 + #define __NR_pwritev2 1349 + #define __NR_quotactl 1137 ++#define __NR_quotactl_fd 1467 + #define __NR_read 1026 + #define __NR_readahead 1216 + #define __NR_readlink 1092 +diff --git a/sysdeps/unix/sysv/linux/m68k/arch-syscall.h b/sysdeps/unix/sysv/linux/m68k/arch-syscall.h +index 7bc8c4af92..2f10f71f90 100644 +--- a/sysdeps/unix/sysv/linux/m68k/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/m68k/arch-syscall.h +@@ -254,6 +254,7 @@ + #define __NR_pwritev2 378 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 240 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h b/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h +index cf560d3af4..0607a4dfa6 100644 +--- a/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h +@@ -266,6 +266,7 @@ + #define __NR_pwritev2 394 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/mips/fxstat.c b/sysdeps/unix/sysv/linux/mips/fxstat.c +index 11511d30b3..4a6016ff12 100644 +--- a/sysdeps/unix/sysv/linux/mips/fxstat.c ++++ b/sysdeps/unix/sysv/linux/mips/fxstat.c +@@ -35,7 +35,9 @@ __fxstat (int vers, int fd, struct stat *buf) + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf); +- return r ?: __xstat_conv (vers, &kbuf, buf); ++ if (r == 0) ++ return __xstat_conv (vers, &kbuf, buf); ++ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } + } +diff --git a/sysdeps/unix/sysv/linux/mips/lxstat.c b/sysdeps/unix/sysv/linux/mips/lxstat.c +index 871fb6c6c5..54f990a250 100644 +--- a/sysdeps/unix/sysv/linux/mips/lxstat.c ++++ b/sysdeps/unix/sysv/linux/mips/lxstat.c +@@ -35,7 +35,9 @@ __lxstat (int vers, const char *name, struct stat *buf) + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (lstat, name, &kbuf); +- return r ?: __xstat_conv (vers, &kbuf, buf); ++ if (r == 0) ++ return __xstat_conv (vers, &kbuf, buf); ++ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } + } +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h b/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h +index f346460f48..0055eec0b1 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h +@@ -251,6 +251,7 @@ + #define __NR_pwritev2 4362 + #define __NR_query_module 4187 + #define __NR_quotactl 4131 ++#define __NR_quotactl_fd 4443 + #define __NR_read 4003 + #define __NR_readahead 4223 + #define __NR_readdir 4089 +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h +index 38ed84997a..8e8e9f91cc 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h +@@ -232,6 +232,7 @@ + #define __NR_pwritev2 6326 + #define __NR_query_module 6171 + #define __NR_quotactl 6172 ++#define __NR_quotactl_fd 6443 + #define __NR_read 6000 + #define __NR_readahead 6179 + #define __NR_readlink 6087 +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h +index e6a10c8421..ebd1545f80 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h +@@ -219,6 +219,7 @@ + #define __NR_pwritev2 5322 + #define __NR_query_module 5171 + #define __NR_quotactl 5172 ++#define __NR_quotactl_fd 5443 + #define __NR_read 5000 + #define __NR_readahead 5179 + #define __NR_readlink 5087 +diff --git a/sysdeps/unix/sysv/linux/mips/xstat.c b/sysdeps/unix/sysv/linux/mips/xstat.c +index 9d810b6f65..86f4dc31a8 100644 +--- a/sysdeps/unix/sysv/linux/mips/xstat.c ++++ b/sysdeps/unix/sysv/linux/mips/xstat.c +@@ -35,7 +35,9 @@ __xstat (int vers, const char *name, struct stat *buf) + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf); +- return r ?: __xstat_conv (vers, &kbuf, buf); ++ if (r == 0) ++ return __xstat_conv (vers, &kbuf, buf); ++ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } + } +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c +index 9799dcdaa4..eccae2e4c6 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -131,7 +131,7 @@ helper_thread (void *arg) + to wait until it is done with it. */ + (void) __pthread_barrier_wait (&notify_barrier); + } +- else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) ++ 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); +diff --git a/sysdeps/unix/sysv/linux/nios2/arch-syscall.h b/sysdeps/unix/sysv/linux/nios2/arch-syscall.h +index 5314890289..2b530b1f88 100644 +--- a/sysdeps/unix/sysv/linux/nios2/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/nios2/arch-syscall.h +@@ -198,6 +198,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h +index b5b0758532..a32984a9c1 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h +@@ -260,6 +260,7 @@ + #define __NR_pwritev2 381 + #define __NR_query_module 166 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 191 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h +index c77435ca61..b01e464fb9 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h +@@ -243,6 +243,7 @@ + #define __NR_pwritev2 381 + #define __NR_query_module 166 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 191 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h b/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h +index 70854bb9e3..24d0a2c455 100644 +--- a/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h +@@ -179,6 +179,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h b/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h +index 83b9f31aba..e526c89ae7 100644 +--- a/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h +@@ -187,6 +187,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h +index e9bd3684db..00e73a3e3b 100644 +--- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h ++++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h +@@ -22,6 +22,11 @@ + + /* + * The following must match the kernels asm/elf.h. ++ * Note: The kernel commit 511ad531afd4090625def4d9aba1f5227bd44b8e ++ * "s390/hwcaps: shorten HWCAP defines" has shortened the prefix of the macros ++ * from "HWCAP_S390_" to "HWCAP_". For compatibility reasons, we do not ++ * change the prefix in public glibc header file. ++ * + * Note that these are *not* the same as the STORE FACILITY LIST bits. + */ + #define HWCAP_S390_ESAN3 1 +@@ -48,3 +53,5 @@ + #define HWCAP_S390_DFLT 262144 + #define HWCAP_S390_VXRS_PDE2 524288 + #define HWCAP_S390_NNPA 1048576 ++#define HWCAP_S390_PCI_MIO 2097152 ++#define HWCAP_S390_SIE 4194304 +diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h b/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h +index b224c4aad4..d4c7b101b6 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h +@@ -251,6 +251,7 @@ + #define __NR_pwritev2 377 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 222 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h b/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h +index 59864af125..bd8c78d705 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h +@@ -221,6 +221,7 @@ + #define __NR_pwritev2 377 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 222 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/sh/arch-syscall.h b/sysdeps/unix/sysv/linux/sh/arch-syscall.h +index 23612c9092..3b6ac3d084 100644 +--- a/sysdeps/unix/sysv/linux/sh/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/sh/arch-syscall.h +@@ -246,6 +246,7 @@ + #define __NR_pwritev 334 + #define __NR_pwritev2 382 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h b/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h +index b481b4f9f8..45db6b6ffb 100644 +--- a/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h ++++ b/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h +@@ -28,32 +28,35 @@ + + struct stat + { ++#ifdef __USE_TIME_BITS64 ++# include <bits/struct_stat_time64_helper.h> ++#else + __dev_t st_dev; /* Device. */ +-#if __WORDSIZE == 64 || !defined __USE_FILE_OFFSET64 ++# if __WORDSIZE == 64 || !defined __USE_FILE_OFFSET64 + unsigned short int __pad1; + __ino_t st_ino; /* File serial number. */ +-#else ++# else + __ino64_t st_ino; /* File serial number. */ +-#endif ++# endif + __mode_t st_mode; /* File mode. */ + __nlink_t st_nlink; /* Link count. */ + __uid_t st_uid; /* User ID of the file's owner. */ + __gid_t st_gid; /* Group ID of the file's group.*/ + __dev_t st_rdev; /* Device number, if device. */ + unsigned short int __pad2; +-#ifndef __USE_FILE_OFFSET64 ++# ifndef __USE_FILE_OFFSET64 + __off_t st_size; /* Size of file, in bytes. */ +-#else ++# else + __off64_t st_size; /* Size of file, in bytes. */ +-#endif ++# endif + __blksize_t st_blksize; /* Optimal block size for I/O. */ + +-#ifndef __USE_FILE_OFFSET64 ++# ifndef __USE_FILE_OFFSET64 + __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */ +-#else ++# else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#endif +-#ifdef __USE_XOPEN2K8 ++# endif ++# ifdef __USE_XOPEN2K8 + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -63,28 +66,32 @@ struct stat + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +-# define st_atime st_atim.tv_sec /* Backward compatibility. */ +-# define st_mtime st_mtim.tv_sec +-# define st_ctime st_ctim.tv_sec +-#else ++# define st_atime st_atim.tv_sec /* Backward compatibility. */ ++# define st_mtime st_mtim.tv_sec ++# define st_ctime st_ctim.tv_sec ++# else + __time_t st_atime; /* Time of last access. */ + unsigned long int st_atimensec; /* Nscecs of last access. */ + __time_t st_mtime; /* Time of last modification. */ + unsigned long int st_mtimensec; /* Nsecs of last modification. */ + __time_t st_ctime; /* Time of last status change. */ + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +-#endif ++# endif + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; ++#endif /* __USE_TIME_BITS64 */ + }; + + #ifdef __USE_LARGEFILE64 + struct stat64 + { ++# ifdef __USE_TIME_BITS64 ++# include <bits/struct_stat_time64_helper.h> ++# else + __dev_t st_dev; /* Device. */ +-# if __WORDSIZE == 64 ++# if __WORDSIZE == 64 + unsigned short int __pad1; +-# endif ++# endif + __ino64_t st_ino; /* File serial number. */ + __mode_t st_mode; /* File mode. */ + __nlink_t st_nlink; /* Link count. */ +@@ -96,7 +103,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-# ifdef __USE_XOPEN2K8 ++# ifdef __USE_XOPEN2K8 + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -106,19 +113,20 @@ struct stat64 + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +-# define st_atime st_atim.tv_sec /* Backward compatibility. */ +-# define st_mtime st_mtim.tv_sec +-# define st_ctime st_ctim.tv_sec +-# else ++# define st_atime st_atim.tv_sec /* Backward compatibility. */ ++# define st_mtime st_mtim.tv_sec ++# define st_ctime st_ctim.tv_sec ++# else + __time_t st_atime; /* Time of last access. */ + unsigned long int st_atimensec; /* Nscecs of last access. */ + __time_t st_mtime; /* Time of last modification. */ + unsigned long int st_mtimensec; /* Nsecs of last modification. */ + __time_t st_ctime; /* Time of last status change. */ + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +-# endif ++# endif + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; ++# endif /* __USE_TIME_BITS64 */ + }; + #endif + +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h b/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h +index 380cddb2d8..35221a707e 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h +@@ -252,6 +252,7 @@ + #define __NR_pwritev2 359 + #define __NR_query_module 184 + #define __NR_quotactl 165 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 205 + #define __NR_readdir 204 +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h b/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h +index 2175eeb6ed..5ba2b20509 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h +@@ -231,6 +231,7 @@ + #define __NR_pwritev2 359 + #define __NR_query_module 184 + #define __NR_quotactl 165 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 205 + #define __NR_readdir 204 +diff --git a/sysdeps/unix/sysv/linux/sys/prctl.h b/sysdeps/unix/sysv/linux/sys/prctl.h +index db88938b3a..f0e0d2f27f 100644 +--- a/sysdeps/unix/sysv/linux/sys/prctl.h ++++ b/sysdeps/unix/sysv/linux/sys/prctl.h +@@ -42,7 +42,7 @@ __BEGIN_DECLS + extern int prctl (int __option, ...) __THROW; + #else + # ifdef __REDIRECT +-extern int __REDIRECT (prctl, (int __option, ...), __prctl_time64) __THROW; ++extern int __REDIRECT_NTH (prctl, (int __option, ...), __prctl_time64); + # else + extern int __prctl_time64 (int __option,d ...) __THROW; + # define ioctl __prctl_time64 +diff --git a/sysdeps/unix/sysv/linux/syscall-names.list b/sysdeps/unix/sysv/linux/syscall-names.list +index 89c5895b9b..fd98893b0e 100644 +--- a/sysdeps/unix/sysv/linux/syscall-names.list ++++ b/sysdeps/unix/sysv/linux/syscall-names.list +@@ -21,8 +21,8 @@ + # This file can list all potential system calls. The names are only + # used if the installed kernel headers also provide them. + +-# The list of system calls is current as of Linux 5.13. +-kernel 5.13 ++# The list of system calls is current as of Linux 5.14. ++kernel 5.14 + + FAST_atomic_update + FAST_cmpxchg +@@ -247,6 +247,7 @@ madvise + mbind + membarrier + memfd_create ++memfd_secret + memory_ordering + migrate_pages + mincore +@@ -452,6 +453,7 @@ pwritev + pwritev2 + query_module + quotactl ++quotactl_fd + read + readahead + readdir +diff --git a/sysdeps/unix/sysv/linux/tst-close_range.c b/sysdeps/unix/sysv/linux/tst-close_range.c +index dccb6189c5..f5069d1b8a 100644 +--- a/sysdeps/unix/sysv/linux/tst-close_range.c ++++ b/sysdeps/unix/sysv/linux/tst-close_range.c +@@ -36,23 +36,12 @@ + + #define NFDS 100 + +-static int +-open_multiple_temp_files (void) +-{ +- /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = xopen ("/dev/null", O_RDONLY, 0600); +- for (int i = 1; i <= NFDS; i++) +- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), +- lowfd + i); +- return lowfd; +-} +- + static void + close_range_test_max_upper_limit (void) + { + struct support_descriptors *descrs = support_descriptors_list (); + +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + { + int r = close_range (lowfd, ~0U, 0); +@@ -68,7 +57,7 @@ close_range_test_max_upper_limit (void) + static void + close_range_test_common (int lowfd, unsigned int flags) + { +- const int maximum_fd = lowfd + NFDS; ++ const int maximum_fd = lowfd + NFDS - 1; + const int half_fd = lowfd + NFDS / 2; + const int gap_1 = maximum_fd - 8; + +@@ -121,7 +110,7 @@ close_range_test (void) + struct support_descriptors *descrs = support_descriptors_list (); + + /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + close_range_test_common (lowfd, 0); + +@@ -146,7 +135,7 @@ close_range_test_subprocess (void) + struct support_descriptors *descrs = support_descriptors_list (); + + /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + struct support_stack stack = support_stack_alloc (4096); + +@@ -184,7 +173,7 @@ close_range_unshare_test (void) + struct support_descriptors *descrs1 = support_descriptors_list (); + + /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + struct support_descriptors *descrs2 = support_descriptors_list (); + +@@ -200,7 +189,7 @@ close_range_unshare_test (void) + + support_stack_free (&stack); + +- for (int i = 0; i < NFDS; i++) ++ for (int i = lowfd; i < lowfd + NFDS; i++) + TEST_VERIFY (fcntl (i, F_GETFL) > -1); + + support_descriptors_check (descrs2); +@@ -226,9 +215,9 @@ static void + close_range_cloexec_test (void) + { + /* Check if the temporary file descriptor has no no gaps. */ +- const int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + +- const int maximum_fd = lowfd + NFDS; ++ const int maximum_fd = lowfd + NFDS - 1; + const int half_fd = lowfd + NFDS / 2; + const int gap_1 = maximum_fd - 8; + +@@ -251,13 +240,13 @@ close_range_cloexec_test (void) + /* Create some gaps, close up to a threshold, and check result. */ + static int gap_close[] = { 57, 78, 81, 82, 84, 90 }; + for (int i = 0; i < array_length (gap_close); i++) +- xclose (gap_close[i]); ++ xclose (lowfd + gap_close[i]); + + TEST_COMPARE (close_range (half_fd + 1, gap_1, CLOSE_RANGE_CLOEXEC), 0); + for (int i = half_fd + 1; i < gap_1; i++) + { + int flags = fcntl (i, F_GETFD); +- if (is_in_array (gap_close, array_length (gap_close), i)) ++ if (is_in_array (gap_close, array_length (gap_close), i - lowfd)) + TEST_COMPARE (flags, -1); + else + { +diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py +index ee5b13ee12..810433c238 100644 +--- a/sysdeps/unix/sysv/linux/tst-mman-consts.py ++++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py +@@ -33,7 +33,7 @@ def main(): + help='C compiler (including options) to use') + args = parser.parse_args() + linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc) +- linux_version_glibc = (5, 13) ++ linux_version_glibc = (5, 14) + sys.exit(glibcextract.compare_macro_consts( + '#define _GNU_SOURCE 1\n' + '#include <sys/mman.h>\n', +diff --git a/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h b/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h +index 8e028eb62b..26d6ac68a6 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h +@@ -154,6 +154,7 @@ + #define __NR_mbind 237 + #define __NR_membarrier 324 + #define __NR_memfd_create 319 ++#define __NR_memfd_secret 447 + #define __NR_migrate_pages 256 + #define __NR_mincore 27 + #define __NR_mkdir 83 +@@ -224,6 +225,7 @@ + #define __NR_pwritev2 328 + #define __NR_query_module 178 + #define __NR_quotactl 179 ++#define __NR_quotactl_fd 443 + #define __NR_read 0 + #define __NR_readahead 187 + #define __NR_readlink 89 +diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +index 004feb53f1..36847783f6 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +@@ -148,6 +148,7 @@ + #define __NR_mbind 1073742061 + #define __NR_membarrier 1073742148 + #define __NR_memfd_create 1073742143 ++#define __NR_memfd_secret 1073742271 + #define __NR_migrate_pages 1073742080 + #define __NR_mincore 1073741851 + #define __NR_mkdir 1073741907 +@@ -216,6 +217,7 @@ + #define __NR_pwritev 1073742359 + #define __NR_pwritev2 1073742371 + #define __NR_quotactl 1073742003 ++#define __NR_quotactl_fd 1073742267 + #define __NR_read 1073741824 + #define __NR_readahead 1073742011 + #define __NR_readlink 1073741913 +diff --git a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S +index 9f02624375..abde8438d4 100644 +--- a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S ++++ b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S +@@ -325,7 +325,7 @@ L(movsb): + /* Avoid slow backward REP MOVSB. */ + jb L(more_8x_vec_backward) + # if AVOID_SHORT_DISTANCE_REP_MOVSB +- andl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) ++ testl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) + jz 3f + movq %rdi, %rcx + subq %rsi, %rcx +@@ -333,7 +333,7 @@ L(movsb): + # endif + 1: + # if AVOID_SHORT_DISTANCE_REP_MOVSB +- andl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) ++ testl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) + jz 3f + movq %rsi, %rcx + subq %rdi, %rcx

1 0

ports/core (3.7): glibc: included upstream fixes
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit ef16948581c3f6e52e21065310fc7d8d581a6317 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Dec 11 22:53:16 2021 +0100 glibc: included upstream fixes diff --git a/glibc/.signature b/glibc/.signature index 8de98650..5110fbb9 100644 --- a/glibc/.signature +++ b/glibc/.signature @@ -1,11 +1,11 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqvKhXIzyuug5zMxiqQzi5AB959uIdPTkaIOfxi4NPS1TMt+DakFGiZokfW7j+0f9rCTS8hG2gC7SLY4p90cerw8= -SHA256 (Pkgfile) = 28b166045febad3ccd774d1e6fa76090e13e13dd9b6deb8f843363e82df27135 +RWRJc1FUaeVeqnN1rd8Njv9KhzrTZTJ4oAtldvvN2Pom5JFy3/26lYV9U1EdRGmBLI6jVh4YKJl7GPEituRjYiUuW3h5Y9nfwA4= +SHA256 (Pkgfile) = 5d8ed6bf0836c191e22ec0fb89ff08a7d673ceac79cf4738917626dde25c8e49 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-2.34-upstream-fixes.patch) = 54e965200314f627a3412dd723d31e44a56ae9a156fce066d2a742caa86c0a36 SHA256 (glibc-c-utf8-locale-1.patch) = c48c306658ede269fb4a43140d41a3f609bffd17a8f661127e3e4dde48b85cd4 SHA256 (glibc-c-utf8-locale-2.patch) = a9d3c0660e6a48bb22dc77afbc7bb47ce79ca0d8c2ee8ebee4228d8d4952214e SHA256 (hosts) = 5c02b256c105f1d4a12fb738d71c1bab9eb126533074d7a0c8a14b92670c9431 diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 505d9220..175a6217 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -4,10 +4,10 @@ name=glibc version=2.34 -release=1 +release=2 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-python3.patch glibc-2.34-upstream-fixes.patch glibc-c-utf8-locale-1.patch glibc-c-utf8-locale-2.patch hosts resolv.conf nsswitch.conf host.conf ld.so.conf) @@ -19,6 +19,7 @@ build() { make -C $SRC/linux-5.10 INSTALL_HDR_PATH=$PKG/usr headers_install chown root:root $PKG/usr + patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-2.34-upstream-fixes.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 diff --git a/glibc/bz27343.patch b/glibc/bz27343.patch deleted file mode 100644 index 3db6a944..00000000 --- a/glibc/bz27343.patch +++ /dev/null @@ -1,48 +0,0 @@ -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.34-upstream-fixes.patch b/glibc/glibc-2.34-upstream-fixes.patch new file mode 100644 index 00000000..02585341 --- /dev/null +++ b/glibc/glibc-2.34-upstream-fixes.patch @@ -0,0 +1,4387 @@ +diff --git a/NEWS b/NEWS +index 3c610744c9..698964bb9e 100644 +--- a/NEWS ++++ b/NEWS +@@ -4,6 +4,25 @@ See the end for copying conditions. + + Please send GNU C library bug reports via <https://sourceware.org/bugzilla/> + using `glibc' in the "product" field. ++ ++Version 2.34.1 ++ ++The following bugs are resolved with this release: ++ ++ [12889] nptl: Fix race between pthread_kill and thread exit ++ [19193] nptl: pthread_kill, pthread_cancel should not fail after exit ++ [28036] Incorrect types for pthread_mutexattr_set/getrobust_np ++ [28182] _TIME_BITS=64 in C++ has issues with fcntl, ioctl, prctl ++ [28310] Do not use affinity mask for sysconf (_SC_NPROCESSORS_CONF) ++ [28340] ld.so crashes while loading a DSO with a read-only dynamic section ++ [28357] deadlock between pthread_create and ELF constructors ++ [28361] nptl: Avoid setxid deadlock with blocked signals in thread exit ++ [28407] pthread_kill assumes that kill and tgkill are equivalent ++ [28524] Conversion from ISO-2022-JP-3 with iconv may emit spurious NULs ++ [28607] Masked signals are delivered on thread exit ++ [28532] powerpc64[le]: CFI for assembly templated syscalls is incorrect ++ [28678] nptl/tst-create1 hangs sporadically ++ + + Version 2.34 + +diff --git a/bits/stdlib-bsearch.h b/bits/stdlib-bsearch.h +index 4132dc6af0..e2fcea6e17 100644 +--- a/bits/stdlib-bsearch.h ++++ b/bits/stdlib-bsearch.h +@@ -29,14 +29,23 @@ bsearch (const void *__key, const void *__base, size_t __nmemb, size_t __size, + while (__l < __u) + { + __idx = (__l + __u) / 2; +- __p = (void *) (((const char *) __base) + (__idx * __size)); ++ __p = (const void *) (((const char *) __base) + (__idx * __size)); + __comparison = (*__compar) (__key, __p); + if (__comparison < 0) + __u = __idx; + else if (__comparison > 0) + __l = __idx + 1; + else +- return (void *) __p; ++ { ++#if __GNUC_PREREQ(4, 6) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wcast-qual" ++#endif ++ return (void *) __p; ++#if __GNUC_PREREQ(4, 6) ++# pragma GCC diagnostic pop ++#endif ++ } + } + + return NULL; +diff --git a/elf/Makefile b/elf/Makefile +index d05f410592..118d579c42 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -224,7 +224,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-tls-ie tst-tls-ie-dlmopen argv0test \ + tst-glibc-hwcaps tst-glibc-hwcaps-prepend tst-glibc-hwcaps-mask \ + tst-tls20 tst-tls21 tst-dlmopen-dlerror tst-dlmopen-gethostbyname \ +- tst-dl-is_dso ++ tst-dl-is_dso tst-ro-dynamic + # reldep9 + tests-internal += loadtest unload unload2 circleload1 \ + neededtest neededtest2 neededtest3 neededtest4 \ +@@ -357,7 +357,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + libmarkermod4-1 libmarkermod4-2 libmarkermod4-3 libmarkermod4-4 \ + tst-tls20mod-bad tst-tls21mod tst-dlmopen-dlerror-mod \ + tst-auxvalmod \ +- tst-dlmopen-gethostbyname-mod \ ++ tst-dlmopen-gethostbyname-mod tst-ro-dynamic-mod \ + + # Most modules build with _ISOMAC defined, but those filtered out + # depend on internal headers. +@@ -399,8 +399,9 @@ endif + modules-execstack-yes = tst-execstack-mod + extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) + +-# filtmod1.so, tst-big-note-lib.so have special rules. +-modules-names-nobuild := filtmod1 tst-big-note-lib ++# filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special ++# rules. ++modules-names-nobuild := filtmod1 tst-big-note-lib tst-ro-dynamic-mod + + tests += $(tests-static) + +@@ -1906,3 +1907,10 @@ $(objpfx)tst-getauxval-static.out: $(objpfx)tst-auxvalmod.so + tst-getauxval-static-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx) + + $(objpfx)tst-dlmopen-gethostbyname.out: $(objpfx)tst-dlmopen-gethostbyname-mod.so ++ ++$(objpfx)tst-ro-dynamic: $(objpfx)tst-ro-dynamic-mod.so ++$(objpfx)tst-ro-dynamic-mod.so: $(objpfx)tst-ro-dynamic-mod.os \ ++ tst-ro-dynamic-mod.map ++ $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ ++ -Wl,--script=tst-ro-dynamic-mod.map \ ++ $(objpfx)tst-ro-dynamic-mod.os +diff --git a/elf/dl-close.c b/elf/dl-close.c +index f39001cab9..cd7b9c9fe8 100644 +--- a/elf/dl-close.c ++++ b/elf/dl-close.c +@@ -549,6 +549,9 @@ _dl_close_worker (struct link_map *map, bool force) + size_t tls_free_end; + tls_free_start = tls_free_end = NO_TLS_OFFSET; + ++ /* Protects global and module specitic TLS state. */ ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); ++ + /* We modify the list of loaded objects. */ + __rtld_lock_lock_recursive (GL(dl_load_write_lock)); + +@@ -784,6 +787,9 @@ _dl_close_worker (struct link_map *map, bool force) + GL(dl_tls_static_used) = tls_free_start; + } + ++ /* TLS is cleaned up for the unloaded modules. */ ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); ++ + #ifdef SHARED + /* Auditing checkpoint: we have deleted all objects. */ + if (__glibc_unlikely (do_audit)) +diff --git a/elf/dl-load.c b/elf/dl-load.c +index 650e4edc35..0976977fbd 100644 +--- a/elf/dl-load.c ++++ b/elf/dl-load.c +@@ -1130,6 +1130,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + struct loadcmd loadcmds[l->l_phnum]; + size_t nloadcmds = 0; + bool has_holes = false; ++ bool empty_dynamic = false; + + /* The struct is initialized to zero so this is not necessary: + l->l_ld = 0; +@@ -1142,13 +1143,16 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + segments are mapped in. We record the addresses it says + verbatim, and later correct for the run-time load address. */ + case PT_DYNAMIC: +- if (ph->p_filesz) ++ if (ph->p_filesz == 0) ++ empty_dynamic = true; /* Usually separate debuginfo. */ ++ else + { + /* Debuginfo only files from "objcopy --only-keep-debug" + contain a PT_DYNAMIC segment with p_filesz == 0. Skip + such a segment to avoid a crash later. */ + l->l_ld = (void *) ph->p_vaddr; + l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn)); ++ l->l_ld_readonly = (ph->p_flags & PF_W) == 0; + } + break; + +@@ -1264,6 +1268,13 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + goto lose; + } + ++ /* This check recognizes most separate debuginfo files. */ ++ if (__glibc_unlikely ((l->l_ld == 0 && type == ET_DYN) || empty_dynamic)) ++ { ++ errstring = N_("object file has no dynamic section"); ++ goto lose; ++ } ++ + /* Length of the sections to be loaded. */ + maplength = loadcmds[nloadcmds - 1].allocend - loadcmds[0].mapstart; + +@@ -1281,18 +1292,10 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, + } + } + +- if (l->l_ld == 0) +- { +- if (__glibc_unlikely (type == ET_DYN)) +- { +- errstring = N_("object file has no dynamic section"); +- goto lose; +- } +- } +- else ++ if (l->l_ld != 0) + l->l_ld = (ElfW(Dyn) *) ((ElfW(Addr)) l->l_ld + l->l_addr); + +- elf_get_dynamic_info (l, NULL); ++ elf_get_dynamic_info (l); + + /* Make sure we are not dlopen'ing an object that has the + DF_1_NOOPEN flag set, or a PIE object. */ +diff --git a/elf/dl-open.c b/elf/dl-open.c +index ec386626f9..bc68e2c376 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -66,6 +66,9 @@ struct dl_open_args + libc_map value in the namespace in case of a dlopen failure. */ + bool libc_already_loaded; + ++ /* Set to true if the end of dl_open_worker_begin was reached. */ ++ bool worker_continue; ++ + /* Original parameters to the program and the current environment. */ + int argc; + char **argv; +@@ -482,7 +485,7 @@ call_dl_init (void *closure) + } + + static void +-dl_open_worker (void *a) ++dl_open_worker_begin (void *a) + { + struct dl_open_args *args = a; + const char *file = args->file; +@@ -774,6 +777,36 @@ dl_open_worker (void *a) + _dl_call_libc_early_init (libc_map, false); + } + ++ args->worker_continue = true; ++} ++ ++static void ++dl_open_worker (void *a) ++{ ++ struct dl_open_args *args = a; ++ ++ args->worker_continue = false; ++ ++ { ++ /* Protects global and module specific TLS state. */ ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); ++ ++ struct dl_exception ex; ++ int err = _dl_catch_exception (&ex, dl_open_worker_begin, args); ++ ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); ++ ++ if (__glibc_unlikely (ex.errstring != NULL)) ++ /* Reraise the error. */ ++ _dl_signal_exception (err, &ex, NULL); ++ } ++ ++ if (!args->worker_continue) ++ return; ++ ++ int mode = args->mode; ++ struct link_map *new = args->map; ++ + /* Run the initializer functions of new objects. Temporarily + disable the exception handler, so that lazy binding failures are + fatal. */ +@@ -886,7 +919,7 @@ no more namespaces available for dlmopen()")); + /* Avoid keeping around a dangling reference to the libc.so link + map in case it has been cached in libc_map. */ + if (!args.libc_already_loaded) +- GL(dl_ns)[nsid].libc_map = NULL; ++ GL(dl_ns)[args.nsid].libc_map = NULL; + + /* Remove the object from memory. It may be in an inconsistent + state if relocation failed, for example. */ +diff --git a/elf/dl-reloc-static-pie.c b/elf/dl-reloc-static-pie.c +index d5bd2f31e9..2fb02d7276 100644 +--- a/elf/dl-reloc-static-pie.c ++++ b/elf/dl-reloc-static-pie.c +@@ -40,7 +40,17 @@ _dl_relocate_static_pie (void) + + /* Read our own dynamic section and fill in the info array. */ + main_map->l_ld = ((void *) main_map->l_addr + elf_machine_dynamic ()); +- elf_get_dynamic_info (main_map, NULL); ++ ++ const ElfW(Phdr) *ph, *phdr = GL(dl_phdr); ++ size_t phnum = GL(dl_phnum); ++ for (ph = phdr; ph < &phdr[phnum]; ++ph) ++ if (ph->p_type == PT_DYNAMIC) ++ { ++ main_map->l_ld_readonly = (ph->p_flags & PF_W) == 0; ++ break; ++ } ++ ++ elf_get_dynamic_info (main_map); + + # ifdef ELF_MACHINE_BEFORE_RTLD_RELOC + ELF_MACHINE_BEFORE_RTLD_RELOC (main_map->l_info); +diff --git a/elf/dl-support.c b/elf/dl-support.c +index 0155718175..d8c06ba7eb 100644 +--- a/elf/dl-support.c ++++ b/elf/dl-support.c +@@ -229,6 +229,13 @@ __rtld_lock_define_initialized_recursive (, _dl_load_lock) + list of loaded objects while an object is added to or removed from + that list. */ + __rtld_lock_define_initialized_recursive (, _dl_load_write_lock) ++ /* This lock protects global and module specific TLS related data. ++ E.g. it is held in dlopen and dlclose when GL(dl_tls_generation), ++ GL(dl_tls_max_dtv_idx) or GL(dl_tls_dtv_slotinfo_list) are ++ accessed and when TLS related relocations are processed for a ++ module. It was introduced to keep pthread_create accessing TLS ++ state that is being set up. */ ++__rtld_lock_define_initialized_recursive (, _dl_load_tls_lock) + + + #ifdef HAVE_AUX_VECTOR +diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c +index d47bef1340..2c684c2db2 100644 +--- a/elf/dl-sysdep.c ++++ b/elf/dl-sysdep.c +@@ -317,7 +317,7 @@ _dl_show_auxv (void) + [AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex }, + [AT_RANDOM - 2] = { "RANDOM: 0x", hex }, + [AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex }, +- [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ ", dec }, ++ [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec }, + [AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec }, + [AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex }, + [AT_L1D_CACHESIZE - 2] = { "L1D_CACHESIZE: ", dec }, +diff --git a/elf/dl-tls.c b/elf/dl-tls.c +index 423e380f7c..40263cf586 100644 +--- a/elf/dl-tls.c ++++ b/elf/dl-tls.c +@@ -532,7 +532,7 @@ _dl_allocate_tls_init (void *result) + size_t maxgen = 0; + + /* Protects global dynamic TLS related state. */ +- __rtld_lock_lock_recursive (GL(dl_load_lock)); ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); + + /* Check if the current dtv is big enough. */ + if (dtv[-1].counter < GL(dl_tls_max_dtv_idx)) +@@ -606,7 +606,7 @@ _dl_allocate_tls_init (void *result) + listp = listp->next; + assert (listp != NULL); + } +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + + /* The DTV version is up-to-date now. */ + dtv[0].counter = maxgen; +@@ -745,7 +745,7 @@ _dl_update_slotinfo (unsigned long int req_modid) + + Here the dtv needs to be updated to new_gen generation count. + +- This code may be called during TLS access when GL(dl_load_lock) ++ This code may be called during TLS access when GL(dl_load_tls_lock) + is not held. In that case the user code has to synchronize with + dlopen and dlclose calls of relevant modules. A module m is + relevant if the generation of m <= new_gen and dlclose of m is +@@ -867,11 +867,11 @@ tls_get_addr_tail (GET_ADDR_ARGS, dtv_t *dtv, struct link_map *the_map) + if (__glibc_unlikely (the_map->l_tls_offset + != FORCED_DYNAMIC_TLS_OFFSET)) + { +- __rtld_lock_lock_recursive (GL(dl_load_lock)); ++ __rtld_lock_lock_recursive (GL(dl_load_tls_lock)); + if (__glibc_likely (the_map->l_tls_offset == NO_TLS_OFFSET)) + { + the_map->l_tls_offset = FORCED_DYNAMIC_TLS_OFFSET; +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + } + else if (__glibc_likely (the_map->l_tls_offset + != FORCED_DYNAMIC_TLS_OFFSET)) +@@ -883,7 +883,7 @@ tls_get_addr_tail (GET_ADDR_ARGS, dtv_t *dtv, struct link_map *the_map) + #else + # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" + #endif +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + + dtv[GET_ADDR_MODULE].pointer.to_free = NULL; + dtv[GET_ADDR_MODULE].pointer.val = p; +@@ -891,7 +891,7 @@ tls_get_addr_tail (GET_ADDR_ARGS, dtv_t *dtv, struct link_map *the_map) + return (char *) p + GET_ADDR_OFFSET; + } + else +- __rtld_lock_unlock_recursive (GL(dl_load_lock)); ++ __rtld_lock_unlock_recursive (GL(dl_load_tls_lock)); + } + struct dtv_pointer result = allocate_and_init (the_map); + dtv[GET_ADDR_MODULE].pointer = result; +@@ -962,7 +962,7 @@ _dl_tls_get_addr_soft (struct link_map *l) + return NULL; + + dtv_t *dtv = THREAD_DTV (); +- /* This may be called without holding the GL(dl_load_lock). Reading ++ /* This may be called without holding the GL(dl_load_tls_lock). Reading + arbitrary gen value is fine since this is best effort code. */ + size_t gen = atomic_load_relaxed (&GL(dl_tls_generation)); + if (__glibc_unlikely (dtv[0].counter != gen)) +diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h +index d8ec32377d..4aa2058abf 100644 +--- a/elf/get-dynamic-info.h ++++ b/elf/get-dynamic-info.h +@@ -28,7 +28,7 @@ static + auto + #endif + inline void __attribute__ ((unused, always_inline)) +-elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) ++elf_get_dynamic_info (struct link_map *l) + { + #if __ELF_NATIVE_CLASS == 32 + typedef Elf32_Word d_tag_utype; +@@ -69,28 +69,15 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) + info[i] = dyn; + } + +-#define DL_RO_DYN_TEMP_CNT 8 +- +-#ifndef DL_RO_DYN_SECTION + /* Don't adjust .dynamic unnecessarily. */ +- if (l->l_addr != 0) ++ if (l->l_addr != 0 && dl_relocate_ld (l)) + { + ElfW(Addr) l_addr = l->l_addr; +- int cnt = 0; + + # define ADJUST_DYN_INFO(tag) \ + do \ + if (info[tag] != NULL) \ +- { \ +- if (temp) \ +- { \ +- temp[cnt].d_tag = info[tag]->d_tag; \ +- temp[cnt].d_un.d_ptr = info[tag]->d_un.d_ptr + l_addr; \ +- info[tag] = temp + cnt++; \ +- } \ +- else \ +- info[tag]->d_un.d_ptr += l_addr; \ +- } \ ++ info[tag]->d_un.d_ptr += l_addr; \ + while (0) + + ADJUST_DYN_INFO (DT_HASH); +@@ -107,9 +94,7 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) + ADJUST_DYN_INFO (VERSYMIDX (DT_VERSYM)); + ADJUST_DYN_INFO (ADDRIDX (DT_GNU_HASH)); + # undef ADJUST_DYN_INFO +- assert (cnt <= DL_RO_DYN_TEMP_CNT); + } +-#endif + if (info[DT_PLTREL] != NULL) + { + #if ELF_MACHINE_NO_RELA +diff --git a/elf/ldconfig.c b/elf/ldconfig.c +index 1037e8d0cf..b8893637f8 100644 +--- a/elf/ldconfig.c ++++ b/elf/ldconfig.c +@@ -503,7 +503,11 @@ add_dir_1 (const char *line, const char *from_file, int from_line) + entry->path[--i] = '\0'; + + if (i == 0) +- return; ++ { ++ free (entry->path); ++ free (entry); ++ return; ++ } + + char *path = entry->path; + if (opt_chroot != NULL) +diff --git a/elf/rtld.c b/elf/rtld.c +index d733359eaf..d83ac1bdc4 100644 +--- a/elf/rtld.c ++++ b/elf/rtld.c +@@ -322,6 +322,7 @@ struct rtld_global _rtld_global = + #ifdef _LIBC_REENTRANT + ._dl_load_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER, + ._dl_load_write_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER, ++ ._dl_load_tls_lock = _RTLD_LOCK_RECURSIVE_INITIALIZER, + #endif + ._dl_nns = 1, + ._dl_ns = +@@ -463,6 +464,7 @@ _dl_start_final (void *arg, struct dl_start_final_info *info) + #ifndef DONT_USE_BOOTSTRAP_MAP + GL(dl_rtld_map).l_addr = info->l.l_addr; + GL(dl_rtld_map).l_ld = info->l.l_ld; ++ GL(dl_rtld_map).l_ld_readonly = info->l.l_ld_readonly; + memcpy (GL(dl_rtld_map).l_info, info->l.l_info, + sizeof GL(dl_rtld_map).l_info); + GL(dl_rtld_map).l_mach = info->l.l_mach; +@@ -546,7 +548,8 @@ _dl_start (void *arg) + + /* Read our own dynamic section and fill in the info array. */ + bootstrap_map.l_ld = (void *) bootstrap_map.l_addr + elf_machine_dynamic (); +- elf_get_dynamic_info (&bootstrap_map, NULL); ++ bootstrap_map.l_ld_readonly = DL_RO_DYN_SECTION; ++ elf_get_dynamic_info (&bootstrap_map); + + #if NO_TLS_OFFSET != 0 + bootstrap_map.l_tls_offset = NO_TLS_OFFSET; +@@ -1468,6 +1471,7 @@ dl_main (const ElfW(Phdr) *phdr, + /* This tells us where to find the dynamic section, + which tells us everything we need to do. */ + main_map->l_ld = (void *) main_map->l_addr + ph->p_vaddr; ++ main_map->l_ld_readonly = (ph->p_flags & PF_W) == 0; + break; + case PT_INTERP: + /* This "interpreter segment" was used by the program loader to +@@ -1613,7 +1617,7 @@ dl_main (const ElfW(Phdr) *phdr, + if (! rtld_is_main) + { + /* Extract the contents of the dynamic section for easy access. */ +- elf_get_dynamic_info (main_map, NULL); ++ elf_get_dynamic_info (main_map); + + /* If the main map is libc.so, update the base namespace to + refer to this map. If libc.so is loaded later, this happens +diff --git a/elf/setup-vdso.h b/elf/setup-vdso.h +index 86c491e49c..f44748bc98 100644 +--- a/elf/setup-vdso.h ++++ b/elf/setup-vdso.h +@@ -33,8 +33,6 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), + 0, LM_ID_BASE); + if (__glibc_likely (l != NULL)) + { +- static ElfW(Dyn) dyn_temp[DL_RO_DYN_TEMP_CNT] attribute_relro; +- + l->l_phdr = ((const void *) GLRO(dl_sysinfo_dso) + + GLRO(dl_sysinfo_dso)->e_phoff); + l->l_phnum = GLRO(dl_sysinfo_dso)->e_phnum; +@@ -45,6 +43,7 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), + { + l->l_ld = (void *) ph->p_vaddr; + l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn)); ++ l->l_ld_readonly = (ph->p_flags & PF_W) == 0; + } + else if (ph->p_type == PT_LOAD) + { +@@ -65,7 +64,7 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)), + l->l_map_end += l->l_addr; + l->l_text_end += l->l_addr; + l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr); +- elf_get_dynamic_info (l, dyn_temp); ++ elf_get_dynamic_info (l); + _dl_setup_hash (l); + l->l_relocated = 1; + +diff --git a/elf/tst-ro-dynamic-mod.c b/elf/tst-ro-dynamic-mod.c +new file mode 100644 +index 0000000000..6d99925964 +--- /dev/null ++++ b/elf/tst-ro-dynamic-mod.c +@@ -0,0 +1,19 @@ ++/* Test case for DSO with readonly dynamic section. ++ 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/>. */ ++ ++int foo = -1; +diff --git a/elf/tst-ro-dynamic-mod.map b/elf/tst-ro-dynamic-mod.map +new file mode 100644 +index 0000000000..2fe4a2998c +--- /dev/null ++++ b/elf/tst-ro-dynamic-mod.map +@@ -0,0 +1,16 @@ ++SECTIONS ++{ ++ . = SIZEOF_HEADERS; ++ .dynamic : { *(.dynamic) } :text :dynamic ++ .rodata : { *(.data*) *(.bss*) } :text ++ /DISCARD/ : { ++ *(.note.gnu.property) ++ } ++ .note : { *(.note.*) } :text :note ++} ++PHDRS ++{ ++ text PT_LOAD FLAGS(5) FILEHDR PHDRS; ++ dynamic PT_DYNAMIC FLAGS(4); ++ note PT_NOTE FLAGS(4); ++} +diff --git a/elf/tst-ro-dynamic.c b/elf/tst-ro-dynamic.c +new file mode 100644 +index 0000000000..3a18f8789a +--- /dev/null ++++ b/elf/tst-ro-dynamic.c +@@ -0,0 +1,31 @@ ++/* Test case for DSO with readonly dynamic section. ++ 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 <support/check.h> ++#include <support/test-driver.h> ++ ++extern int foo; ++ ++static int ++do_test (void) ++{ ++ TEST_COMPARE (foo, -1); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c +index 62bee28769..cc391d8f93 100644 +--- a/iconv/gconv_conf.c ++++ b/iconv/gconv_conf.c +@@ -478,7 +478,7 @@ __gconv_read_conf (void) + __gconv_get_path (); + + for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt) +- gconv_parseconfdir (__gconv_path_elem[cnt].name, ++ gconv_parseconfdir (NULL, __gconv_path_elem[cnt].name, + __gconv_path_elem[cnt].len); + #endif + +diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h +index a4153e54c6..a586268abc 100644 +--- a/iconv/gconv_parseconfdir.h ++++ b/iconv/gconv_parseconfdir.h +@@ -39,7 +39,6 @@ + /* Name of the file containing the module information in the directories + along the path. */ + static const char gconv_conf_filename[] = "gconv-modules"; +-static const char gconv_conf_dirname[] = "gconv-modules.d"; + + static void add_alias (char *); + static void add_module (char *, const char *, size_t, int); +@@ -110,19 +109,28 @@ read_conf_file (const char *filename, const char *directory, size_t dir_len) + return true; + } + ++/* Prefix DIR (with length DIR_LEN) with PREFIX if the latter is non-NULL and ++ parse configuration in it. */ ++ + static __always_inline bool +-gconv_parseconfdir (const char *dir, size_t dir_len) ++gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len) + { +- /* No slash needs to be inserted between dir and gconv_conf_filename; +- dir already ends in a slash. */ +- char *buf = malloc (dir_len + sizeof (gconv_conf_dirname)); ++ /* No slash needs to be inserted between dir and gconv_conf_filename; dir ++ already ends in a slash. The additional 2 is to accommodate the ".d" ++ when looking for configuration files in gconv-modules.d. */ ++ size_t buflen = dir_len + sizeof (gconv_conf_filename) + 2; ++ char *buf = malloc (buflen + (prefix != NULL ? strlen (prefix) : 0)); ++ char *cp = buf; + bool found = false; + + if (buf == NULL) + return false; + +- char *cp = mempcpy (mempcpy (buf, dir, dir_len), gconv_conf_filename, +- sizeof (gconv_conf_filename)); ++ if (prefix != NULL) ++ cp = stpcpy (cp, prefix); ++ ++ cp = mempcpy (mempcpy (cp, dir, dir_len), gconv_conf_filename, ++ sizeof (gconv_conf_filename)); + + /* Read the gconv-modules configuration file first. */ + found = read_conf_file (buf, dir, dir_len); +@@ -153,12 +161,11 @@ gconv_parseconfdir (const char *dir, size_t dir_len) + struct stat64 st; + if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) + continue; +- if (ent->d_type == DT_UNKNOWN +- && (lstat64 (conf, &st) == -1 +- || !S_ISREG (st.st_mode))) +- continue; + +- found |= read_conf_file (conf, dir, dir_len); ++ if (ent->d_type != DT_UNKNOWN ++ || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode))) ++ found |= read_conf_file (conf, dir, dir_len); ++ + free (conf); + } + } +diff --git a/iconv/iconv_charmap.c b/iconv/iconv_charmap.c +index e2d53fee3c..a8b6b56124 100644 +--- a/iconv/iconv_charmap.c ++++ b/iconv/iconv_charmap.c +@@ -234,6 +234,8 @@ charmap_conversion (const char *from_code, struct charmap_t *from_charmap, + while (++remaining < argc); + + /* All done. */ ++ if (output != stdout) ++ fclose (output); + free_table (cvtbl); + return status; + } +diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c +index 783b2bbdbb..273a71f673 100644 +--- a/iconv/iconvconfig.c ++++ b/iconv/iconvconfig.c +@@ -653,13 +653,21 @@ add_module (char *rp, const char *directory, + static int + handle_dir (const char *dir) + { ++ char *newp = NULL; + size_t dirlen = strlen (dir); + bool found = false; + +- char *fulldir = xasprintf ("%s%s%s", dir[0] == '/' ? prefix : "", +- dir, dir[dirlen - 1] != '/' ? "/" : ""); ++ /* End directory path with a '/' if it doesn't already. */ ++ if (dir[dirlen - 1] != '/') ++ { ++ newp = xmalloc (dirlen + 2); ++ memcpy (newp, dir, dirlen); ++ newp[dirlen++] = '/'; ++ newp[dirlen] = '\0'; ++ dir = newp; ++ } + +- found = gconv_parseconfdir (fulldir, strlen (fulldir)); ++ found = gconv_parseconfdir (dir[0] == '/' ? prefix : NULL, dir, dirlen); + + if (!found) + { +@@ -671,7 +679,7 @@ handle_dir (const char *dir) + "configuration files with names ending in .conf."); + } + +- free (fulldir); ++ free (newp); + + return found ? 0 : 1; + } +diff --git a/iconvdata/Makefile b/iconvdata/Makefile +index c216f959df..d5507a048c 100644 +--- a/iconvdata/Makefile ++++ b/iconvdata/Makefile +@@ -1,4 +1,5 @@ + # Copyright (C) 1997-2021 Free Software Foundation, Inc. ++# Copyright (C) The GNU Toolchain Authors. + # This file is part of the GNU C Library. + + # The GNU C Library is free software; you can redistribute it and/or +@@ -74,7 +75,7 @@ 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-iconv13 bug-iconv14 ++ bug-iconv13 bug-iconv14 bug-iconv15 + ifeq ($(have-thread-library),yes) + tests += bug-iconv3 + endif +@@ -327,6 +328,8 @@ $(objpfx)bug-iconv12.out: $(addprefix $(objpfx), $(gconv-modules)) \ + $(addprefix $(objpfx),$(modules.so)) + $(objpfx)bug-iconv14.out: $(addprefix $(objpfx), $(gconv-modules)) \ + $(addprefix $(objpfx),$(modules.so)) ++$(objpfx)bug-iconv15.out: $(addprefix $(objpfx), $(gconv-modules)) \ ++ $(addprefix $(objpfx),$(modules.so)) + + $(objpfx)iconv-test.out: run-iconv-test.sh \ + $(addprefix $(objpfx), $(gconv-modules)) \ +diff --git a/iconvdata/bug-iconv15.c b/iconvdata/bug-iconv15.c +new file mode 100644 +index 0000000000..cc04bd0313 +--- /dev/null ++++ b/iconvdata/bug-iconv15.c +@@ -0,0 +1,60 @@ ++/* Bug 28524: Conversion from ISO-2022-JP-3 with iconv ++ may emit spurious NUL character on state reset. ++ Copyright (C) The GNU Toolchain Authors. ++ 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 <stddef.h> ++#include <iconv.h> ++#include <support/check.h> ++ ++static int ++do_test (void) ++{ ++ char in[] = "\x1b(I"; ++ char *inbuf = in; ++ size_t inleft = sizeof (in) - 1; ++ char out[1]; ++ char *outbuf = out; ++ size_t outleft = sizeof (out); ++ iconv_t cd; ++ ++ cd = iconv_open ("UTF8", "ISO-2022-JP-3"); ++ TEST_VERIFY_EXIT (cd != (iconv_t) -1); ++ ++ /* First call to iconv should alter internal state. ++ Now, JISX0201_Kana_set is selected and ++ state value != ASCII_set. */ ++ TEST_VERIFY (iconv (cd, &inbuf, &inleft, &outbuf, &outleft) != (size_t) -1); ++ ++ /* No bytes should have been added to ++ the output buffer at this point. */ ++ TEST_VERIFY (outbuf == out); ++ TEST_VERIFY (outleft == sizeof (out)); ++ ++ /* Second call shall emit spurious NUL character in unpatched glibc. */ ++ TEST_VERIFY (iconv (cd, NULL, NULL, &outbuf, &outleft) != (size_t) -1); ++ ++ /* No characters are expected to be produced. */ ++ TEST_VERIFY (outbuf == out); ++ TEST_VERIFY (outleft == sizeof (out)); ++ ++ TEST_VERIFY_EXIT (iconv_close (cd) != -1); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/iconvdata/iso-2022-jp-3.c b/iconvdata/iso-2022-jp-3.c +index c8ba88cdc9..5fc0c0f739 100644 +--- a/iconvdata/iso-2022-jp-3.c ++++ b/iconvdata/iso-2022-jp-3.c +@@ -1,5 +1,6 @@ + /* Conversion module for ISO-2022-JP-3. + Copyright (C) 1998-2021 Free Software Foundation, Inc. ++ Copyright (C) The GNU Toolchain Authors. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper(a)cygnus.com>, 1998, + and Bruno Haible <bruno(a)clisp.org>, 2002. +@@ -81,20 +82,31 @@ enum + the output state to the initial state. This has to be done during the + flushing. */ + #define EMIT_SHIFT_TO_INIT \ +- if (data->__statep->__count != ASCII_set) \ ++ if ((data->__statep->__count & ~7) != ASCII_set) \ + { \ + if (FROM_DIRECTION) \ + { \ +- if (__glibc_likely (outbuf + 4 <= outend)) \ ++ uint32_t ch = data->__statep->__count >> 6; \ ++ \ ++ if (__glibc_unlikely (ch != 0)) \ + { \ +- /* Write out the last character. */ \ +- *((uint32_t *) outbuf) = data->__statep->__count >> 6; \ +- outbuf += sizeof (uint32_t); \ +- data->__statep->__count = ASCII_set; \ ++ if (__glibc_likely (outbuf + 4 <= outend)) \ ++ { \ ++ /* Write out the last character. */ \ ++ put32u (outbuf, ch); \ ++ outbuf += 4; \ ++ data->__statep->__count &= 7; \ ++ data->__statep->__count |= ASCII_set; \ ++ } \ ++ else \ ++ /* We don't have enough room in the output buffer. */ \ ++ status = __GCONV_FULL_OUTPUT; \ + } \ + else \ +- /* We don't have enough room in the output buffer. */ \ +- status = __GCONV_FULL_OUTPUT; \ ++ { \ ++ data->__statep->__count &= 7; \ ++ data->__statep->__count |= ASCII_set; \ ++ } \ + } \ + else \ + { \ +diff --git a/include/link.h b/include/link.h +index 4af16cb596..c46aced9f7 100644 +--- a/include/link.h ++++ b/include/link.h +@@ -205,6 +205,7 @@ struct link_map + unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be + freed, ie. not allocated with + the dummy malloc in ld.so. */ ++ unsigned int l_ld_readonly:1; /* Nonzero if dynamic section is readonly. */ + + /* NODELETE status of the map. Only valid for maps of type + lt_loaded. Lazy binding sets l_nodelete_active directly, +@@ -342,6 +343,8 @@ struct link_map + unsigned long long int l_serial; + }; + ++#include <dl-relocate-ld.h> ++ + /* Information used by audit modules. For most link maps, this data + immediate follows the link map in memory. For the dynamic linker, + it is allocated separately. See link_map_audit_state in +diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h +index 7388356a19..c490561581 100644 +--- a/include/sys/sysinfo.h ++++ b/include/sys/sysinfo.h +@@ -9,10 +9,15 @@ + extern int __get_nprocs_conf (void); + libc_hidden_proto (__get_nprocs_conf) + +-/* Return number of available processors. */ ++/* Return number of available processors (not all of them will be ++ available to the caller process). */ + extern int __get_nprocs (void); + libc_hidden_proto (__get_nprocs) + ++/* Return the number of available processors which the process can ++ be scheduled. */ ++extern int __get_nprocs_sched (void) attribute_hidden; ++ + /* Return number of physical pages of memory in the system. */ + extern long int __get_phys_pages (void); + libc_hidden_proto (__get_phys_pages) +diff --git a/io/fcntl.h b/io/fcntl.h +index 8917a73b42..1c96f98f4d 100644 +--- a/io/fcntl.h ++++ b/io/fcntl.h +@@ -187,10 +187,10 @@ extern int fcntl64 (int __fd, int __cmd, ...); + # endif + #else /* __USE_TIME_BITS64 */ + # ifdef __REDIRECT +-extern int __REDIRECT (fcntl, (int __fd, int __request, ...), +- __fcntl_time64) __THROW; +-extern int __REDIRECT (fcntl64, (int __fd, int __request, ...), +- __fcntl_time64) __THROW; ++extern int __REDIRECT_NTH (fcntl, (int __fd, int __request, ...), ++ __fcntl_time64); ++extern int __REDIRECT_NTH (fcntl64, (int __fd, int __request, ...), ++ __fcntl_time64); + # else + extern int __fcntl_time64 (int __fd, int __request, ...) __THROW; + # define fcntl64 __fcntl_time64 +diff --git a/io/tst-closefrom.c b/io/tst-closefrom.c +index d4c187073c..395ec0d894 100644 +--- a/io/tst-closefrom.c ++++ b/io/tst-closefrom.c +@@ -24,31 +24,22 @@ + #include <support/check.h> + #include <support/descriptors.h> + #include <support/xunistd.h> ++#include <support/support.h> + + #include <array_length.h> + + #define NFDS 100 + +-static int +-open_multiple_temp_files (void) +-{ +- /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = xopen ("/dev/null", O_RDONLY, 0600); +- for (int i = 1; i <= NFDS; i++) +- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), lowfd + i); +- return lowfd; +-} +- + static int + closefrom_test (void) + { + struct support_descriptors *descrs = support_descriptors_list (); + +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + +- const int maximum_fd = lowfd + NFDS; ++ const int maximum_fd = lowfd + NFDS - 1; + const int half_fd = lowfd + NFDS / 2; +- const int gap = maximum_fd / 4; ++ const int gap = lowfd + NFDS / 4; + + /* Close half of the descriptors and check result. */ + closefrom (half_fd); +@@ -58,7 +49,7 @@ closefrom_test (void) + TEST_COMPARE (fcntl (i, F_GETFL), -1); + TEST_COMPARE (errno, EBADF); + } +- for (int i = 0; i < half_fd; i++) ++ for (int i = lowfd; i < half_fd; i++) + TEST_VERIFY (fcntl (i, F_GETFL) > -1); + + /* Create some gaps, close up to a threshold, and check result. */ +@@ -74,7 +65,7 @@ closefrom_test (void) + TEST_COMPARE (fcntl (i, F_GETFL), -1); + TEST_COMPARE (errno, EBADF); + } +- for (int i = 0; i < gap; i++) ++ for (int i = lowfd; i < gap; i++) + TEST_VERIFY (fcntl (i, F_GETFL) > -1); + + /* Close the remmaining but the last one. */ +diff --git a/malloc/arena.c b/malloc/arena.c +index 667484630e..f1f0af8648 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -879,7 +879,7 @@ arena_get2 (size_t size, mstate avoid_arena) + narenas_limit = mp_.arena_max; + else if (narenas > mp_.arena_test) + { +- int n = __get_nprocs (); ++ int n = __get_nprocs_sched (); + + if (n >= 1) + narenas_limit = NARENAS_FROM_NCORES (n); +diff --git a/malloc/malloc-debug.c b/malloc/malloc-debug.c +index 9922ef5f25..3d7e6d44fd 100644 +--- a/malloc/malloc-debug.c ++++ b/malloc/malloc-debug.c +@@ -1,5 +1,6 @@ + /* Malloc debug DSO. + Copyright (C) 2021 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -399,17 +400,17 @@ strong_alias (__debug_calloc, calloc) + size_t + malloc_usable_size (void *mem) + { ++ if (mem == NULL) ++ return 0; ++ + if (__is_malloc_debug_enabled (MALLOC_MCHECK_HOOK)) + return mcheck_usable_size (mem); + if (__is_malloc_debug_enabled (MALLOC_CHECK_HOOK)) + return malloc_check_get_size (mem); + +- if (mem != NULL) +- { +- mchunkptr p = mem2chunk (mem); +- if (DUMPED_MAIN_ARENA_CHUNK (p)) +- return chunksize (p) - SIZE_SZ; +- } ++ mchunkptr p = mem2chunk (mem); ++ if (DUMPED_MAIN_ARENA_CHUNK (p)) ++ return chunksize (p) - SIZE_SZ; + + return musable (mem); + } +diff --git a/malloc/malloc.c b/malloc/malloc.c +index e065785af7..7882c70f0a 100644 +--- a/malloc/malloc.c ++++ b/malloc/malloc.c +@@ -1,5 +1,6 @@ + /* Malloc implementation for multiple threads without lock contention. + Copyright (C) 1996-2021 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. + Contributed by Wolfram Gloger <wg(a)malloc.de> + and Doug Lea <dl(a)cs.oswego.edu>, 2001. +@@ -5009,20 +5010,13 @@ __malloc_trim (size_t s) + static size_t + musable (void *mem) + { +- mchunkptr p; +- if (mem != 0) +- { +- size_t result = 0; +- +- p = mem2chunk (mem); ++ mchunkptr p = mem2chunk (mem); + +- if (chunk_is_mmapped (p)) +- result = chunksize (p) - CHUNK_HDR_SZ; +- else if (inuse (p)) +- result = memsize (p); ++ if (chunk_is_mmapped (p)) ++ return chunksize (p) - CHUNK_HDR_SZ; ++ else if (inuse (p)) ++ return memsize (p); + +- return result; +- } + return 0; + } + +@@ -5030,10 +5024,9 @@ musable (void *mem) + size_t + __malloc_usable_size (void *m) + { +- size_t result; +- +- result = musable (m); +- return result; ++ if (m == NULL) ++ return 0; ++ return musable (m); + } + #endif + +diff --git a/malloc/tst-malloc-usable.c b/malloc/tst-malloc-usable.c +index a1074b782a..b0d702be10 100644 +--- a/malloc/tst-malloc-usable.c ++++ b/malloc/tst-malloc-usable.c +@@ -2,6 +2,7 @@ + MALLOC_CHECK_ exported to a positive value. + + Copyright (C) 2012-2021 Free Software Foundation, Inc. ++ Copyright The GNU Toolchain Authors. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -21,29 +22,24 @@ + #include <malloc.h> + #include <string.h> + #include <stdio.h> ++#include <support/support.h> ++#include <support/check.h> + + static int + do_test (void) + { + size_t usable_size; + void *p = malloc (7); +- if (!p) +- { +- printf ("memory allocation failed\n"); +- return 1; +- } + ++ TEST_VERIFY_EXIT (p != NULL); + usable_size = malloc_usable_size (p); +- if (usable_size != 7) +- { +- printf ("malloc_usable_size: expected 7 but got %zu\n", usable_size); +- return 1; +- } +- ++ TEST_COMPARE (usable_size, 7); + memset (p, 0, usable_size); + free (p); ++ ++ TEST_COMPARE (malloc_usable_size (NULL), 0); ++ + return 0; + } + +-#define TEST_FUNCTION do_test () +-#include "../test-skeleton.c" ++#include "support/test-driver.c" +diff --git a/misc/getsysstats.c b/misc/getsysstats.c +index 0eedface6d..57d93601e2 100644 +--- a/misc/getsysstats.c ++++ b/misc/getsysstats.c +@@ -45,6 +45,12 @@ weak_alias (__get_nprocs, get_nprocs) + link_warning (get_nprocs, "warning: get_nprocs will always return 1") + + ++int ++__get_nprocs_sched (void) ++{ ++ return 1; ++} ++ + long int + __get_phys_pages (void) + { +diff --git a/misc/sys/ioctl.h b/misc/sys/ioctl.h +index 6884d9925f..9945c1e918 100644 +--- a/misc/sys/ioctl.h ++++ b/misc/sys/ioctl.h +@@ -42,8 +42,8 @@ __BEGIN_DECLS + extern int ioctl (int __fd, unsigned long int __request, ...) __THROW; + #else + # ifdef __REDIRECT +-extern int __REDIRECT (ioctl, (int __fd, unsigned long int __request, ...), +- __ioctl_time64) __THROW; ++extern int __REDIRECT_NTH (ioctl, (int __fd, unsigned long int __request, ...), ++ __ioctl_time64); + # else + extern int __ioctl_time64 (int __fd, unsigned long int __request, ...) __THROW; + # define ioctl __ioctl_time64 +diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c +index cfe37a3443..50065bc9bd 100644 +--- a/nptl/allocatestack.c ++++ b/nptl/allocatestack.c +@@ -32,6 +32,7 @@ + #include <futex-internal.h> + #include <kernel-features.h> + #include <nptl-stack.h> ++#include <libc-lock.h> + + /* Default alignment of stack. */ + #ifndef STACK_ALIGN +@@ -127,6 +128,8 @@ get_cached_stack (size_t *sizep, void **memp) + /* No pending event. */ + result->nextevent = NULL; + ++ result->exiting = false; ++ __libc_lock_init (result->exit_lock); + result->tls_state = (struct tls_internal_t) { 0 }; + + /* Clear the DTV. */ +diff --git a/nptl/descr.h b/nptl/descr.h +index c85778d449..4de84138fb 100644 +--- a/nptl/descr.h ++++ b/nptl/descr.h +@@ -396,6 +396,12 @@ struct pthread + PTHREAD_CANCEL_ASYNCHRONOUS). */ + unsigned char canceltype; + ++ /* Used in __pthread_kill_internal to detected a thread that has ++ exited or is about to exit. exit_lock must only be acquired ++ after blocking signals. */ ++ bool exiting; ++ int exit_lock; /* A low-level lock (for use with __libc_lock_init etc). */ ++ + /* Used on strsignal. */ + struct tls_internal_t tls_state; + +diff --git a/nptl/pthread_cancel.c b/nptl/pthread_cancel.c +index cc25ff21f3..9bac6e3b76 100644 +--- a/nptl/pthread_cancel.c ++++ b/nptl/pthread_cancel.c +@@ -62,10 +62,11 @@ __pthread_cancel (pthread_t th) + { + volatile struct pthread *pd = (volatile struct pthread *) th; + +- /* Make sure the descriptor is valid. */ +- if (INVALID_TD_P (pd)) +- /* Not a valid thread handle. */ +- return ESRCH; ++ if (pd->tid == 0) ++ /* The thread has already exited on the kernel side. Its outcome ++ (regular exit, other cancelation) has already been ++ determined. */ ++ return 0; + + static int init_sigcancel = 0; + if (atomic_load_relaxed (&init_sigcancel) == 0) +diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c +index d8ec299cb1..3db0c9fdf4 100644 +--- a/nptl/pthread_create.c ++++ b/nptl/pthread_create.c +@@ -37,6 +37,7 @@ + #include <sys/single_threaded.h> + #include <version.h> + #include <clone_internal.h> ++#include <futex-internal.h> + + #include <shlib-compat.h> + +@@ -406,8 +407,6 @@ start_thread (void *arg) + unwind_buf.priv.data.prev = NULL; + unwind_buf.priv.data.cleanup = NULL; + +- __libc_signal_restore_set (&pd->sigmask); +- + /* Allow setxid from now onwards. */ + if (__glibc_unlikely (atomic_exchange_acq (&pd->setxid_futex, 0) == -2)) + futex_wake (&pd->setxid_futex, 1, FUTEX_PRIVATE); +@@ -417,6 +416,8 @@ start_thread (void *arg) + /* Store the new cleanup handler info. */ + THREAD_SETMEM (pd, cleanup_jmp_buf, &unwind_buf); + ++ __libc_signal_restore_set (&pd->sigmask); ++ + LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg); + + /* Run the code the user provided. */ +@@ -485,6 +486,27 @@ start_thread (void *arg) + /* This was the last thread. */ + exit (0); + ++ /* This prevents sending a signal from this thread to itself during ++ its final stages. This must come after the exit call above ++ because atexit handlers must not run with signals blocked. ++ ++ Do not block SIGSETXID. The setxid handshake below expects the ++ signal to be delivered. (SIGSETXID cannot run application code, ++ nor does it use pthread_kill.) Reuse the pd->sigmask space for ++ computing the signal mask, to save stack space. */ ++ __sigfillset (&pd->sigmask); ++ __sigdelset (&pd->sigmask, SIGSETXID); ++ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &pd->sigmask, NULL, ++ __NSIG_BYTES); ++ ++ /* Tell __pthread_kill_internal that this thread is about to exit. ++ If there is a __pthread_kill_internal in progress, this delays ++ the thread exit until the signal has been queued by the kernel ++ (so that the TID used to send it remains valid). */ ++ __libc_lock_lock (pd->exit_lock); ++ pd->exiting = true; ++ __libc_lock_unlock (pd->exit_lock); ++ + #ifndef __ASSUME_SET_ROBUST_LIST + /* If this thread has any robust mutexes locked, handle them now. */ + # if __PTHREAD_MUTEX_HAVE_PREV +diff --git a/nptl/pthread_kill.c b/nptl/pthread_kill.c +index f79a2b26fc..35bf1f973e 100644 +--- a/nptl/pthread_kill.c ++++ b/nptl/pthread_kill.c +@@ -16,39 +16,66 @@ + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + ++#include <libc-lock.h> + #include <unistd.h> + #include <pthreadP.h> + #include <shlib-compat.h> + +-int +-__pthread_kill_internal (pthread_t threadid, int signo) ++/* Sends SIGNO to THREADID. If the thread is about to exit or has ++ already exited on the kernel side, return NO_TID. Otherwise return ++ 0 or an error code. */ ++static int ++__pthread_kill_implementation (pthread_t threadid, int signo, int no_tid) + { +- pid_t tid; + struct pthread *pd = (struct pthread *) threadid; +- + if (pd == THREAD_SELF) +- /* It is a special case to handle raise() implementation after a vfork +- call (which does not update the PD tid field). */ +- tid = INLINE_SYSCALL_CALL (gettid); +- else +- /* Force load of pd->tid into local variable or register. Otherwise +- if a thread exits between ESRCH test and tgkill, we might return +- EINVAL, because pd->tid would be cleared by the kernel. */ +- tid = atomic_forced_read (pd->tid); +- +- int val; +- if (__glibc_likely (tid > 0)) + { +- pid_t pid = __getpid (); +- +- val = INTERNAL_SYSCALL_CALL (tgkill, pid, tid, signo); +- val = (INTERNAL_SYSCALL_ERROR_P (val) +- ? INTERNAL_SYSCALL_ERRNO (val) : 0); ++ /* Use the actual TID from the kernel, so that it refers to the ++ current thread even if called after vfork. There is no ++ signal blocking in this case, so that the signal is delivered ++ immediately, before __pthread_kill_internal returns: a signal ++ sent to the thread itself needs to be delivered ++ synchronously. (It is unclear if Linux guarantees the ++ delivery of all pending signals after unblocking in the code ++ below. POSIX only guarantees delivery of a single signal, ++ which may not be the right one.) */ ++ pid_t tid = INTERNAL_SYSCALL_CALL (gettid); ++ int ret = INTERNAL_SYSCALL_CALL (tgkill, __getpid (), tid, signo); ++ return INTERNAL_SYSCALL_ERROR_P (ret) ? INTERNAL_SYSCALL_ERRNO (ret) : 0; + } ++ ++ /* Block all signals, as required by pd->exit_lock. */ ++ sigset_t old_mask; ++ __libc_signal_block_all (&old_mask); ++ __libc_lock_lock (pd->exit_lock); ++ ++ int ret; ++ if (pd->exiting) ++ /* The thread is about to exit (or has exited). Sending the ++ signal is either not observable (the target thread has already ++ blocked signals at this point), or it will fail, or it might be ++ delivered to a new, unrelated thread that has reused the TID. ++ So do not actually send the signal. */ ++ ret = no_tid; + else +- val = ESRCH; ++ { ++ ret = INTERNAL_SYSCALL_CALL (tgkill, __getpid (), pd->tid, signo); ++ ret = INTERNAL_SYSCALL_ERROR_P (ret) ? INTERNAL_SYSCALL_ERRNO (ret) : 0; ++ } ++ ++ __libc_lock_unlock (pd->exit_lock); ++ __libc_signal_restore_set (&old_mask); + +- return val; ++ return ret; ++} ++ ++int ++__pthread_kill_internal (pthread_t threadid, int signo) ++{ ++ /* Do not report an error in the no-tid case because the threadid ++ argument is still valid (the thread ID lifetime has not ended), ++ and ESRCH (for example) would be misleading. */ ++ return __pthread_kill_implementation (threadid, signo, 0); + } + + int +@@ -61,6 +88,7 @@ __pthread_kill (pthread_t threadid, int signo) + + return __pthread_kill_internal (threadid, signo); + } ++ + /* Some architectures (for instance arm) might pull raise through libgcc, so + avoid the symbol version if it ends up being used on ld.so. */ + #if !IS_IN(rtld) +@@ -68,6 +96,17 @@ libc_hidden_def (__pthread_kill) + versioned_symbol (libc, __pthread_kill, pthread_kill, GLIBC_2_34); + + # if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) +-compat_symbol (libc, __pthread_kill, pthread_kill, GLIBC_2_0); ++/* Variant which returns ESRCH in the no-TID case, for backwards ++ compatibility. */ ++int ++attribute_compat_text_section ++__pthread_kill_esrch (pthread_t threadid, int signo) ++{ ++ if (__is_internal_signal (signo)) ++ return EINVAL; ++ ++ return __pthread_kill_implementation (threadid, signo, ESRCH); ++} ++compat_symbol (libc, __pthread_kill_esrch, pthread_kill, GLIBC_2_0); + # endif + #endif +diff --git a/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf b/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf +new file mode 100644 +index 0000000000..5b0c6a4199 +--- /dev/null ++++ b/nss/tst-nss-files-hosts-long.root/etc/nsswitch.conf +@@ -0,0 +1 @@ ++hosts: files +diff --git a/posix/Makefile b/posix/Makefile +index 059efb3cd2..09460a28e8 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -107,7 +107,8 @@ tests := test-errno tstgetopt testfnm runtests runptests \ + tst-sysconf-empty-chroot tst-glob_symlinks tst-fexecve \ + tst-glob-tilde test-ssize-max tst-spawn4 bug-regex37 \ + bug-regex38 tst-regcomp-truncated tst-spawn-chdir \ +- tst-wordexp-nocmd tst-execveat tst-spawn5 ++ tst-wordexp-nocmd tst-execveat tst-spawn5 \ ++ tst-sched_getaffinity + + # Test for the glob symbol version that was replaced in glibc 2.27. + ifeq ($(have-GLIBC_2.26)$(build-shared),yesyes) +diff --git a/posix/bits/unistd.h b/posix/bits/unistd.h +index f0831386c7..622adeb2b2 100644 +--- a/posix/bits/unistd.h ++++ b/posix/bits/unistd.h +@@ -199,10 +199,9 @@ __NTH (readlinkat (int __fd, const char *__restrict __path, + #endif + + extern char *__getcwd_chk (char *__buf, size_t __size, size_t __buflen) +- __THROW __wur __attr_access ((__write_only__, 1, 2)); ++ __THROW __wur; + extern char *__REDIRECT_NTH (__getcwd_alias, +- (char *__buf, size_t __size), getcwd) +- __wur __attr_access ((__write_only__, 1, 2)); ++ (char *__buf, size_t __size), getcwd) __wur; + extern char *__REDIRECT_NTH (__getcwd_chk_warn, + (char *__buf, size_t __size, size_t __buflen), + __getcwd_chk) +diff --git a/posix/fork.c b/posix/fork.c +index c471f7b15f..021691b9b7 100644 +--- a/posix/fork.c ++++ b/posix/fork.c +@@ -99,6 +99,9 @@ __libc_fork (void) + /* Reset the lock the dynamic loader uses to protect its data. */ + __rtld_lock_initialize (GL(dl_load_lock)); + ++ /* Reset the lock protecting dynamic TLS related data. */ ++ __rtld_lock_initialize (GL(dl_load_tls_lock)); ++ + reclaim_stacks (); + + /* Run the handlers registered for the child. */ +diff --git a/posix/tst-sched_getaffinity.c b/posix/tst-sched_getaffinity.c +new file mode 100644 +index 0000000000..db9d517a96 +--- /dev/null ++++ b/posix/tst-sched_getaffinity.c +@@ -0,0 +1,48 @@ ++/* Tests for sched_getaffinity with large buffers. ++ 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 <array_length.h> ++#include <sched.h> ++#include <support/check.h> ++ ++/* NB: this test may fail on system with more than 32k cpus. */ ++ ++static int ++do_test (void) ++{ ++ /* The values are larger than the default cpu_set_t. */ ++ const int bufsize[] = { 1<<11, 1<<12, 1<<13, 1<<14, 1<<15, 1<<16, 1<<17 }; ++ int cpucount[array_length (bufsize)]; ++ ++ for (int i = 0; i < array_length (bufsize); i++) ++ { ++ cpu_set_t *cpuset = CPU_ALLOC (bufsize[i]); ++ TEST_VERIFY (cpuset != NULL); ++ size_t size = CPU_ALLOC_SIZE (bufsize[i]); ++ TEST_COMPARE (sched_getaffinity (0, size, cpuset), 0); ++ cpucount[i] = CPU_COUNT_S (size, cpuset); ++ CPU_FREE (cpuset); ++ } ++ ++ for (int i = 0; i < array_length (cpucount) - 1; i++) ++ TEST_COMPARE (cpucount[i], cpucount[i + 1]); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/posix/tst-spawn5.c b/posix/tst-spawn5.c +index ac66738004..a95199af6b 100644 +--- a/posix/tst-spawn5.c ++++ b/posix/tst-spawn5.c +@@ -47,17 +47,6 @@ static int initial_argv_count; + + #define NFDS 100 + +-static int +-open_multiple_temp_files (void) +-{ +- /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = xopen ("/dev/null", O_RDONLY, 0600); +- for (int i = 1; i <= NFDS; i++) +- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), +- lowfd + i); +- return lowfd; +-} +- + static int + parse_fd (const char *str) + { +@@ -185,7 +174,7 @@ spawn_closefrom_test (posix_spawn_file_actions_t *fa, int lowfd, int highfd, + static void + do_test_closefrom (void) + { +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + const int half_fd = lowfd + NFDS / 2; + + /* Close half of the descriptors and check result. */ +diff --git a/posix/unistd.h b/posix/unistd.h +index 3dca65732f..8224c5fbc9 100644 +--- a/posix/unistd.h ++++ b/posix/unistd.h +@@ -528,8 +528,7 @@ extern int fchdir (int __fd) __THROW __wur; + an array is allocated with `malloc'; the array is SIZE + bytes long, unless SIZE == 0, in which case it is as + big as necessary. */ +-extern char *getcwd (char *__buf, size_t __size) __THROW __wur +- __attr_access ((__write_only__, 1, 2)); ++extern char *getcwd (char *__buf, size_t __size) __THROW __wur; + + #ifdef __USE_GNU + /* Return a malloc'd string containing the current directory name. +diff --git a/rt/Makefile b/rt/Makefile +index 113cea03a5..910e775995 100644 +--- a/rt/Makefile ++++ b/rt/Makefile +@@ -74,6 +74,7 @@ tests := tst-shm tst-timer tst-timer2 \ + tst-aio7 tst-aio8 tst-aio9 tst-aio10 \ + tst-mqueue1 tst-mqueue2 tst-mqueue3 tst-mqueue4 \ + tst-mqueue5 tst-mqueue6 tst-mqueue7 tst-mqueue8 tst-mqueue9 \ ++ tst-bz28213 \ + tst-timer3 tst-timer4 tst-timer5 \ + tst-cpuclock2 tst-cputimer1 tst-cputimer2 tst-cputimer3 \ + tst-shm-cancel \ +diff --git a/rt/tst-bz28213.c b/rt/tst-bz28213.c +new file mode 100644 +index 0000000000..0c096b5a0a +--- /dev/null ++++ b/rt/tst-bz28213.c +@@ -0,0 +1,101 @@ ++/* Bug 28213: test for NULL pointer dereference in mq_notify. ++ Copyright (C) The GNU Toolchain Authors. ++ 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 <sys/types.h> ++#include <sys/stat.h> ++#include <fcntl.h> ++#include <unistd.h> ++#include <mqueue.h> ++#include <signal.h> ++#include <stdlib.h> ++#include <string.h> ++#include <support/check.h> ++ ++static mqd_t m = -1; ++static const char msg[] = "hello"; ++ ++static void ++check_bz28213_cb (union sigval sv) ++{ ++ char buf[sizeof (msg)]; ++ ++ (void) sv; ++ ++ TEST_VERIFY_EXIT ((size_t) mq_receive (m, buf, sizeof (buf), NULL) ++ == sizeof (buf)); ++ TEST_VERIFY_EXIT (memcmp (buf, msg, sizeof (buf)) == 0); ++ ++ exit (0); ++} ++ ++static void ++check_bz28213 (void) ++{ ++ struct sigevent sev; ++ ++ memset (&sev, '\0', sizeof (sev)); ++ sev.sigev_notify = SIGEV_THREAD; ++ sev.sigev_notify_function = check_bz28213_cb; ++ ++ /* Step 1: Register & unregister notifier. ++ Helper thread should receive NOTIFY_REMOVED notification. ++ In a vulnerable version of glibc, NULL pointer dereference follows. */ ++ TEST_VERIFY_EXIT (mq_notify (m, &sev) == 0); ++ TEST_VERIFY_EXIT (mq_notify (m, NULL) == 0); ++ ++ /* Step 2: Once again, register notification. ++ Try to send one message. ++ Test is considered successful, if the callback does exit (0). */ ++ TEST_VERIFY_EXIT (mq_notify (m, &sev) == 0); ++ TEST_VERIFY_EXIT (mq_send (m, msg, sizeof (msg), 1) == 0); ++ ++ /* Wait... */ ++ pause (); ++} ++ ++static int ++do_test (void) ++{ ++ static const char m_name[] = "/bz28213_queue"; ++ struct mq_attr m_attr; ++ ++ memset (&m_attr, '\0', sizeof (m_attr)); ++ m_attr.mq_maxmsg = 1; ++ m_attr.mq_msgsize = sizeof (msg); ++ ++ m = mq_open (m_name, ++ O_RDWR | O_CREAT | O_EXCL, ++ 0600, ++ &m_attr); ++ ++ if (m < 0) ++ { ++ if (errno == ENOSYS) ++ FAIL_UNSUPPORTED ("POSIX message queues are not implemented\n"); ++ FAIL_EXIT1 ("Failed to create POSIX message queue: %m\n"); ++ } ++ ++ TEST_VERIFY_EXIT (mq_unlink (m_name) == 0); ++ ++ check_bz28213 (); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/scripts/build-many-glibcs.py b/scripts/build-many-glibcs.py +index 5a77af90a6..86537fa800 100755 +--- a/scripts/build-many-glibcs.py ++++ b/scripts/build-many-glibcs.py +@@ -782,7 +782,7 @@ class Context(object): + 'gcc': 'vcs-11', + 'glibc': 'vcs-mainline', + 'gmp': '6.2.1', +- 'linux': '5.13', ++ 'linux': '5.14', + 'mpc': '1.2.1', + 'mpfr': '4.1.0', + 'mig': 'vcs-mainline', +diff --git a/support/Makefile b/support/Makefile +index a462781718..2a0731796f 100644 +--- a/support/Makefile ++++ b/support/Makefile +@@ -66,6 +66,7 @@ libsupport-routines = \ + support_path_support_time64 \ + support_process_state \ + support_ptrace \ ++ support-open-dev-null-range \ + support_openpty \ + support_paths \ + support_quote_blob \ +@@ -82,9 +83,10 @@ libsupport-routines = \ + support_test_compare_blob \ + support_test_compare_failure \ + support_test_compare_string \ +- support_write_file_string \ + support_test_main \ + support_test_verify_impl \ ++ support_wait_for_thread_exit \ ++ support_write_file_string \ + temp_file \ + timespec \ + timespec-time64 \ +@@ -264,6 +266,7 @@ tests = \ + tst-support_capture_subprocess \ + tst-support_descriptors \ + tst-support_format_dns_packet \ ++ tst-support-open-dev-null-range \ + tst-support-process_state \ + tst-support_quote_blob \ + tst-support_quote_string \ +diff --git a/support/support-open-dev-null-range.c b/support/support-open-dev-null-range.c +new file mode 100644 +index 0000000000..66a8504105 +--- /dev/null ++++ b/support/support-open-dev-null-range.c +@@ -0,0 +1,134 @@ ++/* Return a range of open file descriptors. ++ 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 <errno.h> ++#include <fcntl.h> ++#include <support/support.h> ++#include <support/check.h> ++#include <support/xunistd.h> ++#include <stdlib.h> ++#include <sys/resource.h> ++ ++static void ++increase_nofile (void) ++{ ++ struct rlimit rl; ++ if (getrlimit (RLIMIT_NOFILE, &rl) == -1) ++ FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m"); ++ ++ rl.rlim_cur += 128; ++ ++ if (setrlimit (RLIMIT_NOFILE, &rl) == 1) ++ FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m"); ++} ++ ++static int ++open_dev_null (int flags, mode_t mode) ++{ ++ int fd = open64 ("/dev/null", flags, mode); ++ if (fd >= 0) ++ return fd; ++ ++ if (fd < 0 && errno != EMFILE) ++ FAIL_EXIT1 ("open64 (\"/dev/null\", 0x%x, 0%o): %m", flags, mode); ++ ++ increase_nofile (); ++ ++ return xopen ("/dev/null", flags, mode); ++} ++ ++struct range ++{ ++ int lowfd; ++ size_t len; ++}; ++ ++struct range_list ++{ ++ size_t total; ++ size_t used; ++ struct range *ranges; ++}; ++ ++static void ++range_init (struct range_list *r) ++{ ++ r->total = 8; ++ r->used = 0; ++ r->ranges = xmalloc (r->total * sizeof (struct range)); ++} ++ ++static void ++range_add (struct range_list *r, int lowfd, size_t len) ++{ ++ if (r->used == r->total) ++ { ++ r->total *= 2; ++ r->ranges = xrealloc (r->ranges, r->total * sizeof (struct range)); ++ } ++ r->ranges[r->used].lowfd = lowfd; ++ r->ranges[r->used].len = len; ++ r->used++; ++} ++ ++static void ++range_close (struct range_list *r) ++{ ++ for (size_t i = 0; i < r->used; i++) ++ { ++ int minfd = r->ranges[i].lowfd; ++ int maxfd = r->ranges[i].lowfd + r->ranges[i].len; ++ for (int fd = minfd; fd < maxfd; fd++) ++ xclose (fd); ++ } ++ free (r->ranges); ++} ++ ++int ++support_open_dev_null_range (int num, int flags, mode_t mode) ++{ ++ /* We keep track of the ranges that hit an already opened descriptor, so ++ we close them after we get a working range. */ ++ struct range_list rl; ++ range_init (&rl); ++ ++ int lowfd = open_dev_null (flags, mode); ++ int prevfd = lowfd; ++ while (true) ++ { ++ int i = 1; ++ for (; i < num; i++) ++ { ++ int fd = open_dev_null (flags, mode); ++ if (fd != lowfd + i) ++ { ++ range_add (&rl, lowfd, prevfd - lowfd + 1); ++ ++ prevfd = lowfd = fd; ++ break; ++ } ++ prevfd = fd; ++ } ++ if (i == num) ++ break; ++ } ++ ++ range_close (&rl); ++ ++ return lowfd; ++} +diff --git a/support/support.h b/support/support.h +index 834dba9097..c219e0d9d1 100644 +--- a/support/support.h ++++ b/support/support.h +@@ -174,6 +174,10 @@ timer_t support_create_timer (uint64_t sec, long int nsec, bool repeat, + /* Disable the timer TIMER. */ + void support_delete_timer (timer_t timer); + ++/* Wait until all threads except the current thread have exited (as ++ far as the kernel is concerned). */ ++void support_wait_for_thread_exit (void); ++ + struct support_stack + { + void *stack; +@@ -193,6 +197,14 @@ struct support_stack support_stack_alloc (size_t size); + /* Deallocate the STACK. */ + void support_stack_free (struct support_stack *stack); + ++ ++/* Create a range of NUM opened '/dev/null' file descriptors using FLAGS and ++ MODE. The function takes care of restarting the open range if a file ++ descriptor is found within the specified range and also increases ++ RLIMIT_NOFILE if required. ++ The returned value is the lowest file descriptor number. */ ++int support_open_dev_null_range (int num, int flags, mode_t mode); ++ + __END_DECLS + + #endif /* SUPPORT_H */ +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index 27bfd19c93..0bacf6dbc2 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -170,6 +170,7 @@ copy_and_spawn_sgid (char *child_id, gid_t gid) + support_subprogram because we only want the program exit status, not the + contents. */ + ret = 0; ++ infd = outfd = -1; + + char * const args[] = {execname, child_id, NULL}; + +diff --git a/support/support_wait_for_thread_exit.c b/support/support_wait_for_thread_exit.c +new file mode 100644 +index 0000000000..5e3be421a7 +--- /dev/null ++++ b/support/support_wait_for_thread_exit.c +@@ -0,0 +1,75 @@ ++/* Wait until all threads except the current thread has exited. ++ 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 <dirent.h> ++#include <errno.h> ++#include <string.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <unistd.h> ++ ++void ++support_wait_for_thread_exit (void) ++{ ++#ifdef __linux__ ++ DIR *proc_self_task = opendir ("/proc/self/task"); ++ TEST_VERIFY_EXIT (proc_self_task != NULL); ++ ++ while (true) ++ { ++ errno = 0; ++ struct dirent *e = readdir (proc_self_task); ++ if (e == NULL && errno != 0) ++ FAIL_EXIT1 ("readdir: %m"); ++ if (e == NULL) ++ { ++ /* Only the main thread remains. Testing may continue. */ ++ closedir (proc_self_task); ++ return; ++ } ++ ++ /* In some kernels, "0" entries denote a thread that has just ++ exited. */ ++ if (strcmp (e->d_name, ".") == 0 || strcmp (e->d_name, "..") == 0 ++ || strcmp (e->d_name, "0") == 0) ++ continue; ++ ++ int task_tid = atoi (e->d_name); ++ if (task_tid <= 0) ++ FAIL_EXIT1 ("Invalid /proc/self/task entry: %s", e->d_name); ++ ++ if (task_tid == gettid ()) ++ /* The current thread. Keep scanning for other ++ threads. */ ++ continue; ++ ++ /* task_tid does not refer to this thread here, i.e., there is ++ another running thread. */ ++ ++ /* Small timeout to give the thread a chance to exit. */ ++ usleep (50 * 1000); ++ ++ /* Start scanning the directory from the start. */ ++ rewinddir (proc_self_task); ++ } ++#else ++ /* Use a large timeout because we cannot verify that the thread has ++ exited. */ ++ usleep (5 * 1000 * 1000); ++#endif ++} +diff --git a/support/tst-support-open-dev-null-range.c b/support/tst-support-open-dev-null-range.c +new file mode 100644 +index 0000000000..8e29def1ce +--- /dev/null ++++ b/support/tst-support-open-dev-null-range.c +@@ -0,0 +1,155 @@ ++/* Tests for support_open_dev_null_range. ++ 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 <errno.h> ++#include <dirent.h> ++#include <fcntl.h> ++#include <limits.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <support/xunistd.h> ++#include <sys/resource.h> ++#include <stdlib.h> ++ ++#ifndef PATH_MAX ++# define PATH_MAX 1024 ++#endif ++ ++#include <stdio.h> ++ ++static void ++check_path (int fd) ++{ ++ char *proc_fd_path = xasprintf ("/proc/self/fd/%d", fd); ++ char file_path[PATH_MAX]; ++ ssize_t file_path_length ++ = readlink (proc_fd_path, file_path, sizeof (file_path)); ++ free (proc_fd_path); ++ if (file_path_length < 0) ++ FAIL_EXIT1 ("readlink (%s, %p, %zu)", proc_fd_path, file_path, ++ sizeof (file_path)); ++ file_path[file_path_length] = '\0'; ++ TEST_COMPARE_STRING (file_path, "/dev/null"); ++} ++ ++static int ++number_of_opened_files (void) ++{ ++ DIR *fds = opendir ("/proc/self/fd"); ++ if (fds == NULL) ++ FAIL_EXIT1 ("opendir (\"/proc/self/fd\"): %m"); ++ ++ int r = 0; ++ while (true) ++ { ++ errno = 0; ++ struct dirent64 *e = readdir64 (fds); ++ if (e == NULL) ++ { ++ if (errno != 0) ++ FAIL_EXIT1 ("readdir: %m"); ++ break; ++ } ++ ++ if (e->d_name[0] == '.') ++ continue; ++ ++ char *endptr; ++ long int fd = strtol (e->d_name, &endptr, 10); ++ if (*endptr != '\0' || fd < 0 || fd > INT_MAX) ++ FAIL_EXIT1 ("readdir: invalid file descriptor name: /proc/self/fd/%s", ++ e->d_name); ++ ++ /* Skip the descriptor which is used to enumerate the ++ descriptors. */ ++ if (fd == dirfd (fds)) ++ continue; ++ ++ r = r + 1; ++ } ++ ++ closedir (fds); ++ ++ return r; ++} ++ ++static int ++do_test (void) ++{ ++ const int nfds1 = 8; ++ int lowfd = support_open_dev_null_range (nfds1, O_RDONLY, 0600); ++ for (int i = 0; i < nfds1; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd + i, F_GETFL) > -1); ++ check_path (lowfd + i); ++ } ++ ++ /* create some gaps. */ ++ xclose (lowfd + 1); ++ xclose (lowfd + 5); ++ xclose (lowfd + 6); ++ ++ const int nfds2 = 16; ++ int lowfd2 = support_open_dev_null_range (nfds2, O_RDONLY, 0600); ++ for (int i = 0; i < nfds2; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd2 + i, F_GETFL) > -1); ++ check_path (lowfd2 + i); ++ } ++ ++ /* Decrease the maximum number of files. */ ++ { ++ struct rlimit rl; ++ if (getrlimit (RLIMIT_NOFILE, &rl) == -1) ++ FAIL_EXIT1 ("getrlimit (RLIMIT_NOFILE): %m"); ++ ++ rl.rlim_cur = number_of_opened_files (); ++ ++ if (setrlimit (RLIMIT_NOFILE, &rl) == 1) ++ FAIL_EXIT1 ("setrlimit (RLIMIT_NOFILE): %m"); ++ } ++ ++ const int nfds3 = 16; ++ int lowfd3 = support_open_dev_null_range (nfds3, O_RDONLY, 0600); ++ for (int i = 0; i < nfds3; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd3 + i, F_GETFL) > -1); ++ check_path (lowfd3 + i); ++ } ++ ++ /* create a lot of gaps to trigger the range extension. */ ++ xclose (lowfd3 + 1); ++ xclose (lowfd3 + 3); ++ xclose (lowfd3 + 5); ++ xclose (lowfd3 + 7); ++ xclose (lowfd3 + 9); ++ xclose (lowfd3 + 11); ++ xclose (lowfd3 + 13); ++ ++ const int nfds4 = 16; ++ int lowfd4 = support_open_dev_null_range (nfds4, O_RDONLY, 0600); ++ for (int i = 0; i < nfds4; i++) ++ { ++ TEST_VERIFY (fcntl (lowfd4 + i, F_GETFL) > -1); ++ check_path (lowfd4 + i); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/generic/dl-relocate-ld.h b/sysdeps/generic/dl-relocate-ld.h +new file mode 100644 +index 0000000000..cfb86c2d6a +--- /dev/null ++++ b/sysdeps/generic/dl-relocate-ld.h +@@ -0,0 +1,25 @@ ++/* Check if dynamic section should be relocated. Generic version. ++ 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/>. */ ++ ++#ifndef _DL_RELOCATE_LD_H ++#define _DL_RELOCATE_LD_H ++ ++/* The dynamic section is writable. */ ++#define DL_RO_DYN_SECTION 0 ++ ++#endif /* _DL_RELOCATE_LD_H */ +diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h +index 9c15259236..fcbbf69748 100644 +--- a/sysdeps/generic/ldsodefs.h ++++ b/sysdeps/generic/ldsodefs.h +@@ -69,17 +69,24 @@ __BEGIN_DECLS + `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'. */ + #define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) + ++/* Return true if dynamic section in the shared library L should be ++ relocated. */ ++ ++static inline bool ++dl_relocate_ld (const struct link_map *l) ++{ ++ /* Don't relocate dynamic section if it is readonly */ ++ return !(l->l_ld_readonly || DL_RO_DYN_SECTION); ++} ++ + /* All references to the value of l_info[DT_PLTGOT], + l_info[DT_STRTAB], l_info[DT_SYMTAB], l_info[DT_RELA], + l_info[DT_REL], l_info[DT_JMPREL], and l_info[VERSYMIDX (DT_VERSYM)] + have to be accessed via the D_PTR macro. The macro is needed since for + most architectures the entry is already relocated - but for some not + and we need to relocate at access time. */ +-#ifdef DL_RO_DYN_SECTION +-# define D_PTR(map, i) ((map)->i->d_un.d_ptr + (map)->l_addr) +-#else +-# define D_PTR(map, i) (map)->i->d_un.d_ptr +-#endif ++#define D_PTR(map, i) \ ++ ((map)->i->d_un.d_ptr + (dl_relocate_ld (map) ? 0 : (map)->l_addr)) + + /* Result of the lookup functions and how to retrieve the base address. */ + typedef struct link_map *lookup_t; +@@ -372,6 +379,13 @@ struct rtld_global + list of loaded objects while an object is added to or removed + from that list. */ + __rtld_lock_define_recursive (EXTERN, _dl_load_write_lock) ++ /* This lock protects global and module specific TLS related data. ++ E.g. it is held in dlopen and dlclose when GL(dl_tls_generation), ++ GL(dl_tls_max_dtv_idx) or GL(dl_tls_dtv_slotinfo_list) are ++ accessed and when TLS related relocations are processed for a ++ module. It was introduced to keep pthread_create accessing TLS ++ state that is being set up. */ ++ __rtld_lock_define_recursive (EXTERN, _dl_load_tls_lock) + + /* Incremented whenever something may have been added to dl_loaded. */ + EXTERN unsigned long long _dl_load_adds; +@@ -1261,7 +1275,7 @@ extern int _dl_scope_free (void *) attribute_hidden; + + /* Add module to slot information data. If DO_ADD is false, only the + required memory is allocated. Must be called with GL +- (dl_load_lock) acquired. If the function has already been called ++ (dl_load_tls_lock) acquired. If the function has already been called + for the link map L with !do_add, then this function will not raise + an exception, otherwise it is possible that it encounters a memory + allocation failure. */ +diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c +index 1267f39da2..cc8023f979 100644 +--- a/sysdeps/mach/getsysstats.c ++++ b/sysdeps/mach/getsysstats.c +@@ -62,6 +62,12 @@ __get_nprocs (void) + libc_hidden_def (__get_nprocs) + weak_alias (__get_nprocs, get_nprocs) + ++int ++__get_nprocs_sched (void) ++{ ++ return __get_nprocs (); ++} ++ + /* Return the number of physical pages on the system. */ + long int + __get_phys_pages (void) +diff --git a/sysdeps/mips/dl-relocate-ld.h b/sysdeps/mips/dl-relocate-ld.h +new file mode 100644 +index 0000000000..376ad75dd1 +--- /dev/null ++++ b/sysdeps/mips/dl-relocate-ld.h +@@ -0,0 +1,25 @@ ++/* Check if dynamic section should be relocated. MIPS version. ++ 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/>. */ ++ ++#ifndef _DL_RELOCATE_LD_H ++#define _DL_RELOCATE_LD_H ++ ++/* The dynamic section is readonly. */ ++#define DL_RO_DYN_SECTION 1 ++ ++#endif /* _DL_RELOCATE_LD_H */ +diff --git a/sysdeps/mips/ldsodefs.h b/sysdeps/mips/ldsodefs.h +index 4db7c60e38..36fd09a8bd 100644 +--- a/sysdeps/mips/ldsodefs.h ++++ b/sysdeps/mips/ldsodefs.h +@@ -75,10 +75,6 @@ struct La_mips_64_retval; + struct La_mips_64_retval *, \ + const char *); + +-/* The MIPS ABI specifies that the dynamic section has to be read-only. */ +- +-#define DL_RO_DYN_SECTION 1 +- + #include_next <ldsodefs.h> + + /* The 64-bit MIPS ELF ABI uses an unusual reloc format. Each +diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h +index f1b7f2bdc6..43146e91c9 100644 +--- a/sysdeps/nptl/pthread.h ++++ b/sysdeps/nptl/pthread.h +@@ -933,7 +933,7 @@ extern int pthread_mutexattr_getrobust (const pthread_mutexattr_t *__attr, + # ifdef __USE_GNU + # ifdef __REDIRECT_NTH + extern int __REDIRECT_NTH (pthread_mutexattr_getrobust_np, +- (pthread_mutex_t *, int *), ++ (pthread_mutexattr_t *, int *), + pthread_mutexattr_getrobust) __nonnull ((1)) + __attribute_deprecated_msg__ ("\ + pthread_mutexattr_getrobust_np is deprecated, use pthread_mutexattr_getrobust"); +@@ -949,7 +949,7 @@ extern int pthread_mutexattr_setrobust (pthread_mutexattr_t *__attr, + # ifdef __USE_GNU + # ifdef __REDIRECT_NTH + extern int __REDIRECT_NTH (pthread_mutexattr_setrobust_np, +- (pthread_mutex_t *, int), ++ (pthread_mutexattr_t *, int), + pthread_mutexattr_setrobust) __nonnull ((1)) + __attribute_deprecated_msg__ ("\ + pthread_mutexattr_setrobust_np is deprecated, use pthread_mutexattr_setrobust"); +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index 838a68f022..43dfc6739e 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2008,6 +2008,7 @@ gaiconf_init (void) + l = l->next; + } + free_prefixlist (labellist); ++ labellist = NULL; + + /* Sort the entries so that the most specific ones are at + the beginning. */ +@@ -2046,6 +2047,7 @@ gaiconf_init (void) + l = l->next; + } + free_prefixlist (precedencelist); ++ precedencelist = NULL; + + /* Sort the entries so that the most specific ones are at + the beginning. */ +diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64/sysdep.h +index 589f7c8d18..cfcfa69f91 100644 +--- a/sysdeps/powerpc/powerpc64/sysdep.h ++++ b/sysdeps/powerpc/powerpc64/sysdep.h +@@ -275,12 +275,14 @@ LT_LABELSUFFIX(name,_name_end): ; \ + /* Allocate frame and save register */ + #define NVOLREG_SAVE \ + stdu r1,-SCV_FRAME_SIZE(r1); \ ++ cfi_adjust_cfa_offset(SCV_FRAME_SIZE); \ + std r31,SCV_FRAME_NVOLREG_SAVE(r1); \ +- cfi_adjust_cfa_offset(SCV_FRAME_SIZE); ++ cfi_rel_offset(r31,SCV_FRAME_NVOLREG_SAVE); + + /* Restore register and destroy frame */ + #define NVOLREG_RESTORE \ + ld r31,SCV_FRAME_NVOLREG_SAVE(r1); \ ++ cfi_restore(r31); \ + addi r1,r1,SCV_FRAME_SIZE; \ + cfi_adjust_cfa_offset(-SCV_FRAME_SIZE); + +@@ -331,13 +333,13 @@ LT_LABELSUFFIX(name,_name_end): ; \ + + #define DO_CALL_SCV \ + mflr r9; \ +- std r9,FRAME_LR_SAVE(r1); \ +- cfi_offset(lr,FRAME_LR_SAVE); \ ++ std r9,SCV_FRAME_SIZE+FRAME_LR_SAVE(r1); \ ++ cfi_rel_offset(lr,SCV_FRAME_SIZE+FRAME_LR_SAVE); \ + .machine "push"; \ + .machine "power9"; \ + scv 0; \ + .machine "pop"; \ +- ld r9,FRAME_LR_SAVE(r1); \ ++ ld r9,SCV_FRAME_SIZE+FRAME_LR_SAVE(r1); \ + mtlr r9; \ + cfi_restore(lr); + +diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile +index 42f9fc5072..c657101696 100644 +--- a/sysdeps/pthread/Makefile ++++ b/sysdeps/pthread/Makefile +@@ -89,7 +89,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ + tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \ + tst-join14 tst-join15 \ + tst-key1 tst-key2 tst-key3 tst-key4 \ +- tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \ ++ tst-kill1 tst-kill2 tst-kill3 tst-kill5 tst-kill6 \ + tst-locale1 tst-locale2 \ + tst-memstream \ + tst-mutex-errorcheck tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 \ +@@ -118,6 +118,14 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ + tst-unload \ + tst-unwind-thread \ + tst-pt-vfork1 tst-pt-vfork2 tst-vfork1x tst-vfork2x \ ++ tst-pthread-exit-signal \ ++ tst-pthread-setuid-loop \ ++ tst-pthread_cancel-exited \ ++ tst-pthread_cancel-select-loop \ ++ tst-pthread-raise-blocked-self \ ++ tst-pthread_kill-exited \ ++ tst-pthread_kill-exiting \ ++ # tests + + tests-time64 := \ + tst-abstime-time64 \ +@@ -145,15 +153,17 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx6 tst-cancelx8 tst-cancelx9 \ + tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 + + ifeq ($(build-shared),yes) +-tests += tst-atfork2 tst-pt-tls4 tst-_res1 tst-fini1 ++tests += tst-atfork2 tst-pt-tls4 tst-_res1 tst-fini1 tst-create1 + tests-nolibpthread += tst-fini1 + endif + + modules-names += tst-atfork2mod tst-tls4moda tst-tls4modb \ +- tst-_res1mod1 tst-_res1mod2 tst-fini1mod ++ tst-_res1mod1 tst-_res1mod2 tst-fini1mod \ ++ tst-create1mod + test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names))) + + tst-atfork2mod.so-no-z-defs = yes ++tst-create1mod.so-no-z-defs = yes + + ifeq ($(build-shared),yes) + # Build all the modules even when not actually running test programs. +@@ -272,4 +282,8 @@ LDFLAGS-tst-join7mod.so = -Wl,-soname,tst-join7mod.so + + CFLAGS-tst-unwind-thread.c += -funwind-tables + ++LDFLAGS-tst-create1 = -Wl,-export-dynamic ++$(objpfx)tst-create1: $(shared-thread-library) ++$(objpfx)tst-create1.out: $(objpfx)tst-create1mod.so ++ + endif +diff --git a/sysdeps/pthread/tst-create1.c b/sysdeps/pthread/tst-create1.c +new file mode 100644 +index 0000000000..763ded8d79 +--- /dev/null ++++ b/sysdeps/pthread/tst-create1.c +@@ -0,0 +1,123 @@ ++/* Verify that pthread_create does not deadlock when ctors take locks. ++ 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 <stdio.h> ++#include <support/xdlfcn.h> ++#include <support/xthread.h> ++ ++/* ++Check if ctor and pthread_create deadlocks in ++ ++thread 1: dlopen -> ctor -> lock(user_lock) ++thread 2: lock(user_lock) -> pthread_create ++ ++or in ++ ++thread 1: dlclose -> dtor -> lock(user_lock) ++thread 2: lock(user_lock) -> pthread_create ++*/ ++ ++static pthread_barrier_t bar_ctor; ++static pthread_barrier_t bar_ctor_finish; ++static pthread_barrier_t bar_dtor; ++static pthread_mutex_t user_lock = PTHREAD_MUTEX_INITIALIZER; ++ ++void ++ctor (void) ++{ ++ xpthread_barrier_wait (&bar_ctor); ++ dprintf (1, "thread 1: in ctor: started.\n"); ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 1: in ctor: locked user_lock.\n"); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 1: in ctor: unlocked user_lock.\n"); ++ dprintf (1, "thread 1: in ctor: done.\n"); ++ xpthread_barrier_wait (&bar_ctor_finish); ++} ++ ++void ++dtor (void) ++{ ++ xpthread_barrier_wait (&bar_dtor); ++ dprintf (1, "thread 1: in dtor: started.\n"); ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 1: in dtor: locked user_lock.\n"); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 1: in dtor: unlocked user_lock.\n"); ++ dprintf (1, "thread 1: in dtor: done.\n"); ++} ++ ++static void * ++thread3 (void *a) ++{ ++ dprintf (1, "thread 3: started.\n"); ++ dprintf (1, "thread 3: done.\n"); ++ return 0; ++} ++ ++static void * ++thread2 (void *a) ++{ ++ pthread_t t3; ++ dprintf (1, "thread 2: started.\n"); ++ ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 2: locked user_lock.\n"); ++ xpthread_barrier_wait (&bar_ctor); ++ t3 = xpthread_create (0, thread3, 0); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 2: unlocked user_lock.\n"); ++ xpthread_join (t3); ++ xpthread_barrier_wait (&bar_ctor_finish); ++ ++ xpthread_mutex_lock (&user_lock); ++ dprintf (1, "thread 2: locked user_lock.\n"); ++ xpthread_barrier_wait (&bar_dtor); ++ t3 = xpthread_create (0, thread3, 0); ++ xpthread_mutex_unlock (&user_lock); ++ dprintf (1, "thread 2: unlocked user_lock.\n"); ++ xpthread_join (t3); ++ ++ dprintf (1, "thread 2: done.\n"); ++ return 0; ++} ++ ++static void ++thread1 (void) ++{ ++ dprintf (1, "thread 1: started.\n"); ++ xpthread_barrier_init (&bar_ctor, NULL, 2); ++ xpthread_barrier_init (&bar_ctor_finish, NULL, 2); ++ xpthread_barrier_init (&bar_dtor, NULL, 2); ++ pthread_t t2 = xpthread_create (0, thread2, 0); ++ void *p = xdlopen ("tst-create1mod.so", RTLD_NOW | RTLD_GLOBAL); ++ dprintf (1, "thread 1: dlopen done.\n"); ++ xdlclose (p); ++ dprintf (1, "thread 1: dlclose done.\n"); ++ xpthread_join (t2); ++ dprintf (1, "thread 1: done.\n"); ++} ++ ++static int ++do_test (void) ++{ ++ thread1 (); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-create1mod.c b/sysdeps/pthread/tst-create1mod.c +new file mode 100644 +index 0000000000..62c9006961 +--- /dev/null ++++ b/sysdeps/pthread/tst-create1mod.c +@@ -0,0 +1,41 @@ ++/* Verify that pthread_create does not deadlock when ctors take locks. ++ 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 <stdio.h> ++ ++/* Require TLS setup for the module. */ ++__thread int tlsvar; ++ ++void ctor (void); ++void dtor (void); ++ ++static void __attribute__ ((constructor)) ++do_init (void) ++{ ++ dprintf (1, "constructor started: %d.\n", tlsvar++); ++ ctor (); ++ dprintf (1, "constructor done: %d.\n", tlsvar++); ++} ++ ++static void __attribute__ ((destructor)) ++do_end (void) ++{ ++ dprintf (1, "destructor started: %d.\n", tlsvar++); ++ dtor (); ++ dprintf (1, "destructor done: %d.\n", tlsvar++); ++} +diff --git a/sysdeps/pthread/tst-kill4.c b/sysdeps/pthread/tst-kill4.c +deleted file mode 100644 +index 9563939792..0000000000 +--- a/sysdeps/pthread/tst-kill4.c ++++ /dev/null +@@ -1,90 +0,0 @@ +-/* Copyright (C) 2003-2021 Free Software Foundation, Inc. +- This file is part of the GNU C Library. +- Contributed by Ulrich Drepper <drepper(a)redhat.com>, 2003. +- +- 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 <pthread.h> +-#include <signal.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <unistd.h> +- +- +-static void * +-tf (void *a) +-{ +- return NULL; +-} +- +- +-int +-do_test (void) +-{ +- pthread_attr_t at; +- if (pthread_attr_init (&at) != 0) +- { +- puts ("attr_create failed"); +- exit (1); +- } +- +- /* Limit thread stack size, because if it is too large, pthread_join +- will free it immediately rather than put it into stack cache. */ +- if (pthread_attr_setstacksize (&at, 2 * 1024 * 1024) != 0) +- { +- puts ("setstacksize failed"); +- exit (1); +- } +- +- pthread_t th; +- if (pthread_create (&th, &at, tf, NULL) != 0) +- { +- puts ("create failed"); +- exit (1); +- } +- +- pthread_attr_destroy (&at); +- +- if (pthread_join (th, NULL) != 0) +- { +- puts ("join failed"); +- exit (1); +- } +- +- /* The following only works because we assume here something about +- the implementation. Namely, that the memory allocated for the +- thread descriptor is not going away, that the TID field is +- cleared and therefore the signal is sent to process 0, and that +- we can savely assume there is no other process with this ID at +- that time. */ +- int e = pthread_kill (th, 0); +- if (e == 0) +- { +- puts ("pthread_kill succeeded"); +- exit (1); +- } +- if (e != ESRCH) +- { +- puts ("pthread_kill didn't return ESRCH"); +- exit (1); +- } +- +- return 0; +-} +- +- +-#define TEST_FUNCTION do_test () +-#include "../test-skeleton.c" +diff --git a/sysdeps/pthread/tst-pthread-exit-signal.c b/sysdeps/pthread/tst-pthread-exit-signal.c +new file mode 100644 +index 0000000000..b4526fe663 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread-exit-signal.c +@@ -0,0 +1,45 @@ ++/* Test that pending signals are not delivered on thread exit (bug 28607). ++ 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/>. */ ++ ++/* Due to bug 28607, pthread_kill (or pthread_cancel) restored the ++ signal mask during during thread exit, triggering the delivery of a ++ blocked pending signal (SIGUSR1 in this test). */ ++ ++#include <support/xthread.h> ++#include <support/xsignal.h> ++ ++static void * ++threadfunc (void *closure) ++{ ++ sigset_t sigmask; ++ sigfillset (&sigmask); ++ xpthread_sigmask (SIG_SETMASK, &sigmask, NULL); ++ xpthread_kill (pthread_self (), SIGUSR1); ++ pthread_exit (NULL); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ pthread_t thr = xpthread_create (NULL, threadfunc, NULL); ++ xpthread_join (thr); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread-raise-blocked-self.c b/sysdeps/pthread/tst-pthread-raise-blocked-self.c +new file mode 100644 +index 0000000000..128e1a6071 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread-raise-blocked-self.c +@@ -0,0 +1,92 @@ ++/* Test that raise sends signal to current thread even if blocked. ++ 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 <signal.h> ++#include <support/check.h> ++#include <support/xsignal.h> ++#include <support/xthread.h> ++#include <pthread.h> ++#include <unistd.h> ++ ++/* Used to create a dummy thread ID distinct from all other thread ++ IDs. */ ++static void * ++noop (void *ignored) ++{ ++ return NULL; ++} ++ ++static volatile pthread_t signal_thread; ++ ++static void ++signal_handler (int signo) ++{ ++ signal_thread = pthread_self (); ++} ++ ++/* Used to ensure that waiting_thread has launched and can accept ++ signals. */ ++static pthread_barrier_t barrier; ++ ++static void * ++waiting_thread (void *ignored) ++{ ++ xpthread_barrier_wait (&barrier); ++ pause (); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xsignal (SIGUSR1, signal_handler); ++ xpthread_barrier_init (&barrier, NULL, 2); ++ ++ /* Distinct thread ID value to */ ++ pthread_t dummy = xpthread_create (NULL, noop, NULL); ++ signal_thread = dummy; ++ ++ pthread_t helper = xpthread_create (NULL, waiting_thread, NULL); ++ ++ /* Make sure that the thread is running. */ ++ xpthread_barrier_wait (&barrier); ++ ++ /* Block signals on this thread. */ ++ sigset_t set; ++ sigfillset (&set); ++ xpthread_sigmask (SIG_BLOCK, &set, NULL); ++ ++ /* Send the signal to this thread. It must not be delivered. */ ++ raise (SIGUSR1); ++ TEST_VERIFY (signal_thread == dummy); ++ ++ /* Wait a bit to give a chance for signal delivery (increases ++ chances of failure with bug 28407). */ ++ usleep (50 * 1000); ++ ++ /* Unblocking should cause synchronous delivery of the signal. */ ++ xpthread_sigmask (SIG_UNBLOCK, &set, NULL); ++ TEST_VERIFY (signal_thread == pthread_self ()); ++ ++ xpthread_cancel (helper); ++ xpthread_join (helper); ++ xpthread_join (dummy); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread-setuid-loop.c b/sysdeps/pthread/tst-pthread-setuid-loop.c +new file mode 100644 +index 0000000000..fda2a49b7f +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread-setuid-loop.c +@@ -0,0 +1,61 @@ ++/* Test that setuid, pthread_create, thread exit do not deadlock (bug 28361). ++ 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 <support/check.h> ++#include <support/xthread.h> ++#include <unistd.h> ++ ++/* How many threads to launch during each iteration. */ ++enum { threads = 4 }; ++ ++/* How many iterations to perform. This value seems to reproduce ++ bug 28361 in a bout one in three runs. */ ++enum { iterations = 5000 }; ++ ++/* Cache of the real user ID used by setuid_thread. */ ++static uid_t uid; ++ ++/* Start routine for the threads. */ ++static void * ++setuid_thread (void *closure) ++{ ++ TEST_COMPARE (setuid (uid), 0); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ /* The setxid machinery is still invoked even if the UID is ++ unchanged. (The kernel might reset other credentials as part of ++ the system call.) */ ++ uid = getuid (); ++ ++ for (int i = 0; i < iterations; ++i) ++ { ++ pthread_t thread_ids[threads]; ++ for (int j = 0; j < threads; ++j) ++ thread_ids[j] = xpthread_create (NULL, setuid_thread, NULL); ++ for (int j = 0; j < threads; ++j) ++ xpthread_join (thread_ids[j]); ++ } ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_cancel-exited.c b/sysdeps/pthread/tst-pthread_cancel-exited.c +new file mode 100644 +index 0000000000..811c9bee07 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_cancel-exited.c +@@ -0,0 +1,45 @@ ++/* Test that pthread_kill succeeds for an exited thread. ++ 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/>. */ ++ ++/* This test verifies that pthread_kill returns 0 (and not ESRCH) for ++ a thread that has exited on the kernel side. */ ++ ++#include <stddef.h> ++#include <support/support.h> ++#include <support/xthread.h> ++ ++static void * ++noop_thread (void *closure) ++{ ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ pthread_t thr = xpthread_create (NULL, noop_thread, NULL); ++ ++ support_wait_for_thread_exit (); ++ ++ xpthread_cancel (thr); ++ xpthread_join (thr); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_cancel-select-loop.c b/sysdeps/pthread/tst-pthread_cancel-select-loop.c +new file mode 100644 +index 0000000000..a62087589c +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_cancel-select-loop.c +@@ -0,0 +1,87 @@ ++/* Test that pthread_cancel succeeds during thread exit. ++ 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/>. */ ++ ++/* This test tries to trigger an internal race condition in ++ pthread_cancel, where the cancellation signal is sent after the ++ thread has begun the cancellation process. This can result in a ++ spurious ESRCH error. For the original bug 12889, the window is ++ quite small, so the bug was not reproduced in every run. */ ++ ++#include <stdbool.h> ++#include <stddef.h> ++#include <support/check.h> ++#include <support/xthread.h> ++#include <support/xunistd.h> ++#include <sys/select.h> ++#include <unistd.h> ++ ++/* Set to true by timeout_thread_function when the test should ++ terminate. */ ++static bool timeout; ++ ++static void * ++timeout_thread_function (void *unused) ++{ ++ usleep (5 * 1000 * 1000); ++ __atomic_store_n (&timeout, true, __ATOMIC_RELAXED); ++ return NULL; ++} ++ ++/* Used for blocking the select function below. */ ++static int pipe_fds[2]; ++ ++static void * ++canceled_thread_function (void *unused) ++{ ++ while (true) ++ { ++ fd_set rfs; ++ fd_set wfs; ++ fd_set efs; ++ FD_ZERO (&rfs); ++ FD_ZERO (&wfs); ++ FD_ZERO (&efs); ++ FD_SET (pipe_fds[0], &rfs); ++ ++ /* If the cancellation request is recognized early, the thread ++ begins exiting while the cancellation signal arrives. */ ++ select (FD_SETSIZE, &rfs, &wfs, &efs, NULL); ++ } ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xpipe (pipe_fds); ++ pthread_t thr_timeout = xpthread_create (NULL, timeout_thread_function, NULL); ++ ++ while (!__atomic_load_n (&timeout, __ATOMIC_RELAXED)) ++ { ++ pthread_t thr = xpthread_create (NULL, canceled_thread_function, NULL); ++ xpthread_cancel (thr); ++ TEST_VERIFY (xpthread_join (thr) == PTHREAD_CANCELED); ++ } ++ ++ xpthread_join (thr_timeout); ++ xclose (pipe_fds[0]); ++ xclose (pipe_fds[1]); ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_kill-exited.c b/sysdeps/pthread/tst-pthread_kill-exited.c +new file mode 100644 +index 0000000000..a2fddad526 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_kill-exited.c +@@ -0,0 +1,63 @@ ++/* Test that pthread_kill succeeds for an exited thread. ++ 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/>. */ ++ ++/* This test verifies that the default pthread_kill returns 0 (and not ++ ESRCH) for a thread that has exited on the kernel side. */ ++ ++#include <errno.h> ++#include <pthread.h> ++#include <shlib-compat.h> ++#include <signal.h> ++#include <stddef.h> ++#include <support/check.h> ++#include <support/support.h> ++#include <support/xthread.h> ++ ++static void * ++noop_thread (void *closure) ++{ ++ return NULL; ++} ++ ++#if TEST_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) && PTHREAD_IN_LIBC ++extern __typeof (pthread_kill) compat_pthread_kill; ++compat_symbol_reference (libpthread, compat_pthread_kill, pthread_kill, ++ GLIBC_2_0); ++#endif ++ ++static int ++do_test (void) ++{ ++ pthread_t thr = xpthread_create (NULL, noop_thread, NULL); ++ ++ support_wait_for_thread_exit (); ++ ++ /* NB: Always uses the default symbol due to separate compilation. */ ++ xpthread_kill (thr, SIGUSR1); ++ ++#if TEST_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_34) && PTHREAD_IN_LIBC ++ /* Old binaries need the non-conforming ESRCH error code. */ ++ TEST_COMPARE (compat_pthread_kill (thr, SIGUSR1), ESRCH); ++#endif ++ ++ xpthread_join (thr); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/pthread/tst-pthread_kill-exiting.c b/sysdeps/pthread/tst-pthread_kill-exiting.c +new file mode 100644 +index 0000000000..f803e94f11 +--- /dev/null ++++ b/sysdeps/pthread/tst-pthread_kill-exiting.c +@@ -0,0 +1,123 @@ ++/* Test that pthread_kill succeeds during thread exit. ++ 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/>. */ ++ ++/* This test verifies that pthread_kill for a thread that is exiting ++ succeeds (with or without actually delivering the signal). */ ++ ++#include <array_length.h> ++#include <stdbool.h> ++#include <stddef.h> ++#include <support/xsignal.h> ++#include <support/xthread.h> ++#include <unistd.h> ++ ++/* Set to true by timeout_thread_function when the test should ++ terminate. */ ++static bool timeout; ++ ++static void * ++timeout_thread_function (void *unused) ++{ ++ usleep (1000 * 1000); ++ __atomic_store_n (&timeout, true, __ATOMIC_RELAXED); ++ return NULL; ++} ++ ++/* Used to synchronize the sending threads with the target thread and ++ main thread. */ ++static pthread_barrier_t barrier_1; ++static pthread_barrier_t barrier_2; ++ ++/* The target thread to which signals are to be sent. */ ++static pthread_t target_thread; ++ ++/* Set by the main thread to true after timeout has been set to ++ true. */ ++static bool exiting; ++ ++static void * ++sender_thread_function (void *unused) ++{ ++ while (true) ++ { ++ /* Wait until target_thread has been initialized. The target ++ thread and main thread participate in this barrier. */ ++ xpthread_barrier_wait (&barrier_1); ++ ++ if (exiting) ++ break; ++ ++ xpthread_kill (target_thread, SIGUSR1); ++ ++ /* Communicate that the signal has been sent. The main thread ++ participates in this barrier. */ ++ xpthread_barrier_wait (&barrier_2); ++ } ++ return NULL; ++} ++ ++static void * ++target_thread_function (void *unused) ++{ ++ target_thread = pthread_self (); ++ xpthread_barrier_wait (&barrier_1); ++ return NULL; ++} ++ ++static int ++do_test (void) ++{ ++ xsignal (SIGUSR1, SIG_IGN); ++ ++ pthread_t thr_timeout = xpthread_create (NULL, timeout_thread_function, NULL); ++ ++ pthread_t threads[4]; ++ xpthread_barrier_init (&barrier_1, NULL, array_length (threads) + 2); ++ xpthread_barrier_init (&barrier_2, NULL, array_length (threads) + 1); ++ ++ for (int i = 0; i < array_length (threads); ++i) ++ threads[i] = xpthread_create (NULL, sender_thread_function, NULL); ++ ++ while (!__atomic_load_n (&timeout, __ATOMIC_RELAXED)) ++ { ++ xpthread_create (NULL, target_thread_function, NULL); ++ ++ /* Wait for the target thread to be set up and signal sending to ++ start. */ ++ xpthread_barrier_wait (&barrier_1); ++ ++ /* Wait for signal sending to complete. */ ++ xpthread_barrier_wait (&barrier_2); ++ ++ xpthread_join (target_thread); ++ } ++ ++ exiting = true; ++ ++ /* Signal the sending threads to exit. */ ++ xpthread_create (NULL, target_thread_function, NULL); ++ xpthread_barrier_wait (&barrier_1); ++ ++ for (int i = 0; i < array_length (threads); ++i) ++ xpthread_join (threads[i]); ++ xpthread_join (thr_timeout); ++ ++ return 0; ++} ++ ++#include <support/test-driver.c> +diff --git a/sysdeps/riscv/dl-relocate-ld.h b/sysdeps/riscv/dl-relocate-ld.h +new file mode 100644 +index 0000000000..2ab2b8ac6c +--- /dev/null ++++ b/sysdeps/riscv/dl-relocate-ld.h +@@ -0,0 +1,25 @@ ++/* Check if dynamic section should be relocated. RISC-V version. ++ 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/>. */ ++ ++#ifndef _DL_RELOCATE_LD_H ++#define _DL_RELOCATE_LD_H ++ ++/* The dynamic section is readonly for ABI compatibility. */ ++#define DL_RO_DYN_SECTION 1 ++ ++#endif /* _DL_RELOCATE_LD_H */ +diff --git a/sysdeps/riscv/ldsodefs.h b/sysdeps/riscv/ldsodefs.h +index 0c696714a7..8947ffe4b5 100644 +--- a/sysdeps/riscv/ldsodefs.h ++++ b/sysdeps/riscv/ldsodefs.h +@@ -38,11 +38,6 @@ struct La_riscv_retval; + struct La_riscv_retval *, \ + const char *); + +-/* Although the RISC-V ABI does not specify that the dynamic section has +- to be read-only, it needs to be kept for ABI compatibility. */ +- +-#define DL_RO_DYN_SECTION 1 +- + #include_next <ldsodefs.h> + + #endif +diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c +index c174e27b35..155f0bd99e 100644 +--- a/sysdeps/s390/dl-procinfo.c ++++ b/sysdeps/s390/dl-procinfo.c +@@ -46,13 +46,13 @@ + #if !defined PROCINFO_DECL && defined SHARED + ._dl_s390_cap_flags + #else +-PROCINFO_CLASS const char _dl_s390_cap_flags[21][9] ++PROCINFO_CLASS const char _dl_s390_cap_flags[23][9] + #endif + #ifndef PROCINFO_DECL + = { + "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", + "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt", +- "vxp2", "nnpa" ++ "vxp2", "nnpa", "pcimio", "sie" + } + #endif + #if !defined SHARED || defined PROCINFO_DECL +diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h +index 2d9c305808..e4e3e334a5 100644 +--- a/sysdeps/s390/dl-procinfo.h ++++ b/sysdeps/s390/dl-procinfo.h +@@ -21,7 +21,7 @@ + #define _DL_PROCINFO_H 1 + #include <ldsodefs.h> + +-#define _DL_HWCAP_COUNT 21 ++#define _DL_HWCAP_COUNT 23 + + #define _DL_PLATFORMS_COUNT 10 + +@@ -63,6 +63,8 @@ enum + HWCAP_S390_DFLT = 1 << 18, + HWCAP_S390_VXRS_PDE2 = 1 << 19, + HWCAP_S390_NNPA = 1 << 20, ++ HWCAP_S390_PCI_MIO = 1 << 21, ++ HWCAP_S390_SIE = 1 << 22, + }; + + #define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \ +diff --git a/sysdeps/s390/memmem-arch13.S b/sysdeps/s390/memmem-arch13.S +index c5c8d8c97e..58df8cdb14 100644 +--- a/sysdeps/s390/memmem-arch13.S ++++ b/sysdeps/s390/memmem-arch13.S +@@ -41,7 +41,7 @@ ENTRY(MEMMEM_ARCH13) + # error The arch13 variant of memmem needs the z13 variant of memmem! + # endif + clgfi %r5,9 +- jh MEMMEM_Z13 ++ jgh MEMMEM_Z13 + + aghik %r0,%r5,-1 /* vll needs highest index. */ + bc 4,0(%r14) /* cc==1: return if needle-len == 0. */ +diff --git a/sysdeps/s390/strstr-arch13.S b/sysdeps/s390/strstr-arch13.S +index c7183e627c..222a6de91a 100644 +--- a/sysdeps/s390/strstr-arch13.S ++++ b/sysdeps/s390/strstr-arch13.S +@@ -49,7 +49,7 @@ ENTRY(STRSTR_ARCH13) + # error The arch13 variant of strstr needs the z13 variant of strstr! + # endif + clgfi %r4,9 +- jh STRSTR_Z13 ++ jgh STRSTR_Z13 + + /* In case of a partial match, the vstrs instruction returns the index + of the partial match in a vector-register. Then we have to +diff --git a/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h b/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h +index e9eb707d0a..bedab1abba 100644 +--- a/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/aarch64/arch-syscall.h +@@ -126,6 +126,7 @@ + #define __NR_mbind 235 + #define __NR_membarrier 283 + #define __NR_memfd_create 279 ++#define __NR_memfd_secret 447 + #define __NR_migrate_pages 238 + #define __NR_mincore 232 + #define __NR_mkdirat 34 +@@ -187,6 +188,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/alpha/arch-syscall.h b/sysdeps/unix/sysv/linux/alpha/arch-syscall.h +index bd6b7d4003..91354ed9e2 100644 +--- a/sysdeps/unix/sysv/linux/alpha/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/alpha/arch-syscall.h +@@ -337,6 +337,7 @@ + #define __NR_pwritev2 521 + #define __NR_query_module 347 + #define __NR_quotactl 148 ++#define __NR_quotactl_fd 553 + #define __NR_read 3 + #define __NR_readahead 379 + #define __NR_readlink 58 +diff --git a/sysdeps/unix/sysv/linux/arc/arch-syscall.h b/sysdeps/unix/sysv/linux/arc/arch-syscall.h +index 10650549c1..ff5c7eb36d 100644 +--- a/sysdeps/unix/sysv/linux/arc/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/arc/arch-syscall.h +@@ -190,6 +190,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/arm/arch-syscall.h b/sysdeps/unix/sysv/linux/arm/arch-syscall.h +index 85c9b236ce..5772333cee 100644 +--- a/sysdeps/unix/sysv/linux/arm/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/arm/arch-syscall.h +@@ -244,6 +244,7 @@ + #define __NR_pwritev 362 + #define __NR_pwritev2 393 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readlink 85 +diff --git a/sysdeps/unix/sysv/linux/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h +index 3b1ae418e0..31451c28d9 100644 +--- a/sysdeps/unix/sysv/linux/bits/mman-linux.h ++++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h +@@ -89,6 +89,10 @@ + # define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK. */ + # define MADV_COLD 20 /* Deactivate these pages. */ + # define MADV_PAGEOUT 21 /* Reclaim these pages. */ ++# define MADV_POPULATE_READ 22 /* Populate (prefault) page tables ++ readable. */ ++# define MADV_POPULATE_WRITE 23 /* Populate (prefault) page tables ++ writable. */ + # define MADV_HWPOISON 100 /* Poison a page for testing. */ + #endif + +diff --git a/sysdeps/unix/sysv/linux/bits/timex.h b/sysdeps/unix/sysv/linux/bits/timex.h +index ee37694e8f..4a5db6deca 100644 +--- a/sysdeps/unix/sysv/linux/bits/timex.h ++++ b/sysdeps/unix/sysv/linux/bits/timex.h +@@ -25,7 +25,7 @@ + + struct timex + { +-# ifdef __USE_TIME_BITS64 ++# if defined __USE_TIME_BITS64 || (__TIMESIZE == 64 && __WORDSIZE == 32) + unsigned int modes; /* mode selector */ + int :32; /* pad */ + long long offset; /* time offset (usec) */ +diff --git a/sysdeps/unix/sysv/linux/csky/arch-syscall.h b/sysdeps/unix/sysv/linux/csky/arch-syscall.h +index 24b0d1f94e..4af6d6202f 100644 +--- a/sysdeps/unix/sysv/linux/csky/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/csky/arch-syscall.h +@@ -199,6 +199,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c +index 1391e360b8..7fc6521942 100644 +--- a/sysdeps/unix/sysv/linux/getsysstats.c ++++ b/sysdeps/unix/sysv/linux/getsysstats.c +@@ -18,6 +18,8 @@ + <https://www.gnu.org/licenses/>. */ + + #include <array_length.h> ++#include <assert.h> ++#include <ctype.h> + #include <dirent.h> + #include <errno.h> + #include <ldsodefs.h> +@@ -29,61 +31,170 @@ + #include <sys/sysinfo.h> + #include <sysdep.h> + +-/* Compute the population count of the entire array. */ +-static int +-__get_nprocs_count (const unsigned long int *array, size_t length) ++int ++__get_nprocs_sched (void) + { +- int count = 0; +- for (size_t i = 0; i < length; ++i) +- if (__builtin_add_overflow (count, __builtin_popcountl (array[i]), +- &count)) +- return INT_MAX; +- return count; ++ enum ++ { ++ max_num_cpus = 32768, ++ cpu_bits_size = CPU_ALLOC_SIZE (32768) ++ }; ++ ++ /* This cannot use malloc because it is used on malloc initialization. */ ++ __cpu_mask cpu_bits[cpu_bits_size / sizeof (__cpu_mask)]; ++ int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, cpu_bits_size, ++ cpu_bits); ++ if (r > 0) ++ return CPU_COUNT_S (cpu_bits_size, (cpu_set_t*) cpu_bits); ++ else if (r == -EINVAL) ++ /* The input buffer is still not enough to store the number of cpus. This ++ is an arbitrary values assuming such systems should be rare and there ++ is no offline cpus. */ ++ return max_num_cpus; ++ /* Some other error. 2 is conservative (not a uniprocessor system, so ++ atomics are needed). */ ++ return 2; ++} ++ ++static char * ++next_line (int fd, char *const buffer, char **cp, char **re, ++ char *const buffer_end) ++{ ++ char *res = *cp; ++ char *nl = memchr (*cp, '\n', *re - *cp); ++ if (nl == NULL) ++ { ++ if (*cp != buffer) ++ { ++ if (*re == buffer_end) ++ { ++ memmove (buffer, *cp, *re - *cp); ++ *re = buffer + (*re - *cp); ++ *cp = buffer; ++ ++ ssize_t n = __read_nocancel (fd, *re, buffer_end - *re); ++ if (n < 0) ++ return NULL; ++ ++ *re += n; ++ ++ nl = memchr (*cp, '\n', *re - *cp); ++ while (nl == NULL && *re == buffer_end) ++ { ++ /* Truncate too long lines. */ ++ *re = buffer + 3 * (buffer_end - buffer) / 4; ++ n = __read_nocancel (fd, *re, buffer_end - *re); ++ if (n < 0) ++ return NULL; ++ ++ nl = memchr (*re, '\n', n); ++ **re = '\n'; ++ *re += n; ++ } ++ } ++ else ++ nl = memchr (*cp, '\n', *re - *cp); ++ ++ res = *cp; ++ } ++ ++ if (nl == NULL) ++ nl = *re - 1; ++ } ++ ++ *cp = nl + 1; ++ assert (*cp <= *re); ++ ++ return res == *re ? NULL : res; + } + +-/* __get_nprocs with a large buffer. */ + static int +-__get_nprocs_large (void) ++get_nproc_stat (char *buffer, size_t buffer_size) + { +- /* This code cannot use scratch_buffer because it is used during +- malloc initialization. */ +- size_t pagesize = GLRO (dl_pagesize); +- unsigned long int *page = __mmap (0, pagesize, PROT_READ | PROT_WRITE, +- MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); +- if (page == MAP_FAILED) +- return 2; +- int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, pagesize, page); +- int count; +- if (r > 0) +- count = __get_nprocs_count (page, pagesize / sizeof (unsigned long int)); +- else if (r == -EINVAL) +- /* One page is still not enough to store the bits. A more-or-less +- arbitrary value. This assumes t hat such large systems never +- happen in practice. */ +- count = GLRO (dl_pagesize) * CHAR_BIT; +- else +- count = 2; +- __munmap (page, GLRO (dl_pagesize)); +- return count; ++ char *buffer_end = buffer + buffer_size; ++ char *cp = buffer_end; ++ char *re = buffer_end; ++ ++ /* Default to an SMP system in case we cannot obtain an accurate ++ number. */ ++ int result = 2; ++ ++ const int flags = O_RDONLY | O_CLOEXEC; ++ int fd = __open_nocancel ("/proc/stat", flags); ++ if (fd != -1) ++ { ++ result = 0; ++ ++ char *l; ++ while ((l = next_line (fd, buffer, &cp, &re, buffer_end)) != NULL) ++ /* The current format of /proc/stat has all the cpu* entries ++ at the front. We assume here that stays this way. */ ++ if (strncmp (l, "cpu", 3) != 0) ++ break; ++ else if (isdigit (l[3])) ++ ++result; ++ ++ __close_nocancel_nostatus (fd); ++ } ++ ++ return result; + } + + int + __get_nprocs (void) + { +- /* Fast path for most systems. The kernel expects a buffer size +- that is a multiple of 8. */ +- unsigned long int small_buffer[1024 / CHAR_BIT / sizeof (unsigned long int)]; +- int r = INTERNAL_SYSCALL_CALL (sched_getaffinity, 0, +- sizeof (small_buffer), small_buffer); +- if (r > 0) +- return __get_nprocs_count (small_buffer, r / sizeof (unsigned long int)); +- else if (r == -EINVAL) +- /* The kernel requests a larger buffer to store the data. */ +- return __get_nprocs_large (); +- else +- /* Some other error. 2 is conservative (not a uniprocessor +- system, so atomics are needed). */ +- return 2; ++ enum { buffer_size = 1024 }; ++ char buffer[buffer_size]; ++ char *buffer_end = buffer + buffer_size; ++ char *cp = buffer_end; ++ char *re = buffer_end; ++ ++ const int flags = O_RDONLY | O_CLOEXEC; ++ /* This file contains comma-separated ranges. */ ++ int fd = __open_nocancel ("/sys/devices/system/cpu/online", flags); ++ char *l; ++ int result = 0; ++ if (fd != -1) ++ { ++ l = next_line (fd, buffer, &cp, &re, buffer_end); ++ if (l != NULL) ++ do ++ { ++ char *endp; ++ unsigned long int n = strtoul (l, &endp, 10); ++ if (l == endp) ++ { ++ result = 0; ++ break; ++ } ++ ++ unsigned long int m = n; ++ if (*endp == '-') ++ { ++ l = endp + 1; ++ m = strtoul (l, &endp, 10); ++ if (l == endp) ++ { ++ result = 0; ++ break; ++ } ++ } ++ ++ result += m - n + 1; ++ ++ l = endp; ++ if (l < re && *l == ',') ++ ++l; ++ } ++ while (l < re && *l != '\n'); ++ ++ __close_nocancel_nostatus (fd); ++ ++ if (result > 0) ++ return result; ++ } ++ ++ return get_nproc_stat (buffer, buffer_size); + } + libc_hidden_def (__get_nprocs) + weak_alias (__get_nprocs, get_nprocs) +@@ -117,7 +228,9 @@ __get_nprocs_conf (void) + return count; + } + +- return 1; ++ enum { buffer_size = 1024 }; ++ char buffer[buffer_size]; ++ return get_nproc_stat (buffer, buffer_size); + } + libc_hidden_def (__get_nprocs_conf) + weak_alias (__get_nprocs_conf, get_nprocs_conf) +diff --git a/sysdeps/unix/sysv/linux/hppa/arch-syscall.h b/sysdeps/unix/sysv/linux/hppa/arch-syscall.h +index feb70abc3e..b07fc8549d 100644 +--- a/sysdeps/unix/sysv/linux/hppa/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/hppa/arch-syscall.h +@@ -231,6 +231,7 @@ + #define __NR_pwritev 316 + #define __NR_pwritev2 348 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 207 + #define __NR_readlink 85 +diff --git a/sysdeps/unix/sysv/linux/i386/arch-syscall.h b/sysdeps/unix/sysv/linux/i386/arch-syscall.h +index 3b1894a79b..6e4264698b 100644 +--- a/sysdeps/unix/sysv/linux/i386/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/i386/arch-syscall.h +@@ -183,6 +183,7 @@ + #define __NR_mbind 274 + #define __NR_membarrier 375 + #define __NR_memfd_create 356 ++#define __NR_memfd_secret 447 + #define __NR_migrate_pages 294 + #define __NR_mincore 218 + #define __NR_mkdir 39 +@@ -266,6 +267,7 @@ + #define __NR_pwritev2 379 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/ia64/arch-syscall.h b/sysdeps/unix/sysv/linux/ia64/arch-syscall.h +index fb388a5fa4..1ca706d721 100644 +--- a/sysdeps/unix/sysv/linux/ia64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/ia64/arch-syscall.h +@@ -218,6 +218,7 @@ + #define __NR_pwritev 1320 + #define __NR_pwritev2 1349 + #define __NR_quotactl 1137 ++#define __NR_quotactl_fd 1467 + #define __NR_read 1026 + #define __NR_readahead 1216 + #define __NR_readlink 1092 +diff --git a/sysdeps/unix/sysv/linux/m68k/arch-syscall.h b/sysdeps/unix/sysv/linux/m68k/arch-syscall.h +index 7bc8c4af92..2f10f71f90 100644 +--- a/sysdeps/unix/sysv/linux/m68k/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/m68k/arch-syscall.h +@@ -254,6 +254,7 @@ + #define __NR_pwritev2 378 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 240 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h b/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h +index cf560d3af4..0607a4dfa6 100644 +--- a/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/microblaze/arch-syscall.h +@@ -266,6 +266,7 @@ + #define __NR_pwritev2 394 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/mips/fxstat.c b/sysdeps/unix/sysv/linux/mips/fxstat.c +index 11511d30b3..4a6016ff12 100644 +--- a/sysdeps/unix/sysv/linux/mips/fxstat.c ++++ b/sysdeps/unix/sysv/linux/mips/fxstat.c +@@ -35,7 +35,9 @@ __fxstat (int vers, int fd, struct stat *buf) + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (fstat, fd, &kbuf); +- return r ?: __xstat_conv (vers, &kbuf, buf); ++ if (r == 0) ++ return __xstat_conv (vers, &kbuf, buf); ++ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } + } +diff --git a/sysdeps/unix/sysv/linux/mips/lxstat.c b/sysdeps/unix/sysv/linux/mips/lxstat.c +index 871fb6c6c5..54f990a250 100644 +--- a/sysdeps/unix/sysv/linux/mips/lxstat.c ++++ b/sysdeps/unix/sysv/linux/mips/lxstat.c +@@ -35,7 +35,9 @@ __lxstat (int vers, const char *name, struct stat *buf) + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (lstat, name, &kbuf); +- return r ?: __xstat_conv (vers, &kbuf, buf); ++ if (r == 0) ++ return __xstat_conv (vers, &kbuf, buf); ++ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } + } +diff --git a/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h b/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h +index f346460f48..0055eec0b1 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips32/arch-syscall.h +@@ -251,6 +251,7 @@ + #define __NR_pwritev2 4362 + #define __NR_query_module 4187 + #define __NR_quotactl 4131 ++#define __NR_quotactl_fd 4443 + #define __NR_read 4003 + #define __NR_readahead 4223 + #define __NR_readdir 4089 +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h b/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h +index 38ed84997a..8e8e9f91cc 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/arch-syscall.h +@@ -232,6 +232,7 @@ + #define __NR_pwritev2 6326 + #define __NR_query_module 6171 + #define __NR_quotactl 6172 ++#define __NR_quotactl_fd 6443 + #define __NR_read 6000 + #define __NR_readahead 6179 + #define __NR_readlink 6087 +diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h b/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h +index e6a10c8421..ebd1545f80 100644 +--- a/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/arch-syscall.h +@@ -219,6 +219,7 @@ + #define __NR_pwritev2 5322 + #define __NR_query_module 5171 + #define __NR_quotactl 5172 ++#define __NR_quotactl_fd 5443 + #define __NR_read 5000 + #define __NR_readahead 5179 + #define __NR_readlink 5087 +diff --git a/sysdeps/unix/sysv/linux/mips/xstat.c b/sysdeps/unix/sysv/linux/mips/xstat.c +index 9d810b6f65..86f4dc31a8 100644 +--- a/sysdeps/unix/sysv/linux/mips/xstat.c ++++ b/sysdeps/unix/sysv/linux/mips/xstat.c +@@ -35,7 +35,9 @@ __xstat (int vers, const char *name, struct stat *buf) + { + struct kernel_stat kbuf; + int r = INTERNAL_SYSCALL_CALL (stat, name, &kbuf); +- return r ?: __xstat_conv (vers, &kbuf, buf); ++ if (r == 0) ++ return __xstat_conv (vers, &kbuf, buf); ++ return INLINE_SYSCALL_ERROR_RETURN_VALUE (-r); + } + } + } +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c +index 9799dcdaa4..eccae2e4c6 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -131,7 +131,7 @@ helper_thread (void *arg) + to wait until it is done with it. */ + (void) __pthread_barrier_wait (&notify_barrier); + } +- else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) ++ 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); +diff --git a/sysdeps/unix/sysv/linux/nios2/arch-syscall.h b/sysdeps/unix/sysv/linux/nios2/arch-syscall.h +index 5314890289..2b530b1f88 100644 +--- a/sysdeps/unix/sysv/linux/nios2/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/nios2/arch-syscall.h +@@ -198,6 +198,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h +index b5b0758532..a32984a9c1 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/arch-syscall.h +@@ -260,6 +260,7 @@ + #define __NR_pwritev2 381 + #define __NR_query_module 166 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 191 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h b/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h +index c77435ca61..b01e464fb9 100644 +--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/arch-syscall.h +@@ -243,6 +243,7 @@ + #define __NR_pwritev2 381 + #define __NR_query_module 166 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 191 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h b/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h +index 70854bb9e3..24d0a2c455 100644 +--- a/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/riscv/rv32/arch-syscall.h +@@ -179,6 +179,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h b/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h +index 83b9f31aba..e526c89ae7 100644 +--- a/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/riscv/rv64/arch-syscall.h +@@ -187,6 +187,7 @@ + #define __NR_pwritev 70 + #define __NR_pwritev2 287 + #define __NR_quotactl 60 ++#define __NR_quotactl_fd 443 + #define __NR_read 63 + #define __NR_readahead 213 + #define __NR_readlinkat 78 +diff --git a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h +index e9bd3684db..00e73a3e3b 100644 +--- a/sysdeps/unix/sysv/linux/s390/bits/hwcap.h ++++ b/sysdeps/unix/sysv/linux/s390/bits/hwcap.h +@@ -22,6 +22,11 @@ + + /* + * The following must match the kernels asm/elf.h. ++ * Note: The kernel commit 511ad531afd4090625def4d9aba1f5227bd44b8e ++ * "s390/hwcaps: shorten HWCAP defines" has shortened the prefix of the macros ++ * from "HWCAP_S390_" to "HWCAP_". For compatibility reasons, we do not ++ * change the prefix in public glibc header file. ++ * + * Note that these are *not* the same as the STORE FACILITY LIST bits. + */ + #define HWCAP_S390_ESAN3 1 +@@ -48,3 +53,5 @@ + #define HWCAP_S390_DFLT 262144 + #define HWCAP_S390_VXRS_PDE2 524288 + #define HWCAP_S390_NNPA 1048576 ++#define HWCAP_S390_PCI_MIO 2097152 ++#define HWCAP_S390_SIE 4194304 +diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h b/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h +index b224c4aad4..d4c7b101b6 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/s390/s390-32/arch-syscall.h +@@ -251,6 +251,7 @@ + #define __NR_pwritev2 377 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 222 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h b/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h +index 59864af125..bd8c78d705 100644 +--- a/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/s390/s390-64/arch-syscall.h +@@ -221,6 +221,7 @@ + #define __NR_pwritev2 377 + #define __NR_query_module 167 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 222 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/sh/arch-syscall.h b/sysdeps/unix/sysv/linux/sh/arch-syscall.h +index 23612c9092..3b6ac3d084 100644 +--- a/sysdeps/unix/sysv/linux/sh/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/sh/arch-syscall.h +@@ -246,6 +246,7 @@ + #define __NR_pwritev 334 + #define __NR_pwritev2 382 + #define __NR_quotactl 131 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 225 + #define __NR_readdir 89 +diff --git a/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h b/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h +index b481b4f9f8..45db6b6ffb 100644 +--- a/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h ++++ b/sysdeps/unix/sysv/linux/sparc/bits/struct_stat.h +@@ -28,32 +28,35 @@ + + struct stat + { ++#ifdef __USE_TIME_BITS64 ++# include <bits/struct_stat_time64_helper.h> ++#else + __dev_t st_dev; /* Device. */ +-#if __WORDSIZE == 64 || !defined __USE_FILE_OFFSET64 ++# if __WORDSIZE == 64 || !defined __USE_FILE_OFFSET64 + unsigned short int __pad1; + __ino_t st_ino; /* File serial number. */ +-#else ++# else + __ino64_t st_ino; /* File serial number. */ +-#endif ++# endif + __mode_t st_mode; /* File mode. */ + __nlink_t st_nlink; /* Link count. */ + __uid_t st_uid; /* User ID of the file's owner. */ + __gid_t st_gid; /* Group ID of the file's group.*/ + __dev_t st_rdev; /* Device number, if device. */ + unsigned short int __pad2; +-#ifndef __USE_FILE_OFFSET64 ++# ifndef __USE_FILE_OFFSET64 + __off_t st_size; /* Size of file, in bytes. */ +-#else ++# else + __off64_t st_size; /* Size of file, in bytes. */ +-#endif ++# endif + __blksize_t st_blksize; /* Optimal block size for I/O. */ + +-#ifndef __USE_FILE_OFFSET64 ++# ifndef __USE_FILE_OFFSET64 + __blkcnt_t st_blocks; /* Number 512-byte blocks allocated. */ +-#else ++# else + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-#endif +-#ifdef __USE_XOPEN2K8 ++# endif ++# ifdef __USE_XOPEN2K8 + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -63,28 +66,32 @@ struct stat + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +-# define st_atime st_atim.tv_sec /* Backward compatibility. */ +-# define st_mtime st_mtim.tv_sec +-# define st_ctime st_ctim.tv_sec +-#else ++# define st_atime st_atim.tv_sec /* Backward compatibility. */ ++# define st_mtime st_mtim.tv_sec ++# define st_ctime st_ctim.tv_sec ++# else + __time_t st_atime; /* Time of last access. */ + unsigned long int st_atimensec; /* Nscecs of last access. */ + __time_t st_mtime; /* Time of last modification. */ + unsigned long int st_mtimensec; /* Nsecs of last modification. */ + __time_t st_ctime; /* Time of last status change. */ + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +-#endif ++# endif + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; ++#endif /* __USE_TIME_BITS64 */ + }; + + #ifdef __USE_LARGEFILE64 + struct stat64 + { ++# ifdef __USE_TIME_BITS64 ++# include <bits/struct_stat_time64_helper.h> ++# else + __dev_t st_dev; /* Device. */ +-# if __WORDSIZE == 64 ++# if __WORDSIZE == 64 + unsigned short int __pad1; +-# endif ++# endif + __ino64_t st_ino; /* File serial number. */ + __mode_t st_mode; /* File mode. */ + __nlink_t st_nlink; /* Link count. */ +@@ -96,7 +103,7 @@ struct stat64 + __blksize_t st_blksize; /* Optimal block size for I/O. */ + + __blkcnt64_t st_blocks; /* Number 512-byte blocks allocated. */ +-# ifdef __USE_XOPEN2K8 ++# ifdef __USE_XOPEN2K8 + /* Nanosecond resolution timestamps are stored in a format + equivalent to 'struct timespec'. This is the type used + whenever possible but the Unix namespace rules do not allow the +@@ -106,19 +113,20 @@ struct stat64 + struct timespec st_atim; /* Time of last access. */ + struct timespec st_mtim; /* Time of last modification. */ + struct timespec st_ctim; /* Time of last status change. */ +-# define st_atime st_atim.tv_sec /* Backward compatibility. */ +-# define st_mtime st_mtim.tv_sec +-# define st_ctime st_ctim.tv_sec +-# else ++# define st_atime st_atim.tv_sec /* Backward compatibility. */ ++# define st_mtime st_mtim.tv_sec ++# define st_ctime st_ctim.tv_sec ++# else + __time_t st_atime; /* Time of last access. */ + unsigned long int st_atimensec; /* Nscecs of last access. */ + __time_t st_mtime; /* Time of last modification. */ + unsigned long int st_mtimensec; /* Nsecs of last modification. */ + __time_t st_ctime; /* Time of last status change. */ + unsigned long int st_ctimensec; /* Nsecs of last status change. */ +-# endif ++# endif + unsigned long int __glibc_reserved4; + unsigned long int __glibc_reserved5; ++# endif /* __USE_TIME_BITS64 */ + }; + #endif + +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h b/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h +index 380cddb2d8..35221a707e 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc32/arch-syscall.h +@@ -252,6 +252,7 @@ + #define __NR_pwritev2 359 + #define __NR_query_module 184 + #define __NR_quotactl 165 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 205 + #define __NR_readdir 204 +diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h b/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h +index 2175eeb6ed..5ba2b20509 100644 +--- a/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/sparc/sparc64/arch-syscall.h +@@ -231,6 +231,7 @@ + #define __NR_pwritev2 359 + #define __NR_query_module 184 + #define __NR_quotactl 165 ++#define __NR_quotactl_fd 443 + #define __NR_read 3 + #define __NR_readahead 205 + #define __NR_readdir 204 +diff --git a/sysdeps/unix/sysv/linux/sys/prctl.h b/sysdeps/unix/sysv/linux/sys/prctl.h +index db88938b3a..f0e0d2f27f 100644 +--- a/sysdeps/unix/sysv/linux/sys/prctl.h ++++ b/sysdeps/unix/sysv/linux/sys/prctl.h +@@ -42,7 +42,7 @@ __BEGIN_DECLS + extern int prctl (int __option, ...) __THROW; + #else + # ifdef __REDIRECT +-extern int __REDIRECT (prctl, (int __option, ...), __prctl_time64) __THROW; ++extern int __REDIRECT_NTH (prctl, (int __option, ...), __prctl_time64); + # else + extern int __prctl_time64 (int __option,d ...) __THROW; + # define ioctl __prctl_time64 +diff --git a/sysdeps/unix/sysv/linux/syscall-names.list b/sysdeps/unix/sysv/linux/syscall-names.list +index 89c5895b9b..fd98893b0e 100644 +--- a/sysdeps/unix/sysv/linux/syscall-names.list ++++ b/sysdeps/unix/sysv/linux/syscall-names.list +@@ -21,8 +21,8 @@ + # This file can list all potential system calls. The names are only + # used if the installed kernel headers also provide them. + +-# The list of system calls is current as of Linux 5.13. +-kernel 5.13 ++# The list of system calls is current as of Linux 5.14. ++kernel 5.14 + + FAST_atomic_update + FAST_cmpxchg +@@ -247,6 +247,7 @@ madvise + mbind + membarrier + memfd_create ++memfd_secret + memory_ordering + migrate_pages + mincore +@@ -452,6 +453,7 @@ pwritev + pwritev2 + query_module + quotactl ++quotactl_fd + read + readahead + readdir +diff --git a/sysdeps/unix/sysv/linux/tst-close_range.c b/sysdeps/unix/sysv/linux/tst-close_range.c +index dccb6189c5..f5069d1b8a 100644 +--- a/sysdeps/unix/sysv/linux/tst-close_range.c ++++ b/sysdeps/unix/sysv/linux/tst-close_range.c +@@ -36,23 +36,12 @@ + + #define NFDS 100 + +-static int +-open_multiple_temp_files (void) +-{ +- /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = xopen ("/dev/null", O_RDONLY, 0600); +- for (int i = 1; i <= NFDS; i++) +- TEST_COMPARE (xopen ("/dev/null", O_RDONLY, 0600), +- lowfd + i); +- return lowfd; +-} +- + static void + close_range_test_max_upper_limit (void) + { + struct support_descriptors *descrs = support_descriptors_list (); + +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + { + int r = close_range (lowfd, ~0U, 0); +@@ -68,7 +57,7 @@ close_range_test_max_upper_limit (void) + static void + close_range_test_common (int lowfd, unsigned int flags) + { +- const int maximum_fd = lowfd + NFDS; ++ const int maximum_fd = lowfd + NFDS - 1; + const int half_fd = lowfd + NFDS / 2; + const int gap_1 = maximum_fd - 8; + +@@ -121,7 +110,7 @@ close_range_test (void) + struct support_descriptors *descrs = support_descriptors_list (); + + /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + close_range_test_common (lowfd, 0); + +@@ -146,7 +135,7 @@ close_range_test_subprocess (void) + struct support_descriptors *descrs = support_descriptors_list (); + + /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + struct support_stack stack = support_stack_alloc (4096); + +@@ -184,7 +173,7 @@ close_range_unshare_test (void) + struct support_descriptors *descrs1 = support_descriptors_list (); + + /* Check if the temporary file descriptor has no no gaps. */ +- int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + + struct support_descriptors *descrs2 = support_descriptors_list (); + +@@ -200,7 +189,7 @@ close_range_unshare_test (void) + + support_stack_free (&stack); + +- for (int i = 0; i < NFDS; i++) ++ for (int i = lowfd; i < lowfd + NFDS; i++) + TEST_VERIFY (fcntl (i, F_GETFL) > -1); + + support_descriptors_check (descrs2); +@@ -226,9 +215,9 @@ static void + close_range_cloexec_test (void) + { + /* Check if the temporary file descriptor has no no gaps. */ +- const int lowfd = open_multiple_temp_files (); ++ int lowfd = support_open_dev_null_range (NFDS, O_RDONLY, 0600); + +- const int maximum_fd = lowfd + NFDS; ++ const int maximum_fd = lowfd + NFDS - 1; + const int half_fd = lowfd + NFDS / 2; + const int gap_1 = maximum_fd - 8; + +@@ -251,13 +240,13 @@ close_range_cloexec_test (void) + /* Create some gaps, close up to a threshold, and check result. */ + static int gap_close[] = { 57, 78, 81, 82, 84, 90 }; + for (int i = 0; i < array_length (gap_close); i++) +- xclose (gap_close[i]); ++ xclose (lowfd + gap_close[i]); + + TEST_COMPARE (close_range (half_fd + 1, gap_1, CLOSE_RANGE_CLOEXEC), 0); + for (int i = half_fd + 1; i < gap_1; i++) + { + int flags = fcntl (i, F_GETFD); +- if (is_in_array (gap_close, array_length (gap_close), i)) ++ if (is_in_array (gap_close, array_length (gap_close), i - lowfd)) + TEST_COMPARE (flags, -1); + else + { +diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py +index ee5b13ee12..810433c238 100644 +--- a/sysdeps/unix/sysv/linux/tst-mman-consts.py ++++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py +@@ -33,7 +33,7 @@ def main(): + help='C compiler (including options) to use') + args = parser.parse_args() + linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc) +- linux_version_glibc = (5, 13) ++ linux_version_glibc = (5, 14) + sys.exit(glibcextract.compare_macro_consts( + '#define _GNU_SOURCE 1\n' + '#include <sys/mman.h>\n', +diff --git a/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h b/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h +index 8e028eb62b..26d6ac68a6 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/x86_64/64/arch-syscall.h +@@ -154,6 +154,7 @@ + #define __NR_mbind 237 + #define __NR_membarrier 324 + #define __NR_memfd_create 319 ++#define __NR_memfd_secret 447 + #define __NR_migrate_pages 256 + #define __NR_mincore 27 + #define __NR_mkdir 83 +@@ -224,6 +225,7 @@ + #define __NR_pwritev2 328 + #define __NR_query_module 178 + #define __NR_quotactl 179 ++#define __NR_quotactl_fd 443 + #define __NR_read 0 + #define __NR_readahead 187 + #define __NR_readlink 89 +diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +index 004feb53f1..36847783f6 100644 +--- a/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h ++++ b/sysdeps/unix/sysv/linux/x86_64/x32/arch-syscall.h +@@ -148,6 +148,7 @@ + #define __NR_mbind 1073742061 + #define __NR_membarrier 1073742148 + #define __NR_memfd_create 1073742143 ++#define __NR_memfd_secret 1073742271 + #define __NR_migrate_pages 1073742080 + #define __NR_mincore 1073741851 + #define __NR_mkdir 1073741907 +@@ -216,6 +217,7 @@ + #define __NR_pwritev 1073742359 + #define __NR_pwritev2 1073742371 + #define __NR_quotactl 1073742003 ++#define __NR_quotactl_fd 1073742267 + #define __NR_read 1073741824 + #define __NR_readahead 1073742011 + #define __NR_readlink 1073741913 +diff --git a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S +index 9f02624375..abde8438d4 100644 +--- a/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S ++++ b/sysdeps/x86_64/multiarch/memmove-vec-unaligned-erms.S +@@ -325,7 +325,7 @@ L(movsb): + /* Avoid slow backward REP MOVSB. */ + jb L(more_8x_vec_backward) + # if AVOID_SHORT_DISTANCE_REP_MOVSB +- andl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) ++ testl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) + jz 3f + movq %rdi, %rcx + subq %rsi, %rcx +@@ -333,7 +333,7 @@ L(movsb): + # endif + 1: + # if AVOID_SHORT_DISTANCE_REP_MOVSB +- andl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) ++ testl $X86_STRING_CONTROL_AVOID_SHORT_DISTANCE_REP_MOVSB, __x86_string_control(%rip) + jz 3f + movq %rsi, %rcx + subq %rdi, %rcx diff --git a/glibc/post-install b/glibc/post-install index fae8589d..81b2074a 100644 --- a/glibc/post-install +++ b/glibc/post-install @@ -2,3 +2,5 @@ /sbin/telinit U +# provide this new locale by default +/usr/bin/localedef -i C -f UTF-8 C.UTF-8

1 0

ports/core (3.7): filesystem: 3.6 -> 3.7
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 6901de8fe308c1d937e2d3b78fe749d36646dddb Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Dec 11 22:44:39 2021 +0100 filesystem: 3.6 -> 3.7 diff --git a/filesystem/.signature b/filesystem/.signature index eb33c9f6..7003db35 100644 --- a/filesystem/.signature +++ b/filesystem/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqgL744JE6PjaqcHskEyVRrx9Ew/W6M8+sOSZdGse+dAezYCgEsDonFf+ViSbkuzAxwzQqcxi+d5Gprl7LEt03Ak= -SHA256 (Pkgfile) = 99bebc89192c550d8f094db27e883bf931714637dde7e97821cfe4fdc4b254c4 -SHA256 (.footprint) = de7cd6b7dd582e485347b0f716489c82dd41cc00d34b46883d6a03d0c9857fd7 +RWRJc1FUaeVequMipnkvX/Ym6dxkyCW9f7qJwbng9avIO1M7ACJ9BaOTpXEdw84yXkkZ9i1C4h/3D9oGaiobbGng49WIjjGsEgA= +SHA256 (Pkgfile) = c5b7cba5f90a2cf843f5c697ef01906a28ec209f3d9ee5dfeb88a092a67872ad +SHA256 (.footprint) = a0b8a7ceee392c736b0c3847e7dea5ff429d95a1d61fa6f53ffad7d05ad9d29e SHA256 (issue) = e8f3a830102f902bf869c946634215f419ff76f4e03f627d84b8809ed85e65c2 SHA256 (motd) = e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA256 (shells) = f5e8838cb33249bd0ab3a169097bcc411cfb1b37153f268e6655758942e46656 diff --git a/filesystem/Pkgfile b/filesystem/Pkgfile index aa37614b..a20c86e6 100644 --- a/filesystem/Pkgfile +++ b/filesystem/Pkgfile @@ -1,10 +1,10 @@ # Description: Root filesystem package -# URL: http://crux.nu -# Maintainer: CRUX System Team, core-ports at crux dot nu +# URL: https://crux.nu +# Maintainer: CRUX System Team, core-ports at crux dot nu name=filesystem -version=3.6 -release=90 +version=3.7 +release=1 source=(issue motd shells group passwd shadow securetty fstab mime.types) build() { @@ -37,7 +37,7 @@ build() { install -d $PKG/var/log install -d $PKG/var/log/old ln -s ../run/ $PKG/var/run - #can't be in the Pkgfile anymore + # can't be in the Pkgfile anymore #touch $PKG/var/run/utmp install -d $PKG/var/spool install -d $PKG/var/ftp

1 0

ports/core (3.7): libpcre2: initial commit, version 10.39
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit debff28628c5ad31587d513d452c218a1c04a4b3 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Dec 11 22:33:03 2021 +0100 libpcre2: initial commit, version 10.39 diff --git a/libpcre2/.footprint b/libpcre2/.footprint new file mode 100644 index 00000000..af117141 --- /dev/null +++ b/libpcre2/.footprint @@ -0,0 +1,132 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/pcre2-config +-rwxr-xr-x root/root usr/bin/pcre2grep +-rwxr-xr-x root/root usr/bin/pcre2test +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/pcre2.h +-rw-r--r-- root/root usr/include/pcre2posix.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libpcre2-16.a +-rwxr-xr-x root/root usr/lib/libpcre2-16.la +lrwxrwxrwx root/root usr/lib/libpcre2-16.so -> libpcre2-16.so.0.10.4 +lrwxrwxrwx root/root usr/lib/libpcre2-16.so.0 -> libpcre2-16.so.0.10.4 +-rwxr-xr-x root/root usr/lib/libpcre2-16.so.0.10.4 +-rw-r--r-- root/root usr/lib/libpcre2-32.a +-rwxr-xr-x root/root usr/lib/libpcre2-32.la +lrwxrwxrwx root/root usr/lib/libpcre2-32.so -> libpcre2-32.so.0.10.4 +lrwxrwxrwx root/root usr/lib/libpcre2-32.so.0 -> libpcre2-32.so.0.10.4 +-rwxr-xr-x root/root usr/lib/libpcre2-32.so.0.10.4 +-rw-r--r-- root/root usr/lib/libpcre2-8.a +-rwxr-xr-x root/root usr/lib/libpcre2-8.la +lrwxrwxrwx root/root usr/lib/libpcre2-8.so -> libpcre2-8.so.0.10.4 +lrwxrwxrwx root/root usr/lib/libpcre2-8.so.0 -> libpcre2-8.so.0.10.4 +-rwxr-xr-x root/root usr/lib/libpcre2-8.so.0.10.4 +-rw-r--r-- root/root usr/lib/libpcre2-posix.a +-rwxr-xr-x root/root usr/lib/libpcre2-posix.la +lrwxrwxrwx root/root usr/lib/libpcre2-posix.so -> libpcre2-posix.so.3.0.1 +lrwxrwxrwx root/root usr/lib/libpcre2-posix.so.3 -> libpcre2-posix.so.3.0.1 +-rwxr-xr-x root/root usr/lib/libpcre2-posix.so.3.0.1 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/libpcre2-16.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libpcre2-32.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libpcre2-8.pc +-rw-r--r-- root/root usr/lib/pkgconfig/libpcre2-posix.pc +drwxr-xr-x root/root usr/share/ +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/pcre2-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/pcre2grep.1.gz +-rw-r--r-- root/root usr/share/man/man1/pcre2test.1.gz +drwxr-xr-x root/root usr/share/man/man3/ +-rw-r--r-- root/root usr/share/man/man3/pcre2.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_callout_enumerate.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_code_copy.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_code_copy_with_tables.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_code_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_compile.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_compile_context_copy.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_compile_context_create.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_compile_context_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_config.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_convert_context_copy.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_convert_context_create.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_convert_context_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_converted_pattern_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_dfa_match.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_general_context_copy.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_general_context_create.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_general_context_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_get_error_message.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_get_mark.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_get_match_data_size.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_get_ovector_count.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_get_ovector_pointer.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_get_startchar.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_jit_compile.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_jit_free_unused_memory.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_jit_match.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_jit_stack_assign.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_jit_stack_create.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_jit_stack_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_maketables.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_maketables_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match_context_copy.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match_context_create.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match_context_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match_data_create.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match_data_create_from_pattern.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_match_data_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_pattern_convert.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_pattern_info.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_serialize_decode.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_serialize_encode.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_serialize_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_serialize_get_number_of_codes.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_bsr.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_callout.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_character_tables.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_compile_extra_options.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_compile_recursion_guard.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_depth_limit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_glob_escape.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_glob_separator.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_heap_limit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_match_limit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_max_pattern_length.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_newline.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_offset_limit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_parens_nest_limit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_recursion_limit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_recursion_memory_management.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_set_substitute_callout.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substitute.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_copy_byname.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_copy_bynumber.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_get_byname.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_get_bynumber.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_length_byname.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_length_bynumber.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_list_free.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_list_get.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_nametable_scan.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2_substring_number_from_name.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2api.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2build.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2callout.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2compat.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2convert.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2demo.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2jit.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2limits.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2matching.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2partial.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2pattern.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2perform.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2posix.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2sample.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2serialize.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2syntax.3.gz +-rw-r--r-- root/root usr/share/man/man3/pcre2unicode.3.gz diff --git a/libpcre2/.signature b/libpcre2/.signature new file mode 100644 index 00000000..19a4d215 --- /dev/null +++ b/libpcre2/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/core.pub +RWRJc1FUaeVeqjnN+2/9+yOlSFoeRffaxKOV/jmmfRPZsRHQkMVqus3JS+ZenttEVjMuZxCcMoyHwMRyBP3V/fUyrBEV0B479Ao= +SHA256 (Pkgfile) = 0ea98d51bce5818697b57bbf32f0fb18c4f8a37d9a12fe23ebe6794b00469314 +SHA256 (.footprint) = d308b771dec14c3c8188fda683151574655e4851e30dba986667b4647ce6411c +SHA256 (pcre2-10.39.tar.gz) = 0781bd2536ef5279b1943471fdcdbd9961a2845e1d2c9ad849b9bd98ba1a9bd4 diff --git a/libpcre2/Pkgfile b/libpcre2/Pkgfile new file mode 100644 index 00000000..45d5cb96 --- /dev/null +++ b/libpcre2/Pkgfile @@ -0,0 +1,23 @@ +# Description: Perl Compatible Regular Expressions +# URL: https://www.pcre.org +# Maintainer: CRUX System Team, core-ports at crux dot nu + +name=libpcre2 +version=10.39 +release=1 +source=(https://github.com/PhilipHazel/pcre2/releases/download/pcre2-$version/pcre2-$version.tar.gz) + +build() { + cd pcre2-$version + + ./configure \ + --prefix=/usr \ + --enable-jit \ + --enable-pcre2-16 \ + --enable-pcre2-32 + + make + make DESTDIR=$PKG install + + rm -r $PKG/usr/share/doc +}

1 0

ports/core (3.7): cmake: initial commit, version 3.22.1
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 0309c7174bcf899065a8fd08e60c5aa23fadbad5 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Dec 11 22:30:57 2021 +0100 cmake: initial commit, version 3.22.1 diff --git a/cmake/.footprint b/cmake/.footprint new file mode 100644 index 00000000..940b6da9 --- /dev/null +++ b/cmake/.footprint @@ -0,0 +1,1172 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/ccmake +-rwxr-xr-x root/root usr/bin/cmake +-rwxr-xr-x root/root usr/bin/cpack +-rwxr-xr-x root/root usr/bin/ctest +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/aclocal/ +-rw-r--r-- root/root usr/share/aclocal/cmake.m4 +drwxr-xr-x root/root usr/share/bash-completion/ +drwxr-xr-x root/root usr/share/bash-completion/completions/ +-rw-r--r-- root/root usr/share/bash-completion/completions/cmake +-rw-r--r-- root/root usr/share/bash-completion/completions/cpack +-rw-r--r-- root/root usr/share/bash-completion/completions/ctest +lrwxrwxrwx root/root usr/share/cmake-3.22 -> cmake +drwxr-xr-x root/root usr/share/cmake/ +drwxr-xr-x root/root usr/share/cmake/Modules/ +-rw-r--r-- root/root usr/share/cmake/Modules/.NoDartCoverage +-rw-r--r-- root/root usr/share/cmake/Modules/AddFileDependencies.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/AndroidTestUtilities.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/AndroidTestUtilities/ +-rw-r--r-- root/root usr/share/cmake/Modules/AndroidTestUtilities/PushToAndroidDevice.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/BasicConfigVersion-ExactVersion.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/BasicConfigVersion-SameMajorVersion.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/BasicConfigVersion-SameMinorVersion.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/BundleUtilities.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeASM-ATTInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeASMCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeASMInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeASM_MASMInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeASM_NASMInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeAddFortranSubdirectory.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/CMakeAddFortranSubdirectory/ +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeAddNewLanguage.txt +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeBackwardCompatibilityC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeBackwardCompatibilityCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeBorlandFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeBuildSettings.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCCompilerABI.c +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCCompilerId.c.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCSharpCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCSharpCompilerId.cs.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCSharpInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCUDACompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCUDACompilerABI.cu +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCUDACompilerId.cu.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCUDAInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCXXCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCXXCompilerABI.cpp +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCXXCompilerId.cpp.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCXXInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCommonLanguageInclude.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCompilerABI.h +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeCompilerIdDetection.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeConfigurableFile.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDependentOption.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineASM-ATTCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineASMCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineASM_MASMCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineASM_NASMCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCSharpCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCUDACompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCXXCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCompileFeatures.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCompilerABI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineCompilerId.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineFortranCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineHIPCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineISPCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineJavaCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineOBJCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineOBJCXXCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineRCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineSwiftCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineSystem.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeDetermineVSServicePack.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeExpandImportedTargets.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeExportBuildSettings.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindBinUtils.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindCodeBlocks.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindDependencyMacro.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindEclipseCDT4.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindFrameworks.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindJavaCommon.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindKate.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindPackageMode.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindSublimeText2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindWMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFindXCode.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeForceCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFortranCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFortranCompilerABI.F +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFortranCompilerABI.F90 +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFortranCompilerId.F.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeFortranInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeGenericSystem.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeGraphVizOptions.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeHIPCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeHIPCompilerABI.hip +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeHIPCompilerId.hip.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeHIPInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeIOSInstallCombined.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeISPCCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeISPCCompilerABI.ispc +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeISPCCompilerId.ispc.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeISPCInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeImportBuildSettings.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeInitializeConfigs.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeJOMFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeJavaCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeJavaInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeLanguageInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeMSYSFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeMinGWFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeNMakeFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeNinjaFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCCompilerABI.m +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCCompilerId.m.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCXXCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCXXCompilerABI.mm +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCXXCompilerId.mm.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeOBJCXXInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakePackageConfigHelpers.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeParseArguments.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeParseImplicitIncludeInfo.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeParseLibraryArchitecture.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakePlatformId.h.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakePrintHelpers.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakePrintSystemInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakePushCheckState.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeRCCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeRCInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeSwiftCompiler.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeSwiftInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeSystem.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeSystemSpecificInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeSystemSpecificInitialize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestASM-ATTCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestASMCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestASM_MASMCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestASM_NASMCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestCSharpCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestCUDACompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestCXXCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestCompilerCommon.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestFortranCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestGNU.c +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestHIPCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestISPCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestJavaCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestOBJCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestOBJCXXCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestRCCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeTestSwiftCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeUnixFindMake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CMakeVerifyManifest.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CPack.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CPackComponent.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CPackIFW.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CPackIFWConfigureFile.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CSharpUtilities.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CTest.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CTestCoverageCollectGCOV.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CTestScriptMode.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CTestTargets.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CTestUseLaunchers.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCXXCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCXXSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCXXSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCXXSymbolExists.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckForPthreads.c +-rw-r--r-- root/root usr/share/cmake/Modules/CheckFortranCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckFortranFunctionExists.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckFortranSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckFortranSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckFunctionExists.c +-rw-r--r-- root/root usr/share/cmake/Modules/CheckFunctionExists.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/CheckIPOSupported/ +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/CMakeLists-C.txt.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/CMakeLists-CXX.txt.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/CMakeLists-Fortran.txt.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/foo.c +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/foo.cpp +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/foo.f +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/main.c +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/main.cpp +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIPOSupported/main.f +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIncludeFile.c.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIncludeFile.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIncludeFile.cxx.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIncludeFileCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckIncludeFiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckLanguage.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckLibraryExists.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckLibraryExists.lists.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckLinkerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckOBJCCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckOBJCSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckOBJCSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckOBJCXXCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckOBJCXXSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckOBJCXXSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckPIESupported.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckPrototypeDefinition.c.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckPrototypeDefinition.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckSizeOf.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckStructHasMember.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckSymbolExists.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckTypeSize.c.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckTypeSize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/CheckTypeSizeMap.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/CheckVariableExists.c +-rw-r--r-- root/root usr/share/cmake/Modules/CheckVariableExists.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Compiler/ +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ADSP-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMCC-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMCC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMCC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMCC-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMCC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/ARMClang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Absoft-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-OBJC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/AppleClang-OBJCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Borland-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Bruce-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Bruce-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/CCur-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/CMakeCommonCompilerMacros.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-CUDA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-CXX-TestableFeatures.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-DetermineCompilerInternal.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-FindBinUtils.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-HIP.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-OBJC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang-OBJCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Compaq-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Cray-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Cray-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Cray-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Cray-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Cray.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/CrayPrgEnv-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/CrayPrgEnv-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/CrayPrgEnv-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/CrayPrgEnv.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Embarcadero-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Flang-FindBinUtils.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Flang-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Fujitsu-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Fujitsu-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Fujitsu-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Fujitsu-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Fujitsu.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/FujitsuClang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/FujitsuClang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/FujitsuClang-FindBinUtils.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/FujitsuClang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/G95-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GHS-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GHS-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GHS-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GHS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-FindBinUtils.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-OBJC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU-OBJCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/HP-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/HP-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/HP-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/HP-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/HP-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/HP-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IAR-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IAR-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IAR-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IAR-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IAR.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel-ISPC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Intel.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IntelLLVM-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IntelLLVM-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IntelLLVM-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IntelLLVM-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/IntelLLVM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/MSVC-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/MSVC-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/MSVC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/MSVC-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/MSVC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/MSVC-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NAG-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVHPC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVHPC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVHPC-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVHPC-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVHPC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVIDIA-CUDA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/NVIDIA-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/OpenWatcom-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/OpenWatcom-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/OpenWatcom.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PGI-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PGI-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PGI-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PGI-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PGI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PathScale-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PathScale-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PathScale-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PathScale-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/PathScale.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/QCC-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/QCC-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/QCC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/QCC-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/QCC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/QCC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SCO-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SCO-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SCO-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SCO.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SDCC-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-C-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-CXX-FeatureTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/SunPro.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TI-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TI-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TI-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TI-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/TinyCC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/VisualAge-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/VisualAge-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/VisualAge-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/Watcom-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL-Fortran.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Compiler/XL-Fortran/ +-rwxr-xr-x root/root usr/share/cmake/Modules/Compiler/XL-Fortran/cpp +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XLClang-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XLClang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XLClang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/XLClang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/zOS-C-DetermineCompiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/CompilerId/ +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/GHS_default.gpj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/GHS_lib.gpj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/VS-10.csproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/VS-10.vcxproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/VS-7.vcproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/VS-Intel.vfproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/VS-NsightTegra.vcxproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/Xcode-3.pbxproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/CompilerId/main.swift.in +-rw-r--r-- root/root usr/share/cmake/Modules/Dart.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/DartConfiguration.tcl.in +-rw-r--r-- root/root usr/share/cmake/Modules/DeployQt4.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Documentation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/DummyCXXFile.cxx +-rw-r--r-- root/root usr/share/cmake/Modules/ExternalData.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/ExternalData_config.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/ExternalProject-download.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/ExternalProject-gitupdate.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/ExternalProject-verify.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/ExternalProject.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FLTKCompatibility.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FeatureSummary.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FetchContent.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/FetchContent/ +-rw-r--r-- root/root usr/share/cmake/Modules/FetchContent/CMakeLists.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/FindALSA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindASPELL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindAVIFile.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindArmadillo.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindBISON.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindBLAS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindBZip2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindBacktrace.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindBoost.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindBullet.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCABLE.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCUDA.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/FindCUDA/ +-rw-r--r-- root/root usr/share/cmake/Modules/FindCUDA/make2cmake.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCUDA/parse_cubin.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCUDA/run_nvcc.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCUDA/select_compute_arch.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCUDAToolkit.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCURL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCVS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCoin3D.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCups.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCurses.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCxxTest.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindCygwin.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindDCMTK.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindDart.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindDevIL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindDoxygen.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindEXPAT.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindEnvModules.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindFLEX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindFLTK.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindFLTK2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindFontconfig.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindFreetype.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGCCXML.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGDAL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGIF.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGLEW.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGLU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGLUT.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGSL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGTK.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGTK2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGTest.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGettext.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGit.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGnuTLS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindGnuplot.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindHDF5.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindHSPELL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindHTMLHelp.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindHg.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindICU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindIce.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindIconv.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindIcotool.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindImageMagick.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindIntl.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindJNI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindJPEG.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindJasper.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindJava.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindKDE3.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindKDE4.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLAPACK.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLATEX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLTTngUST.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLibArchive.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLibLZMA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLibXml2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLibXslt.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLibinput.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLua.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLua50.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindLua51.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindMFC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPEG.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPEG2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/FindMPI/ +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI/fortranparam_mpi.f90.in +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI/libver_mpi.c +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI/libver_mpi.f90.in +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI/mpiver.f90.in +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI/test_mpi.c +-rw-r--r-- root/root usr/share/cmake/Modules/FindMPI/test_mpi.f90.in +-rw-r--r-- root/root usr/share/cmake/Modules/FindMatlab.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindMotif.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindMsys.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindODBC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenACC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenAL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenCL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenGL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenMP.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenSSL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenSceneGraph.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindOpenThreads.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPHP4.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPNG.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPackageMessage.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPatch.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPerl.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPerlLibs.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPhysFS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPike.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPkgConfig.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPostgreSQL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindProducer.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindProtobuf.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPython.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/FindPython/ +-rw-r--r-- root/root usr/share/cmake/Modules/FindPython/Support.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPython2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPython3.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPythonInterp.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindPythonLibs.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindQt.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindQt3.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindQt4.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindQuickTime.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindRTI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindRuby.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSDL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSDL_image.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSDL_mixer.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSDL_net.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSDL_sound.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSDL_ttf.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSQLite3.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSWIG.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSelfPackers.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSquish.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindSubversion.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindTCL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindTIFF.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindTclStub.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindTclsh.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindThreads.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindUnixCommands.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindVulkan.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindWget.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindWish.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindX11.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindXCTest.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindXMLRPC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindXalanC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindXercesC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindZLIB.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Findosg.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgAnimation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgDB.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgFX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgGA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgIntrospection.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgManipulator.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgParticle.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgPresentation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgProducer.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgQt.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgShadow.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgSim.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgTerrain.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgText.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgUtil.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgViewer.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgVolume.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindosgWidget.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Findosg_functions.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindwxWidgets.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FindwxWindows.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/FortranCInterface/ +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/CMakeLists.txt +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Detect.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Input.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/MYMODULE.c +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/MY_MODULE.c +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Macro.h.in +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Output.cmake.in +drwxr-xr-x root/root usr/share/cmake/Modules/FortranCInterface/Verify/ +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Verify/CMakeLists.txt +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Verify/VerifyC.c +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Verify/VerifyCXX.cxx +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Verify/VerifyFortran.f +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/Verify/main.c +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/call_mod.f90 +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/call_sub.f +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/main.F +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/my_module.f90 +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/my_module_.c +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/my_sub.f +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/mymodule.f90 +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/mymodule_.c +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/mysub.f +-rw-r--r-- root/root usr/share/cmake/Modules/FortranCInterface/symbol.c.in +-rw-r--r-- root/root usr/share/cmake/Modules/GNUInstallDirs.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/GenerateExportHeader.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/GetPrerequisites.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/GoogleTest.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/GoogleTestAddTests.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/ITKCompatibility.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/InstallRequiredSystemLibraries.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/IntelVSImplicitPath/ +-rw-r--r-- root/root usr/share/cmake/Modules/IntelVSImplicitPath/CMakeLists.txt +-rw-r--r-- root/root usr/share/cmake/Modules/IntelVSImplicitPath/detect.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/IntelVSImplicitPath/hello.f (EMPTY) +drwxr-xr-x root/root usr/share/cmake/Modules/Internal/ +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CMakeTryCompilerOrLinkerFlag.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Internal/CPack/ +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.DS_Store.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.Description.plist.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.Info.plist.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.NuGet.nuspec.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.OSXScriptLauncher.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.OSXScriptLauncher.rsrc.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.OSXX11.Info.plist.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.OSXX11.main.scpt.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.RuntimeScript.in +-rwxr-xr-x root/root usr/share/cmake/Modules/Internal/CPack/CPack.STGZ_Header.sh.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.VolumeIcon.icns.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.background.png.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPack.distribution.dist.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackDeb.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackExternal.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackFreeBSD.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackNuGet.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackRPM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackWIX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/CPackZIP.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/NSIS.InstallOptions.ini.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/NSIS.template.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CPack/WIX.template.in +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CheckCompilerFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CheckSourceCompiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/CheckSourceRuns.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/FeatureTesting.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Internal/OSRelease/ +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/OSRelease/010-TryOldCentOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Internal/OSRelease/020-TryDebianVersion.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/KDE3Macros.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/MacOSXBundleInfo.plist.in +-rw-r--r-- root/root usr/share/cmake/Modules/MacOSXFrameworkInfo.plist.in +-rw-r--r-- root/root usr/share/cmake/Modules/MacroAddFileDependencies.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/MatlabTestsRedirect.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Platform/ +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-GNU-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-VisualAge-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-VisualAge-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-VisualAge-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XL-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XL-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XLClang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XLClang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX-XLClang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/AIX.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Platform/AIX/ +-rwxr-xr-x root/root usr/share/cmake/Modules/Platform/AIX/ExportImportList +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/ARTOS-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/ARTOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Clang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Common.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Determine-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Determine.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android-Initialize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/Platform/Android/ +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/Determine-Compiler-NDK.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/Determine-Compiler-Standalone.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/Determine-Compiler.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/VCXProjInspect.vcxproj.in +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-arm64-v8a-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-arm64-v8a-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-armeabi-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-armeabi-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-armeabi-v6-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-armeabi-v6-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-armeabi-v7a-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-armeabi-v7a-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-common-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-common-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-common.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-mips-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-mips-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-mips64-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-mips64-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-x86-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-x86-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-x86_64-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/abi-x86_64-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-c++.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-c++_shared.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-c++_static.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-gabi++.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-gabi++_shared.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-gabi++_static.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-gnustl.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-gnustl_shared.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-gnustl_static.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-none.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-stlport.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-stlport_shared.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-stlport_static.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Android/ndk-stl-system.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Absoft-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Apple-Swift.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-AppleClang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-AppleClang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-AppleClang-OBJC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-AppleClang-OBJCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Clang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Clang-OBJC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Clang-OBJCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-GNU-OBJC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-GNU-OBJCXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Intel-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Intel-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Intel-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-Intel.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-IntelLLVM-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-IntelLLVM-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-IntelLLVM-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-IntelLLVM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-NAG-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-NVIDIA-CUDA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-PGI-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-PGI-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-PGI-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-PGI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-VisualAge-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-VisualAge-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Apple-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BSDOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BeOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneL.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-base.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic-XL-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-dynamic.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneP-static.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-base.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic-XL-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-dynamic.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static-XL-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/BlueGeneQ-static.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN-windres.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CYGWIN.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Catamount.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/CrayLinuxEnvironment.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/DOS-OpenWatcom-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/DOS-OpenWatcom-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/DOS-OpenWatcom.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/DOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Darwin-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Darwin-Initialize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Darwin.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/DragonFly.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Euros.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/FreeBSD-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/FreeBSD.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Fuchsia.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/GHS-MULTI-Determine.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/GHS-MULTI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/GNUtoMS_lib.bat.in +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/GNUtoMS_lib.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Generic-ADSP-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Generic-ADSP-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Generic-ADSP-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Generic-ADSP-Common.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Generic-SDCC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Generic.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-GNU-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-HP-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-HP-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-HP-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-HP-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX-HP.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/HP-UX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Haiku.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Absoft-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-CCur-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Fujitsu-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Fujitsu-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Fujitsu.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Intel-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Intel-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Intel-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-Intel.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-IntelLLVM-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-IntelLLVM-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-IntelLLVM-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-IntelLLVM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-NAG-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-NVHPC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-NVHPC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-NVHPC-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-NVHPC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-OpenWatcom-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-OpenWatcom-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-OpenWatcom.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PGI-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PGI-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PGI-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PGI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PathScale-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PathScale-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PathScale-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-PathScale.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-SunPro-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-TinyCC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-VisualAge-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-VisualAge-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-VisualAge-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-XL-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-XL-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-XL-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux-como.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Linux.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MP-RAS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS-windres.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MSYS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Midipix.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/MirBSD.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/NetBSD.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OS2-OpenWatcom-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OS2-OpenWatcom-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OS2-OpenWatcom.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OS2.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OSF1.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OpenBSD.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/OpenVMS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/QNX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/RISCos.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SCO_SV.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SINIX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-PathScale-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-PathScale-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-PathScale-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS-PathScale.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/SunOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Tru64.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/ULTRIX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/UNIX_SV.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/UnixPaths.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/UnixWare.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Apple-Swift.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Borland-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Borland-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Clang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Clang.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Embarcadero-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Embarcadero-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Embarcadero.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Flang-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-G95-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-C-ABI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-CXX-ABI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-Fortran-ABI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-GNU.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Intel-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Intel-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Intel-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Intel-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Intel-ISPC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Intel.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-IntelLLVM-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-IntelLLVM-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-IntelLLVM-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-IntelLLVM-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-IntelLLVM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-MSVC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-MSVC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-MSVC.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-NVIDIA-CUDA.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-OpenWatcom-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-OpenWatcom-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-OpenWatcom.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-PGI-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-PGI-Fortran.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-PGI.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Watcom-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-Watcom-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-df.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows-windres.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Windows.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsCE-MSVC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsCE-MSVC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsCE.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPaths.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-Clang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-GNU-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-MSVC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone-MSVC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsPhone.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-Clang-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-Clang-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-Clang-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-GNU-ASM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-GNU-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-GNU-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-MSVC-C.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore-MSVC-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/WindowsStore.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/Xenix.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/eCos.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/gas.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/iOS-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/iOS-Initialize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/iOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/kFreeBSD.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/syllable.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/tvOS-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/tvOS-Initialize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/tvOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/watchOS-Determine-CXX.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/watchOS-Initialize.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Platform/watchOS.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/ProcessorCount.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Qt4ConfigDependentSettings.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Qt4Macros.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/RepositoryInfo.txt.in +-rw-r--r-- root/root usr/share/cmake/Modules/SelectLibraryConfigurations.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Squish4RunTestCase.bat +-rwxr-xr-x root/root usr/share/cmake/Modules/Squish4RunTestCase.sh +-rw-r--r-- root/root usr/share/cmake/Modules/SquishRunTestCase.bat +-rwxr-xr-x root/root usr/share/cmake/Modules/SquishRunTestCase.sh +-rw-r--r-- root/root usr/share/cmake/Modules/SquishTestScript.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/SystemInformation.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/SystemInformation.in +-rw-r--r-- root/root usr/share/cmake/Modules/TestBigEndian.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/TestCXXAcceptsFlag.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/TestEndianess.c.in +-rw-r--r-- root/root usr/share/cmake/Modules/TestForANSIForScope.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/TestForANSIStreamHeaders.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/TestForANSIStreamHeaders.cxx +-rw-r--r-- root/root usr/share/cmake/Modules/TestForAnsiForScope.cxx +-rw-r--r-- root/root usr/share/cmake/Modules/TestForSSTREAM.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/TestForSSTREAM.cxx +-rw-r--r-- root/root usr/share/cmake/Modules/TestForSTDNamespace.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/TestForSTDNamespace.cxx +-rw-r--r-- root/root usr/share/cmake/Modules/UseEcos.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UseJava.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/UseJava/ +-rw-r--r-- root/root usr/share/cmake/Modules/UseJava/ClassFilelist.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UseJava/ClearClassFiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UseJava/Symlinks.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UseJava/javaTargets.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/UsePkgConfig.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UseQt4.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UseSWIG.cmake +drwxr-xr-x root/root usr/share/cmake/Modules/UseSWIG/ +-rw-r--r-- root/root usr/share/cmake/Modules/UseSWIG/ManageSupportFiles.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/Use_wxWindows.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/UsewxWidgets.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/VTKCompatibility.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/WriteBasicConfigVersionFile.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/WriteCompilerDetectionHeader.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/ecos_clean.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/exportheader.cmake.in +-rw-r--r-- root/root usr/share/cmake/Modules/kde3init_dummy.cpp.in +-rw-r--r-- root/root usr/share/cmake/Modules/kde3uic.cmake +-rw-r--r-- root/root usr/share/cmake/Modules/readme.txt +drwxr-xr-x root/root usr/share/cmake/Templates/ +-rw-r--r-- root/root usr/share/cmake/Templates/AppleInfo.plist +-rw-r--r-- root/root usr/share/cmake/Templates/CMakeVSMacros1.vsmacros +-rw-r--r-- root/root usr/share/cmake/Templates/CMakeVSMacros2.vsmacros +-rw-r--r-- root/root usr/share/cmake/Templates/CPack.GenericDescription.txt +-rw-r--r-- root/root usr/share/cmake/Templates/CPack.GenericLicense.txt +-rw-r--r-- root/root usr/share/cmake/Templates/CPack.GenericWelcome.txt +-rw-r--r-- root/root usr/share/cmake/Templates/CPackConfig.cmake.in +-rw-r--r-- root/root usr/share/cmake/Templates/CTestScript.cmake.in +drwxr-xr-x root/root usr/share/cmake/Templates/MSBuild/ +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/CustomBuildDepFile.targets +drwxr-xr-x root/root usr/share/cmake/Templates/MSBuild/FlagTables/ +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_Cuda.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_CudaHost.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_LIB.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_MASM.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_NASM.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v10_RC.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v11_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v11_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v11_LIB.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v11_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v11_MASM.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v11_RC.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v12_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v12_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v12_LIB.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v12_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v12_MASM.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v12_RC.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v140_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v140_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v140_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v141_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v141_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v141_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v142_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v142_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v142_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v143_CL.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v143_CSharp.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v143_Link.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v14_LIB.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v14_MASM.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/FlagTables/v14_RC.json +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/nasm.props.in +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/nasm.targets +-rw-r--r-- root/root usr/share/cmake/Templates/MSBuild/nasm.xml +-rw-r--r-- root/root usr/share/cmake/Templates/TestDriver.cxx.in +drwxr-xr-x root/root usr/share/cmake/Templates/Windows/ +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/ApplicationIcon.png +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/Logo.png +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/SmallLogo.png +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/SmallLogo44x44.png +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/SplashScreen.png +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/StoreLogo.png +-rw-r--r-- root/root usr/share/cmake/Templates/Windows/Windows_TemporaryKey.pfx +drwxr-xr-x root/root usr/share/cmake/include/ +-rw-r--r-- root/root usr/share/cmake/include/cmCPluginAPI.h +drwxr-xr-x root/root usr/share/emacs/ +drwxr-xr-x root/root usr/share/emacs/site-lisp/ +-rw-r--r-- root/root usr/share/emacs/site-lisp/cmake-mode.el +drwxr-xr-x root/root usr/share/vim/ +drwxr-xr-x root/root usr/share/vim/vimfiles/ +drwxr-xr-x root/root usr/share/vim/vimfiles/indent/ +-rw-r--r-- root/root usr/share/vim/vimfiles/indent/cmake.vim +drwxr-xr-x root/root usr/share/vim/vimfiles/syntax/ +-rw-r--r-- root/root usr/share/vim/vimfiles/syntax/cmake.vim diff --git a/cmake/.signature b/cmake/.signature new file mode 100644 index 00000000..89237201 --- /dev/null +++ b/cmake/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/core.pub +RWRJc1FUaeVeqgG9EFAUHrC0YuXtJnICnc0MBK1Z6i4r+dQm0VHErj0WjV7JaxbXtrj9JTwpmco2DHgR9ueW2wNvS1Ia9AZMPwI= +SHA256 (Pkgfile) = 5ee30cc06c6638a62fb60cbb48bdc6453677ae31952d4b2746203cc358ad49c0 +SHA256 (.footprint) = 77255f3e01e14136358d738d9a3284d8148fce7e9da0255057fb289ab3d672f9 +SHA256 (cmake-3.22.1.tar.gz) = 0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0 diff --git a/cmake/Pkgfile b/cmake/Pkgfile new file mode 100644 index 00000000..2c3108ff --- /dev/null +++ b/cmake/Pkgfile @@ -0,0 +1,41 @@ +# Description: A cross-platform, open-source make system +# URL: https://www.cmake.org/ +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Depends on: curl expat libarchive ncurses +# Optional: jsoncpp librhash libuv lzlib nghttp2-libs ninja python3-sphinx + +name=cmake +version=3.22.1 +release=1 +source=(https://cmake.org/files/v${version%.*}/$name-$version.tar.gz) + +build() { + cd $name-$version + + sed -i Source/CMakeInstallDestinations.cmake \ + -e 's|share/cmake-${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}|share/cmake|' + + prt-get isinst ninja && PKGMK_CMAKE+=' --generator=Ninja' + prt-get isinst jsoncpp && PKGMK_CMAKE+=' --system-jsoncpp' || PKGMK_CMAKE+=' --no-system-jsoncpp' + prt-get isinst librhash && PKGMK_CMAKE+=' --system-librhash' || PKGMK_CMAKE+=' --no-system-librhash' + prt-get isinst libuv && PKGMK_CMAKE+=' --system-libuv' || PKGMK_CMAKE+=' --no-system-libuv' + prt-get isinst lzlib && PKGMK_CMAKE+=' --system-liblzma' || PKGMK_CMAKE+=' --no-system-liblzma' + prt-get isinst nghttp2-libs && PKGMK_CMAKE+=' --system-nghttp2' || PKGMK_CMAKE+=' --no-system-nghttp2' + + ./bootstrap $PKGMK_CMAKE \ + --prefix=/usr \ + --system-curl \ + --system-expat \ + --system-zlib \ + --system-bzip2 \ + --system-libarchive \ + --system-zstd \ + --parallel=${JOBS:-1} \ + $(prt-get isinst python3-sphinx >/dev/null && echo --sphinx-man) + + ninja + DESTDIR=$PKG ninja install + rm -r $PKG/usr/{doc,share/cmake/Help} + + ln -sf $name $PKG/usr/share/$name-${version%.*} +}

1 0

ports/core (3.7): Merge remote-tracking branch 'origin/3.6' into 3.7-alpha0
by crux＠crux.nu 10 Jan '22

10 Jan '22

commit 5e7707f64d94024afa89db90c9728fd24b51b206 Merge: afb882b1 ade8e7fe Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Dec 11 22:30:46 2021 +0100 Merge remote-tracking branch 'origin/3.6' into 3.7-alpha0

1 0

Jump to page: