public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] Makerules: Remove no-op -Wl,-d when linking libc_pic.os
@ 2022-06-26 22:31 Fangrui Song
  0 siblings, 0 replies; only message in thread
From: Fangrui Song @ 2022-06-26 22:31 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=dbb0f06cc09784f6229cc1736c4af8caa687975f

commit dbb0f06cc09784f6229cc1736c4af8caa687975f
Author: Fangrui Song <maskray@google.com>
Date:   Sun Jun 26 15:31:19 2022 -0700

    Makerules: Remove no-op -Wl,-d when linking libc_pic.os
    
    In GNU ld, -d assigns space to common symbols for -r (i.e. change common
    symbols to STB_GLOBAL definitions).  This option was added in commit
    da2d1bc5adf49352232ad0514e79fbd5dcae08e8 (1998) perhaps because ld at
    that time had a bug that common symbols did not override shared object
    definitions.  -d has been long unneeded and more so since -fno-common
    was added to +cflags.

Diff:
---
 Makerules | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makerules b/Makerules
index dfe89e9e39..d1e139d03c 100644
--- a/Makerules
+++ b/Makerules
@@ -633,14 +633,10 @@ LDFLAGS-c.so = -nostdlib -nostartfiles
 LDLIBS-c.so += $(libc.so-gnulib)
 # Give libc.so an entry point and make it directly runnable itself.
 LDFLAGS-c.so += -e __libc_main
-# Pre-link the objects of libc_pic.a so that we can locally resolve
-# COMMON symbols before we link against ld.so.  This is because ld.so
-# contains some of libc_pic.a already, which will prevent the COMMONs
-# from being allocated in libc.so, which introduces evil dependencies
-# between libc.so and ld.so, which can make it impossible to upgrade.
+# Pre-link the objects of libc_pic.a for .gnu.glibc-stub.* processing.
 $(common-objpfx)libc_pic.os: $(common-objpfx)libc_pic.a
 	$(LINK.o) -nostdlib -nostartfiles -r -o $@ \
-	$(LDFLAGS-c_pic.os) -Wl,-d $(whole-archive) $^ -o $@
+	$(LDFLAGS-c_pic.os) $(whole-archive) $^ -o $@
 
 ifeq (,$(strip $(shlib-lds-flags)))
 # Generate a list of -R options to excise .gnu.glibc-stub.* sections.


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-06-26 22:31 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-26 22:31 [glibc] Makerules: Remove no-op -Wl,-d when linking libc_pic.os Fangrui Song

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).