summaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-15 19:32:58 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-10-15 19:32:58 +0000
commit30f58bb19238bfc5f617978f3201c2c42d2828f4 (patch)
treedab6915641e96726e62b0700ded22bea25da7dc4 /Makerules
parent06e2c646693d5310011c0190509682a23097b8ae (diff)
downloadglibc-30f58bb19238bfc5f617978f3201c2c42d2828f4.tar.gz
Remove -static-libgcc configure test.
There is a configure test for -static-libgcc. GCC added this option in version 3.0, so this test is obsolete; this patch removes it. Tested for x86_64 and x86 (testsuite, and that installed shared libraries are unchanged by the patch). * configure.ac (libc_cv_gcc_static_libgcc): Remove configure test. * configure: Regenerated. * config.make.in (static-libgcc): Remove variable. * Makerules (build-shlib-helper): Use -static-libgcc instead of $(static-libgcc). (build-module-helper): Likewise.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makerules b/Makerules
index f9ca3f5021..1329f73c38 100644
--- a/Makerules
+++ b/Makerules
@@ -518,7 +518,7 @@ lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(link-libc-deps)
$(call after-link,$@)
define build-shlib-helper
-$(LINK.o) -shared $(static-libgcc) -Wl,-O1 $(sysdep-LDFLAGS) \
+$(LINK.o) -shared -static-libgcc -Wl,-O1 $(sysdep-LDFLAGS) \
$(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) $(rtld-LDFLAGS) \
$(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
$(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
@@ -577,7 +577,7 @@ $(build-shlib-helper) -o $@ $(shlib-lds-flags) \
endef
define build-module-helper
-$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \
+$(LINK.o) -shared -static-libgcc $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \
$(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \
-B$(csu-objpfx) $(load-map-file) \
$(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \