summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-07-11 08:13:12 +0000
committerJakub Jelinek <jakub@redhat.com>2006-07-11 08:13:12 +0000
commitdf8843c5a803743714e1b0b53ea8e4e8f8c95f42 (patch)
treec99ce2859df2a645c744596a999aa870a0490f6d /Makeconfig
parentac7609f7998add41673e8428cf0bc824a40a1361 (diff)
Updated to fedora-glibc-20060710T2206cvs/fedora-glibc-2_4_90-13
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig11
1 files changed, 10 insertions, 1 deletions
diff --git a/Makeconfig b/Makeconfig
index 87f8ba7fbe..5a1aebccff 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -413,11 +413,20 @@ LDFLAGS.so += $(relro-LDFLAGS)
LDFLAGS-rtld += $(relro-LDFLAGS)
endif
+ifeq (yes,$(have-hash-style))
+# For the time being we unconditionally use 'both'. At some time we
+# should declare statically linked code as 'out of luck' and compile
+# with --hash-style=gnu only.
+hashstyle-LDFLAGS = -Wl,--hash-style=both
+LDFLAGS.so += $(hashstyle-LDFLAGS)
+LDFLAGS-rtld += $(hashstyle-LDFLAGS)
+endif
+
# Command for linking programs with the C library.
ifndef +link
+link = $(CC) -nostdlib -nostartfiles -o $@ \
$(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
- $(combreloc-LDFLAGS) $(relro-LDFLAGS) \
+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
$(addprefix $(csu-objpfx),$(start-installed-name)) \
$(+preinit) $(+prector) \
$(filter-out $(addprefix $(csu-objpfx),start.o \