diff options
author | 2023-12-25 21:15:00 +0100 | |
---|---|---|
committer | 2023-12-25 21:15:00 +0100 | |
commit | 522f2db7d83d4c5b9cc4c29ba776362e0c95d84e (patch) | |
tree | db620c9017f0c4395713b8f4dc91533f0f77fda6 | |
parent | Drop patch that is now in master (diff) | |
download | glibc-patches-522f2db7d83d4c5b9cc4c29ba776362e0c95d84e.tar.gz glibc-patches-522f2db7d83d4c5b9cc4c29ba776362e0c95d84e.tar.bz2 glibc-patches-522f2db7d83d4c5b9cc4c29ba776362e0c95d84e.zip |
Rebase onto master
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r-- | 9999/0001-Disable-ldconfig-during-install.patch | 6 | ||||
-rw-r--r-- | 9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch | 4 | ||||
-rw-r--r-- | 9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch | 4 | ||||
-rw-r--r-- | 9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch (renamed from 9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch) | 6 | ||||
-rw-r--r-- | 9999/0005-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch (renamed from 9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch) | 10 | ||||
-rw-r--r-- | 9999/0006-linux-Add-__readdir64_unlocked.patch (renamed from 9999/0007-linux-Add-__readdir64_unlocked.patch) | 6 | ||||
-rw-r--r-- | 9999/0007-linux-Add-__old_readdir64_unlocked.patch (renamed from 9999/0008-linux-Add-__old_readdir64_unlocked.patch) | 6 | ||||
-rw-r--r-- | 9999/0008-linux-Use-getdents64-on-readdir64-compat-implementat.patch (renamed from 9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch) | 6 | ||||
-rw-r--r-- | 9999/0009-Gentoo-Disable-valgrind-based-tests-too-unreliable.patch (renamed from 9999/0011-Gentoo-Disable-valgrind-based-tests-too-unreliable.patch) | 10 |
9 files changed, 29 insertions, 29 deletions
diff --git a/9999/0001-Disable-ldconfig-during-install.patch b/9999/0001-Disable-ldconfig-during-install.patch index 117d65d..5dc96e2 100644 --- a/9999/0001-Disable-ldconfig-during-install.patch +++ b/9999/0001-Disable-ldconfig-during-install.patch @@ -1,4 +1,4 @@ -From 3924368571ae2b77a8465de8bb7ec7e6288dae67 Mon Sep 17 00:00:00 2001 +From 2c5f0265999e3469b81a8cf27d713f212746a352 Mon Sep 17 00:00:00 2001 From: Mike Frysinger <vapier@gentoo.org> Date: Tue, 3 Aug 2021 00:34:59 +0200 Subject: [PATCH 1/9] Disable ldconfig during install @@ -19,7 +19,7 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index f324df7a1f..0221906533 100644 +index a4f3378e21..dca38dd666 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,7 @@ elf/ldso_install: @@ -31,5 +31,5 @@ index f324df7a1f..0221906533 100644 $(elf-objpfx)ldconfig $(addprefix -r ,$(install_root)) \ $(slibdir) $(libdir) -- -2.39.3 +2.41.0 diff --git a/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch index 52d6412..44af542 100644 --- a/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch +++ b/9999/0002-Adapt-to-Gentoo-specific-etc-mail-aliases.patch @@ -1,4 +1,4 @@ -From bc18d3d2140f40e43f9767bf8964eca3b2d0da17 Mon Sep 17 00:00:00 2001 +From e6abcb198ba9bbc848fe00af7da56daff3da7048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Mon, 22 Oct 2018 22:34:13 +0200 Subject: [PATCH 2/9] Adapt to Gentoo-specific /etc/mail/aliases @@ -105,5 +105,5 @@ index 7a1b7272f0..500c9a79a3 100644 /* valgrind needs a temporary directory in the chroot. */ { -- -2.39.3 +2.41.0 diff --git a/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch index d890165..9b03cfd 100644 --- a/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch +++ b/9999/0003-Force-O0-in-conform-tests-to-survive-CC-changes.patch @@ -1,4 +1,4 @@ -From 85d0916ff499c8d9d135cd5200ec1d4797a74565 Mon Sep 17 00:00:00 2001 +From 6f5c946863eb63605ccf7388eebebc63cc3523d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Fri, 14 Dec 2018 20:43:04 +0100 Subject: [PATCH 3/9] Force -O0 in conform tests to survive $CC changes @@ -61,5 +61,5 @@ index 983bba1bd2..b6fce8a21c 100644 args.header) with tempfile.TemporaryDirectory() as temp_dir: -- -2.39.3 +2.41.0 diff --git a/9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch b/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch index 3bae810..a451fd6 100644 --- a/9999/0005-linux-Use-getdents64-on-non-LFS-readdir.patch +++ b/9999/0004-linux-Use-getdents64-on-non-LFS-readdir.patch @@ -1,7 +1,7 @@ -From bc521cf2674e2a27cc4a0dfd638c151462d51d1b Mon Sep 17 00:00:00 2001 +From 782410070379ffbf54cb8abe71cc13fd24cfaea5 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Fri, 27 Jan 2023 14:28:30 -0300 -Subject: [PATCH 5/9] linux: Use getdents64 on non-LFS readdir +Subject: [PATCH 4/9] linux: Use getdents64 on non-LFS readdir The non-LFS opendir reserves a translation entry to be used to return the entry and the dirent64 struct is translated to the temporary buffer @@ -177,5 +177,5 @@ index 4a4c00ea07..cd0ccaf33a 100644 struct dirent * -- -2.39.3 +2.41.0 diff --git a/9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch b/9999/0005-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch index 69f6ca0..9b566a2 100644 --- a/9999/0006-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch +++ b/9999/0005-linux-Set-internal-DIR-filepos-as-off64_t-BZ-23960-B.patch @@ -1,7 +1,7 @@ -From 61beae8ace3127d476570b8989ec4d60f421b94e Mon Sep 17 00:00:00 2001 +From 8b628a35f0ce66d74be6557e74e28a49a58d749a Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Fri, 27 Jan 2023 14:28:31 -0300 -Subject: [PATCH 6/9] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ +Subject: [PATCH 5/9] linux: Set internal DIR filepos as off64_t (BZ #23960, BZ #24050) It allows to obtain the expected entry offset on telldir and set @@ -61,10 +61,10 @@ index dcdd699b09..187eda7584 100644 printf ("going back past 4-th entry...\n"); diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile -index be801e3be4..29c747b387 100644 +index 415aa1f14d..dc204883db 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile -@@ -546,6 +546,7 @@ sysdep_routines += \ +@@ -574,6 +574,7 @@ sysdep_routines += \ tests += \ tst-getdents64 \ @@ -530,5 +530,5 @@ index 0000000000..52e18171a7 + +#include <support/test-driver.c> -- -2.39.3 +2.41.0 diff --git a/9999/0007-linux-Add-__readdir64_unlocked.patch b/9999/0006-linux-Add-__readdir64_unlocked.patch index 73bf546..3510868 100644 --- a/9999/0007-linux-Add-__readdir64_unlocked.patch +++ b/9999/0006-linux-Add-__readdir64_unlocked.patch @@ -1,7 +1,7 @@ -From aa6bdde21d0305ce4e95fd49f7b36524ba92e745 Mon Sep 17 00:00:00 2001 +From a2a34383be6e082561a09f37c5747215a70e2439 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Fri, 27 Jan 2023 14:28:32 -0300 -Subject: [PATCH 7/9] linux: Add __readdir64_unlocked +Subject: [PATCH 6/9] linux: Add __readdir64_unlocked And use it on readdir_r implementation. @@ -178,5 +178,5 @@ index 285dc99509..5ae099bde7 100644 -- -2.39.3 +2.41.0 diff --git a/9999/0008-linux-Add-__old_readdir64_unlocked.patch b/9999/0007-linux-Add-__old_readdir64_unlocked.patch index 200d275..2b99897 100644 --- a/9999/0008-linux-Add-__old_readdir64_unlocked.patch +++ b/9999/0007-linux-Add-__old_readdir64_unlocked.patch @@ -1,7 +1,7 @@ -From 906b7cf87806610267ffff0b850b138bd1fd2098 Mon Sep 17 00:00:00 2001 +From f1d798104d5adfdec9aff9390dd7b62014d888eb Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Fri, 27 Jan 2023 14:28:33 -0300 -Subject: [PATCH 8/9] linux: Add __old_readdir64_unlocked +Subject: [PATCH 7/9] linux: Add __old_readdir64_unlocked And use it __old_readdir64_r. @@ -190,5 +190,5 @@ index 5ae099bde7..b499388de7 100644 compat_symbol (libc, __old_readdir64_r, readdir64_r, GLIBC_2_1); -- -2.39.3 +2.41.0 diff --git a/9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch b/9999/0008-linux-Use-getdents64-on-readdir64-compat-implementat.patch index 99429ea..bf2981e 100644 --- a/9999/0009-linux-Use-getdents64-on-readdir64-compat-implementat.patch +++ b/9999/0008-linux-Use-getdents64-on-readdir64-compat-implementat.patch @@ -1,7 +1,7 @@ -From 8eb2ff5f6f4040f238bd40083d6bfbb711fc675c Mon Sep 17 00:00:00 2001 +From 43e064d5764246f49561def52f9fd592d58b7ac2 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Fri, 27 Jan 2023 14:28:34 -0300 -Subject: [PATCH 9/9] linux: Use getdents64 on readdir64 compat implementation +Subject: [PATCH 8/9] linux: Use getdents64 on readdir64 compat implementation It uses a similar strategy from the non-LFS readdir that also uses getdents64 internally and uses a translation buffer to return @@ -246,5 +246,5 @@ index b901071aa7..88e42c5e90 100644 attribute_compat_text_section -- -2.39.3 +2.41.0 diff --git a/9999/0011-Gentoo-Disable-valgrind-based-tests-too-unreliable.patch b/9999/0009-Gentoo-Disable-valgrind-based-tests-too-unreliable.patch index 4d2931f..9f13cb0 100644 --- a/9999/0011-Gentoo-Disable-valgrind-based-tests-too-unreliable.patch +++ b/9999/0009-Gentoo-Disable-valgrind-based-tests-too-unreliable.patch @@ -1,7 +1,7 @@ -From d63e3913e62114f4fc71862f2d57b454a5746a24 Mon Sep 17 00:00:00 2001 +From 47f6f53cd39997f8e7fea5235b27a30fbdc9dd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> Date: Sat, 23 Dec 2023 22:56:11 +0100 -Subject: [PATCH] Gentoo: Disable valgrind-based tests, too unreliable +Subject: [PATCH 9/9] Gentoo: Disable valgrind-based tests, too unreliable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -12,10 +12,10 @@ Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> 1 file changed, 4 deletions(-) diff --git a/elf/Makefile b/elf/Makefile -index 1a05a6aaca..5910453e1c 100644 +index ba7b71035c..4337603c6b 100644 --- a/elf/Makefile +++ b/elf/Makefile -@@ -470,7 +470,6 @@ tests += \ +@@ -480,7 +480,6 @@ tests += \ unload6 \ unload7 \ unload8 \ @@ -23,7 +23,7 @@ index 1a05a6aaca..5910453e1c 100644 # tests tests-cxx = \ tst-dlopen-nodelete-reloc \ -@@ -601,9 +600,6 @@ $(objpfx)tst-relro-libc.out: tst-relro-symbols.py $(..)/scripts/glibcelf.py \ +@@ -611,9 +610,6 @@ $(objpfx)tst-relro-libc.out: tst-relro-symbols.py $(..)/scripts/glibcelf.py \ --required=__io_vtables \ > $@ 2>&1; $(evaluate-test) |