From 10eb188cac2228f07ea4009cd4037c0eb320e894 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Fri, 18 Nov 2011 10:52:32 +0000 Subject: [PATCH] re PR target/49992 (lto-bootstrap reveals duplicate symbols on x86_64-apple-darwin11) toplevel: PR target/49992 * configure.ac: Remove ranlib special-casing for Darwin. * configure: Regenerate. gcc: PR target/49992 * configure.ac: Remove ranlib special-casing for Darwin. * configure: Regenerate. From-SVN: r181469 --- ChangeLog | 6 ++++++ configure | 4 ---- configure.ac | 4 ---- gcc/ChangeLog | 6 ++++++ gcc/configure | 16 +++------------- gcc/configure.ac | 12 +----------- 6 files changed, 16 insertions(+), 32 deletions(-) diff --git a/ChangeLog b/ChangeLog index e18fea2234f..bae8f29fcf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-11-18 Iain Sandoe + + PR target/49992 + * configure.ac: Remove ranlib special-casing for Darwin. + * configure: Regenerate. + 2011-11-12 Andrey Belevantsev * MAINTAINERS (Reviewers): Keep the list sorted. diff --git a/configure b/configure index f5c76be1968..e68c402db9f 100755 --- a/configure +++ b/configure @@ -6833,10 +6833,6 @@ case "${target}" in extra_arflags_for_target=" -X32_64" extra_nmflags_for_target=" -B -X32_64" ;; - *-*-darwin[3-9]*) - # ranlib before Darwin10 requires the -c flag to look at common symbols. - extra_ranlibflags_for_target=" -c" - ;; esac alphaieee_frag=/dev/null diff --git a/configure.ac b/configure.ac index a5034b26217..7e27de4f57f 100644 --- a/configure.ac +++ b/configure.ac @@ -2291,10 +2291,6 @@ case "${target}" in extra_arflags_for_target=" -X32_64" extra_nmflags_for_target=" -B -X32_64" ;; - *-*-darwin[[3-9]]*) - # ranlib before Darwin10 requires the -c flag to look at common symbols. - extra_ranlibflags_for_target=" -c" - ;; esac alphaieee_frag=/dev/null diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 157e9f43960..a433ece8d0e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-11-18 Iain Sandoe + + PR target/49992 + * configure.ac: Remove ranlib special-casing for Darwin. + * configure: Regenerate. + 2011-11-18 Uros Bizjak PR tree-optimization/51118 diff --git a/gcc/configure b/gcc/configure index d8654121837..6bffb8f24ad 100755 --- a/gcc/configure +++ b/gcc/configure @@ -7597,17 +7597,7 @@ else RANLIB="$ac_cv_prog_RANLIB" fi -case "${host}" in -*-*-darwin*) - # By default, the Darwin ranlib will not treat common symbols as - # definitions when building the archive table of contents. Other - # ranlibs do that; pass an option to the Darwin ranlib that makes - # it behave similarly. - ranlib_flags="-c" - ;; -*) - ranlib_flags="" -esac +ranlib_flags="" # Find a good install program. We prefer a C program (faster), @@ -18087,7 +18077,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18090 "configure" +#line 18080 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18193,7 +18183,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18196 "configure" +#line 18186 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index af5b748b0f5..12492ff1fe5 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -847,17 +847,7 @@ esac gcc_AC_PROG_LN_S ACX_PROG_LN($LN_S) AC_PROG_RANLIB -case "${host}" in -*-*-darwin*) - # By default, the Darwin ranlib will not treat common symbols as - # definitions when building the archive table of contents. Other - # ranlibs do that; pass an option to the Darwin ranlib that makes - # it behave similarly. - ranlib_flags="-c" - ;; -*) - ranlib_flags="" -esac +ranlib_flags="" AC_SUBST(ranlib_flags) gcc_AC_PROG_INSTALL