diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makeconfig | 11 | ||||
| -rw-r--r-- | config.make.in | 1 | ||||
| -rwxr-xr-x | configure | 29 | ||||
| -rw-r--r-- | configure.in | 17 |
5 files changed, 11 insertions, 57 deletions
diff --git a/ChangeLog b/ChangeLog index 1a1d23a968..84038da78a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-04-25 Joseph Myers <joseph@codesourcery.com> + + * configure.in (libc_cv_as_needed): Remove test. + * configure: Regenerated. + * Makeconfig [$(have-as-needed) != yes] (as-needed): Remove + conditional definition. + [$(have-as-needed) != yes] (no-as-needed): Likewise. + [$(have-as-needed) != yes] (libgcc_eh): Likewise. + * config.make.in (have-as-needed): Remove variable. + 2012-04-25 Siddhesh Poyarekar <siddhesh@redhat.com> Paul Pluzhnikov <ppluzhnikov@google.com> diff --git a/Makeconfig b/Makeconfig index 4364296b3c..148db6e3df 100644 --- a/Makeconfig +++ b/Makeconfig @@ -388,13 +388,8 @@ ifndef asm-CPPFLAGS asm-CPPFLAGS = endif -ifeq ($(have-as-needed),yes) as-needed := -Wl,--as-needed no-as-needed := -Wl,--no-as-needed -else -as-needed := -no-as-needed := -endif # Must be supported by the linker. no-whole-archive = -Wl,--no-whole-archive @@ -534,11 +529,7 @@ ifneq ($(have-cc-with-libunwind),yes) else libunwind = -lunwind endif -ifneq ($(have-as-needed),yes) - libgcc_eh := -lgcc_eh $(libunwind) -else - libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed -endif +libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed gnulib := -lgcc $(libgcc_eh) static-gnulib := -lgcc -lgcc_eh $(libunwind) libc.so-gnulib := -lgcc diff --git a/config.make.in b/config.make.in index 0cea3a460e..9aff468fe5 100644 --- a/config.make.in +++ b/config.make.in @@ -49,7 +49,6 @@ all-warnings = @all_warnings@ have-z-combreloc = @libc_cv_z_combreloc@ have-z-execstack = @libc_cv_z_execstack@ have-Bgroup = @libc_cv_Bgroup@ -have-as-needed = @libc_cv_as_needed@ with-fp = @with_fp@ old-glibc-headers = @old_glibc_headers@ unwind-find-fde = @libc_cv_gcc_unwind_find_fde@ diff --git a/configure b/configure index 9cfccb2f9f..7fd47c17c0 100755 --- a/configure +++ b/configure @@ -650,7 +650,6 @@ libc_cv_fpie libc_cv_z_execstack libc_cv_z_combreloc ASFLAGS_config -libc_cv_as_needed libc_cv_Bgroup libc_cv_cc_with_libunwind VERSIONING @@ -6304,34 +6303,6 @@ fi $as_echo "$libc_cv_Bgroup" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --as-needed option" >&5 -$as_echo_n "checking for --as-needed option... " >&6; } -if ${libc_cv_as_needed+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat > conftest.c <<EOF -int main (void) { return 0; } -EOF -if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -fPIC -shared -o conftest.so conftest.c - -lgcc_s -Wl,--as-needed - -nostdlib 1>&5' - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 - (eval $ac_try) 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; } -then - libc_cv_as_needed=yes -else - libc_cv_as_needed=no -fi -rm -f conftest* -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_as_needed" >&5 -$as_echo "$libc_cv_as_needed" >&6; } - - ASFLAGS_config= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether --noexecstack is desirable for .S files" >&5 $as_echo_n "checking whether --noexecstack is desirable for .S files... " >&6; } diff --git a/configure.in b/configure.in index 442f8eb503..42d521f708 100644 --- a/configure.in +++ b/configure.in @@ -1519,23 +1519,6 @@ fi rm -f conftest*]) AC_SUBST(libc_cv_Bgroup) -AC_CACHE_CHECK(for --as-needed option, - libc_cv_as_needed, [dnl -cat > conftest.c <<EOF -int main (void) { return 0; } -EOF -if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS - -fPIC -shared -o conftest.so conftest.c - -lgcc_s -Wl,--as-needed - -nostdlib 1>&AS_MESSAGE_LOG_FD]) -then - libc_cv_as_needed=yes -else - libc_cv_as_needed=no -fi -rm -f conftest*]) -AC_SUBST(libc_cv_as_needed) - ASFLAGS_config= AC_CACHE_CHECK(whether --noexecstack is desirable for .S files, libc_cv_as_noexecstack, [dnl |