diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makerules | 4 | ||||
| -rw-r--r-- | config.make.in | 2 | ||||
| -rwxr-xr-x | configure | 16 | ||||
| -rw-r--r-- | configure.ac | 8 |
5 files changed, 9 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog index bcf53f9b7f..cbcb070fa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2015-10-15 Joseph Myers <joseph@codesourcery.com> + * 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. + * configure.ac (libc_cv_friendly_stddef): Remove configure test. * configure: Regenerated. 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) \ diff --git a/config.make.in b/config.make.in index 839d86fa0c..644955928d 100644 --- a/config.make.in +++ b/config.make.in @@ -70,8 +70,6 @@ use-default-link = @use_default_link@ output-format = @libc_cv_output_format@ have-cxx-thread_local = @libc_cv_cxx_thread_local@ -static-libgcc = @libc_cv_gcc_static_libgcc@ - exceptions = @exceptions@ multi-arch = @multi_arch@ diff --git a/configure b/configure index 4b96ec7ad7..3d7b08892d 100755 --- a/configure +++ b/configure @@ -641,7 +641,6 @@ BISON INSTALL_INFO PERL BASH_SHELL -libc_cv_gcc_static_libgcc CXX_SYSINCLUDES SYSINCLUDES AUTOCONF @@ -5316,21 +5315,6 @@ as_fn_error $? " *** and run configure again." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GCC supports -static-libgcc" >&5 -$as_echo_n "checking whether GCC supports -static-libgcc... " >&6; } -if ${libc_cv_gcc_static_libgcc+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $CC -v -static-libgcc 2>&1 | grep 'unrecognized option.*static-libgcc' >/dev/null; then - libc_cv_gcc_static_libgcc= -else - libc_cv_gcc_static_libgcc=-static-libgcc -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_gcc_static_libgcc" >&5 -$as_echo "$libc_cv_gcc_static_libgcc" >&6; } - - # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.ac b/configure.ac index e2112f3c54..047c6322a3 100644 --- a/configure.ac +++ b/configure.ac @@ -1065,14 +1065,6 @@ AC_MSG_ERROR([ *** and run configure again.]) fi -AC_CACHE_CHECK(whether GCC supports -static-libgcc, libc_cv_gcc_static_libgcc, [dnl -if $CC -v -static-libgcc 2>&1 | grep 'unrecognized option.*static-libgcc' >/dev/null; then - libc_cv_gcc_static_libgcc= -else - libc_cv_gcc_static_libgcc=-static-libgcc -fi]) -AC_SUBST(libc_cv_gcc_static_libgcc) - AC_PATH_PROG(BASH_SHELL, bash, no) AC_PATH_PROG(PERL, perl, no) |