OSDN Git Service

new
[pf3gnuchains/gcc-fork.git] / gcc / configure
index 0fad951..7e86ceb 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12.1 
+# Generated automatically using autoconf version 2.12.2 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -14,8 +14,12 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --with-gnu-ld           arrange to work with GNU ld."
 ac_help="$ac_help
+  --with-ld               arrange to use the specified ld (full pathname)."
+ac_help="$ac_help
   --with-gnu-as           arrange to work with GNU as."
 ac_help="$ac_help
+  --with-as               arrange to use the specified as (full pathname)."
+ac_help="$ac_help
   --with-stabs            arrange to use stabs instead of host debug format."
 ac_help="$ac_help
   --with-elf              arrange to use ELF instead of host debug format."
@@ -27,16 +31,31 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-checking       enable expensive run-time checks."
 ac_help="$ac_help
-  --enable-c-cpplib       Use cpplib for C."
+  --enable-cpplib         use cpplib for the C preprocessor."
+ac_help="$ac_help
+  --enable-c-cpplib       link cpplib directly into C and C++ compilers
+                          (implies --enable-cpplib)."
+ac_help="$ac_help
+  --enable-c-mbchar       enable multibyte characters for C and C++."
 ac_help="$ac_help
-  --enable-haifa          Use the experimental scheduler.
-  --disable-haifa         Don't use the experimental scheduler for the
+  --enable-haifa          use the experimental scheduler.
+  --disable-haifa         don't use the experimental scheduler for the
                           targets which normally enable it."
 ac_help="$ac_help
-  --with-fast-fixincludes    Use a faster fixinclude program.  Experimental"
+  --with-fast-fixincludes    use a faster fixinclude program (experimental)"
+ac_help="$ac_help
+  --enable-init-priority  use attributes to assign initialization order
+                         for static objects.
+  --disable-init-priority conform to ISO C++ rules for ordering static objects
+                         (i.e. initialized in order of declaration). "
 ac_help="$ac_help
   --enable-threads        enable thread usage for target GCC.
   --enable-threads=LIB    use LIB thread package for target GCC."
+ac_help="$ac_help
+  --enable-objc-gc       enable the use of Boehm's garbage collector with
+                         the GNU Objective-C runtime."
+ac_help="$ac_help
+  --enable-java-gc=TYPE   choose garbage collector [boehm]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -359,7 +378,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12.1"
+    echo "configure generated by autoconf version 2.12.2"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -529,9 +548,11 @@ ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
@@ -552,6 +573,57 @@ hard_link=ln
 symbolic_link='ln -s'
 copy=cp
 
+# Check for bogus environment variables.
+# Test if LIBRARY_PATH contains the notation for the current directory
+# since this would lead to problems installing/building glibc.
+# LIBRARY_PATH contains the current directory if one of the following
+# is true:
+# - one of the terminals (":" and ";") is the first or last sign
+# - two terminals occur directly after each other
+# - the path contains an element with a dot in it
+echo $ac_n "checking LIBRARY_PATH variable""... $ac_c" 1>&6
+echo "configure:586: checking LIBRARY_PATH variable" >&5
+case ${LIBRARY_PATH} in
+  [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
+    library_path_setting="contains current directory"
+    ;;
+  *)
+    library_path_setting="ok"
+    ;;
+esac
+echo "$ac_t""$library_path_setting" 1>&6
+if test "$library_path_setting" != "ok"; then
+{ echo "configure: error: 
+*** LIBRARY_PATH shouldn't contain the current directory when
+*** building egcs. Please change the environment variable
+*** and run configure again." 1>&2; exit 1; }
+fi
+
+# Test if GCC_EXEC_PREFIX contains the notation for the current directory
+# since this would lead to problems installing/building glibc.
+# GCC_EXEC_PREFIX contains the current directory if one of the following
+# is true:
+# - one of the terminals (":" and ";") is the first or last sign
+# - two terminals occur directly after each other
+# - the path contains an element with a dot in it
+echo $ac_n "checking GCC_EXEC_PREFIX variable""... $ac_c" 1>&6
+echo "configure:611: checking GCC_EXEC_PREFIX variable" >&5
+case ${GCC_EXEC_PREFIX} in
+  [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
+    gcc_exec_prefix_setting="contains current directory"
+    ;;
+  *)
+    gcc_exec_prefix_setting="ok"
+    ;;
+esac
+echo "$ac_t""$gcc_exec_prefix_setting" 1>&6
+if test "$gcc_exec_prefix_setting" != "ok"; then
+{ echo "configure: error: 
+*** GCC_EXEC_PREFIX shouldn't contain the current directory when
+*** building egcs. Please change the environment variable
+*** and run configure again." 1>&2; exit 1; }
+fi
+
 # Check for additional parameters
 
 # With GNU ld
@@ -564,6 +636,25 @@ else
 fi
 
 
+# With pre-defined ld
+# Check whether --with-ld or --without-ld was given.
+if test "${with_ld+set}" = set; then
+  withval="$with_ld"
+  DEFAULT_LINKER="$with_ld"
+fi
+
+if test x"${DEFAULT_LINKER+set}" = x"set"; then
+  if test ! -x "$DEFAULT_LINKER"; then
+    echo "configure: warning: cannot execute: $DEFAULT_LINKER: check --with-ld or env. var. DEFAULT_LINKER" 1>&2
+  elif test "GNU" = `$DEFAULT_LINKER -v </dev/null 2>&1 | sed '1s/^GNU.*/GNU/;q'`; then
+    gnu_ld_flag=yes
+  fi
+  cat >> confdefs.h <<EOF
+#define DEFAULT_LINKER "$DEFAULT_LINKER"
+EOF
+
+fi
+
 # With GNU as
 # Check whether --with-gnu-as or --without-gnu-as was given.
 if test "${with_gnu_as+set}" = set; then
@@ -574,6 +665,24 @@ else
 fi
 
 
+# Check whether --with-as or --without-as was given.
+if test "${with_as+set}" = set; then
+  withval="$with_as"
+  DEFAULT_ASSEMBLER="$with_as"
+fi
+
+if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
+  if test ! -x "$DEFAULT_ASSEMBLER"; then
+    echo "configure: warning: cannot execute: $DEFAULT_ASSEMBLER: check --with-as or env. var. DEFAULT_ASSEMBLER" 1>&2
+  elif test "GNU" = `$DEFAULT_ASSEMBLER -v </dev/null 2>&1 | sed '1s/^GNU.*/GNU/;q'`; then
+    gas_flag=yes
+  fi
+  cat >> confdefs.h <<EOF
+#define DEFAULT_ASSEMBLER "$DEFAULT_ASSEMBLER"
+EOF
+
+fi
+
 # With stabs
 # Check whether --with-stabs or --without-stabs was given.
 if test "${with_stabs+set}" = set; then
@@ -595,54 +704,90 @@ fi
 
 
 # Specify the local prefix
+local_prefix=
 # Check whether --with-local-prefix or --without-local-prefix was given.
 if test "${with_local_prefix+set}" = set; then
   withval="$with_local_prefix"
-  local_prefix=$with_local_prefix
-else
-  local_prefix=/usr/local
+  case "${withval}" in
+yes)   { echo "configure: error: bad value ${withval} given for local include directory prefix" 1>&2; exit 1; } ;;
+no)    ;;
+*)     local_prefix=$with_local_prefix ;;
+esac
 fi
 
 
 # Default local prefix if it is empty
-if [ x$local_prefix = x ]; then
+if test x$local_prefix = x; then
        local_prefix=/usr/local
 fi
 
+gxx_include_dir=
 # Specify the g++ header file directory
 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
 if test "${with_gxx_include_dir+set}" = set; then
   withval="$with_gxx_include_dir"
-  gxx_include_dir=$with_gxx_include_dir
-else
-  gxx_include_dir='${prefix}/include/g++'
+  case "${withval}" in
+yes)   { echo "configure: error: bad value ${withval} given for g++ include directory" 1>&2; exit 1; } ;;
+no)    ;;
+*)     gxx_include_dir=$with_gxx_include_dir ;;
+esac
 fi
 
 
-# Default g++ header file directory if it is empty
-if [ x$gxx_include_dir = x ]; then
-       gxx_include_dir='${prefix}/include/g++'
+if test x${gxx_include_dir} = x; then
+  if test x${enable_version_specific_runtime_libs} = xyes; then
+    gxx_include_dir='${libsubdir}/include/g++'
+  else
+    topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+    gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+  fi
 fi
 
 # Enable expensive internal checks
 # Check whether --enable-checking or --disable-checking was given.
 if test "${enable_checking+set}" = set; then
   enableval="$enable_checking"
-  cat >> confdefs.h <<\EOF
+  case "${enableval}" in
+yes)   cat >> confdefs.h <<\EOF
 #define ENABLE_CHECKING 1
 EOF
-  
+ ;;
+no)    ;;
+*)     { echo "configure: error: bad value ${enableval} given for checking option" 1>&2; exit 1; } ;;
+esac
+fi
+
 
+# Use cpplib+cppmain for the preprocessor, but don't link it with the compiler.
+cpp_main=cccp
+# Check whether --enable-cpplib or --disable-cpplib was given.
+if test "${enable_cpplib+set}" = set; then
+  enableval="$enable_cpplib"
+  if test x$enable_cpplib != xno; then
+  cpp_main=cppmain
+fi
 fi
 
 
-# Enable use of cpplib for C.
+# Link cpplib into the compiler proper, for C/C++/ObjC.
 # Check whether --enable-c-cpplib or --disable-c-cpplib was given.
 if test "${enable_c_cpplib+set}" = set; then
   enableval="$enable_c_cpplib"
-  if [ x$enable_c_cpplib != xno ]; then
-  extra_c_objs="${extra_c_objs} cpplib.o cppexp.o cpphash.o cpperror.o"
+  if test x$enable_c_cpplib != xno; then
+  extra_c_objs="${extra_c_objs} libcpp.a"
+  extra_cxx_objs="${extra_cxx_objs} ../libcpp.a"
   extra_c_flags=-DUSE_CPPLIB=1
+  cpp_main=cppmain
+fi
+fi
+
+
+# Enable Multibyte Characters for C/C++
+# Check whether --enable-c-mbchar or --disable-c-mbchar was given.
+if test "${enable_c_mbchar+set}" = set; then
+  enableval="$enable_c_mbchar"
+  if test x$enable_c_mbchar != xno; then
+  extra_c_flags=-DMULTIBYTE_CHARS=1
 fi
 fi
 
@@ -666,13 +811,23 @@ else
 fi
 
 
+# Enable init_priority.
+# Check whether --enable-init-priority or --disable-init-priority was given.
+if test "${enable_init_priority+set}" = set; then
+  enableval="$enable_init_priority"
+  if test x$enable_init_priority != xno; then
+  extra_c_flags=-DUSE_INIT_PRIORITY
+fi
+fi
+
+
 # Enable threads
 # Pass with no value to take the default
 # Pass with a value to specify a thread package
 # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
-  if [ x$enable_threads = xno ]; then
+  if test x$enable_threads = xno; then
        enable_threads=''
 fi
 else
@@ -701,6 +856,29 @@ case x${enable_threads_flag} in
                ;;
 esac
 
+# Check whether --enable-objc-gc or --disable-objc-gc was given.
+if test "${enable_objc_gc+set}" = set; then
+  enableval="$enable_objc_gc"
+  if [ x$enable_objc_gc = xno ]; then
+       objc_boehm_gc=''
+else
+       objc_boehm_gc=1
+fi
+else
+  objc_boehm_gc=''
+fi
+
+
+# Check whether --enable-java-gc or --disable-java-gc was given.
+if test "${enable_java_gc+set}" = set; then
+  enableval="$enable_java_gc"
+  
+  JAVAGC=$enableval
+else
+  JAVAGC=boehm
+fi
+
+
 # Determine the host, build, and target systems
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -749,7 +927,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:753: checking host system type" >&5
+echo "configure:931: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -770,7 +948,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:774: checking target system type" >&5
+echo "configure:952: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -788,7 +966,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:792: checking build system type" >&5
+echo "configure:970: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -815,14 +993,14 @@ test "$host_alias" != "$target_alias" &&
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:819: checking for $ac_word" >&5
+echo "configure:997: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -844,14 +1022,14 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:848: checking for $ac_word" >&5
+echo "configure:1026: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   ac_prog_rejected=no
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
@@ -888,25 +1066,58 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # Extract the first word of "cl", so it can be a program name with args.
+set dummy cl; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1076: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:896: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1107: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 906 "configure"
+#line 1117 "configure"
 #include "confdefs.h"
 main(){return(0);}
 EOF
-if { (eval echo configure:910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -926,12 +1137,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:930: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1141: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:935: checking whether we are using GNU C" >&5
+echo "configure:1146: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -940,7 +1151,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -951,11 +1162,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
   GCC=yes
-  ac_test_CFLAGS="${CFLAGS+set}"
-  ac_save_CFLAGS="$CFLAGS"
-  CFLAGS=
-  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:959: checking whether ${CC-cc} accepts -g" >&5
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:1174: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -970,20 +1185,35 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-  if test "$ac_test_CFLAGS" = set; then
-    CFLAGS="$ac_save_CFLAGS"
-  elif test $ac_cv_prog_cc_g = yes; then
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
     CFLAGS="-O2"
+  else
+    CFLAGS=
   fi
+fi
+
+
+# If the native compiler is GCC, we can enable warnings even in stage1.  
+# That's useful for people building cross-compilers, or just running a
+# quick `make'.
+if test "x$GCC" = "xyes"; then 
+  stage1_warn_cflags='$(WARN_CFLAGS)'
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
+  stage1_warn_cflags=""
 fi
 
+
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:987: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1217: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1010,20 +1240,44 @@ else
 fi
 
 
+echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6
+echo "configure:1245: checking whether a default assembler was specified" >&5
+if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
+    if test x"$with_gas" = x"no"; then
+       echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6
+    else
+       echo "$ac_t""yes ($DEFAULT_ASSEMBLER - GNU as)" 1>&6
+    fi
+else
+    echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6
+echo "configure:1257: checking whether a default linker was specified" >&5
+if test x"${DEFAULT_LINKER+set}" = x"set"; then
+    if test x"$with_gnu_ld" = x"no"; then
+       echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6
+    else
+       echo "$ac_t""yes ($DEFAULT_LINKER - GNU ld)" 1>&6
+    fi
+else
+    echo "$ac_t""no" 1>&6
+fi
+
 # Find some useful tools
 for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1020: checking for $ac_word" >&5
+echo "configure:1274: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1047,14 +1301,14 @@ done
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1051: checking for $ac_word" >&5
+echo "configure:1305: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1080,7 +1334,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1084: checking for yywrap in -l$ac_lib" >&5
+echo "configure:1338: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1088,7 +1342,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1092 "configure"
+#line 1346 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1099,7 +1353,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:1103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1122,7 +1376,7 @@ fi
 fi
 
 echo $ac_n "checking whether ln works""... $ac_c" 1>&6
-echo "configure:1126: checking whether ln works" >&5
+echo "configure:1380: checking whether ln works" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_LN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1154,7 +1408,7 @@ else
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1158: checking whether ln -s works" >&5
+echo "configure:1412: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1186,19 +1440,19 @@ else
 fi
 
 echo $ac_n "checking for volatile""... $ac_c" 1>&6
-echo "configure:1190: checking for volatile" >&5
+echo "configure:1444: checking for volatile" >&5
 if eval "test \"`echo '$''{'gcc_cv_c_volatile'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1195 "configure"
+#line 1449 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int foo;
 ; return 0; }
 EOF
-if { (eval echo configure:1202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_c_volatile=yes
 else
@@ -1221,14 +1475,14 @@ fi
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1225: checking for $ac_word" >&5
+echo "configure:1479: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1252,14 +1506,14 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1256: checking for $ac_word" >&5
+echo "configure:1510: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   for ac_dir in $PATH; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
@@ -1292,7 +1546,7 @@ test -n "$YACC" || YACC="yacc"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1296: checking for a BSD compatible install" >&5
+echo "configure:1550: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1343,7 +1597,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1347: checking how to run the C preprocessor" >&5
+echo "configure:1601: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1358,14 +1612,14 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1362 "configure"
+#line 1616 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1368: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@ -1375,14 +1629,31 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1379 "configure"
+#line 1633 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 1650 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
 else
@@ -1395,6 +1666,8 @@ fi
 rm -f conftest*
 fi
 rm -f conftest*
+fi
+rm -f conftest*
   ac_cv_prog_CPP="$CPP"
 fi
   CPP="$ac_cv_prog_CPP"
@@ -1404,12 +1677,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1408: checking for ANSI C header files" >&5
+echo "configure:1681: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1413 "configure"
+#line 1686 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1417,8 +1690,8 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   ac_cv_header_stdc=yes
@@ -1434,7 +1707,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1438 "configure"
+#line 1711 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1452,7 +1725,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1456 "configure"
+#line 1729 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1473,7 +1746,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1477 "configure"
+#line 1750 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1484,7 +1757,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1508,12 +1781,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1512: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1785: checking whether time.h and sys/time.h may both be included" >&5
 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1517 "configure"
+#line 1790 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1522,7 +1795,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1542,22 +1815,98 @@ EOF
 
 fi
 
-for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h fcntl.h unistd.h stab.h sys/file.h sys/time.h sys/resource.h sys/param.h sys/times.h wait.h sys/wait.h
+echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6
+echo "configure:1820: checking whether string.h and strings.h may both be included" >&5
+if eval "test \"`echo '$''{'gcc_cv_header_string'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1825 "configure"
+#include "confdefs.h"
+#include <string.h>
+#include <strings.h>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_header_string=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_header_string=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gcc_cv_header_string" 1>&6
+if test $gcc_cv_header_string = yes; then
+  cat >> confdefs.h <<\EOF
+#define STRING_WITH_STRINGS 1
+EOF
+
+fi
+
+echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+echo "configure:1854: checking for sys/wait.h that is POSIX.1 compatible" >&5
+if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1859 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+int main() {
+int s;
+wait (&s);
+s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+; return 0; }
+EOF
+if { (eval echo configure:1875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_sys_wait_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_sys_wait_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
+if test $ac_cv_header_sys_wait_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_SYS_WAIT_H 1
+EOF
+
+fi
+
+for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h fcntl.h unistd.h stab.h sys/file.h sys/time.h sys/resource.h sys/param.h sys/times.h sys/stat.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1550: checking for $ac_hdr" >&5
+echo "configure:1899: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1555 "configure"
+#line 1904 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1586,18 +1935,18 @@ done
 # Check for thread headers.
 ac_safe=`echo "thread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for thread.h""... $ac_c" 1>&6
-echo "configure:1590: checking for thread.h" >&5
+echo "configure:1939: checking for thread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1595 "configure"
+#line 1944 "configure"
 #include "confdefs.h"
 #include <thread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1620,18 +1969,18 @@ fi
 
 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:1624: checking for pthread.h" >&5
+echo "configure:1973: checking for pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1629 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:1983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
   eval "ac_cv_header_$ac_safe=yes"
@@ -1653,15 +2002,46 @@ have_pthread_h=
 fi
 
 
+# See if GNAT has been installed
+# Extract the first word of "gnatbind", so it can be a program name with args.
+set dummy gnatbind; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2010: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gnat'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$gnat"; then
+  ac_cv_prog_gnat="$gnat" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_gnat="yes"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_gnat" && ac_cv_prog_gnat="no"
+fi
+fi
+gnat="$ac_cv_prog_gnat"
+if test -n "$gnat"; then
+  echo "$ac_t""$gnat" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
 # See if the system preprocessor understands the ANSI C preprocessor
 # stringification operator.
 echo $ac_n "checking whether cpp understands the stringify operator""... $ac_c" 1>&6
-echo "configure:1660: checking whether cpp understands the stringify operator" >&5
+echo "configure:2040: checking whether cpp understands the stringify operator" >&5
 if eval "test \"`echo '$''{'gcc_cv_c_have_stringify'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1665 "configure"
+#line 2045 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1669,7 +2049,7 @@ int main() {
 char *test = S(foo);
 ; return 0; }
 EOF
-if { (eval echo configure:1673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_c_have_stringify=yes
 else
@@ -1692,12 +2072,12 @@ fi
 # Use <inttypes.h> only if it exists,
 # doesn't clash with <sys/types.h>, and declares intmax_t.
 echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6
-echo "configure:1696: checking for inttypes.h" >&5
+echo "configure:2076: checking for inttypes.h" >&5
 if eval "test \"`echo '$''{'gcc_cv_header_inttypes_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1701 "configure"
+#line 2081 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -1705,13 +2085,9 @@ int main() {
 intmax_t i = -1;
 ; return 0; }
 EOF
-if { (eval echo configure:1709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  cat >> confdefs.h <<EOF
-#define HAVE_INTTYPES_H 1
-EOF
-
-   gcc_cv_header_inttypes_h=yes
+  gcc_cv_header_inttypes_h=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
@@ -1722,18 +2098,24 @@ rm -f conftest*
 fi
 
 echo "$ac_t""$gcc_cv_header_inttypes_h" 1>&6
+if test $gcc_cv_header_inttypes_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_INTTYPES_H 1
+EOF
+
+fi
 
 for ac_func in strtoul bsearch strerror putenv popen bcopy bzero bcmp \
        index rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
-       sysconf isascii
+       sysconf isascii gettimeofday strsignal
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1732: checking for $ac_func" >&5
+echo "configure:2114: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 2119 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1756,7 +2138,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -1781,13 +2163,16 @@ fi
 done
 
 
+# Make sure wchar_t is available
+#AC_CHECK_TYPE(wchar_t, unsigned int)
+
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:1786: checking for vprintf" >&5
+echo "configure:2171: checking for vprintf" >&5
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1791 "configure"
+#line 2176 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -1810,7 +2195,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
@@ -1834,12 +2219,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:1838: checking for _doprnt" >&5
+echo "configure:2223: checking for _doprnt" >&5
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1843 "configure"
+#line 2228 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -1862,7 +2247,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
@@ -1898,7 +2283,7 @@ fi
 
 
 echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
-echo "configure:1902: checking whether the printf functions support %p" >&5
+echo "configure:2287: checking whether the printf functions support %p" >&5
 if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1906,7 +2291,7 @@ else
   gcc_cv_func_printf_ptr=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 1910 "configure"
+#line 2295 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 
@@ -1919,7 +2304,7 @@ main()
   exit (p != q);
 }
 EOF
-if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   gcc_cv_func_printf_ptr=yes
 else
 echo "$ac_t""$gcc_cv_func_printf_ptr" 1>&6
 if test $gcc_cv_func_printf_ptr = yes ; then
   cat >> confdefs.h <<\EOF
-#define HOST_PTR_PRINTF "%p"
+#define HAVE_PRINTF_PTR 1
+EOF
+
+fi
+
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:2332: checking for pid_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2337 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_pid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_pid_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+
+fi
+
+ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+echo "configure:2366: checking for vfork.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2371 "configure"
+#include "confdefs.h"
+#include <vfork.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VFORK_H 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+echo $ac_n "checking for working vfork""... $ac_c" 1>&6
+echo "configure:2401: checking for working vfork" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  echo $ac_n "checking for vfork""... $ac_c" 1>&6
+echo "configure:2407: checking for vfork" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2412 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char vfork(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char vfork();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vfork) || defined (__stub___vfork)
+choke me
+#else
+vfork();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_vfork=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vfork=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+ac_cv_func_vfork_works=$ac_cv_func_vfork
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2457 "configure"
+#include "confdefs.h"
+/* Thanks to Paul Eggert for this test.  */
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_VFORK_H
+#include <vfork.h>
+#endif
+/* On some sparc systems, changes by the child to local and incoming
+   argument registers are propagated back to the parent.
+   The compiler is told about this with #include <vfork.h>,
+   but some compilers (e.g. gcc -O) don't grok <vfork.h>.
+   Test for this by using a static variable whose address
+   is put into a register that is clobbered by the vfork.  */
+static
+#ifdef __cplusplus
+sparc_address_test (int arg)
+#else
+sparc_address_test (arg) int arg;
+#endif
+{
+  static pid_t child;
+  if (!child) {
+    child = vfork ();
+    if (child < 0) {
+      perror ("vfork");
+      _exit(2);
+    }
+    if (!child) {
+      arg = getpid();
+      write(-1, "", 0);
+      _exit (arg);
+    }
+  }
+}
+main() {
+  pid_t parent = getpid ();
+  pid_t child;
+
+  sparc_address_test ();
+
+  child = vfork ();
+
+  if (child == 0) {
+    /* Here is another test for sparc vfork register problems.
+       This test uses lots of local variables, at least
+       as many local variables as main has allocated so far
+       including compiler temporaries.  4 locals are enough for
+       gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
+       A buggy compiler should reuse the register of parent
+       for one of the local variables, since it will think that
+       parent can't possibly be used any more in this routine.
+       Assigning to the local variable will thus munge parent
+       in the parent process.  */
+    pid_t
+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
+    /* Convince the compiler that p..p7 are live; otherwise, it might
+       use the same hardware register for all 8 local variables.  */
+    if (p != p1 || p != p2 || p != p3 || p != p4
+       || p != p5 || p != p6 || p != p7)
+      _exit(1);
+
+    /* On some systems (e.g. IRIX 3.3),
+       vfork doesn't separate parent from child file descriptors.
+       If the child closes a descriptor before it execs or exits,
+       this munges the parent's descriptor as well.
+       Test for this by closing stdout in the child.  */
+    _exit(close(fileno(stdout)) != 0);
+  } else {
+    int status;
+    struct stat st;
+
+    while (wait(&status) != child)
+      ;
+    exit(
+        /* Was there some problem with vforking?  */
+        child < 0
+
+        /* Did the child fail?  (This shouldn't happen.)  */
+        || status
+
+        /* Did the vfork/compiler bug occur?  */
+        || parent != getpid()
+
+        /* Did the file descriptor bug occur?  */
+        || fstat(fileno(stdout), &st) != 0
+        );
+  }
+}
+EOF
+if { (eval echo configure:2552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_vfork_works=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_vfork_works=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
+if test $ac_cv_func_vfork_works = no; then
+  cat >> confdefs.h <<\EOF
+#define vfork fork
 EOF
 
 fi
 
 
 for ac_func in malloc realloc calloc free bcopy bzero bcmp \
-       index rindex getenv atol sbrk abort atof
+       index rindex getenv atol sbrk abort atof strerror getcwd getwd \
+       strsignal
 do
 echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
-echo "configure:1951: checking whether $ac_func must be declared" >&5
+echo "configure:2580: checking whether $ac_func must be declared" >&5
 if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1956 "configure"
+#line 2585 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
+#ifdef STRING_WITH_STRINGS
+# include <string.h>
+# include <strings.h>
 #else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# ifdef HAVE_STRING_H
+#  include <string.h>
+# else
+#  ifdef HAVE_STRINGS_H
+#   include <strings.h>
+#  endif
+# endif
+#endif
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifndef HAVE_RINDEX
+#define rindex strrchr
 #endif
+#ifndef HAVE_INDEX
+#define index strchr
+#endif
+
+int main() {
+char *(*pfn) = (char *(*)) $ac_func
+; return 0; }
+EOF
+if { (eval echo configure:2618: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "gcc_cv_decl_needed_$ac_func=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "gcc_cv_decl_needed_$ac_func=yes"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$gcc_cv_decl_needed_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  gcc_tr_decl=NEED_DECLARATION_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $gcc_tr_decl 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+done
+
+
+for ac_func in getrlimit setrlimit
+do
+echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
+echo "configure:2647: checking whether $ac_func must be declared" >&5
+if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2652 "configure"
+#include "confdefs.h"
+
+#include <stdio.h>
+#ifdef STRING_WITH_STRINGS
+# include <string.h>
+# include <strings.h>
+#else
+# ifdef HAVE_STRING_H
+#  include <string.h>
+# else
+#  ifdef HAVE_STRINGS_H
+#   include <strings.h>
+#  endif
+# endif
 #endif
 #ifdef HAVE_STDLIB_H
 #include <stdlib.h>
@@ -1975,11 +2676,16 @@ else
 #ifndef HAVE_INDEX
 #define index strchr
 #endif
+#include <sys/types.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+
 int main() {
 char *(*pfn) = (char *(*)) $ac_func
 ; return 0; }
 EOF
-if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "gcc_cv_decl_needed_$ac_func=no"
 else
@@ -2006,12 +2712,12 @@ done
 
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2010: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2716: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2015 "configure"
+#line 2721 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2023,7 +2729,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -2083,7 +2789,7 @@ for machine in $build $host $target; do
        # Set this to override the default target model.
        target_cpu_default=
        # Set this to control which fixincludes program to use.
-       if [ x$fast_fixinc != xyes ] ; then
+       if test x$fast_fixinc != xyes; then
                fixincludes=fixincludes
        else fixincludes=fixinc.sh ; fi
        # Set this to control how the header file directory is installed.
@@ -2148,7 +2854,7 @@ for machine in $build $host $target; do
        # Set the default macros to define for GNU/Linux systems.
        case $machine in
        *-*-linux-gnu*)
-               xm_defines="HAVE_ATEXIT POSIX NO_STAB_H BSTRING"
+               xm_defines="HAVE_ATEXIT POSIX BSTRING"
                ;;
        esac
 
@@ -2159,11 +2865,11 @@ for machine in $build $host $target; do
                rest=`echo $machine | sed -e "s/$cpu_type-//"`
                xm_file=${cpu_type}/xm-$rest.h
                tm_file=${cpu_type}/$rest.h
-               if [ -f $srcdir/config/${cpu_type}/x-$rest ] ; \
+               if test -f $srcdir/config/${cpu_type}/x-$rest; \
                then xmake_file=${cpu_type}/x-$rest; \
                else true; \
                fi
-               if [ -f $srcdir/config/${cpu_type}/t-$rest ] ; \
+               if test -f $srcdir/config/${cpu_type}/t-$rest; \
                then tmake_file=${cpu_type}/t-$rest; \
                else true; \
                fi
@@ -2204,7 +2910,7 @@ for machine in $build $host $target; do
                fixincludes=fixinc.wrap
                xmake_file=none
                gas=yes gnu_ld=yes
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
@@ -2216,7 +2922,7 @@ for machine in $build $host $target; do
                xmake_file=none
                fixincludes=Makefile.in
                gas=yes gnu_ld=yes
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
@@ -2231,11 +2937,11 @@ for machine in $build $host $target; do
                ;;
                
        alpha*-dec-osf*)
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
-               if [ x$gas != xyes ]
+               if test x$gas != xyes
                then
                        extra_passes="mips-tfile mips-tdump"
                fi
@@ -2260,6 +2966,14 @@ for machine in $build $host $target; do
                    ;;
                esac
                ;;
+       alpha*-*-vxworks*)
+               tm_file="${tm_file} dbx.h alpha/vxworks.h"
+               if  x$gas != xyes 
+               then
+                       extra_passes="mips-tfile mips-tdump"
+               fi
+               use_collect2=yes
+               ;;
        alpha*-*-winnt*)
                tm_file="${tm_file} alpha/win-nt.h"
                xm_file="${xm_file} config/winnt/xm-winnt.h alpha/xm-winnt.h"
@@ -2268,11 +2982,11 @@ for machine in $build $host $target; do
                extra_host_objs=oldnames.o
                extra_gcc_objs="spawnv.o oldnames.o"
                fixincludes=fixinc.winnt
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        extra_programs=ld.exe
                fi
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='win32'
                fi
                ;;
@@ -2294,7 +3008,7 @@ for machine in $build $host $target; do
                use_collect2=yes
                ;;
        arm-*-riscix*)                  # Acorn RISC machine
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                    tm_file=arm/rix-gas.h
                else
@@ -2314,25 +3028,45 @@ for machine in $build $host $target; do
                tmake_file=arm/t-semiaof
                fixincludes=Makefile.in # There is nothing to fix
                ;;
-       arm-*-netbsd*)
+       arm*-*-netbsd*)
                tm_file=arm/netbsd.h
-               xm_file="xm-siglist.h ${xm_file}"
+               xm_file="arm/xm-netbsd.h ${xm_file}"
                tmake_file="t-netbsd arm/t-netbsd"
                # On NetBSD, the headers are already okay, except for math.h.
                fixincludes=fixinc.wrap
                ;;
-       arm-*-linux-gnuaout*)           # ARM GNU/Linux
+       arm*-*-linux-gnuaout*)          # ARM GNU/Linux with a.out
                cpu_type=arm
                xmake_file=x-linux
-               tm_file=arm/linux-gas.h
+               tm_file=arm/linux-aout.h
                tmake_file=arm/t-linux
                fixincludes=Makefile.in
                gnu_ld=yes
                ;;
-       arm-*-aout)
+       arm*-*-linux-gnu*)              # ARM GNU/Linux with ELF
+               xm_file=arm/xm-linux.h
+               xmake_file=x-linux
+               case $machine in
+               armv2*-*-*)
+                       tm_file=arm/linux-elf26.h
+                       ;;
+               *)
+                       tm_file=arm/linux-elf.h
+                       ;;
+               esac
+               tmake_file="t-linux arm/t-linux"
+               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+               fixincludes=Makefile.in         # Nothing to fix
+               gnu_ld=yes
+               ;;
+       arm*-*-aout)
                tm_file=arm/aout.h
                tmake_file=arm/t-bare
                ;;
+       arm*-*-elf)
+               tm_file=arm/unknown-elf.h
+               tmake_file=arm/t-arm-elf
+               ;;
        c1-convex-*)                    # Convex C1
                target_cpu_default=1
                use_collect2=yes
@@ -2358,6 +3092,10 @@ for machine in $build $host $target; do
                use_collect2=yes
                fixincludes=Makefile.in
                ;;
+       c4x-*)
+               cpu_type=c4x
+               tmake_file=c4x/t-c4x
+               ;;
        clipper-intergraph-clix*)
                tm_file="${tm_file} svr3.h clipper/clix.h"
                xm_file=clipper/xm-clix.h
@@ -2411,7 +3149,7 @@ for machine in $build $host $target; do
                tm_file="pa/pa-oldas.h ${tm_file} pa/pa-hpux7.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/gas.h"
                fi
@@ -2422,7 +3160,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                else
@@ -2436,7 +3174,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                else
@@ -2450,7 +3188,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
@@ -2461,7 +3199,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
@@ -2474,14 +3212,14 @@ for machine in $build $host $target; do
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
                tmake_file=pa/t-pa
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
-               if [ x$enable_threads = x ]; then
+               if test x$enable_threads = x; then
                    enable_threads=$have_pthread_h
                fi
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='dce'
                        tmake_file="${tmake_file} pa/t-dce-thr"
                fi
@@ -2492,14 +3230,14 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux10.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
-               if [ x$enable_threads = x ]; then
+               if test x$enable_threads = x; then
                    enable_threads=$have_pthread_h
                fi
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='dce'
                        tmake_file="${tmake_file} pa/t-dce-thr"
                fi
@@ -2511,7 +3249,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux9.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
@@ -2522,7 +3260,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux9.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
@@ -2534,7 +3272,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hiux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
@@ -2545,7 +3283,7 @@ for machine in $build $host $target; do
                tm_file="${tm_file} pa/pa-hpux.h pa/pa-hiux.h"
                xm_file=pa/xm-pahpux.h
                xmake_file=pa/x-pa-hpux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} pa/pa-gas.h"
                fi
@@ -2560,7 +3298,7 @@ for machine in $build $host $target; do
        i370-*-mvs*)
                ;;
        i[34567]86-ibm-aix*)            # IBM PS/2 running AIX
-                if [ x$gas = xyes ]
+                if test x$gas = xyes
                then
                        tm_file=i386/aix386.h
                        extra_parts="crtbegin.o crtend.o"
@@ -2573,11 +3311,11 @@ for machine in $build $host $target; do
                xm_defines=USG
                xmake_file=i386/x-aix
                ;;
-       i[34567]86-ncr-sysv4*)  # NCR 3000 - ix86 running system V.4
+       i[34567]86-ncr-sysv4*)          # NCR 3000 - ix86 running system V.4
                xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
                xm_defines="USG POSIX SMALL_ARG_MAX"
                xmake_file=i386/x-ncr3000
-               if [ x$stabs = xyes -a x$gas = xyes ]
+               if test x$stabs = xyes -a x$gas = xyes
                then
                        tm_file=i386/sysv4gdb.h
                else
@@ -2592,13 +3330,14 @@ for machine in $build $host $target; do
                tmake_file=i386/t-next
                xmake_file=i386/x-next
                extra_objs=nextstep.o
-               if [ x$enable_threads = xyes ]; then
+               extra_parts="crtbegin.o crtend.o"
+               if test x$enable_threads = xyes; then
                        thread_file='mach'
                fi
                ;;
        i[34567]86-sequent-bsd*)                # 80386 from Sequent
                use_collect2=yes
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=i386/seq-gas.h
                else
@@ -2671,7 +3410,9 @@ for machine in $build $host $target; do
                fixincludes=fixinc.wrap
                tmake_file=i386/t-freebsd
                ;;
-       i[34567]86-*-netbsd*)
+       # We are hoping OpenBSD is still close enough to NetBSD that we can
+       # share the configurations.
+       i[34567]86-*-netbsd* | i[34567]86-*-openbsd*)
                tm_file=i386/netbsd.h
                # On NetBSD, the headers are already okay, except for math.h.
                fixincludes=fixinc.wrap
@@ -2692,7 +3433,7 @@ for machine in $build $host $target; do
                    xmake_file=i386/x-isc
                    ;;
                esac
-                if [ x$gas = xyes -a x$stabs = xyes ]
+                if test x$gas = xyes -a x$stabs = xyes
                then
                        tm_file=i386/iscdbx.h
                        tmake_file=i386/t-svr3dbx
@@ -2705,24 +3446,23 @@ for machine in $build $host $target; do
                install_headers_dir=install-headers-cpio
                ;;
        i[34567]86-*-linux-gnuoldld*)   # Intel 80386's running GNU/Linux
-                                       # with a.out format using
                                        # pre BFD linkers
                xmake_file=x-linux-aout
                tmake_file="t-linux-aout i386/t-crtstuff"
                tm_file=i386/linux-oldld.h
                fixincludes=Makefile.in #On Linux, the headers are ok already.
                gnu_ld=yes
+               float_format=i386
                ;;
        i[34567]86-*-linux-gnuaout*)    # Intel 80386's running GNU/Linux
-                                       # with a.out format
                xmake_file=x-linux-aout
                tmake_file="t-linux-aout i386/t-crtstuff"
                tm_file=i386/linux-aout.h
                fixincludes=Makefile.in #On Linux, the headers are ok already.
                gnu_ld=yes
+               float_format=i386
                ;;
        i[34567]86-*-linux-gnulibc1)    # Intel 80386's running GNU/Linux
-                                       # with ELF format using the
                                        # GNU/Linux C library 5
                xmake_file=x-linux      
                tm_file=i386/linux.h    
@@ -2730,12 +3470,12 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                fixincludes=Makefile.in #On Linux, the headers are ok already.
                gnu_ld=yes
-               if [ x$enable_threads = xyes ]; then
+               float_format=i386
+               if test x$enable_threads = xyes; then
                        thread_file='single'
                fi
                ;;
        i[34567]86-*-linux-gnu*)        # Intel 80386's running GNU/Linux
-                                       # with ELF format using glibc 2
                                        # aka GNU/Linux C library 6
                xmake_file=x-linux
                tm_file=i386/linux.h
@@ -2743,7 +3483,8 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                fixincludes=Makefile.in #On Linux, the headers are ok already.
                gnu_ld=yes
-               if [ x$enable_threads = xyes ]; then
+               float_format=i386
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
@@ -2760,6 +3501,12 @@ for machine in $build $host $target; do
                tmake_file=i386/t-go32
                gnu_ld=yes
                gas=yes
+               exeext=.exe
+               case $host in
+               *pc-msdosdjgpp*)
+                       target_alias=djgpp
+                       ;;
+               esac
                ;;
        i[34567]86-moss-msdos* | i[34567]86-*-moss*)
                tm_file=i386/moss.h
@@ -2769,7 +3516,7 @@ for machine in $build $host $target; do
                gas=yes
                ;;
        i[34567]86-*-lynxos*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=i386/lynx.h
                else
@@ -2785,7 +3532,7 @@ for machine in $build $host $target; do
                use_collect2=yes
                ;;
        i[34567]86-*-osfrose*)          # 386 using OSF/rose
-                if [ x$elf = xyes ]
+                if test x$elf = xyes
                then
                        tm_file=i386/osfelf.h
                        use_collect2=
@@ -2821,7 +3568,13 @@ for machine in $build $host $target; do
                fixincludes=fixinc.sco
                install_headers_dir=install-headers-cpio
                tm_file=i386/sco5.h
-               tmake_file=i386/t-sco5
+               if test x$gas = xyes
+               then
+                       tm_file="i386/sco5gas.h ${tm_file}"
+                       tmake_file=i386/t-sco5gas
+               else
+                       tmake_file=i386/t-sco5
+               fi
                extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
                ;;
        i[34567]86-*-sco3.2v4*)         # 80386 running SCO 3.2v4 system
@@ -2830,7 +3583,7 @@ for machine in $build $host $target; do
                xmake_file=i386/x-sco4
                fixincludes=fixinc.sco
                install_headers_dir=install-headers-cpio
-                if [ x$stabs = xyes ]
+                if test x$stabs = xyes
                then
                        tm_file=i386/sco4dbx.h
                        tmake_file=i386/t-svr3dbx
@@ -2846,7 +3599,7 @@ for machine in $build $host $target; do
                xm_file=i386/xm-sco.h
                xmake_file=i386/x-sco
                install_headers_dir=install-headers-cpio
-                if [ x$stabs = xyes ]
+                if test x$stabs = xyes
                then
                        tm_file=i386/scodbx.h
                        tmake_file=i386/t-svr3dbx
@@ -2861,7 +3614,7 @@ for machine in $build $host $target; do
        i[34567]86-*-solaris2*)
                xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
                xm_defines="USG POSIX SMALL_ARG_MAX"
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file=i386/sol2dbg.h
                else
@@ -2876,7 +3629,7 @@ for machine in $build $host $target; do
                *)
                        fixincludes=fixinc.wrap;;
                esac
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='solaris'
                fi
                ;;
@@ -2884,20 +3637,20 @@ for machine in $build $host $target; do
                xm_file="xm-alloca.h xm-siglist.h ${xm_file}"
                xm_defines="USG POSIX"
                tm_file=i386/sysv4.h
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
                tmake_file=i386/t-crtpic
                xmake_file=x-svr4
                extra_parts="crtbegin.o crtend.o"
-               fixincludes=Makefile.in # The headers are just fine, thank you.
+               fixincludes=fixinc.svr4
                ;;
        i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
                xm_file="xm-siglist.h xm-alloca.h ${xm_file}"
                xm_defines="USG POSIX SMALL_ARG_MAX"
                tm_file=i386/sysv4.h
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
@@ -2905,12 +3658,21 @@ for machine in $build $host $target; do
                xmake_file=x-svr4
                extra_parts="crtbegin.o crtend.o"
                ;;
+       i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
+               xm_file="xm-alloca.h xm-siglist.h ${xm_file}"
+               xm_defines="USG POSIX"
+               tm_file=i386/udk.h
+               tmake_file="i386/t-crtpic i386/t-udk"
+               xmake_file=x-svr4
+               extra_parts="crtbegin.o crtend.o"
+               fixincludes="fixinc.svr4"
+               ;;
        i[34567]86-*-osf1*)             # Intel 80386's running OSF/1 1.3+
                cpu_type=i386
                xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h i386/xm-osf1elf.h"
                xm_defines="USE_C_ALLOCA SMALL_ARG_MAX"
                fixincludes=Makefile.in #Don't do it on OSF/1
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file=i386/osf1elfgdb.h
                else
@@ -2923,9 +3685,9 @@ for machine in $build $host $target; do
        i[34567]86-*-sysv*)             # Intel 80386's running system V
                xm_defines="USG SVR3"
                xmake_file=i386/x-sysv3
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
-                       if [ x$stabs = xyes ]
+                       if test x$stabs = xyes
                        then
                                tm_file=i386/svr3dbx.h
                                tmake_file=i386/t-svr3dbx
@@ -2947,14 +3709,26 @@ for machine in $build $host $target; do
                tmake_file=i386/t-vsta
                xmake_file=i386/x-vsta
                ;;
-       i[34567]86-*-pe | i[34567]86-*-cygwin32)
-               xm_file="${xm_file} i386/xm-cygwin32.h"
-               tmake_file=i386/t-cygwin32
-               tm_file=i386/cygwin32.h
-               xmake_file=i386/x-cygwin32
+       i[34567]86-*-win32)
+               xm_file="${xm_file} i386/xm-cygwin.h"
+               tmake_file=i386/t-cygwin
+               tm_file=i386/win32.h
+               xmake_file=i386/x-cygwin
                extra_objs=winnt.o
                fixincludes=Makefile.in
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
+                       thread_file='win32'
+               fi
+               exeext=.exe
+               ;;
+       i[34567]86-*-pe | i[34567]86-*-cygwin*)
+               xm_file="${xm_file} i386/xm-cygwin.h"
+               tmake_file=i386/t-cygwin
+               tm_file=i386/cygwin.h
+               xmake_file=i386/x-cygwin
+               extra_objs=winnt.o
+               fixincludes=Makefile.in
+               if test x$enable_threads = xyes; then
                        thread_file='win32'
                fi
                exeext=.exe
@@ -2962,11 +3736,11 @@ for machine in $build $host $target; do
        i[34567]86-*-mingw32*)
                tm_file=i386/mingw32.h
                xm_file="${xm_file} i386/xm-mingw32.h"
-               tmake_file=i386/t-cygwin32
+               tmake_file="i386/t-cygwin i386/t-mingw32"
                extra_objs=winnt.o
-               xmake_file=i386/x-cygwin32
+               xmake_file=i386/x-cygwin
                fixincludes=Makefile.in
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='win32'
                fi
                exeext=.exe
@@ -2987,11 +3761,11 @@ for machine in $build $host $target; do
                extra_host_objs="winnt.o oldnames.o"
                extra_gcc_objs="spawnv.o oldnames.o"
                fixincludes=fixinc.winnt
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        extra_programs=ld.exe
                fi
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='win32'
                fi
                ;;
@@ -3014,7 +3788,7 @@ for machine in $build $host $target; do
                ;;
        i860-*-bsd*)
                tm_file="${tm_file} i860/bsd.h"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="${tm_file} i860/bsd-gas.h"
                fi
@@ -3092,7 +3866,7 @@ for machine in $build $host $target; do
        m68000-hp-hpux*)                # HP 9000 series 300
                xm_file="xm_alloca.h ${xm_file}"
                xm_defines="USG NO_SYS_SIGLIST"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        xmake_file=m68k/x-hp320g
                        tm_file=m68k/hp310g.h
@@ -3117,7 +3891,7 @@ for machine in $build $host $target; do
        m68000-att-sysv*)
                xm_file="m68k/xm-3b1.h ${xm_file}"
                xm_defines=USG
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=m68k/3b1g.h
                else
@@ -3133,28 +3907,30 @@ for machine in $build $host $target; do
                extra_headers=math-68881.h
                extra_parts="crt1.o mcrt1.o maccrt1.o crt2.o crtn.o"
                tm_file=
-               if [ "$gnu_ld" = yes ]
+               if test "$gnu_ld" = yes
                then
                        tm_file="${tm_file} m68k/auxgld.h"
                else
                        tm_file="${tm_file} m68k/auxld.h"
                fi
-               if [ "$gas" = yes ]
+               if test "$gas" = yes
                then
                        tm_file="${tm_file} m68k/auxgas.h"
                else
                        tm_file="${tm_file} m68k/auxas.h"
                fi
                tm_file="${tm_file} m68k/a-ux.h"
+               float_format=m68k
                ;;
        m68k-apollo-*)
                tm_file=m68k/apollo68.h
                xmake_file=m68k/x-apollo68
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-altos-sysv*)                  # Altos 3068
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=m68k/altos3068.h
                        xm_defines=USG
@@ -3165,9 +3941,9 @@ for machine in $build $host $target; do
                extra_headers=math-68881.h
                ;;
        m68k-bull-sysv*)                # Bull DPX/2
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
-                       if [ x$stabs = xyes ]
+                       if test x$stabs = xyes
                        then
                                tm_file=m68k/dpx2cdbx.h
                        else
@@ -3189,15 +3965,16 @@ for machine in $build $host $target; do
                tmake_file=t-svr4
                extra_parts="crtbegin.o crtend.o"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-motorola-sysv*)
                tm_file=m68k/mot3300.h
                xm_file="xm-alloca.h m68k/xm-mot3300.h ${xm_file}"
                xm_defines=NO_SYS_SIGLIST
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        xmake_file=m68k/x-mot3300-gas
-                       if [ x$gnu_ld = xyes ]
+                       if test x$gnu_ld = xyes
                        then
                                tmake_file=m68k/t-mot3300-gald
                        else
@@ -3206,7 +3983,7 @@ for machine in $build $host $target; do
                        fi
                else
                        xmake_file=m68k/x-mot3300
-                       if [ x$gnu_ld = xyes ]
+                       if test x$gnu_ld = xyes
                        then
                                tmake_file=m68k/t-mot3300-gld
                        else
@@ -3217,6 +3994,7 @@ for machine in $build $host $target; do
                gdb_needs_out_file_path=yes
                extra_parts="crt0.o mcrt0.o"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-ncr-sysv*)                 # NCR Tower 32 SVR3
                tm_file=m68k/tower-as.h
@@ -3254,30 +4032,35 @@ for machine in $build $host $target; do
                tmake_file=t-svr4
                extra_parts="crtbegin.o crtend.o"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-ccur-rtu)
                tm_file=m68k/ccur-GAS.h
                xmake_file=m68k/x-ccur
                extra_headers=math-68881.h
                use_collect2=yes
+               float_format=m68k
                ;;
        m68k-hp-bsd4.4*)                # HP 9000/3xx running 4.4bsd
                tm_file=m68k/hp3bsd44.h
                xmake_file=m68k/x-hp3bsd44
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-hp-bsd*)                   # HP 9000/3xx running Berkeley Unix
                tm_file=m68k/hp3bsd.h
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-isi-bsd*)
-               if [ x$with_fp = xno ]
+               if test x$with_fp = xno
                then
                        tm_file=m68k/isi-nfp.h
                else
                        tm_file=m68k/isi.h
+                       float_format=m68k
                fi
                use_collect2=yes
                extra_headers=math-68881.h
@@ -3285,7 +4068,7 @@ for machine in $build $host $target; do
        m68k-hp-hpux7*) # HP 9000 series 300 running HPUX version 7.
                xm_file="xm_alloca.h ${xm_file}"
                xm_defines="USG NO_SYS_SIGLIST"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        xmake_file=m68k/x-hp320g
                        tm_file=m68k/hp320g.h
@@ -3296,11 +4079,12 @@ for machine in $build $host $target; do
                install_headers_dir=install-headers-cpio
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-hp-hpux*)  # HP 9000 series 300
                xm_file="xm_alloca.h ${xm_file}"
                xm_defines="USG NO_SYS_SIGLIST"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        xmake_file=m68k/x-hp320g
                        tm_file=m68k/hp320g.h
@@ -3311,14 +4095,16 @@ for machine in $build $host $target; do
                install_headers_dir=install-headers-cpio
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-sun-mach*)
                tm_file=m68k/sun3mach.h
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-sony-newsos3*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=m68k/news3gas.h
                else
@@ -3326,9 +4112,10 @@ for machine in $build $host $target; do
                fi
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-sony-bsd* | m68k-sony-newsos*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=m68k/newsgas.h
                else
@@ -3336,6 +4123,7 @@ for machine in $build $host $target; do
                fi
                use_collect2=yes
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-next-nextstep2*)
                tm_file=m68k/next21.h
@@ -3345,6 +4133,7 @@ for machine in $build $host $target; do
                extra_objs=nextstep.o
                extra_headers=math-68881.h
                use_collect2=yes
+               float_format=m68k
                 ;;
        m68k-next-nextstep3*)
                tm_file=m68k/next.h
@@ -3352,27 +4141,31 @@ for machine in $build $host $target; do
                tmake_file=m68k/t-next
                xmake_file=m68k/x-next
                extra_objs=nextstep.o
+               extra_parts="crtbegin.o crtend.o"
                extra_headers=math-68881.h
-               if [ x$enable_threads = xyes ]; then
+               float_format=m68k
+               if test x$enable_threads = xyes; then
                        thread_file='mach'
                fi
                ;;
        m68k-sun-sunos3*)
-               if [ x$with_fp = xno ]
+               if test x$with_fp = xno
                then
                        tm_file=m68k/sun3n3.h
                else
                        tm_file=m68k/sun3o3.h
+                       float_format=m68k
                fi
                use_collect2=yes
                extra_headers=math-68881.h
                ;;
        m68k-sun-sunos*)                        # For SunOS 4 (the default).
-               if [ x$with_fp = xno ]
+               if test x$with_fp = xno
                then
                        tm_file=m68k/sun3n.h
                else
                        tm_file=m68k/sun3.h
+                       float_format=m68k
                fi
                use_collect2=yes
                extra_headers=math-68881.h
@@ -3382,19 +4175,22 @@ for machine in $build $host $target; do
                tmake_file=m68k/t-vxworks68
                extra_headers=math-68881.h
                thread_file='vxworks'
+               float_format=m68k
                ;;
        m68k-*-aout*)
                tmake_file=m68k/t-m68kbare
                tm_file="m68k/m68k-aout.h libgloss.h"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-*-coff*)
                tmake_file=m68k/t-m68kbare
                tm_file="m68k/m68k-coff.h dbx.h libgloss.h"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-*-lynxos*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=m68k/lynx.h
                else
@@ -3404,12 +4200,14 @@ for machine in $build $host $target; do
                xmake_file=x-lynx
                tmake_file=m68k/t-lynx
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
-       m68k-*-netbsd*)
+       m68k*-*-netbsd*)
                tm_file=m68k/netbsd.h
                # On NetBSD, the headers are already okay, except for math.h.
                fixincludes=fixinc.wrap
                tmake_file=t-netbsd
+               float_format=m68k
                ;;
        m68k-*-sysv3*)                  # Motorola m68k's running system V.3
                xm_file="xm-alloca.h ${xm_file}"
@@ -3417,6 +4215,7 @@ for machine in $build $host $target; do
                xmake_file=m68k/x-m68kv
                extra_parts="crtbegin.o crtend.o"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-*-sysv4*)                  # Motorola m68k's running system V.4
                tm_file=m68k/m68kv4.h
@@ -3425,6 +4224,7 @@ for machine in $build $host $target; do
                tmake_file=t-svr4
                extra_parts="crtbegin.o crtend.o"
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-*-linux-gnuaout*)          # Motorola m68k's running GNU/Linux
                                        # with a.out format
@@ -3433,6 +4233,7 @@ for machine in $build $host $target; do
                tmake_file="t-linux-aout m68k/t-linux-aout"
                fixincludes=Makefile.in # The headers are ok already.
                extra_headers=math-68881.h
+               float_format=m68k
                gnu_ld=yes
                ;;
        m68k-*-linux-gnulibc1)          # Motorola m68k's running GNU/Linux
@@ -3444,6 +4245,7 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                fixincludes=Makefile.in # The headers are ok already.
                extra_headers=math-68881.h
+               float_format=m68k
                gnu_ld=yes
                ;;
        m68k-*-linux-gnu*)              # Motorola m68k's running GNU/Linux
@@ -3455,8 +4257,9 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                fixincludes=Makefile.in # The headers are ok already.
                extra_headers=math-68881.h
+               float_format=m68k
                gnu_ld=yes
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
@@ -3464,11 +4267,13 @@ for machine in $build $host $target; do
                tmake_file=m68k/t-m68kbare
                tm_file=m68k/m68k-psos.h
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
        m68k-*-rtems*)
                tmake_file="m68k/t-m68kbare t-rtems"
                tm_file=m68k/rtems.h
                extra_headers=math-68881.h
+               float_format=m68k
                ;;
 
        m88k-dg-dgux*)
@@ -3484,7 +4289,7 @@ for machine in $build $host $target; do
                esac
                extra_parts="crtbegin.o bcscrtbegin.o crtend.o m88kdgux.ld"
                xmake_file=m88k/x-dgux
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=m88k/t-dgux-gas
                fi
@@ -3495,7 +4300,7 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtend.o"
                xm_file="m88k/xm-sysv3.h ${xm_file}"
                xmake_file=m88k/x-dolph
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=m88k/t-m88k-gas
                fi
@@ -3505,7 +4310,7 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtend.o"
                xm_file="m88k/xm-sysv3.h ${xm_file}"
                xmake_file=m88k/x-tekXD88
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=m88k/t-m88k-gas
                fi
@@ -3520,7 +4325,7 @@ for machine in $build $host $target; do
        m88k-*-luna*)
                tm_file=m88k/luna.h
                extra_parts="crtbegin.o crtend.o"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=m88k/t-luna-gas
                else
@@ -3532,7 +4337,7 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtend.o"
                xm_file="m88k/xm-sysv3.h ${xm_file}"
                xmake_file=m88k/x-sysv3
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=m88k/t-m88k-gas
                fi
@@ -3549,9 +4354,9 @@ for machine in $build $host $target; do
                fixincludes=fixinc.irix
                xmake_file=mips/x-iris6
                tmake_file=mips/t-iris6
-               if [ x$enable_threads = xyes ]; then
-                       thread_file='irix'
-               fi
+#              if test x$enable_threads = xyes; then
+#                      thread_file='irix'
+#              fi
                ;;
        mips-wrs-vxworks)
                tm_file="mips/elf.h libgloss.h"
@@ -3563,20 +4368,21 @@ for machine in $build $host $target; do
                ;;
        mips-sgi-irix5cross64)          # Irix5 host, Irix 6 target, cross64
                tm_file="mips/iris6.h mips/cross64.h"
-               xm_defines="USG HAVE_INTTYPES_H"
+               xm_defines=USG
+               xm_file="mips/xm-iris5.h"
                fixincludes=Makefile.in
                xmake_file=mips/x-iris
                tmake_file=mips/t-cross64
                # See comment in mips/iris[56].h files.
                use_collect2=yes
-               if [ x$enable_threads = xyes ]; then
-                       thread_file='irix'
-               fi
+#              if test x$enable_threads = xyes; then
+#                      thread_file='irix'
+#              fi
                ;;
         mips-sni-sysv4)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
-                       if [ x$stabs = xyes ]
+                       if test x$stabs = xyes
                        then
                                tm_file=mips/iris5gdb.h
                        else
@@ -3588,89 +4394,90 @@ for machine in $build $host $target; do
                xm_defines=USG
                 xmake_file=mips/x-sni-svr4
                 tmake_file=mips/t-mips-gas
-                if [ x$gnu_ld != xyes ]
+                if test x$gnu_ld != xyes
                 then
                         use_collect2=yes
                 fi
                 ;;
        mips-sgi-irix5*)                # SGI System V.4., IRIX 5
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file="mips/iris5.h mips/iris5gas.h"
-                       if [ x$stabs = xyes ]
+                       if test x$stabs = xyes
                        then
                                tm_file="${tm_file} dbx.h"
                        fi
                else
                        tm_file=mips/iris5.h
                fi
-               xm_defines="USG HAVE_INTTYPES_H"
+               xm_defines=USG
+               xm_file="mips/xm-iris5.h"
                fixincludes=fixinc.irix
                xmake_file=mips/x-iris
                # mips-tfile doesn't work yet
                tmake_file=mips/t-mips-gas
                # See comment in mips/iris5.h file.
                use_collect2=yes
-               if [ x$enable_threads = xyes ]; then
-                       thread_file='irix'
-               fi
+#              if test x$enable_threads = xyes; then
+#                      thread_file='irix'
+#              fi
                ;;
        mips-sgi-irix4loser*)           # Mostly like a MIPS.
                tm_file="mips/iris4loser.h mips/iris3.h ${tm_file} mips/iris4.h"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_defines=USG
                xmake_file=mips/x-iris
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
-               if [ x$enable_threads = xyes ]; then
-                       thread_file='irix'
-               fi
+#              if test x$enable_threads = xyes; then
+#                      thread_file='irix'
+#              fi
                ;;
        mips-sgi-irix4*)                # Mostly like a MIPS.
                tm_file="mips/iris3.h ${tm_file} mips/iris4.h"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_defines=USG
                xmake_file=mips/x-iris
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
-               if [ x$enable_threads = xyes ]; then
-                       thread_file='irix'
-               fi
+#              if test x$enable_threads = xyes; then
+#                      thread_file='irix'
+#              fi
                ;;
        mips-sgi-*)                     # Mostly like a MIPS.
                tm_file="mips/iris3.h ${tm_file}"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_defines=USG
                xmake_file=mips/x-iris3
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
@@ -3684,18 +4491,18 @@ for machine in $build $host $target; do
                ;;
        mips-dec-osf*)                  # Decstation running OSF/1 as shipped by DIGITAL
                tm_file=mips/dec-osf1.h
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xmake_file=mips/x-dec-osf1
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        tmake_file=mips/t-ultrix
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
@@ -3703,19 +4510,19 @@ for machine in $build $host $target; do
        mips-dec-bsd*)                  # Decstation running 4.4 BSD
               tm_file=mips/dec-bsd.h
               fixincludes=
-             if [ x$gas = xyes ]
+             if test x$gas = xyes
              then
                        tmake_file=mips/t-mips-gas
              else
                        tmake_file=mips/t-ultrix
                        extra_passes="mips-tfile mips-tdump"
              fi
-             if [ x$gnu_ld != xyes ]
+             if test x$gnu_ld != xyes
              then
                        use_collect2=yes
              fi
              ;;
-       mips-dec-netbsd*)                  # Decstation running NetBSD
+       mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
                tm_file=mips/netbsd.h
                # On NetBSD, the headers are already okay, except for math.h.
                fixincludes=fixinc.wrap
@@ -3723,16 +4530,16 @@ for machine in $build $host $target; do
                ;;
        mips-sony-bsd* | mips-sony-newsos*)     # Sony NEWS 3600 or risc/news.
                tm_file="mips/news4.h ${tm_file}"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
@@ -3742,31 +4549,31 @@ for machine in $build $host $target; do
                                        # That is based on svr4.
                # t-svr4 is not right because this system doesn't use ELF.
                tm_file="mips/news5.h ${tm_file}"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_file="xm-siglist.h ${xm_file}"
                xm_defines=USG
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-tandem-sysv4*)             # Tandem S2 running NonStop UX
                tm_file="mips/svr4-5.h mips/svr4-t.h"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_file="xm-siglist.h ${xm_file}"
                xm_defines=USG
                xmake_file=mips/x-sysv
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                        extra_parts="crtbegin.o crtend.o"
@@ -3774,151 +4581,151 @@ for machine in $build $host $target; do
                        tmake_file=mips/t-mips
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-ultrix* | mips-dec-mach3)        # Decstation.
                tm_file="mips/ultrix.h ${tm_file}"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xmake_file=mips/x-ultrix
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        tmake_file=mips/t-ultrix
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-riscos[56789]bsd*)
                tm_file=mips/bsd-5.h    # MIPS BSD 4.3, RISC-OS 5.0
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-bsd-gas
                else
                        tmake_file=mips/t-bsd
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-bsd* | mips-*-riscosbsd* | mips-*-riscos[1234]bsd*)
                tm_file="mips/bsd-4.h ${tm_file}" # MIPS BSD 4.3, RISC-OS 4.0
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-bsd-gas
                else
                        tmake_file=mips/t-bsd
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-riscos[56789]sysv4*)
                tm_file=mips/svr4-5.h   # MIPS System V.4., RISC-OS 5.0
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_file="xm-siglist.h ${xm_file}"
                xmake_file=mips/x-sysv
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-svr4-gas
                else
                        tmake_file=mips/t-svr4
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-sysv4* | mips-*-riscos[1234]sysv4* | mips-*-riscossysv4*)
                tm_file="mips/svr4-4.h ${tm_file}"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_defines=USG
                xmake_file=mips/x-sysv
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-svr4-gas
                else
                        tmake_file=mips/t-svr4
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-riscos[56789]sysv*)
                tm_file=mips/svr3-5.h   # MIPS System V.3, RISC-OS 5.0
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_defines=USG
                xmake_file=mips/x-sysv
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-svr3-gas
                else
                        tmake_file=mips/t-svr3
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-sysv* | mips-*-riscos*sysv*)
                tm_file="mips/svr3-4.h ${tm_file}"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                xm_defines=USG
                xmake_file=mips/x-sysv
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-svr3-gas
                else
                        tmake_file=mips/t-svr3
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
                ;;
        mips-*-riscos[56789]*)          # Default MIPS RISC-OS 5.0.
                tm_file=mips/mips-5.h
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
@@ -3927,14 +4734,14 @@ for machine in $build $host $target; do
                ;;
        mipsel-*-ecoff*)
                tm_file=mips/ecoffl.h
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                tmake_file=mips/t-ecoff
                ;;
        mips-*-ecoff*)
                tm_file="gofast.h mips/ecoff.h"
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
                tmake_file=mips/t-ecoff
@@ -3964,7 +4771,7 @@ for machine in $build $host $target; do
                tmake_file=mips/t-ecoff
                ;;
        mips64orion-*-rtems*)
-               tm_file="mips/elforion.h mips/elfl64.h mips/rtems64.h"
+               tm_file="mips/elforion.h mips/elf64.h mips/rtems64.h"
                tmake_file="mips/t-ecoff t-rtems"
                ;;
        mipstx39el-*-elf*)
@@ -3974,18 +4781,20 @@ for machine in $build $host $target; do
        mipstx39-*-elf*)
                tm_file="mips/r3900.h mips/elf.h mips/abi64.h libgloss.h"
                tmake_file=mips/t-r3900
+               # FIXME mips-elf should be fixed to use crtstuff.
+               use_collect2=yes
                ;;
        mips-*-*)                               # Default MIPS RISC-OS 4.0.
-               if [ x$stabs = xyes ]; then
+               if test x$stabs = xyes; then
                        tm_file="${tm_file} dbx.h"
                fi
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file=mips/t-mips-gas
                else
                        extra_passes="mips-tfile mips-tdump"
                fi
-               if [ x$gnu_ld != xyes ]
+               if test x$gnu_ld != xyes
                then
                        use_collect2=yes
                fi
@@ -3993,7 +4802,7 @@ for machine in $build $host $target; do
        mn10200-*-*)
                cpu_type=mn10200
                tm_file="mn10200/mn10200.h"
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
@@ -4002,7 +4811,7 @@ for machine in $build $host $target; do
        mn10300-*-*)
                cpu_type=mn10300
                tm_file="mn10300/mn10300.h"
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
@@ -4045,8 +4854,9 @@ for machine in $build $host $target; do
                xm_defines=USG
                use_collect2=yes
                ;;
-       ns32k-pc532-netbsd*)
+       ns32k-*-netbsd*)
                tm_file=ns32k/netbsd.h
+               xm_file="ns32k/xm-netbsd.h ${xm_file}"
                # On NetBSD, the headers are already okay, except for math.h.
                fixincludes=fixinc.wrap
                tmake_file=t-netbsd
@@ -4080,7 +4890,7 @@ for machine in $build $host $target; do
                xm_file="xm-siglist.h rs6000/xm-sysv4.h"
                xm_defines="USG POSIX"
                extra_headers=ppc-asm.h
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
                else
@@ -4102,7 +4912,7 @@ for machine in $build $host $target; do
                ;;
        powerpc-*-eabi*)
                tm_file=rs6000/eabi.h
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
                else
@@ -4113,7 +4923,7 @@ for machine in $build $host $target; do
                ;;
        powerpc-*-rtems*)
                tm_file=rs6000/rtems.h
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                     tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
                else
@@ -4126,7 +4936,7 @@ for machine in $build $host $target; do
                tm_file=rs6000/linux.h
                xm_file=rs6000/xm-sysv4.h
                out_file=rs6000/rs6000.c
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
                else
@@ -4136,7 +4946,7 @@ for machine in $build $host $target; do
                fixincludes=Makefile.in
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                extra_headers=ppc-asm.h
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
@@ -4145,7 +4955,7 @@ for machine in $build $host $target; do
                xm_file="xm-siglist.h rs6000/xm-sysv4.h"
                xm_defines="USG ${xm_defines}"
                out_file=rs6000/rs6000.c
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcos t-linux rs6000/t-ppccomm"
                else
@@ -4155,7 +4965,7 @@ for machine in $build $host $target; do
                fixincludes=Makefile.in
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                extra_headers=ppc-asm.h
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
@@ -4172,7 +4982,7 @@ for machine in $build $host $target; do
                tm_file=rs6000/sysv4le.h
                xm_file="xm-siglist.h rs6000/xm-sysv4.h"
                xm_defines="USG POSIX"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
                else
@@ -4189,7 +4999,7 @@ for machine in $build $host $target; do
                ;;
        powerpcle-*-eabi*)
                tm_file=rs6000/eabile.h
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
                else
@@ -4203,20 +5013,19 @@ for machine in $build $host $target; do
                 tmake_file=rs6000/t-winnt
 #               extra_objs=pe.o
                fixincludes=Makefile.in
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='win32'
                fi
                extra_headers=ppc-asm.h
                ;;
-       powerpcle-*-pe | powerpcle-*-cygwin32)
-               tm_file=rs6000/cygwin32.h
-               xm_file="rs6000/xm-cygwin32.h ${xm_file}"
-               xm_defines=NO_STAB_H
+       powerpcle-*-pe | powerpcle-*-cygwin*)
+               tm_file=rs6000/cygwin.h
+               xm_file="rs6000/xm-cygwin.h ${xm_file}"
                tmake_file=rs6000/t-winnt
-               xmake_file=rs6000/x-cygwin32
+               xmake_file=rs6000/x-cygwin
 #              extra_objs=pe.o
                fixincludes=Makefile.in
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='win32'
                fi
                exeext=.exe
@@ -4226,7 +5035,7 @@ for machine in $build $host $target; do
                tm_file=rs6000/sol2.h
                xm_file="xm-siglist.h rs6000/xm-sysv4.h"
                xm_defines="USG POSIX"
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
                else
@@ -4248,7 +5057,7 @@ for machine in $build $host $target; do
                ;;
        rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
                tm_file=rs6000/aix3newas.h
-               if [ x$host != x$target ]
+               if test x$host != x$target
                then
                        tmake_file=rs6000/t-xnewas
                else
@@ -4256,15 +5065,37 @@ for machine in $build $host $target; do
                fi
                use_collect2=yes
                ;;
-       rs6000-ibm-aix[456789].* | powerpc-ibm-aix[456789].*)
+       rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
                tm_file=rs6000/aix41.h
-               if [ x$host != x$target ]
+               if test x$host != x$target
                then
                        tmake_file=rs6000/t-xnewas
                else
                        tmake_file=rs6000/t-newas
                fi
-               xmake_file=rs6000/x-aix31
+               xmake_file=rs6000/x-aix41
+               use_collect2=yes
+               ;;
+       rs6000-ibm-aix4.[3456789].* | powerpc-ibm-aix4.[3456789].*)
+               tm_file=rs6000/aix43.h
+               if test x$host != x$target
+               then
+                       tmake_file=rs6000/t-xaix43
+               else
+                       tmake_file=rs6000/t-aix43
+               fi
+               xmake_file=rs6000/x-aix43
+               use_collect2=yes
+               ;;
+       rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
+               tm_file=rs6000/aix43.h
+               if test x$host != x$target
+               then
+                       tmake_file=rs6000/t-xaix43
+               else
+                       tmake_file=rs6000/t-aix43
+               fi
+               xmake_file=rs6000/x-aix43
                use_collect2=yes
                ;;
        rs6000-ibm-aix*)
@@ -4290,6 +5121,11 @@ for machine in $build $host $target; do
                tm_file=sh/elf.h
                float_format=sh
                ;;
+       sh-*-rtemself*)
+               tmake_file="sh/t-sh t-rtems"
+               tm_file=sh/rtemself.h
+               float_format=sh
+               ;;
        sh-*-rtems*)
                tmake_file="sh/t-sh t-rtems"
                tm_file=sh/rtems.h
@@ -4353,12 +5189,12 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                fixincludes=Makefile.in #On Linux, the headers are ok already.
                gnu_ld=yes
-               if [ x$enable_threads = xyes ]; then
+               if test x$enable_threads = xyes; then
                        thread_file='posix'
                fi
                ;;
        sparc-*-lynxos*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        tm_file=sparc/lynx.h
                else
@@ -4372,8 +5208,31 @@ for machine in $build $host $target; do
                tmake_file="sparc/t-sparcbare t-rtems"
                tm_file=sparc/rtems.h
                ;;
+       sparcv9-*-solaris2*)
+               tm_file=sparc/sol2-sld-64.h
+               xm_file="sparc/xm-sysv4-64.h sparc/xm-sol2.h"
+               xm_defines="USG POSIX"
+               tmake_file="sparc/t-sol2 sparc/t-sol2-64"
+               xmake_file=sparc/x-sysv4
+               extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
+               fixincludes=fixinc.wrap
+               float_format=i128
+               if test x${enable_threads} = x ; then
+                   enable_threads=$have_pthread_h
+                   if test x${enable_threads} = x ; then
+                       enable_threads=$have_thread_h
+                   fi
+               fi
+               if test x${enable_threads} = xyes ; then
+                   if test x${have_pthread_h} = xyes ; then
+                       thread_file='posix'
+                   else
+                       thread_file='solaris'
+                   fi
+               fi
+               ;;
        sparc-*-solaris2*)
-               if [ x$gnu_ld = xyes ]
+               if test x$gnu_ld = xyes
                then
                        tm_file=sparc/sol2.h
                else
@@ -4391,14 +5250,14 @@ for machine in $build $host $target; do
                        fixincludes=fixinc.wrap;;
                esac
                float_format=i128
-               if [ x${enable_threads} = x ]; then
+               if test x${enable_threads} = x; then
                    enable_threads=$have_pthread_h
-                   if [ x${enable_threads} = x ]; then
+                   if test x${enable_threads} = x; then
                        enable_threads=$have_thread_h
                    fi
                fi
-               if [ x${enable_threads} = xyes ]; then
-                   if [ x${have_pthread_h} = xyes ]; then
+               if test x${enable_threads} = xyes; then
+                   if test x${have_pthread_h} = xyes; then
                        thread_file='posix'
                    else
                        thread_file='solaris'
@@ -4414,7 +5273,7 @@ for machine in $build $host $target; do
                tm_file=sparc/sunos4.h
                tmake_file=sparc/t-sunos41
                use_collect2=yes
-               if [ x$gas = xyes ]; then
+               if test x$gas = xyes; then
                        tm_file="${tm_file} sparc/sun4gas.h"
                fi
                ;;
@@ -4459,11 +5318,12 @@ for machine in $build $host $target; do
                extra_parts="crtbegin.o crtend.o"
                ;;
        sparc64-*-linux*)               # 64-bit Sparc's running GNU/Linux
-               tmake_file=sparc/t-sp64
+               tmake_file="t-linux sparc/t-linux64"
                xm_file="sparc/xm-sp64.h sparc/xm-linux.h"
                tm_file=sparc/linux64.h
                xmake_file=x-linux
                fixincludes=Makefile.in # The headers are ok already.
+               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                gnu_ld=yes
                ;;
 # This hasn't been upgraded to GCC 2.
@@ -4478,6 +5338,7 @@ for machine in $build $host $target; do
                xm_file=arm/xm-thumb.h
                md_file=arm/thumb.md
                tmake_file=arm/t-thumb
+               fixincludes=Makefile.in # There is nothing to fix
                ;;
 # This hasn't been upgraded to GCC 2.
 #      tron-*-*)
@@ -4489,7 +5350,7 @@ for machine in $build $host $target; do
                tm_file="v850/v850.h"
                xm_file="v850/xm-v850.h"
                tmake_file=v850/t-v850
-               if [ x$stabs = xyes ]
+               if test x$stabs = xyes
                then
                        tm_file="${tm_file} dbx.h"
                fi
@@ -4594,9 +5455,9 @@ for machine in $build $host $target; do
                                ;;
                esac
                                
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
-                       if [ "$target_cpu_default2" = "" ]
+                       if test "$target_cpu_default2" = ""
                        then
                                target_cpu_default2="MASK_GAS"
                        else
@@ -4626,7 +5487,7 @@ for machine in $build $host $target; do
                                ;;
 
                        *)
-                               if [ x$pass2done = xyes ]
+                               if test x$pass2done = xyes
                                then
                                        echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
                                        exit 1
@@ -4636,9 +5497,9 @@ for machine in $build $host $target; do
                ;;
 
        mips*-*-ecoff* | mips*-*-elf*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
-                       if [ x$gnu_ld = xyes ]
+                       if test x$gnu_ld = xyes
                        then
                                target_cpu_default2=20
                        else
@@ -4647,7 +5508,7 @@ for machine in $build $host $target; do
                fi
                ;;
        mips*-*-*)
-               if [ x$gas = xyes ]
+               if test x$gas = xyes
                then
                        target_cpu_default2=16
                fi
@@ -4670,7 +5531,7 @@ for machine in $build $host $target; do
                                ;;
 
                        *)
-                               if [ x$pass2done = xyes ]
+                               if test x$pass2done = xyes
                                then
                                        echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
                                        exit 1
@@ -4687,7 +5548,7 @@ for machine in $build $host $target; do
                                target_cpu_default2="TARGET_CPU_$with_cpu"
                                ;;
                        *)
-                               if [ x$pass2done = xyes ]
+                               if test x$pass2done = xyes
                                then
                                        echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
                                        exit 1
@@ -4697,9 +5558,9 @@ for machine in $build $host $target; do
                ;;
        esac
 
-       if [ "$target_cpu_default2" != "" ]
+       if test "$target_cpu_default2" != ""
        then
-               if [ "$target_cpu_default" != "" ]
+               if test "$target_cpu_default" != ""
                then
                        target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
                else
@@ -4708,17 +5569,19 @@ for machine in $build $host $target; do
        fi
 
        # No need for collect2 if we have the GNU linker.
-       case x$gnu_ld in
-       xyes)
-               use_collect2=
-               ;;
-       esac
+       # Actually, there is now; GNU ld doesn't handle the EH info or
+       # collecting for shared libraries.
+       #case x$gnu_ld in
+       #xyes)
+       #       use_collect2=
+       #       ;;
+       #esac
 
 # Save data on machine being used to compile GCC in build_xm_file.
 # Save data on host machine in vars host_xm_file and host_xmake_file.
-       if [ x$pass1done = x ]
+       if test x$pass1done = x
        then
-               if [ x"$xm_file" = x ]
+               if test x"$xm_file" = x
                then build_xm_file=$cpu_type/xm-$cpu_type.h
                else build_xm_file=$xm_file
                fi
@@ -4727,14 +5590,14 @@ for machine in $build $host $target; do
                build_exeext=$exeext
                pass1done=yes
        else
-               if [ x$pass2done = x ]
+               if test x$pass2done = x
                then
-                       if [ x"$xm_file" = x ]
+                       if test x"$xm_file" = x
                        then host_xm_file=$cpu_type/xm-$cpu_type.h
                        else host_xm_file=$xm_file
                        fi
                        host_xm_defines=$xm_defines
-                       if [ x"$xmake_file" = x ]
+                       if test x"$xmake_file" = x
                        then xmake_file=$cpu_type/x-$cpu_type
                        fi
                        host_xmake_file="$xmake_file"
@@ -4750,33 +5613,33 @@ done
 extra_objs="${host_extra_objs} ${extra_objs}"
 
 # Default the target-machine variables that were not explicitly set.
-if [ x"$tm_file" = x ]
+if test x"$tm_file" = x
 then tm_file=$cpu_type/$cpu_type.h; fi
 
-if [ x$extra_headers = x ]
+if test x$extra_headers = x
 then extra_headers=; fi
 
-if [ x"$xm_file" = x ]
+if test x"$xm_file" = x
 then xm_file=$cpu_type/xm-$cpu_type.h; fi
 
-if [ x$md_file = x ]
+if test x$md_file = x
 then md_file=$cpu_type/$cpu_type.md; fi
 
-if [ x$out_file = x ]
+if test x$out_file = x
 then out_file=$cpu_type/$cpu_type.c; fi
 
-if [ x"$tmake_file" = x ]
+if test x"$tmake_file" = x
 then tmake_file=$cpu_type/t-$cpu_type
 fi
 
-if [ x$float_format = x ]
+if test x$float_format = x
 then float_format=i64
 fi
 
-if [ x$enable_haifa = x ]
+if test x$enable_haifa = x
 then
   case $target in
-    alpha*-* | hppa1.?-* | powerpc*-* | rs6000-* | *sparc-* | m32r*-*)
+    alpha*-* | hppa1.?-* | powerpc*-* | rs6000-* | *sparc*-* | m32r*-*)
       enable_haifa=yes;;
   esac
 fi
@@ -4789,7 +5652,7 @@ count=a
 for f in $tm_file; do
        count=${count}x
 done
-if [ $count = ax ]; then
+if test $count = ax; then
        echo "Using \`$srcdir/config/$tm_file' as target machine macro file."
 else
        echo "Using the following target machine macro files:"
@@ -4802,7 +5665,7 @@ count=a
 for f in $host_xm_file; do
        count=${count}x
 done
-if [ $count = ax ]; then
+if test $count = ax; then
        echo "Using \`$srcdir/config/$host_xm_file' as host machine macro file."
 else
        echo "Using the following host machine macro files:"
@@ -4811,12 +5674,12 @@ else
        done
 fi
 
-if [ "$host_xm_file" != "$build_xm_file" ]; then
+if test "$host_xm_file" != "$build_xm_file"; then
        count=a
        for f in $build_xm_file; do
                count=${count}x
        done
-       if [ $count = ax ]; then
+       if test $count = ax; then
                echo "Using \`$srcdir/config/$build_xm_file' as build machine macro file."
        else
                echo "Using the following build machine macro files:"
@@ -4826,8 +5689,8 @@ if [ "$host_xm_file" != "$build_xm_file" ]; then
        fi
 fi
 
-if [ x$thread_file = x ]; then
-       if [ x$target_thread_file != x ]; then
+if test x$thread_file = x; then
+       if test x$target_thread_file != x; then
                thread_file=$target_thread_file
        else
                thread_file='single'
@@ -4840,14 +5703,14 @@ fi
 # auto-host.h is the file containing items generated by autoconf and is
 # the first file included by config.h.
 null_defines=
-host_xm_file="auto-host.h ${host_xm_file}"
+host_xm_file="auto-host.h gansidecl.h ${host_xm_file}"
 
 # If host=build, it is correct to have hconfig include auto-host.h
 # as well.  If host!=build, we are in error and need to do more 
 # work to find out the build config parameters.
-if [ x$host = x$build ]
+if test x$host = x$build
 then
-       build_xm_file="auto-host.h ${build_xm_file}"
+       build_xm_file="auto-host.h gansidecl.h ${build_xm_file}"
 else
        # We create a subdir, then run autoconf in the subdir.
        # To prevent recursion we set host and build for the new
@@ -4869,18 +5732,21 @@ else
        mv auto-host.h ../auto-build.h
        cd ..
        rm -rf $tempdir
-       build_xm_file="auto-build.h ${build_xm_file}"
+       build_xm_file="auto-build.h gansidecl.h ${build_xm_file}"
 fi
 
+xm_file="gansidecl.h ${xm_file}"
+tm_file="gansidecl.h ${tm_file}"
+
 vars="host_xm_file tm_file xm_file build_xm_file"
 links="config.h tm.h tconfig.h hconfig.h"
 defines="host_xm_defines null_defines xm_defines build_xm_defines"
 
 rm -f config.bak
-if [ -f config.status ]; then mv -f config.status config.bak; fi
+if test -f config.status; then mv -f config.status config.bak; fi
 
 # Make the links.
-while [ -n "$vars" ]
+while test -n "$vars"
 do
        set $vars; var=$1; shift; vars=$*
        set $links; link=$1; shift; links=$*
@@ -4890,7 +5756,7 @@ do
 
        # Define TARGET_CPU_DEFAULT if the system wants one.
        # This substitutes for lots of *.h files.
-       if [ "$target_cpu_default" != "" -a $link = tm.h ]
+       if test "$target_cpu_default" != "" -a $link = tm.h
        then
                echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link
        fi
@@ -4907,12 +5773,17 @@ do
 done
 
 # Truncate the target if necessary
-if [ x$host_truncate_target != x ]; then
+if test x$host_truncate_target != x; then
        target=`echo $target | sed -e 's/\(..............\).*/\1/'`
 fi
 
-# Get the version number from the toplevel
-version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${srcdir}/version.c`
+# Get the version trigger filename from the toplevel
+if test "${with_gcc_version_trigger+set}" = set; then
+       gcc_version_trigger=$with_gcc_version_trigger
+else
+       gcc_version_trigger=${srcdir}/version.c
+fi
+gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
 
 # Get an absolute path to the GCC top-level source directory
 holddir=`pwd`
@@ -4927,7 +5798,7 @@ host_overrides=Make-host
 dep_host_xmake_file=
 for f in .. ${host_xmake_file}
 do
-       if [ -f ${srcdir}/config/$f ]
+       if test -f ${srcdir}/config/$f
        then
                dep_host_xmake_file="${dep_host_xmake_file} ${srcdir}/config/$f"
        fi
@@ -4940,7 +5811,7 @@ target_overrides=Make-target
 dep_tmake_file=
 for f in .. ${tmake_file}
 do
-       if [ -f ${srcdir}/config/$f ]
+       if test -f ${srcdir}/config/$f
        then
                dep_tmake_file="${dep_tmake_file} ${srcdir}/config/$f"
        fi
@@ -4971,28 +5842,28 @@ out_object_file=`basename $out_file .c`.o
 
 tm_file_list=
 for f in $tm_file; do
-       tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+       if test $f != "gansidecl.h" ; then
+               tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
+       else
+               tm_file_list="${tm_file_list} $f"
+       fi
 done
 
 host_xm_file_list=
 for f in $host_xm_file; do
-       if test $f != "auto-host.h"; then
+       if test $f != "auto-host.h" -a $f != "gansidecl.h" ; then
                host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f"
        else
-               host_xm_file_list="${host_xm_file_list} auto-host.h"
+               host_xm_file_list="${host_xm_file_list} $f"
        fi
 done
 
 build_xm_file_list=
 for f in $build_xm_file; do
-       if test $f != "auto-build.h"; then
-               if test $f != "auto-host.h"; then
-                       build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f"
-               else
-                       build_xm_file_list="${build_xm_file_list} auto-host.h"
-               fi
+       if test $f != "auto-build.h" -a $f != "auto-host.h" -a $f != "gansidecl.h" ; then
+               build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f"
        else
-               build_xm_file_list="${build_xm_file_list} auto-build.h"
+               build_xm_file_list="${build_xm_file_list} $f"
        fi
 done
 
@@ -5001,7 +5872,7 @@ done
 # Also use all.cross instead of all.internal
 # and add cross-make to Makefile.
 cross_overrides="/dev/null"
-if [ x$host != x$target ]
+if test x$host != x$target
 then
        cross_defines="CROSS=-DCROSS_COMPILE"
        cross_overrides="${topdir}/cross-make"
@@ -5011,7 +5882,7 @@ fi
 # This must come after cross-make as we want all.build to override
 # all.cross.
 build_overrides="/dev/null"
-if [ x$build != x$host ]
+if test x$build != x$host
 then
        build_overrides="${topdir}/build-make"
 fi
@@ -5019,7 +5890,7 @@ fi
 # Expand extra_headers to include complete path.
 # This substitutes for lots of t-* files.
 extra_headers_list=
-if [ "x$extra_headers" = x ]
+if test "x$extra_headers" = x
 then true
 else
        # Prepend ${srcdir}/ginclude/ to every entry in extra_headers.
@@ -5029,10 +5900,14 @@ else
        done
 fi
 
+if test x$use_collect2 = xno; then
+       use_collect2=
+fi
+
 # Add a definition of USE_COLLECT2 if system wants one.
 # Also tell toplev.c what to do.
 # This substitutes for lots of t-* files.
-if [ x$use_collect2 = x ]
+if test x$use_collect2 = x
 then
        will_use_collect2=
        maybe_use_collect2=
@@ -5048,7 +5923,7 @@ fi
 # building gcc with a cross compiler, use the cross compiler just
 # built.  Otherwise, we can use the cpp just built.
 md_file_sub=
-if [ "x$md_cppflags" = x ]
+if test "x$md_cppflags" = x
 then
        md_file_sub=$srcdir/config/$md_file
 else
@@ -5056,19 +5931,138 @@ else
 fi
 
 # If we have gas in the build tree, make a link to it.
-if [ -f ../gas/Makefile ]; then
+if test -f ../gas/Makefile; then
        rm -f as; $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null
 fi
 
+# If we have nm in the build tree, make a link to it.
+if test -f ../binutils/Makefile; then
+       rm -f nm; $symbolic_link ../binutils/nm-new$host_exeext nm$host_exeext 2>/dev/null
+fi
+
 # If we have ld in the build tree, make a link to it.
-if [ -f ../ld/Makefile ]; then
-#      if [[ x$use_collect2 = x ]]; then
+if test -f ../ld/Makefile; then
+#      if test x$use_collect2 = x; then
 #              rm -f ld; $symbolic_link ../ld/ld-new$host_exeext ld$host_exeext 2>/dev/null
 #      else
                rm -f collect-ld; $symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext 2>/dev/null
 #      fi
 fi
 
+# Figure out what assembler alignment features are present.
+echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
+echo "configure:5955: checking assembler alignment features" >&5
+gcc_cv_as=
+gcc_cv_as_alignment_features=
+gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
+if test -x "$DEFAULT_ASSEMBLER"; then
+       gcc_cv_as="$DEFAULT_ASSEMBLER"
+elif test -x "$AS"; then
+       gcc_cv_as="$AS"
+elif test -x as$host_exeext; then
+       # Build using assembler in the current directory.
+       gcc_cv_as=./as$host_exeext
+elif test -f $gcc_cv_as_gas_srcdir/configure.in -a -f ../gas/Makefile; then
+       # Single tree build which includes gas.
+       for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
+       do
+               gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+               if test x$gcc_cv_gas_version != x; then
+                       break
+               fi
+       done
+       gcc_cv_gas_major_version=`expr "$gcc_cv_gas_version" : "VERSION=\([0-9]*\)"`
+       gcc_cv_gas_minor_version=`expr "$gcc_cv_gas_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
+       if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+               # Gas version 2.6 and later support for .balign and .p2align.
+               # bytes to skip when using .p2align.
+               if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 6 -o "$gcc_cv_gas_major_version" -gt 2; then
+                       gcc_cv_as_alignment_features=".balign and .p2align"
+                       cat >> confdefs.h <<\EOF
+#define HAVE_GAS_BALIGN_AND_P2ALIGN 1
+EOF
+
+               fi
+               # Gas version 2.8 and later support specifying the maximum
+               # bytes to skip when using .p2align.
+               if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 8 -o "$gcc_cv_gas_major_version" -gt 2; then
+                       gcc_cv_as_alignment_features=".p2align including maximum skip"
+                       cat >> confdefs.h <<\EOF
+#define HAVE_GAS_MAX_SKIP_P2ALIGN 1
+EOF
+
+               fi
+       fi
+elif test x$host = x$target; then
+       # Native build.
+       gcc_cv_as=as$host_exeext
+fi
+if test x$gcc_cv_as != x; then
+       # Check if we have .balign and .p2align
+       echo ".balign  4" > conftest.s
+       echo ".p2align  2" >> conftest.s
+       if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+               gcc_cv_as_alignment_features=".balign and .p2align"
+               cat >> confdefs.h <<\EOF
+#define HAVE_GAS_BALIGN_AND_P2ALIGN 1
+EOF
+
+       fi
+       rm -f conftest.s conftest.o
+       # Check if specifying the maximum bytes to skip when
+       # using .p2align is supported.
+       echo ".p2align 4,,7" > conftest.s
+       if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+               gcc_cv_as_alignment_features=".p2align including maximum skip"
+               cat >> confdefs.h <<\EOF
+#define HAVE_GAS_MAX_SKIP_P2ALIGN 1
+EOF
+
+       fi
+       rm -f conftest.s conftest.o
+fi
+echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
+
+echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
+echo "configure:6028: checking assembler subsection support" >&5
+gcc_cv_as_subsections=
+if test x$gcc_cv_as != x; then
+       # Check if we have .subsection
+       echo ".subsection 1" > conftest.s
+       if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+               gcc_cv_as_subsections=".subsection"
+               if test -x nm$host_exeext; then
+                       gcc_cv_nm=./nm$host_exeext
+               elif test x$host = x$target; then
+                       # Native build.
+                       gcc_cv_nm=nm$host_exeext
+               fi
+               if test x$gcc_cv_nm != x; then
+                       cat > conftest.s <<EOF
+conftest_label1: .word 0
+.subsection -1
+conftest_label2: .word 0
+.previous
+EOF
+                       if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+                               $gcc_cv_nm conftest.o | grep conftest_label1 > conftest.nm1
+                               $gcc_cv_nm conftest.o | grep conftest_label2 | sed -e 's/label2/label1/' > conftest.nm2
+                               if cmp conftest.nm1 conftest.nm2 > /dev/null 2>&1; then
+                                       :
+                               else
+                                       gcc_cv_as_subsections="working .subsection -1"
+                                       cat >> confdefs.h <<\EOF
+#define HAVE_GAS_SUBSECTION_ORDERING 1
+EOF
+
+                               fi
+                       fi
+               fi
+       fi
+       rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
+fi
+echo "$ac_t""$gcc_cv_as_subsections" 1>&6
+
 # Figure out what language subdirectories are present.
 subdirs=
 for lang in ${srcdir}/*/config-lang.in ..
@@ -5077,6 +6071,11 @@ do
        ..) ;;
        # The odd quoting in the next line works around
        # an apparent bug in bash 1.12 on linux.
+       ${srcdir}/ada/config-lang.in)
+         if test x$gnat = xyes ; then
+               subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
+         fi
+       ;;
        ${srcdir}/[*]/config-lang.in) ;;
        *) subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`" ;;
        esac
@@ -5084,7 +6083,7 @@ done
 
 # Make gthr-default.h if we have a thread file.
 gthread_flags=
-if [ $thread_file != single ]; then
+if test $thread_file != single; then
     rm -f gthr-default.h
     echo "#include \"gthr-${thread_file}.h\"" > gthr-default.h
     gthread_flags=-DHAVE_GTHR_DEFAULT
@@ -5096,18 +6095,23 @@ fi
 
 lang_specs_files=
 lang_options_files=
-rm -f specs.h options.h
-touch specs.h options.h
+lang_tree_files=
+rm -f specs.h options.h gencheck.h
+touch specs.h options.h gencheck.h
 for subdir in . $subdirs
 do
-       if [ -f $srcdir/$subdir/lang-specs.h ]; then
+       if test -f $srcdir/$subdir/lang-specs.h; then
                echo "#include \"$subdir/lang-specs.h\"" >>specs.h
                lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
        fi
-       if [ -f $srcdir/$subdir/lang-options.h ]; then
+       if test -f $srcdir/$subdir/lang-options.h; then
                echo "#include \"$subdir/lang-options.h\"" >>options.h
                lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h"
        fi
+       if test -f $srcdir/$subdir/$subdir-tree.def; then
+               echo "#include \"$subdir/$subdir-tree.def\"" >>gencheck.h
+               lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
+       fi
 done
 
 # These (without "all_") are set in each config-lang.in.
@@ -5136,7 +6140,7 @@ oldstyle_subdirs=
 
 for s in .. $subdirs
 do
-       if [ $s != ".." ]
+       if test $s != ".."
        then
                language=
                boot_language=
@@ -5147,14 +6151,14 @@ do
                outputs=
                lib2funcs=
                . ${srcdir}/$s/config-lang.in
-               if [ "x$language" = x ]
+               if test "x$language" = x
                then
                        echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
                        exit 1
                fi
                all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in ${srcdir}/$s/Makefile.in"
                all_languages="$all_languages $language"
-               if [ "x$boot_language" = xyes ]
+               if test "x$boot_language" = xyes
                then
                        all_boot_languages="$all_boot_languages $language"
                fi
@@ -5163,7 +6167,7 @@ do
                all_diff_excludes="$all_diff_excludes $diff_excludes"
                all_headers="$all_headers $headers"
                all_outputs="$all_outputs $outputs"
-               if [ x$outputs = x ]
+               if test x$outputs = x
                then
                        oldstyle_subdirs="$oldstyle_subdirs $s"
                fi
@@ -5187,7 +6191,7 @@ do
        x=
        for l in .. $all_languages
        do
-               if [ $l != ".." ]; then
+               if test $l != ".."; then
                        x="$x $l.$t"
                fi
        done
@@ -5196,14 +6200,14 @@ done
 
 # If we're not building in srcdir, create .gdbinit.
 
-if [ ! -f Makefile.in ]; then
+if test ! -f Makefile.in; then
        echo "dir ." > .gdbinit
        echo "dir ${srcdir}" >> .gdbinit
-       if [ x$gdb_needs_out_file_path = xyes ]
+       if test x$gdb_needs_out_file_path = xyes
        then
                echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
        fi
-       if [ "x$subdirs" != x ]; then
+       if test "x$subdirs" != x; then
                for s in $subdirs
                do
                        echo "dir ${srcdir}/$s" >> .gdbinit
@@ -5217,7 +6221,7 @@ fi
 build_canonical=${build}
 host_canonical=${host}
 target_subdir=
-if [ "${host}" != "${target}" ] ; then
+if test "${host}" != "${target}" ; then
     target_subdir=${target}/
 fi
 
@@ -5229,7 +6233,7 @@ fi
 # libgcc.a, but that's OK because newib should have its own version of
 # assert.h.
 inhibit_libc=
-if [ x$with_newlib = xyes ]; then
+if test x$with_newlib = xyes; then
        inhibit_libc=-Dinhibit_libc
 fi
 
@@ -5237,23 +6241,31 @@ fi
 # Override SCHED_OBJ and SCHED_CFLAGS to enable the Haifa scheduler.
 sched_prefix=
 sched_cflags=
-if [ x$enable_haifa = xyes ]; then
+if test x$enable_haifa = xyes; then
     echo "Using the Haifa scheduler."
     sched_prefix=haifa-
     sched_cflags=-DHAIFA
 fi
 
 
-if [ x$enable_haifa != x ]; then
+if test x$enable_haifa != x; then
     # Explicitly remove files that need to be recompiled for the Haifa scheduler.
     for x in genattrtab.o toplev.o loop.o unroll.o *sched.o; do
-       if [ -f $x ]; then
+       if test -f $x; then
            echo "Removing $x"
            rm -f $x
        fi
     done
 fi
 
+# Warn if using init_priority.
+echo $ac_n "checking whether to enable init_priority by default""... $ac_c" 1>&6
+echo "configure:6264: checking whether to enable init_priority by default" >&5
+if test x$enable_init_priority != xyes; then
+  enable_init_priority=no
+fi
+echo "$ac_t""$enable_init_priority" 1>&6
+
 # Nothing to do for FLOAT_H, float_format already handled.
 objdir=`pwd`
 
@@ -5313,8 +6325,15 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma
 
 
 
+
+
+
+
+
+
+
 # Echo that links are built
-if [ x$host = x$target ]
+if test x$host = x$target
 then
        str1="native "
 else
@@ -5322,25 +6341,25 @@ else
        str2=" from $host"
 fi
 
-if [ x$host != x$build ]
+if test x$host != x$build
 then
        str3=" on a $build system"
 fi
 
-if [ "x$str2" != x ] || [ "x$str3" != x ]
+if test "x$str2" != x || test "x$str3" != x
 then
        str4=
 fi
 
 echo "Links are now set up to build a ${str1}compiler for ${target}$str4" 1>&2
 
-if [ "x$str2" != x ] || [ "x$str3" != x ]
+if test "x$str2" != x || test "x$str3" != x
 then
        echo " ${str2}${str3}." 1>&2
 fi
 
 # Truncate the target if necessary
-if [ x$host_truncate_target != x ]; then
+if test x$host_truncate_target != x; then
        target=`echo $target | sed -e 's/\(..............\).*/\1/'`
 fi
 
@@ -5439,7 +6458,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12.1"
+    echo "$CONFIG_STATUS generated by autoconf version 2.12.2"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -5496,6 +6515,7 @@ s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@CC@%$CC%g
+s%@stage1_warn_cflags@%$stage1_warn_cflags%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@AWK@%$AWK%g
 s%@LEX@%$LEX%g
@@ -5508,6 +6528,7 @@ s%@INSTALL@%$INSTALL%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@CPP@%$CPP%g
+s%@gnat@%$gnat%g
 s%@vfprintf@%$vfprintf%g
 s%@doprint@%$doprint%g
 s%@manext@%$manext%g
@@ -5529,10 +6550,13 @@ s%@all_stagestuff@%$all_stagestuff%g
 s%@all_diff_excludes@%$all_diff_excludes%g
 s%@all_lib2funcs@%$all_lib2funcs%g
 s%@all_headers@%$all_headers%g
+s%@cpp_main@%$cpp_main%g
 s%@extra_passes@%$extra_passes%g
 s%@extra_programs@%$extra_programs%g
 s%@extra_parts@%$extra_parts%g
 s%@extra_c_objs@%$extra_c_objs%g
+s%@extra_cxx_objs@%$extra_cxx_objs%g
+s%@extra_cpp_objs@%$extra_cpp_objs%g
 s%@extra_c_flags@%$extra_c_flags%g
 s%@extra_objs@%$extra_objs%g
 s%@host_extra_gcc_objs@%$host_extra_gcc_objs%g
@@ -5547,8 +6571,12 @@ s%@build_xm_file_list@%$build_xm_file_list%g
 s%@host_xm_file_list@%$host_xm_file_list%g
 s%@lang_specs_files@%$lang_specs_files%g
 s%@lang_options_files@%$lang_options_files%g
+s%@lang_tree_files@%$lang_tree_files%g
 s%@thread_file@%$thread_file%g
-s%@version@%$version%g
+s%@objc_boehm_gc@%$objc_boehm_gc%g
+s%@JAVAGC@%$JAVAGC%g
+s%@gcc_version@%$gcc_version%g
+s%@gcc_version_trigger@%$gcc_version_trigger%g
 s%@local_prefix@%$local_prefix%g
 s%@gxx_include_dir@%$gxx_include_dir%g
 s%@fixincludes@%$fixincludes%g
@@ -5795,7 +6823,8 @@ host_xmake_file='${host_xmake_file}'
 dep_tmake_file='${dep_tmake_file}'
 tmake_file='${tmake_file}'
 thread_file='${thread_file}'
-version='${version}'
+gcc_version='${gcc_version}'
+gcc_version_trigger='${gcc_version_trigger}'
 local_prefix='${local_prefix}'
 build_install_headers_dir='${build_install_headers_dir}'
 build_exeext='${build_exeext}'
@@ -5824,9 +6853,9 @@ esac
 # FLAGS_TO_PASS has been modified to solve the problem there.
 # This is virtually a duplicate of what happens in configure.lang; we do
 # an extra check to make sure this only happens if ln -s can be used.
-if [ "$symbolic_link" = "ln -s" ]; then
+if test "$symbolic_link" = "ln -s"; then
  for d in .. ${subdirs} ; do
-   if [ $d != .. ]; then
+   if test $d != ..; then
        STARTDIR=`pwd`
        cd $d
        for t in stage1 stage2 stage3 stage4 include