about summary refs log tree commit diff
path: root/Makerules
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2022-06-26 15:31:19 -0700
committerFangrui Song <maskray@google.com>2022-06-26 15:31:19 -0700
commitdbb0f06cc09784f6229cc1736c4af8caa687975f (patch)
treeba55c063c73a1d3dbfbebf410d4ed7161b7b0ee4 /Makerules
parent01c60dc90ca404c153d51f0ddc3b5fe36d3c1099 (diff)
downloadglibc-dbb0f06cc09784f6229cc1736c4af8caa687975f.tar.gz
glibc-dbb0f06cc09784f6229cc1736c4af8caa687975f.tar.xz
glibc-dbb0f06cc09784f6229cc1736c4af8caa687975f.zip
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.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules8
1 files 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.