2010-04-07 Doug Kwan <dougkwan@google.com>

[pf3gnuchains/gcc-fork.git] / gcc / configure

diff --git a/gcc/configure b/gcc/configure
index 888fc94..c3ff39c 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -900,7 +900,6 @@ with_pic
 enable_fast_install
 enable_libtool_lock
 with_plugin_ld
-enable_comdat
 enable_gnu_unique_object
 enable_linker_build_id
 with_long_double_128
@@ -1603,7 +1602,6 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-comdat         enable COMDAT group support
   --enable-gnu-unique-object   enable the use of the @gnu_unique_object ELF extension on
                                glibc systems
   --enable-linker-build-id
@@ -17039,7 +17037,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17042 "configure"
+#line 17040 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17145,7 +17143,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17148 "configure"
+#line 17146 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21212,27 +21210,6 @@ if test $in_tree_ld != yes ; then
     ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
     ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
     ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
-  else
-    case "${target}" in
-      *-*-solaris2*)
-       #
-       # Solaris 2 ld -V output looks like this for a regular version:
-       #
-       # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1699
-       #
-       # but test versions add stuff at the end:
-       #
-       # ld: Software Generation Utilities - Solaris Link Editors: 5.11-1.1701:onnv-ab196087-6931056-03/25/10
-       #
-       ld_ver=`$gcc_cv_ld -V 2>&1`
-       if echo "$ld_ver" | grep 'Solaris Link Editors' > /dev/null; then
-         ld_vers=`echo $ld_ver | sed -n \
-           -e 's,^.*: 5\.[0-9][0-9]*-\([0-9]\.[0-9][0-9]*\).*$,\1,p'`
-         ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
-         ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
-       fi
-       ;;
-    esac
   fi
 fi
 
@@ -21831,7 +21808,7 @@ elif test $in_tree_ld = yes ; then
      && test $in_tree_ld_is_elf = yes; then
      comdat_group=yes
   fi
-elif echo "$ld_ver" | grep GNU > /dev/null; then
+elif test x"$ld_vers" != x; then
   comdat_group=yes
   if test 0"$ld_date" -lt 20050308; then
     if test -n "$ld_date"; then
@@ -21844,32 +21821,9 @@ elif echo "$ld_ver" | grep GNU > /dev/null; then
     fi
   fi
 else
-  case "${target}" in
-    *-*-solaris2.1[1-9]*)
-      # Sun ld has COMDAT group support since Solaris 9, but it doesn't
-      # interoperate with GNU as until Solaris 11 build 130, i.e. ld
-      # version 1.688.
-      #
-      # FIXME: Maybe need to refine later when COMDAT group support with
-      # Sun as is implemented.
-      if test "$ld_vers_major" -gt 1 || test "$ld_vers_minor" -ge 1688; then
-        comdat_group=yes
-      else
-        comdat_group=no
-      fi
-      ;;
-    *)
-      # Assume linkers other than GNU ld don't support COMDAT group.
-      comdat_group=no
-      ;;
-  esac
-fi
-# Allow overriding the automatic COMDAT group tests above.
-# Check whether --enable-comdat was given.
-if test "${enable_comdat+set}" = set; then :
-  enableval=$enable_comdat; comdat_group="$enable_comdat"
+  # assume linkers other than GNU ld don't support COMDAT group
+  comdat_group=no
 fi
-
 if test $comdat_group = no; then
   gcc_cv_as_comdat_group=no
   gcc_cv_as_comdat_group_percent=no