glibc/0003-elf-Make-dl-rseq-symbols-Linux-only.patch
liqingqing_1229 8ead2a5406 sync from glibc upstream 2.38 branch.
here are the patches:
9184c13681 resolv: Fix tst-resolv-short-response for older GCC (bug 32042)
3ac7ba61d2 Update syscall lists for Linux 6.5
6bb75212e6 Add mremap tests
f0e2114535 mremap: Update manual entry
0301637b99 linux: Update the mremap C implementation [BZ #31968]
1bed6acf50 resolv: Track single-request fallback via _res._flags (bug 31476)
6cad0f543c resolv: Do not wait for non-existing second DNS response after error (bug 30081)
dc512364e8 resolv: Allow short error responses to match any query (bug 31890)
bb30bd2162 Linux: Make __rseq_size useful for feature detection (bug 31965)
d9d019d674 elf: Make dl-rseq-symbols Linux only
7bfc35959d nptl: fix potential merge of __rseq_* relro symbols
712453634c s390x: Fix segfault in wcsncmp [BZ #31934]

(cherry picked from commit bfffcbf6ae59fd90403d1a40103b2a61ba4aaf6b)
2024-08-06 19:37:39 +08:00

52 lines
1.5 KiB
Diff

From d9d019d674f95509b5001f4d878ae09e32ea7a10 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Thu, 4 Jul 2024 10:09:07 -0300
Subject: [PATCH 03/12] elf: Make dl-rseq-symbols Linux only
And avoid a Hurd build failures.
Checked on x86_64-linux-gnu.
(cherry picked from commit 9fc639f654dc004736836613be703e6bed0c36a8)
---
elf/Makefile | 1 -
sysdeps/unix/sysv/linux/Makefile | 4 ++++
{elf => sysdeps/unix/sysv/linux}/dl-rseq-symbols.S | 0
3 files changed, 4 insertions(+), 1 deletion(-)
rename {elf => sysdeps/unix/sysv/linux}/dl-rseq-symbols.S (100%)
diff --git a/elf/Makefile b/elf/Makefile
index 04e1d7ded5..c2af11b92c 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -74,7 +74,6 @@ dl-routines = \
dl-printf \
dl-profile \
dl-reloc \
- dl-rseq-symbols \
dl-runtime \
dl-scope \
dl-setup_hash \
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index be801e3be4..623a7d4de0 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -587,6 +587,10 @@ tests += \
endif
ifeq ($(subdir),elf)
+dl-routines += \
+ dl-rseq-symbols \
+ # dl-routines
+
sysdep-rtld-routines += \
dl-brk \
dl-getcwd \
diff --git a/elf/dl-rseq-symbols.S b/sysdeps/unix/sysv/linux/dl-rseq-symbols.S
similarity index 100%
rename from elf/dl-rseq-symbols.S
rename to sysdeps/unix/sysv/linux/dl-rseq-symbols.S
--
2.33.0