* class.c (add_method_1): Set both DECL_EXTERNAL and METHOD_NATIVE

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

diff --git a/config-ml.in b/config-ml.in
index 527e781..fbdfb17 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -99,6 +99,7 @@ fi
 
 # Scan all the arguments and set all the ones we need.
 
+ml_verbose=--verbose
 for option in ${ml_arguments}
 do
   case $option in
@@ -128,6 +129,9 @@ do
   --norecursion | --no*)
        ml_norecursion=yes
        ;;
+  --silent | --sil* | --quiet | --q*)
+       ml_verbose=--silent
+       ;;
   --verbose | --v | --verb*)
        ml_verbose=--verbose
        ;;
@@ -214,6 +218,75 @@ arc-*-elf*)
          done
        fi
        ;;
+arm-*-*)
+       if [ x"$enable_fpu" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *fpu*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_26bit" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *26bit*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_underscore" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *under*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_interwork" = xno ]
+       then
+         old_multidirs=${multidirs}
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "${x}" in
+             *interwork*) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x$enable_biendian = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *le* ) : ;;
+             *be* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       if [ x"$enable_nofmult" = xno ]
+       then
+         old_multidirs="${multidirs}"
+         multidirs=""
+         for x in ${old_multidirs}; do
+           case "$x" in
+             *nofmult* ) : ;;
+             *) multidirs="${multidirs} ${x}" ;;
+           esac
+         done
+       fi
+       ;;
 m68*-*-*)
        if [ x$enable_softfloat = xno ]
        then
@@ -295,6 +368,28 @@ 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_softfloat = xno ]
@@ -375,6 +470,30 @@ 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.
@@ -564,6 +683,13 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
       fi
       (cd ${ml_dir}/${ml_libdir};
        ../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
+      if [ -f ${ml_dir}/${ml_libdir}/Makefile ]; then
+       if [ x"${MAKE}" = x ]; then
+         (cd ${ml_dir}/${ml_libdir}; make distclean)
+       else
+         (cd ${ml_dir}/${ml_libdir}; ${MAKE} distclean)
+       fi
+      fi
       ml_newsrcdir="."
       ml_srcdiroption=
       multisrctop=${dotdot}
@@ -594,7 +720,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     if [ -f ${ml_newsrcdir}/configure ]; then
       ml_recprog=${ml_newsrcdir}/configure
     fi
-    if eval ${ml_config_shell} ${ml_recprog} \
+
+    # find compiler flag corresponding to ${ml_dir}
+    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do 
+      dir=`echo $i | sed -e 's/;.*$//'`
+      if [ "${dir}" = "${ml_dir}" ]; then
+        flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
+        break
+      fi
+    done
+    ml_config_env='CC="${CC} $flags"'
+
+    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
        --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
        ${ml_arguments} ${ml_srcdiroption} ; then
       true