about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-07-04 10:09:07 -0300
committerFlorian Weimer <fweimer@redhat.com>2024-07-16 16:33:53 +0200
commit143a7a06235cf091b63f58a739c8367ffe54a722 (patch)
tree8de32b4eb7e4ec5df5b2bf236033700cf87c623b
parent1062ebbd1911ec9efe909765ca3ee3809ec3fd67 (diff)
downloadglibc-143a7a06235cf091b63f58a739c8367ffe54a722.tar.gz
glibc-143a7a06235cf091b63f58a739c8367ffe54a722.tar.xz
glibc-143a7a06235cf091b63f58a739c8367ffe54a722.zip
elf: Make dl-rseq-symbols Linux only
And avoid a Hurd build failures.

Checked on x86_64-linux-gnu.

(cherry picked from commit 9fc639f654dc004736836613be703e6bed0c36a8)
-rw-r--r--elf/Makefile1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/dl-rseq-symbols.S (renamed from elf/dl-rseq-symbols.S)0
3 files changed, 4 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 0049ffa13c..a50a988e73 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -73,7 +73,6 @@ dl-routines = \
   dl-origin \
   dl-printf \
   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 415aa1f14d..6ab9b90123 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -615,6 +615,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
index b4bba06a99..b4bba06a99 100644
--- a/elf/dl-rseq-symbols.S
+++ b/sysdeps/unix/sysv/linux/dl-rseq-symbols.S