[RFC,v11,8/7] Drop DT_GNU_FLAGS_1/DF_GNU_1_UNIQUE from the libpthread DSO

Message ID alpine.DEB.2.21.2106111855300.6900@noise.cbg.collabora.co.uk
State New
Headers show
Series
  • Untitled series #38870
Related show

Commit Message

Adhemerval Zanella via Libc-alpha June 11, 2021, 5:57 p.m.
libpthread should have no contents that are sensitive
to duplication anymore, so doesn't require special
treatment under dlmopen.
---
  extra-lib.mk  | 2 ++
  htl/Makefile  | 3 ---
  nptl/Makefile | 3 ---
  3 files changed, 2 insertions(+), 6 deletions(-)

-- 
2.20.1

Patch

diff --git a/extra-lib.mk b/extra-lib.mk
index 9051958ec0..38184adae1 100644
--- a/extra-lib.mk
+++ b/extra-lib.mk
@@ -102,9 +102,11 @@  $(objpfx)$(lib).so: $(firstword $($(lib)-map) \
  					    $(filter $(lib).map, \
  						     $(version-maps))))
  ifneq ($(ld-zunique),yes)
+ifneq ($(lib),libpthread)
  $(objpfx)$(lib).so: $(common-objpfx)/elf/dynamic-notes.os
  endif
  endif
+endif

  endif

diff --git a/htl/Makefile b/htl/Makefile
index f472e42751..8c5ad3c5de 100644
--- a/htl/Makefile
+++ b/htl/Makefile
@@ -205,9 +205,6 @@  libc-link.so = $(common-objpfx)libc.so

  extra-B-pthread.so = -B$(common-objpfx)htl/
  LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
-ifeq ($(ld-zunique),yes)
-LDFLAGS-pthread.so += -Wl,-z,unique
-endif

  include ../Rules

diff --git a/nptl/Makefile b/nptl/Makefile
index 65e4631d33..0e6e96a225 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -373,9 +373,6 @@  CPPFLAGS-tst-pthread-gdb-attach-static.c := \
  tst-pthread-gdb-attach-no-pie = yes

  LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
-ifeq ($(ld-zunique),yes)
-LDFLAGS-pthread.so += -Wl,-z,unique
-endif

  tests += tst-cancelx7 tst-cancelx17 tst-cleanupx4