2008-05-14 Rafael Espindola <espindola@google.com>

[pf3gnuchains/gcc-fork.git] / config-ml.in

diff --git a/config-ml.in b/config-ml.in
index 9adc9e0..f2497ad 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -135,7 +135,12 @@ do
        *)      optarg=yes ;;
        esac
        enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
-       eval $enableopt="$optarg"
+       # enable_shared and enable_static are handled by configure.
+       # Don't undo its work.
+       case $enableopt in
+       enable_shared | enable_static) ;;
+       *) eval $enableopt="$optarg" ;;
+       esac
        ;;
   --norecursion | --no-recursion)
        ml_norecursion=yes
@@ -382,28 +387,6 @@ mips*-*-*)
            esac
          done
        fi
-       case " $multidirs " in
-       *" mabi=64 "*)
-         # We will not be able to create libraries with -mabi=64 if
-         # we cannot even link a trivial program.  It usually
-         # indicates the 64bit libraries are missing.
-         if echo 'main() {}' > conftest.c &&
-            ${CC-gcc} -mabi=64 conftest.c -o conftest; then
-           :
-         else
-           echo Could not link program with -mabi=64, disabling it.
-           old_multidirs="${multidirs}"
-           multidirs=""
-           for x in ${old_multidirs}; do
-             case "$x" in
-             *mabi=64* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-             esac
-           done
-         fi
-         rm -f conftest.c conftest
-         ;;
-       esac
        ;;
 powerpc*-*-* | rs6000*-*-*)
        if [ x$enable_aix64 = xno ]
@@ -495,30 +478,6 @@ powerpc*-*-* | rs6000*-*-*)
          done
        fi
        ;;
-sparc*-*-*)
-       case " $multidirs " in
-       *" m64 "*)
-         # We will not be able to create libraries with -m64 if
-         # we cannot even link a trivial program.  It usually
-         # indicates the 64bit libraries are missing.
-         if echo 'main() {}' > conftest.c &&
-            ${CC-gcc} -m64 conftest.c -o conftest; then
-           :
-         else
-           echo Could not link program with -m64, disabling it.
-           old_multidirs="${multidirs}"
-           multidirs=""
-           for x in ${old_multidirs}; do
-             case "$x" in
-             *m64* ) : ;;
-             *) multidirs="${multidirs} ${x}" ;;
-             esac
-           done
-         fi
-         rm -f conftest.c conftest
-         ;;
-       esac
-       ;;
 esac
 
 # Remove extraneous blanks from multidirs.