gdbinit: Rename to gdbinit.in.
[gcc.git] / gcc / configure
index 7761bc97034ca7b7c08220e4c69a185795557e15..e30f26511aa5c7d781b37f7747c2ffd50478d6fa 100755 (executable)
@@ -28,6 +28,8 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-gxx-include-dir=DIR
                           specifies directory to put g++ header files."
+ac_help="$ac_help
+  --enable-multilib      enable library support for multiple ABIs"
 ac_help="$ac_help
   --enable-checking[=LIST]
                          enable expensive run-time checks.  With LIST,
@@ -50,6 +52,8 @@ ac_help="$ac_help
                          the GNU Objective-C runtime."
 ac_help="$ac_help
   --with-dwarf2          force the default debug format to be DWARF2."
+ac_help="$ac_help
+  --disable-shared       don't provide a shared libgcc."
 ac_help="$ac_help
   --enable-nls            use Native Language Support (default)"
 ac_help="$ac_help
@@ -70,16 +74,15 @@ ac_help="$ac_help
   --with-gc={simple,page} Choose the garbage collection mechanism to use
                            with the compiler."
 ac_help="$ac_help
-  --enable-new-gxx-abi
-                         select the new abi for g++. You must select an ABI
-                         at configuration time, so that the correct runtime
-                         support is built. You cannot mix ABIs."
-ac_help="$ac_help
-  --enable-libstdcxx-v3 
-                         enable libstdc++-v3 for building and installation"
+  --with-system-zlib      use installed libz"
 ac_help="$ac_help
   --enable-maintainer-mode enable make rules and dependencies not useful
                           (and sometimes confusing) to the casual installer"
+ac_help="$ac_help
+  --enable-version-specific-runtime-libs    Specify that runtime libraries shou
+ld be installed in a compiler-specific directory "
+ac_help="$ac_help
+  --with-slibdir=DIR      shared libraries in DIR [LIBDIR]"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -606,7 +609,7 @@ copy=cp
 # - 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:610: checking LIBRARY_PATH variable" >&5
+echo "configure:613: checking LIBRARY_PATH variable" >&5
 case ${LIBRARY_PATH} in
   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
     library_path_setting="contains current directory"
@@ -631,7 +634,7 @@ fi
 # - 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:635: checking GCC_EXEC_PREFIX variable" >&5
+echo "configure:638: checking GCC_EXEC_PREFIX variable" >&5
 case ${GCC_EXEC_PREFIX} in
   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
     gcc_exec_prefix_setting="contains current directory"
@@ -766,10 +769,21 @@ if test x${gcc_gxx_include_dir} = x; then
     gcc_gxx_include_dir='${libsubdir}/include/g++'
   else
     topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
-    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir}
   fi
 fi
 
+# Determine whether or not multilibs are enabled.
+# Check whether --enable-multilib or --disable-multilib was given.
+if test "${enable_multilib+set}" = set; then
+  enableval="$enable_multilib"
+  :
+else
+  enable_multilib=yes
+fi
+
+
+
 # Enable expensive internal checks
 # Check whether --enable-checking or --disable-checking was given.
 if test "${enable_checking+set}" = set; then
@@ -856,13 +870,15 @@ 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="${extra_c_flags} -DMULTIBYTE_CHARS=1"
+  cat >> confdefs.h <<\EOF
+#define MULTIBYTE_CHARS 1
+EOF
+
 fi
 fi
 
@@ -873,9 +889,7 @@ fi
 # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
-  if test x$enable_threads = xno; then
-       enable_threads=''
-fi
+  :
 else
   enable_threads=''
 fi
@@ -893,7 +907,7 @@ case x${enable_threads_flag} in
                target_thread_file=''
                ;;
        xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
-       xsolaris | xwin32 | xdce | xvxworks)
+       xsolaris | xwin32 | xdce | xvxworks | xaix)
                target_thread_file=$enable_threads_flag
                ;;
        *)
@@ -924,6 +938,16 @@ else
 fi
 
 
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  :
+else
+  enable_shared=yes
+fi
+
+
+
 # Determine the host, build, and target systems
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -972,7 +996,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:976: checking host system type" >&5
+echo "configure:1000: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -993,7 +1017,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:997: checking target system type" >&5
+echo "configure:1021: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1011,7 +1035,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:1015: checking build system type" >&5
+echo "configure:1039: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1038,7 +1062,7 @@ 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:1042: checking for $ac_word" >&5
+echo "configure:1066: 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
@@ -1068,7 +1092,7 @@ 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:1072: checking for $ac_word" >&5
+echo "configure:1096: 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
@@ -1119,7 +1143,7 @@ fi
       # 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:1123: checking for $ac_word" >&5
+echo "configure:1147: 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
@@ -1151,7 +1175,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1155: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1179: 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.
@@ -1162,12 +1186,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1166 "configure"
+#line 1190 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1195: \"$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
@@ -1193,12 +1217,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:1197: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1221: 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:1202: checking whether we are using GNU C" >&5
+echo "configure:1226: 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
@@ -1207,7 +1231,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1211: \"$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:1235: \"$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
@@ -1226,7 +1250,7 @@ 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:1230: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1254: 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
@@ -1259,10 +1283,10 @@ fi
 
 if test "x$CC" != xcc; then
   echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:1263: checking whether $CC and cc understand -c and -o together" >&5
+echo "configure:1287: checking whether $CC and cc understand -c and -o together" >&5
 else
   echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:1266: checking whether cc understands -c and -o together" >&5
+echo "configure:1290: checking whether cc understands -c and -o together" >&5
 fi
 set dummy $CC; ac_cc="`echo $2 |
                       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
@@ -1274,16 +1298,16 @@ else
 # We do the test twice because some compilers refuse to overwrite an
 # existing .o file with -o, though they will create one.
 ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:1278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-   test -f conftest.o && { (eval echo configure:1279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+if { (eval echo configure:1302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:1303: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
 then
   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
   if test "x$CC" != xcc; then
     # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:1308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
       ac_try='cc -c conftest.c -o conftest.o 1>&5'
-      if { (eval echo configure:1286: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-        test -f conftest.o && { (eval echo configure:1287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+      if { (eval echo configure:1310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+        test -f conftest.o && { (eval echo configure:1311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
       then
         # cc works too.
         :
@@ -1309,13 +1333,17 @@ EOF
 
 fi
 
+# autoconf is lame and doesn't give us any substitution variable for this.
 if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
   NO_MINUS_C_MINUS_O=yes
+else
+  OUTPUT_OPTION='-o $@'
 fi
 
 
+
 echo $ac_n "checking for long double""... $ac_c" 1>&6
-echo "configure:1319: checking for long double" >&5
+echo "configure:1347: checking for long double" >&5
 if eval "test \"`echo '$''{'gcc_cv_c_long_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1323,7 +1351,7 @@ else
   gcc_cv_c_long_double=yes
 else
 cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1355 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1333,7 +1361,7 @@ long double foo = 0.0;
 switch (0) case 0: case (sizeof(long double) >= sizeof(double)):;
 ; return 0; }
 EOF
-if { (eval echo configure:1337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_c_long_double=yes
 else
@@ -1356,21 +1384,21 @@ fi
 
 
 echo $ac_n "checking whether ${CC-cc} accepts -Wno-long-long""... $ac_c" 1>&6
-echo "configure:1360: checking whether ${CC-cc} accepts -Wno-long-long" >&5
+echo "configure:1388: checking whether ${CC-cc} accepts -Wno-long-long" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_no_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   save_CFLAGS="$CFLAGS"
 CFLAGS="-Wno-long-long"
 cat > conftest.$ac_ext <<EOF
-#line 1367 "configure"
+#line 1395 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_cc_no_long_long=yes
 else
@@ -1384,24 +1412,37 @@ CFLAGS="$save_CFLAGS"
 fi
 
 echo "$ac_t""$ac_cv_prog_cc_no_long_long" 1>&6
+strict1_warn=
+if test $ac_cv_prog_cc_no_long_long = yes; then
+  strict1_warn="-pedantic -Wno-long-long"
+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'.
-stage1_warn_cflags=" -W -Wall -Wtraditional -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
-stage2_warn_cflags="$stage1_warn_cflags -pedantic -Wno-long-long"
-if test "x$GCC" = "xyes"; then 
-  if test $ac_cv_prog_cc_no_long_long = yes; then
-    stage1_warn_cflags="$stage1_warn_cflags -pedantic -Wno-long-long"
-  fi
-else
-  stage1_warn_cflags=""
+warn_cflags=
+if test "x$GCC" = "xyes"; then
+  warn_cflags='$(GCC_WARN_CFLAGS)'
 fi
 
 
+# Stage specific cflags for build.
+stage1_cflags=
+case $build in
+vax-*-*)
+  if test x$GCC = xyes
+  then
+    stage1_cflags="-Wa,-J"
+  else
+    stage1_cflags="-J"
+  fi
+  ;;
+esac
+
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1405: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1446: 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
@@ -1429,7 +1470,7 @@ fi
 
 
 echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6
-echo "configure:1433: checking whether a default assembler was specified" >&5
+echo "configure:1474: checking whether a default assembler was specified" >&5
 if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then
     if test x"$gas_flag" = x"no"; then
        echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6
@@ -1441,7 +1482,7 @@ else
 fi
 
 echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6
-echo "configure:1445: checking whether a default linker was specified" >&5
+echo "configure:1486: checking whether a default linker was specified" >&5
 if test x"${DEFAULT_LINKER+set}" = x"set"; then
     if test x"$gnu_ld_flag" = x"no"; then
        echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6
@@ -1452,22 +1493,58 @@ else
     echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking for GNU C library""... $ac_c" 1>&6
+echo "configure:1498: checking for GNU C library" >&5
+if eval "test \"`echo '$''{'gcc_cv_glibc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1503 "configure"
+#include "confdefs.h"
+#include <features.h>
+int main() {
+
+#if ! (defined __GLIBC__ || defined __GNU_LIBRARY__)
+#error Not a GNU C library system
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:1513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_glibc=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_glibc=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gcc_cv_glibc" 1>&6
+if test $gcc_cv_glibc = yes; then
+  cat >> confdefs.h <<\EOF
+#define _GNU_SOURCE 1
+EOF
+
+fi
+
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1457: checking for inline" >&5
+echo "configure:1534: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1464 "configure"
+#line 1541 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1494,12 +1571,12 @@ esac
 
 
 # Find some useful tools
-for ac_prog in gawk mawk nawk awk
+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:1503: checking for $ac_word" >&5
+echo "configure:1580: 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
@@ -1528,86 +1605,8 @@ fi
 test -n "$AWK" && break
 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:1535: 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=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:1569: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1577 "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
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:1588: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
 echo $ac_n "checking whether ln works""... $ac_c" 1>&6
-echo "configure:1611: checking whether ln works" >&5
+echo "configure:1610: 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
@@ -1639,7 +1638,7 @@ else
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1643: checking whether ln -s works" >&5
+echo "configure:1642: 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
@@ -1671,19 +1670,19 @@ else
 fi
 
 echo $ac_n "checking for volatile""... $ac_c" 1>&6
-echo "configure:1675: checking for volatile" >&5
+echo "configure:1674: 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 1680 "configure"
+#line 1679 "configure"
 #include "confdefs.h"
 
 int main() {
 volatile int foo;
 ; return 0; }
 EOF
-if { (eval echo configure:1687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_c_volatile=yes
 else
@@ -1706,7 +1705,7 @@ 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:1710: checking for $ac_word" >&5
+echo "configure:1709: 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
@@ -1733,41 +1732,6 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-for ac_prog in 'bison -y' byacc
-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:1742: 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=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1779,7 +1743,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:1783: checking for a BSD compatible install" >&5
+echo "configure:1747: 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
@@ -1830,7 +1794,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:1834: checking how to run the C preprocessor" >&5
+echo "configure:1798: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1845,13 +1809,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1849 "configure"
+#line 1813 "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:1855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1819: \"$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
   :
@@ -1862,13 +1826,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1866 "configure"
+#line 1830 "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:1872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1836: \"$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
   :
@@ -1879,13 +1843,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1883 "configure"
+#line 1847 "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:1889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1853: \"$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
   :
@@ -1910,12 +1874,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1914: checking for ANSI C header files" >&5
+echo "configure:1878: 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 1919 "configure"
+#line 1883 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1923,7 +1887,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1891: \"$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*
@@ -1940,7 +1904,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 1944 "configure"
+#line 1908 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1958,7 +1922,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 1962 "configure"
+#line 1926 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1979,7 +1943,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1983 "configure"
+#line 1947 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1990,7 +1954,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -2014,12 +1978,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2018: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:1982: 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 2023 "configure"
+#line 1987 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2028,7 +1992,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -2049,12 +2013,12 @@ EOF
 fi
 
 echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6
-echo "configure:2053: checking whether string.h and strings.h may both be included" >&5
+echo "configure:2017: 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 2058 "configure"
+#line 2022 "configure"
 #include "confdefs.h"
 #include <string.h>
 #include <strings.h>
@@ -2062,7 +2026,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_header_string=yes
 else
@@ -2083,12 +2047,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2087: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2051: 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 2092 "configure"
+#line 2056 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2104,7 +2068,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:2108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -2127,21 +2091,21 @@ 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 \
-                direct.h malloc.h
+                direct.h malloc.h langinfo.h iconv.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2135: checking for $ac_hdr" >&5
+echo "configure:2099: 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 2140 "configure"
+#line 2104 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2109: \"$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*
@@ -2171,17 +2135,17 @@ 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:2175: checking for thread.h" >&5
+echo "configure:2139: 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 2180 "configure"
+#line 2144 "configure"
 #include "confdefs.h"
 #include <thread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2149: \"$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*
@@ -2205,17 +2169,17 @@ fi
 
 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:2209: checking for pthread.h" >&5
+echo "configure:2173: 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 2214 "configure"
+#line 2178 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2183: \"$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*
@@ -2242,29 +2206,61 @@ fi
 # 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:2246: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnat'+set}'`\" = set"; then
+echo "configure:2210: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_have_gnat'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$have_gnat"; then
+  ac_cv_prog_have_gnat="$have_gnat" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_have_gnat="yes"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_have_gnat" && ac_cv_prog_have_gnat="no"
+fi
+fi
+have_gnat="$ac_cv_prog_have_gnat"
+if test -n "$have_gnat"; then
+  echo "$ac_t""$have_gnat" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+# See if we have the mktemp command.
+# Extract the first word of "mktemp", so it can be a program name with args.
+set dummy mktemp; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2242: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_have_mktemp_command'+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.
+  if test -n "$have_mktemp_command"; then
+  ac_cv_prog_have_mktemp_command="$have_mktemp_command" # Let the user override the test.
 else
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
   ac_dummy="$PATH"
   for ac_dir in $ac_dummy; do
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_gnat="yes"
+      ac_cv_prog_have_mktemp_command="yes"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_gnat" && ac_cv_prog_gnat="no"
+  test -z "$ac_cv_prog_have_mktemp_command" && ac_cv_prog_have_mktemp_command="no"
 fi
 fi
-gnat="$ac_cv_prog_gnat"
-if test -n "$gnat"; then
-  echo "$ac_t""$gnat" 1>&6
+have_mktemp_command="$ac_cv_prog_have_mktemp_command"
+if test -n "$have_mktemp_command"; then
+  echo "$ac_t""$have_mktemp_command" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
@@ -2281,7 +2277,7 @@ else
   # Extract the first word of "makeinfo", so it can be a program name with args.
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2285: checking for $ac_word" >&5
+echo "configure:2281: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2310,16 +2306,16 @@ fi
 if test -n "$MAKEINFO"; then
   # Found it, now check the version.
   echo $ac_n "checking for modern makeinfo""... $ac_c" 1>&6
-echo "configure:2314: checking for modern makeinfo" >&5
+echo "configure:2310: checking for modern makeinfo" >&5
 if eval "test \"`echo '$''{'gcc_cv_prog_makeinfo_modern'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:2320: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:2316: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
-    3.1[2-9] | 3.[2-9][0-9] | 4.* | 1.6[89] | 1.7[0-9])
+    4.*)
             gcc_cv_prog_makeinfo_modern=yes;;
     *)      gcc_cv_prog_makeinfo_modern=no;;
   esac
@@ -2336,12 +2332,94 @@ fi
 if test $gcc_cv_prog_makeinfo_modern = no; then
   echo "configure: warning: 
 *** Makeinfo is missing or too old.
-*** Info documentation will not be built or installed." 1>&2
+*** Info documentation will not be built." 1>&2
   BUILD_INFO=
-  INSTALL_INFO=
 else
   BUILD_INFO=info              
-  INSTALL_INFO=install-info    
+fi
+
+# Is pod2man recent enough to regenerate manpages?
+echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6
+echo "configure:2344: checking for recent Pod::Man" >&5
+if perl -e 'use 1.10 Pod::Man' >/dev/null 2>&1; then
+  echo "$ac_t""yes" 1>&6
+  GENERATED_MANPAGES=generated-manpages                
+else
+  echo "$ac_t""no" 1>&6
+  GENERATED_MANPAGES=
+fi
+
+# How about lex?
+if test -f $srcdir/../flex/skel.c; then
+  FLEX='$(objdir)/../flex/flex'
+else
+  # 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:2360: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$FLEX"; then
+  ac_cv_prog_FLEX="$FLEX" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_FLEX="flex"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_FLEX" && ac_cv_prog_FLEX="false"
+fi
+fi
+FLEX="$ac_cv_prog_FLEX"
+if test -n "$FLEX"; then
+  echo "$ac_t""$FLEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+# Bison?
+# The -L switch is so bison can find its skeleton file.
+if test -f $srcdir/../bison/bison.simple; then
+  BISON='$(objdir)/../bison/bison -L $(srcdir)/../bison/'
+else
+  # Extract the first word of "bison", so it can be a program name with args.
+set dummy bison; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2397: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$BISON"; then
+  ac_cv_prog_BISON="$BISON" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_BISON="bison"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_BISON" && ac_cv_prog_BISON="false"
+fi
+fi
+BISON="$ac_cv_prog_BISON"
+if test -n "$BISON"; then
+  echo "$ac_t""$BISON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 fi
 
 # See if the stage1 system preprocessor understands the ANSI C
@@ -2349,12 +2427,12 @@ fi
 
 
 echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
-echo "configure:2353: checking for preprocessor stringizing operator" >&5
+echo "configure:2431: checking for preprocessor stringizing operator" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2358 "configure"
+#line 2436 "configure"
 #include "confdefs.h"
 
 #define x(y) #y
@@ -2387,12 +2465,12 @@ echo "$ac_t""${ac_cv_c_stringize}" 1>&6
 # 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:2391: checking for inttypes.h" >&5
+echo "configure:2469: 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 2396 "configure"
+#line 2474 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -2400,7 +2478,7 @@ int main() {
 intmax_t i = -1;
 ; return 0; }
 EOF
-if { (eval echo configure:2404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_header_inttypes_h=yes
 else
@@ -2425,7 +2503,7 @@ fi
 # be either signed or unsigned.
 #
 echo $ac_n "checking for unsigned enumerated bitfields""... $ac_c" 1>&6
-echo "configure:2429: checking for unsigned enumerated bitfields" >&5
+echo "configure:2507: checking for unsigned enumerated bitfields" >&5
 if eval "test \"`echo '$''{'gcc_cv_enum_bf_unsigned'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2433,7 +2511,7 @@ else
   gcc_cv_enum_bf_unsigned=yes
 else
   cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
+#line 2515 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 enum t { BLAH = 128 } ;
@@ -2446,7 +2524,7 @@ int main(void)
 
 }
 EOF
-if { (eval echo configure:2450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   gcc_cv_enum_bf_unsigned=yes
 else
@@ -2468,18 +2546,18 @@ EOF
 
 fi
 
-for ac_func in strtoul bsearch putenv popen bcopy bzero bcmp \
-       index rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
+for ac_func in strtoul bsearch putenv popen bcopy \
+       strchr strrchr kill getrlimit setrlimit atoll atoq \
        sysconf isascii gettimeofday strsignal putc_unlocked fputc_unlocked \
-       fputs_unlocked getrusage valloc
+       fputs_unlocked getrusage iconv nl_langinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2478: checking for $ac_func" >&5
+echo "configure:2556: 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 2483 "configure"
+#line 2561 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2502,7 +2580,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2584: \"$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
@@ -2528,12 +2606,12 @@ done
 
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:2532: checking for ssize_t" >&5
+echo "configure:2610: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2537 "configure"
+#line 2615 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2564,12 +2642,12 @@ fi
 # Try to determine the array type of the second argument of getgroups
 # for the target system (int or gid_t).
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:2568: checking for uid_t in sys/types.h" >&5
+echo "configure:2646: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2573 "configure"
+#line 2651 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -2598,7 +2676,7 @@ EOF
 fi
 
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:2602: checking type of array argument to getgroups" >&5
+echo "configure:2680: checking type of array argument to getgroups" >&5
 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2606,7 +2684,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat > conftest.$ac_ext <<EOF
-#line 2610 "configure"
+#line 2688 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Rendell for this test.  */
@@ -2631,7 +2709,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
     ac_cv_type_getgroups=gid_t
 else
@@ -2645,7 +2723,7 @@ fi
 
 if test $ac_cv_type_getgroups = cross; then
         cat > conftest.$ac_ext <<EOF
-#line 2649 "configure"
+#line 2727 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -2686,12 +2764,12 @@ fi
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2690: checking for vprintf" >&5
+echo "configure:2768: 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 2695 "configure"
+#line 2773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
@@ -2714,7 +2792,7 @@ vprintf();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2796: \"$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
@@ -2738,12 +2816,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2742: checking for _doprnt" >&5
+echo "configure:2820: 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 2747 "configure"
+#line 2825 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
@@ -2766,7 +2844,7 @@ _doprnt();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2848: \"$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
@@ -2801,41 +2879,98 @@ fi
 
 
 
-echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
-echo "configure:2806: checking whether the printf functions support %p" >&5
-if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then
+for ac_func in strstr
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2886: 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
-  if test "$cross_compiling" = yes; then
-  gcc_cv_func_printf_ptr=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2814 "configure"
+#line 2891 "configure"
 #include "confdefs.h"
-#include <stdio.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); 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 $ac_func();
 
-int main()
-{
-  char buf[64];
-  char *p = buf, *q = NULL;
-  sprintf(buf, "%p", p);
-  sscanf(buf, "%p", &q);
-  return (p != q);
-}
+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_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
 EOF
-if { (eval echo configure:2827: \"$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
+if { (eval echo configure:2914: \"$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
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  gcc_cv_func_printf_ptr=no
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-rm -fr conftest*
+rm -f conftest*
 fi
 
-rm -f core core.* *.core
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ strstr=
+else
+  echo "$ac_t""no" 1>&6
+strstr=strstr.o
+fi
+done
+
+   
+echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
+echo "configure:2941: 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
+  if test "$cross_compiling" = yes; then
+  gcc_cv_func_printf_ptr=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2949 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+
+int main()
+{
+  char buf[64];
+  char *p = buf, *q = NULL;
+  sprintf(buf, "%p", p);
+  sscanf(buf, "%p", &q);
+  return (p != q);
+}
+EOF
+if { (eval echo configure:2962: \"$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 "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  gcc_cv_func_printf_ptr=no
+fi
+rm -fr conftest*
+fi
+
+rm -f core core.* *.core
 fi
 
 echo "$ac_t""$gcc_cv_func_printf_ptr" 1>&6
@@ -2849,19 +2984,18 @@ fi
 
 case "${host}" in
 *-*-uwin*)
-  # Under some versions of uwin, vfork is notoriously buggy and the test 
-  # can hang configure; on other versions, vfork exists just as a stub.
-  # FIXME: This should be removed once vfork in uwin's runtime is fixed.
-  ac_cv_func_vfork_works=no
+  { echo "configure: error: 
+*** UWIN may not be used as a host platform because
+*** linking with posix.dll is not allowed by the GNU GPL" 1>&2; exit 1; }
   ;;
 esac
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2860: checking for pid_t" >&5
+echo "configure:2994: 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 2865 "configure"
+#line 2999 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2890,17 +3024,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2894: checking for vfork.h" >&5
+echo "configure:3028: 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 2899 "configure"
+#line 3033 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3038: \"$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*
@@ -2925,18 +3059,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2929: checking for working vfork" >&5
+echo "configure:3063: 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:2935: checking for vfork" >&5
+echo "configure:3069: 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 2940 "configure"
+#line 3074 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -2959,7 +3093,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3097: \"$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
@@ -2981,7 +3115,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 2985 "configure"
+#line 3119 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -3076,7 +3210,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:3080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3214: \"$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
@@ -3098,55 +3232,15 @@ EOF
 
 fi
 
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3106: 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 3111 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3116: \"$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
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3145: checking for $ac_func" >&5
+echo "configure:3239: 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 3150 "configure"
+#line 3244 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3169,7 +3263,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3267: \"$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
@@ -3193,23 +3287,15 @@ else
 fi
 done
 
-echo $ac_n "checking for working mmap which provides zeroed pages anywhere""... $ac_c" 1>&6
-echo "configure:3198: checking for working mmap which provides zeroed pages anywhere" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_anywhere'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_anywhere=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3206 "configure"
-#include "confdefs.h"
-
-/* Test by Richard Henderson and Alexandre Oliva.
-   Check whether mmap MAP_ANONYMOUS or mmap from /dev/zero works. */
+# The test program for the next two tests is the same except for one
+# set of ifdefs.
+cat >ct-mmap.inc <<'EOF'
 #include <sys/types.h>
-#include <fcntl.h>
 #include <sys/mman.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <stdio.h>
 
 #if !defined (MAP_ANONYMOUS) && defined (MAP_ANON)
 # define MAP_ANONYMOUS MAP_ANON
@@ -3256,59 +3342,289 @@ else
 
 #endif /* no HAVE_GETPAGESIZE */
 
-int main()
-{
-  char *x;
-  int fd, pg;
-
-#ifndef MAP_ANONYMOUS
-  fd = open("/dev/zero", O_RDWR);
-  if (fd < 0)
-    exit(1);
+#ifndef MAP_FAILED
+# define MAP_FAILED -1
 #endif
 
-  pg = getpagesize();
-#ifdef MAP_ANONYMOUS
-  x = (char*)mmap(0, pg, PROT_READ|PROT_WRITE,
-                  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#undef perror_exit
+#define perror_exit(str, val) \
+  do { perror(str); exit(val); } while (0)
+
+/* Some versions of cygwin mmap require that munmap is called with the
+   same parameters as mmap.  GCC expects that this is not the case.
+   Test for various forms of this problem.  Warning - icky signal games.  */
+
+static sigset_t unblock_sigsegv;
+static jmp_buf r;
+static size_t pg;
+static int devzero;
+
+static char *
+anonmap (size)
+     size_t size;
+{
+#ifdef USE_MAP_ANON
+  return (char *) mmap (0, size, PROT_READ|PROT_WRITE,
+                       MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
 #else
-  x = (char*)mmap(0, pg, PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0);
+  return (char *) mmap (0, size, PROT_READ|PROT_WRITE,
+                       MAP_PRIVATE, devzero, 0);
 #endif
-  if (x == (char *) -1)
-    exit(2);
+}
+
+static void
+sigsegv (unused)
+     int unused;
+{
+  sigprocmask (SIG_UNBLOCK, &unblock_sigsegv, 0);
+  longjmp (r, 1);
+}
+
+/* Basic functionality test.  */
+void
+test_0 ()
+{
+  char *x = anonmap (pg);
+  if (x == (char *) MAP_FAILED)
+    perror_exit("test 0 mmap", 2);
 
   *(int *)x += 1;
 
   if (munmap(x, pg) < 0)
-    exit(3);
+    perror_exit("test 0 munmap", 3);
+}
+
+/* 1. If we map a 2-page region and unmap its second page, the first page
+   must remain.  */
+static void
+test_1 ()
+{
+  char *x = anonmap (pg * 2);
+  if (x == (char *)MAP_FAILED)
+    perror_exit ("test 1 mmap", 4);
+
+  signal (SIGSEGV, sigsegv);
+  if (setjmp (r))
+    perror_exit ("test 1 fault", 5);
+
+  x[0] = 1;
+  x[pg] = 1;
+
+  if (munmap (x + pg, pg) < 0)
+    perror_exit ("test 1 munmap 1", 6);
+  x[0] = 2;
+
+  if (setjmp (r) == 0)
+    {
+      x[pg] = 1;
+      perror_exit ("test 1 no fault", 7);
+    }
+  if (munmap (x, pg) < 0)
+    perror_exit ("test 1 munmap 2", 8);
+}
+
+/* 2. If we map a 2-page region and unmap its first page, the second
+   page must remain.  */
+static void
+test_2 ()
+{
+  char *x = anonmap (pg * 2);
+  if (x == (char *)MAP_FAILED)
+    perror_exit ("test 2 mmap", 9);
+
+  signal (SIGSEGV, sigsegv);
+  if (setjmp (r))
+    perror_exit ("test 2 fault", 10);
+
+  x[0] = 1;
+  x[pg] = 1;
+
+  if (munmap (x, pg) < 0)
+    perror_exit ("test 2 munmap 1", 11);
+
+  x[pg] = 2;
+
+  if (setjmp (r) == 0)
+    {
+      x[0] = 1;
+      perror_exit ("test 2 no fault", 12);
+    }
+
+  if (munmap (x+pg, pg) < 0)
+    perror_exit ("test 2 munmap 2", 13);
+}
+
+/* 3. If we map two adjacent 1-page regions and unmap them both with
+   one munmap, both must go away.
+
+   Getting two adjacent 1-page regions with two mmap calls is slightly
+   tricky.  All OS's tested skip over already-allocated blocks; therefore
+   we have been careful to unmap all allocated regions in previous tests.
+   HP/UX allocates pages backward in memory.  No OS has yet been observed
+   to be so perverse as to leave unmapped space between consecutive calls
+   to mmap.  */
+
+static void
+test_3 ()
+{
+  char *x, *y, *z;
+
+  x = anonmap (pg);
+  if (x == (char *)MAP_FAILED)
+    perror_exit ("test 3 mmap 1", 14);
+  y = anonmap (pg);
+  if (y == (char *)MAP_FAILED)
+    perror_exit ("test 3 mmap 2", 15);
+
+  if (y != x + pg)
+    {
+      if (y == x - pg)
+       z = y, y = x, x = z;
+      else
+       {
+         fprintf (stderr, "test 3 nonconsecutive pages - %lx, %lx\n",
+                  (unsigned long)x, (unsigned long)y);
+         exit (16);
+       }
+    }
+
+  signal (SIGSEGV, sigsegv);
+  if (setjmp (r))
+    perror_exit ("test 3 fault", 17);
+
+  x[0] = 1;
+  y[0] = 1;
+
+  if (munmap (x, pg*2) < 0)
+    perror_exit ("test 3 munmap", 18);
+
+  if (setjmp (r) == 0)
+    {
+      x[0] = 1;
+      perror_exit ("test 3 no fault 1", 19);
+    }
+  
+  signal (SIGSEGV, sigsegv);
+  if (setjmp (r) == 0)
+    {
+      y[0] = 1;
+      perror_exit ("test 3 no fault 2", 20);
+    }
+}
+
+int
+main ()
+{
+  sigemptyset (&unblock_sigsegv);
+  sigaddset (&unblock_sigsegv, SIGSEGV);
+  pg = getpagesize ();
+#ifndef USE_MAP_ANON
+  devzero = open ("/dev/zero", O_RDWR);
+  if (devzero < 0)
+    perror_exit ("open /dev/zero", 1);
+#endif
+
+  test_0();
+  test_1();
+  test_2();
+  test_3();
 
   exit(0);
 }
 EOF
-if { (eval echo configure:3289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+
+echo $ac_n "checking for working mmap from /dev/zero""... $ac_c" 1>&6
+echo "configure:3538: checking for working mmap from /dev/zero" >&5
+if eval "test \"`echo '$''{'ac_cv_func_mmap_dev_zero'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  # If this is not cygwin, and /dev/zero is a character device, it's probably
+ # safe to assume it works.
+ case "$host_os" in
+   cygwin* | win32 | pe | mingw* ) ac_cv_func_mmap_dev_zero=buggy ;;
+   * ) if test -c /dev/zero
+       then ac_cv_func_mmap_dev_zero=yes
+       else ac_cv_func_mmap_dev_zero=no
+       fi ;;
+  esac
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3554 "configure"
+#include "confdefs.h"
+#include "ct-mmap.inc"
+EOF
+if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_mmap_dev_zero=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  if test $? -lt 4
+ then ac_cv_func_mmap_dev_zero=no
+ else ac_cv_func_mmap_dev_zero=buggy
+ fi
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$ac_cv_func_mmap_dev_zero" 1>&6
+if test $ac_cv_func_mmap_dev_zero = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_MMAP_DEV_ZERO 1
+EOF
+
+fi
+
+echo $ac_n "checking for working mmap with MAP_ANON(YMOUS)""... $ac_c" 1>&6
+echo "configure:3585: checking for working mmap with MAP_ANON(YMOUS)" >&5
+if eval "test \"`echo '$''{'ac_cv_func_mmap_anon'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  # Unlike /dev/zero, it is not safe to assume MAP_ANON(YMOUS) works
+ # just because it's there. Some SCO Un*xen define it but don't implement it.
+ ac_cv_func_mmap_anon=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3595 "configure"
+#include "confdefs.h"
+#define USE_MAP_ANON
+#include "ct-mmap.inc"
+EOF
+if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
-  ac_cv_func_mmap_anywhere=yes
+  ac_cv_func_mmap_anon=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -fr conftest*
-  ac_cv_func_mmap_anywhere=no
+  if test $? -lt 4
+ then ac_cv_func_mmap_anon=no
+ else ac_cv_func_mmap_anon=buggy
+ fi
 fi
 rm -fr conftest*
 fi
 
+
 fi
 
-echo "$ac_t""$ac_cv_func_mmap_anywhere" 1>&6
-if test $ac_cv_func_mmap_anywhere = yes; then
+echo "$ac_t""$ac_cv_func_mmap_anon" 1>&6
+if test $ac_cv_func_mmap_anon = yes; then
   cat >> confdefs.h <<\EOF
-#define HAVE_MMAP_ANYWHERE 1
+#define HAVE_MMAP_ANON 1
 EOF
 
 fi
+rm -f ct-mmap.inc
 
 echo $ac_n "checking for working mmap of a file""... $ac_c" 1>&6
-echo "configure:3312: checking for working mmap of a file" >&5
+echo "configure:3628: checking for working mmap of a file" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_file'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3323,7 +3639,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_func_mmap_file=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 3327 "configure"
+#line 3643 "configure"
 #include "confdefs.h"
 
 /* Test by Zack Weinberg.  Modified from MMAP_ANYWHERE test by
@@ -3360,7 +3676,7 @@ int main()
   exit(0);
 }
 EOF
-if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_file=yes
 else
@@ -3386,19 +3702,19 @@ fi
 # We will need to find libiberty.h and ansidecl.h
 saved_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
-for ac_func in bcopy bzero bcmp \
-       index rindex getenv atol sbrk abort atof getcwd getwd \
+for ac_func in bcopy \
+       getenv atol sbrk abort atof getcwd getwd \
        strsignal putc_unlocked fputs_unlocked strstr environ \
        malloc realloc calloc free basename getopt
 do
   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6
-echo "configure:3397: checking whether $ac_func is declared" >&5
+echo "configure:3713: checking whether $ac_func is declared" >&5
 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3402 "configure"
+#line 3718 "configure"
 #include "confdefs.h"
 #include "gansidecl.h"
 #include "system.h"
@@ -3409,7 +3725,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "gcc_cv_have_decl_$ac_func=yes"
 else
@@ -3437,21 +3753,9 @@ done
 if test x = y ; then
   cat >> confdefs.h <<EOF
 #define HAVE_DECL_BCOPY 1
-EOF
- cat >> confdefs.h <<EOF
-#define HAVE_DECL_BZERO 1
-EOF
- cat >> confdefs.h <<EOF
-#define HAVE_DECL_BCMP 1
 EOF
  \
        cat >> confdefs.h <<EOF
-#define HAVE_DECL_INDEX 1
-EOF
- cat >> confdefs.h <<EOF
-#define HAVE_DECL_RINDEX 1
-EOF
- cat >> confdefs.h <<EOF
 #define HAVE_DECL_GETENV 1
 EOF
  cat >> confdefs.h <<EOF
@@ -3514,12 +3818,12 @@ for ac_func in getrlimit setrlimit getrusage
 do
   ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6
-echo "configure:3518: checking whether $ac_func is declared" >&5
+echo "configure:3822: checking whether $ac_func is declared" >&5
 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3523 "configure"
+#line 3827 "configure"
 #include "confdefs.h"
 #include "gansidecl.h"
 #include "system.h"
@@ -3534,7 +3838,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "gcc_cv_have_decl_$ac_func=yes"
 else
@@ -3572,3280 +3876,76 @@ EOF
 fi
 
 
-# Restore CFLAGS from before the gcc_AC_NEED_DECLARATIONS tests.
-CFLAGS="$saved_CFLAGS"
-
-# mkdir takes a single argument on some systems. 
-echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
-echo "configure:3581: checking if mkdir takes one argument" >&5
-if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3586 "configure"
-#include "confdefs.h"
-
-#include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#ifdef HAVE_DIRECT_H
-# include <direct.h>
-#endif
-int main() {
-mkdir ("foo", 0);
-; return 0; }
-EOF
-if { (eval echo configure:3603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  gcc_cv_mkdir_takes_one_arg=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  gcc_cv_mkdir_takes_one_arg=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$gcc_cv_mkdir_takes_one_arg" 1>&6
-if test $gcc_cv_mkdir_takes_one_arg = yes ; then
-  cat >> confdefs.h <<\EOF
-#define MKDIR_TAKES_ONE_ARG 1
-EOF
-
-fi
-
-
-# File extensions
-manext='.1'
-objext='.o'
-
-
-
-build_xm_file=
-build_xm_defines=
-build_install_headers_dir=install-headers-tar
-build_exeext=
-host_xm_file=
-host_xm_defines=
-host_xmake_file=
-host_truncate_target=
-host_exeext=
-
-# Decode the host machine, then the target machine.
-# For the host machine, we save the xm_file variable as host_xm_file;
-# then we decode the target machine and forget everything else
-# that came from the host machine.
-for machine in $build $host $target; do
-
-       out_file=
-       xmake_file=
-       tmake_file=
-       extra_headers=
-       extra_passes=
-       extra_parts=
-       extra_programs=
-       extra_objs=
-       extra_host_objs=
-       extra_gcc_objs=
-       xm_defines=
-       float_format=
-       # Set this to force installation and use of collect2.
-       use_collect2=
-       # Set this to override the default target model.
-       target_cpu_default=
-       # Set this to control how the header file directory is installed.
-       install_headers_dir=install-headers-tar
-       # Set this to a non-empty list of args to pass to cpp if the target
-       # wants its .md file passed through cpp.
-       md_cppflags=
-       # Set this if directory names should be truncated to 14 characters.
-       truncate_target=
-       # Set this if gdb needs a dir command with `dirname $out_file`
-       gdb_needs_out_file_path=
-       # Set this if the build machine requires executables to have a
-       # file name suffix.
-       exeext=
-       # Set this to control which thread package will be used.
-       thread_file=
-       # Reinitialize these from the flag values every loop pass, since some
-       # configure entries modify them.
-       gas="$gas_flag"
-       gnu_ld="$gnu_ld_flag"
-       enable_threads=$enable_threads_flag
-
-       # Set default cpu_type, tm_file, tm_p_file and xm_file so it can be
-       # updated in each machine entry.
-       tm_p_file=
-       cpu_type=`echo $machine | sed 's/-.*$//'`
-       case $machine in
-       alpha*-*-*)
-               cpu_type=alpha
-               ;;
-       strongarm*-*-*)
-               cpu_type=arm
-               ;;
-       arm*-*-*)
-               cpu_type=arm
-               ;;
-       c*-convex-*)
-               cpu_type=convex
-               ;;
-       i[34567]86-*-*)
-               cpu_type=i386
-               ;;
-       hppa*-*-*)
-               cpu_type=pa
-               ;;
-       m68000-*-*)
-               cpu_type=m68k
-               ;;
-       mips*-*-*)
-               cpu_type=mips
-               ;;
-       pj*-*-*)
-               cpu_type=pj
-               ;;
-       powerpc*-*-*)
-               cpu_type=rs6000
-               ;;
-       pyramid-*-*)
-               cpu_type=pyr
-               ;;
-       sparc*-*-*)
-               cpu_type=sparc
-               ;;
-       esac
-
-       tm_file=${cpu_type}/${cpu_type}.h
-       xm_file=${cpu_type}/xm-${cpu_type}.h
-       if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h;
-       then
-               tm_p_file=${cpu_type}/${cpu_type}-protos.h;
-       fi
-       # On a.out targets, we need to use collect2.
-       case $machine in
-       *-*-*aout*)
-               use_collect2=yes
-               ;;
-       esac    
-
-       # Common parts for linux-gnu and openbsd systems
-       case $machine in
-       *-*-linux-gnu*)
-               xm_defines="HAVE_ATEXIT POSIX BSTRING"
-               ;;
-       *-*-openbsd*)
-               tm_file=${cpu_type}/openbsd.h
-               tmake_file="t-libc-ok t-openbsd"
-               # avoid surprises, always provide an xm-openbsd file 
-               xm_file=${cpu_type}/xm-openbsd.h
-               # don't depend on processor x-fragments as well
-               xmake_file=none
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-                       tmake_file="${tmake_file} t-openbsd-thread"
-               fi
-               ;;
-       esac
-
-       case $machine in
-       # Support site-specific machine types.
-       *local*)
-               cpu_type=`echo $machine | sed -e 's/-.*//'`
-               rest=`echo $machine | sed -e "s/$cpu_type-//"`
-               xm_file=${cpu_type}/xm-$rest.h
-               tm_file=${cpu_type}/$rest.h
-               if test -f $srcdir/config/${cpu_type}/x-$rest; \
-               then xmake_file=${cpu_type}/x-$rest; \
-               else true; \
-               fi
-               if test -f $srcdir/config/${cpu_type}/t-$rest; \
-               then tmake_file=${cpu_type}/t-$rest; \
-               else true; \
-               fi
-               ;;
-       1750a-*-*)
-               ;;
-       a29k-*-bsd* | a29k-*-sym1*)
-               tm_file="${tm_file} a29k/unix.h"
-               xm_defines=USG
-               xmake_file=a29k/x-unix
-               use_collect2=yes
-               ;;
-       a29k-*-udi | a29k-*-coff)
-               tm_file="${tm_file} dbxcoff.h a29k/udi.h"
-               tmake_file=a29k/t-a29kbare
-               ;;
-       a29k-wrs-vxworks*)
-               tm_file="${tm_file} dbxcoff.h a29k/udi.h a29k/vx29k.h"
-               tmake_file=a29k/t-vx29k
-               extra_parts="crtbegin.o crtend.o"
-               thread_file='vxworks'
-               ;;
-       a29k-*-*)                       # Default a29k environment.
-               use_collect2=yes
-               ;;
-       alpha-*-interix)
-               tm_file="${tm_file} alpha/alpha32.h interix.h alpha/alpha-interix.h"
-
-               # GAS + IEEE_CONFORMANT+IEEE (no inexact);
-               #target_cpu_default="MASK_GAS|MASK_IEEE_CONFORMANT|MASK_IEEE"
-
-               # GAS + IEEE_CONFORMANT
-               target_cpu_default="MASK_GAS|MASK_IEEE_CONFORMANT"
-
-               xm_file="alpha/xm-alpha-interix.h xm-interix.h"
-               xmake_file="x-interix alpha/t-pe"
-               tmake_file="alpha/t-alpha alpha/t-interix alpha/t-ieee"
-               if test x$enable_threads = xyes ; then
-                       thread_file='posix'
-               fi
-               if test x$stabs = xyes ; then
-                       tm_file="${tm_file} dbxcoff.h"
-               fi
-               #prefix='$$INTERIX_ROOT'/usr/contrib
-               #local_prefix='$$INTERIX_ROOT'/usr/contrib
-               ;;
-       alpha*-*-linux-gnuecoff*)
-               tm_file="${tm_file} alpha/linux-ecoff.h alpha/linux.h"
-               target_cpu_default="MASK_GAS"
-               tmake_file="alpha/t-alpha alpha/t-ieee"
-               gas=no
-               xmake_file=none
-               gas=yes gnu_ld=yes
-               ;;
-       alpha*-*-linux-gnulibc1*)
-               tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
-               target_cpu_default="MASK_GAS"
-               tmake_file="t-linux t-linux-gnulibc1 alpha/t-alpha alpha/t-crtbe alpha/t-ieee"
-               extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-               xmake_file=none
-               gas=yes gnu_ld=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       alpha*-*-linux-gnu*)
-               tm_file="${tm_file} alpha/elf.h alpha/linux.h alpha/linux-elf.h"
-               target_cpu_default="MASK_GAS"
-               tmake_file="t-linux alpha/t-crtbe alpha/t-alpha alpha/t-ieee"
-               extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-               xmake_file=none
-               gas=yes gnu_ld=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       alpha*-*-netbsd*)
-               tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
-               target_cpu_default="MASK_GAS"
-               tmake_file="alpha/t-crtbe alpha/t-alpha alpha/t-ieee"
-               extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-               xmake_file=none
-               gas=yes gnu_ld=yes
-               ;;
-
-       alpha*-*-openbsd*)
-               # default x-alpha is only appropriate for dec-osf.
-               target_cpu_default="MASK_GAS"
-               tmake_file="alpha/t-alpha alpha/t-ieee"
-               ;;
-               
-       alpha*-dec-osf*)
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               if test x$gas != xyes
-               then
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               use_collect2=yes
-               tmake_file="alpha/t-alpha alpha/t-ieee"
-               case $machine in
-                 *-*-osf1*)
-                   tm_file="${tm_file} alpha/osf.h alpha/osf12.h alpha/osf2or3.h"
-                   ;;
-                 *-*-osf[23]*)
-                   tm_file="${tm_file} alpha/osf.h alpha/osf2or3.h"
-                   ;;
-                 *-*-osf4*)
-                   tm_file="${tm_file} alpha/osf.h"
-                   # Some versions of OSF4 (specifically X4.0-9 296.7) have
-                   # a broken tar, so we use cpio instead.
-                   install_headers_dir=install-headers-cpio
-                   ;;
-                 *-*-osf5*)
-                   tm_file="${tm_file} alpha/osf.h alpha/osf5.h"
-                   ;;
-               esac
-               case $machine in
-                 *-*-osf4.0[b-z] | *-*-osf4.[1-9]* | *-*-osf5*)
-                   target_cpu_default=MASK_SUPPORT_ARCH
-                   ;;
-               esac
-               ;;
-       alpha*-*-vxworks*)
-               tm_file="${tm_file} dbx.h alpha/vxworks.h"
-               tmake_file="alpha/t-alpha alpha/t-ieee"
-               if  x$gas != xyes 
-               then
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               use_collect2=yes
-               thread_file='vxworks'
-               ;;
-       alpha*-*-winnt*)
-               tm_file="${tm_file} alpha/alpha32.h alpha/win-nt.h winnt/win-nt.h"
-               xm_file="${xm_file} config/winnt/xm-winnt.h alpha/xm-winnt.h"
-               tmake_file="t-libc-ok alpha/t-alpha alpha/t-ieee"
-               xmake_file=winnt/x-winnt
-               extra_host_objs=oldnames.o
-               extra_gcc_objs="spawnv.o oldnames.o"
-               if test x$gnu_ld != xyes
-               then
-                       extra_programs=ld.exe
-               fi
-               if test x$enable_threads = xyes; then
-                       thread_file='win32'
-               fi
-               ;;
-       alpha*-dec-vms*)
-               tm_file=alpha/vms.h
-               xm_file="${xm_file} alpha/xm-vms.h"
-               tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
-               ;;
-       arc-*-elf*)
-               extra_parts="crtinit.o crtfini.o"
-               ;;
-       arm-*-coff* | armel-*-coff*)
-               tm_file=arm/coff.h
-               tmake_file=arm/t-arm-coff
-               ;;
-       arm-*-vxworks*)
-               tm_file=arm/vxarm.h
-               tmake_file=arm/t-arm-coff
-               thread_file='vxworks'
-               ;;
-       arm-*-riscix1.[01]*)            # Acorn RISC machine (early versions)
-               tm_file=arm/riscix1-1.h
-               use_collect2=yes
-               ;;
-       arm-*-riscix*)                  # Acorn RISC machine
-               if test x$gas = xyes
-               then
-                   tm_file=arm/rix-gas.h
-               else
-                   tm_file=arm/riscix.h
-               fi
-               xmake_file=arm/x-riscix
-               tmake_file=arm/t-riscix
-               use_collect2=yes
-               ;;
-       arm-semi-aout | armel-semi-aout)
-               tm_file=arm/semi.h
-               tmake_file=arm/t-semi
-               ;;
-       arm-semi-aof | armel-semi-aof)
-               tm_file=arm/semiaof.h
-               tmake_file=arm/t-semiaof
-               ;;
-       arm*-*-netbsd*)
-               tm_file=arm/netbsd.h
-               tmake_file="t-netbsd arm/t-netbsd"
-               use_collect2=yes
-               ;;
-       arm*-*-linux-gnuaout*)          # ARM GNU/Linux with a.out
-               cpu_type=arm
-               xmake_file=x-linux
-               tm_file=arm/linux-aout.h
-               tmake_file=arm/t-linux
-               gnu_ld=yes
-               ;;
-       arm*-*-linux-gnuoldld*)         # ARM GNU/Linux with old ELF linker
-               xm_file=arm/xm-linux.h
-               xmake_file=x-linux
-               tm_file="arm/linux-oldld.h arm/linux-elf.h"
-               case $machine in
-               armv2*-*-*)
-                       tm_file="arm/linux-elf26.h $tm_file"
-                       ;;
-               esac
-               tmake_file="t-linux arm/t-linux"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               case x${enable_threads} in
-               x | xyes | xpthreads | xposix)
-                       thread_file='posix'
-                       ;;
-               esac
-               ;;
-       arm*-*-linux-gnu*)              # ARM GNU/Linux with ELF
-               xm_file=arm/xm-linux.h
-               xmake_file=x-linux
-               tm_file="arm/linux-elf.h"
-               case $machine in
-               armv2*-*-*)
-                       tm_file="arm/linux-elf26.h $tm_file"
-                       ;;
-               esac
-               tmake_file="t-linux arm/t-linux"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               case x${enable_threads} in
-               x | xyes | xpthreads | xposix)
-                       thread_file='posix'
-                       ;;
-               esac
-               ;;
-       arm*-*-uclinux*)                # ARM ucLinux
-               tm_file=arm/uclinux-elf.h
-               tmake_file=arm/t-arm-elf
-               ;;
-       arm*-*-aout)
-               tm_file=arm/aout.h
-               tmake_file=arm/t-arm-aout
-               ;;
-        arm*-*-ecos-elf)
-               tm_file=arm/ecos-elf.h
-               tmake_file=arm/t-arm-elf
-               ;; 
-       arm*-*-elf)
-               tm_file=arm/unknown-elf.h
-               tmake_file=arm/t-arm-elf
-               ;;
-       arm*-*-conix*)
-               tm_file=arm/conix-elf.h
-               tmake_file=arm/t-arm-elf
-               ;;
-        arm*-*-oabi)
-               tm_file=arm/unknown-elf-oabi.h
-               tmake_file=arm/t-arm-elf
-               ;;
-       arm-*-pe*)
-               tm_file=arm/pe.h
-               tmake_file=arm/t-pe
-               extra_objs="pe.o"
-               ;;
-       avr-*-*)
-               ;;
-       c1-convex-*)                    # Convex C1
-               target_cpu_default=1
-               use_collect2=yes
-               ;;
-       c2-convex-*)                    # Convex C2
-               target_cpu_default=2
-               use_collect2=yes
-               ;;
-       c32-convex-*)
-               target_cpu_default=4
-               use_collect2=yes
-               ;;
-       c34-convex-*)
-               target_cpu_default=8
-               use_collect2=yes
-               ;;
-       c38-convex-*)
-               target_cpu_default=16           
-               use_collect2=yes
-               ;;
-       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
-               xmake_file=clipper/x-clix
-               extra_headers=va-clipper.h
-               extra_parts="crtbegin.o crtend.o"
-               install_headers_dir=install-headers-cpio
-               ;;
-       d30v-*)
-               float_format=i64
-               ;;
-       dsp16xx-*)
-               ;;
-       elxsi-elxsi-*)
-               use_collect2=yes
-               ;;
-       fr30-*-elf)
-               tm_file="fr30/fr30.h"
-               tmake_file=fr30/t-fr30
-               extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-               ;;
-# This hasn't been upgraded to GCC 2.
-#      fx80-alliant-*)                 # Alliant FX/80
-#              ;;
-       h8300-*-*)
-               float_format=i32
-               ;;
-       hppa*-*-linux*)
-               target_cpu_default="(MASK_PA_11 | MASK_GAS | MASK_JUMP_IN_DELAY)"
-               tm_file="${tm_file} pa/elf.h linux.h pa/pa-linux.h"
-               tmake_file="t-linux pa/t-linux"
-               extra_parts="crtbegin.o crtend.o"
-               xmake_file=none
-               gas=yes gnu_ld=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       hppa*-*-openbsd*)
-               target_cpu_default="MASK_PA_11"
-               tmake_file=pa/t-openbsd
-               ;;
-       hppa1.1-*-pro*)
-               target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
-               tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h"
-               xm_file=pa/xm-papro.h
-               tmake_file=pa/t-pro
-               ;;
-       hppa1.1-*-osf*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
-               use_collect2=yes
-               ;;
-       hppa1.1-*-rtems*)
-               target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)"
-               tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h pa/rtems.h"
-               xm_file=pa/xm-papro.h
-               tmake_file=pa/t-pro
-               ;;
-       hppa1.0-*-osf*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h"
-               use_collect2=yes
-               ;;
-       hppa1.1-*-bsd*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
-               target_cpu_default="MASK_PA_11"
-               use_collect2=yes
-               ;;
-       hppa1.0-*-bsd*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h"
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hpux7*)
-               tm_file="pa/pa-oldas.h ${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux7.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hpux8.0[0-2]*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               else
-                       tm_file="pa/pa-oldas.h ${tm_file}"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.1-*-hpux8.0[0-2]*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               else
-                       tm_file="pa/pa-oldas.h ${tm_file}"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.1-*-hpux8*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hpux8*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
-               float_format=i128
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               tmake_file=pa/t-pa
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               if test x$enable_threads = x; then
-                   enable_threads=$have_pthread_h
-               fi
-               if test x$enable_threads = xyes; then
-                       thread_file='dce'
-                       tmake_file="${tmake_file} pa/t-dce-thr"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hpux10*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
-               float_format=i128
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               tmake_file=pa/t-pa
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               if test x$enable_threads = x; then
-                   enable_threads=$have_pthread_h
-               fi
-               if test x$enable_threads = xyes; then
-                       thread_file='dce'
-                       tmake_file="${tmake_file} pa/t-dce-thr"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa*64*-*-hpux11*)
-               target_cpu_default="MASK_PA_11"
-               xm_file=pa/xm-pa64hpux.h
-               xmake_file=pa/x-pa-hpux
-               tmake_file=pa/t-pa
-               tm_file="pa/pa64-start.h ${tm_file} pa/pa64-regs.h pa/long_double.h pa/elf.h pa/pa-hpux.h pa/pa-hpux11.h pa/pa-64.h"
-               float_format=i128
-               tmake_file=pa/t-pa64
-               target_cpu_default="(MASK_PA_11|MASK_PA_20)"
-
-               if [ x$gas = xyes ]
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-#              if [[ x$enable_threads = x ]]; then
-#                  enable_threads=$have_pthread_h
-#              fi
-#              if [[ x$enable_threads = xyes ]]; then
-#                      thread_file='dce'
-#                      tmake_file="${tmake_file} pa/t-dce-thr"
-#              fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
-               float_format=i128
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               tmake_file=pa/t-pa
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-#              if test x$enable_threads = x; then
-#                  enable_threads=$have_pthread_h
-#              fi
-#              if test x$enable_threads = xyes; then
-#                      thread_file='dce'
-#                      tmake_file="${tmake_file} pa/t-dce-thr"
-#              fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hpux11*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
-               float_format=i128
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-#              if test x$enable_threads = x; then
-#                  enable_threads=$have_pthread_h
-#              fi
-#              if test x$enable_threads = xyes; then
-#                      thread_file='dce'
-#                      tmake_file="${tmake_file} pa/t-dce-thr"
-#              fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.1-*-hpux* | hppa2*-*-hpux*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hpux*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.1-*-hiux* | hppa2*-*-hiux*)
-               target_cpu_default="MASK_PA_11"
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa1.0-*-hiux*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
-               xm_file=pa/xm-pahpux.h
-               xmake_file=pa/x-pa-hpux
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} pa/pa-gas.h"
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               ;;
-       hppa*-*-lites*)
-               tm_file="${tm_file} pa/pa32-regs.h elfos.h pa/elf.h"
-               target_cpu_default="MASK_PA_11"
-               use_collect2=yes
-               ;;
-       hppa*-*-mpeix*)
-               tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-mpeix.h"
-               xm_file=pa/xm-pampeix.h 
-               xmake_file=pa/x-pa-mpeix 
-               echo "You must use gas. Assuming it is already installed." 
-               install_headers_dir=install-headers-tar
-               use_collect2=yes 
-               ;; 
-       i370-*-opened*)                  # IBM 360/370/390 Architecture
-               xm_file=i370/xm-oe.h
-               tm_file=i370/oe.h
-               xmake_file=i370/x-oe
-               tmake_file=i370/t-oe
-               ;;
-       i370-*-mvs*)
-               xm_file=i370/xm-mvs.h
-               tm_file=i370/mvs.h
-               tmake_file=i370/t-mvs
-               ;;
-       i370-*-linux*)
-               xm_file="xm-linux.h i370/xm-linux.h"
-               xmake_file=x-linux
-               tm_file="i370/linux.h ${tm_file}"
-               tmake_file="t-linux i370/t-linux"
-               # broken_install=yes
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               # extra_parts="crtbegin.o crtend.o"
-               gnu_ld=yes
-               gas=yes
-               elf=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       i[34567]86-*-elf*)
-               xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h"
-               tm_file=i386/i386elf.h
-               tmake_file=i386/t-i386elf
-               xmake_file=x-svr4
-               ;;
-       i[34567]86-ibm-aix*)            # IBM PS/2 running AIX
-                if test x$gas = xyes
-               then
-                       tm_file=i386/aix386.h
-                       extra_parts="crtbegin.o crtend.o"
-                       tmake_file=i386/t-crtstuff
-               else
-                       tm_file=i386/aix386ng.h
-                       use_collect2=yes
-               fi
-               xm_file="xm-alloca.h i386/xm-aix.h ${xm_file}"
-               xm_defines=USG
-               xmake_file=i386/x-aix
-               ;;
-       i[34567]86-ncr-sysv4*)          # NCR 3000 - ix86 running system V.4
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG POSIX SMALL_ARG_MAX"
-               xmake_file=i386/x-ncr3000
-               if test x$stabs = xyes -a x$gas = xyes
-               then
-                       tm_file=i386/sysv4gdb.h
-               else
-                       tm_file=i386/sysv4.h
-               fi
-               extra_parts="crtbegin.o crtend.o"
-               tmake_file=i386/t-crtpic
-               ;;
-       i[34567]86-next-*)
-               tm_file=i386/next.h
-               xm_file=i386/xm-next.h
-               tmake_file=i386/t-next
-               xmake_file=i386/x-next
-               extra_objs=nextstep.o
-               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 test x$gas = xyes
-               then
-                       tm_file=i386/seq-gas.h
-               else
-                       tm_file=i386/sequent.h
-               fi
-               ;;
-       i[34567]86-sequent-ptx1*)
-               xm_defines="USG SVR3"
-               xmake_file=i386/x-sysv3
-               tm_file=i386/seq-sysv3.h
-               tmake_file=i386/t-crtstuff
-               extra_parts="crtbegin.o crtend.o"
-               install_headers_dir=install-headers-cpio
-               ;;
-       i[34567]86-sequent-ptx2* | i[34567]86-sequent-sysv3*)
-               xm_defines="USG SVR3"
-               xmake_file=i386/x-sysv3
-               tm_file=i386/seq2-sysv3.h
-               tmake_file=i386/t-crtstuff
-               extra_parts="crtbegin.o crtend.o"
-               install_headers_dir=install-headers-cpio
-               ;;
-       i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG POSIX SMALL_ARG_MAX"
-               xmake_file=x-svr4
-               tm_file=i386/ptx4-i.h
-               tmake_file=t-svr4
-               extra_parts="crtbegin.o crtend.o"
-               install_headers_dir=install-headers-cpio
-               ;;
-       i386-sun-sunos*)                # Sun i386 roadrunner
-               xm_defines=USG
-               tm_file=i386/sun.h
-               use_collect2=yes
-               ;;
-       i[34567]86-wrs-vxworks*)
-               tm_file=i386/vxi386.h
-               tmake_file=i386/t-i386bare
-               thread_file='vxworks'
-               ;;
-       i[34567]86-*-aout*)
-               tm_file=i386/i386-aout.h
-               tmake_file=i386/t-i386bare
-               ;;
-       i[34567]86-*-beoself* | i[34567]86-*-beos*)
-               xm_file=i386/xm-beos.h
-               tmake_file='i386/t-beos i386/t-crtpic'
-               tm_file=i386/beos-elf.h
-               xmake_file=i386/x-beos
-               extra_parts='crtbegin.o crtend.o'
-               ;;
-       i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
-               tm_file=i386/bsd386.h
-#              tmake_file=t-libc-ok
-               ;;
-       i[34567]86-*-bsd*)
-               tm_file=i386/386bsd.h
-#              tmake_file=t-libc-ok
-# Next line turned off because both 386BSD and BSD/386 use GNU ld.
-#              use_collect2=yes
-               ;;
-       i[34567]86-*-freebsd[12] | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd*aout*)
-               tm_file="i386/freebsd.h i386/perform.h"
-               tmake_file=t-freebsd
-               ;;
-       i[34567]86-*-freebsd*)
-               tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd-elf.h i386/perform.h"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               tmake_file=t-freebsd
-               gas=yes
-               gnu_ld=yes
-               stabs=yes
-               case x${enable_threads} in
-               xyes | xpthreads | xposix)
-                       thread_file='posix'
-                       tmake_file="${tmake_file} t-freebsd-thread"
-                       ;;
-               esac
-               ;;
-       i[34567]86-*-netbsd*)
-               tm_file=i386/netbsd.h
-               tmake_file=t-netbsd
-               use_collect2=yes
-               ;;
-       i[34567]86-*-openbsd*)
-               # we need collect2 until our bug is fixed...
-               use_collect2=yes
-               ;;
-       i[34567]86-*-coff*)
-               tm_file=i386/i386-coff.h
-               tmake_file=i386/t-i386bare
-               ;;
-       i[34567]86-*-isc*)              # 80386 running ISC system
-               xm_file="${xm_file} i386/xm-isc.h"
-               xm_defines="USG SVR3"
-               case $machine in
-                 i[34567]86-*-isc[34]*)
-                   xmake_file=i386/x-isc3
-                   ;;
-                 *)
-                   xmake_file=i386/x-isc
-                   ;;
-               esac
-                if test x$gas = xyes -a x$stabs = xyes
-               then
-                       tm_file=i386/iscdbx.h
-                       tmake_file=i386/t-svr3dbx
-                       extra_parts="svr3.ifile svr3z.ifile"
-               else
-                       tm_file=i386/isccoff.h
-                       tmake_file=i386/t-crtstuff
-                       extra_parts="crtbegin.o crtend.o"
-               fi
-               tmake_file="$tmake_file i386/t-i386bare"
-               install_headers_dir=install-headers-cpio
-               ;;
-       i[34567]86-*-linux-gnuoldld*)   # Intel 80386's running GNU/Linux
-                                       # pre BFD linkers
-               xmake_file=x-linux-aout
-               tmake_file="t-linux-aout i386/t-crtstuff"
-               tm_file=i386/linux-oldld.h
-               gnu_ld=yes
-               float_format=i386
-               ;;
-       i[34567]86-*-linux-gnuaout*)    # Intel 80386's running GNU/Linux
-               xmake_file=x-linux-aout
-               tmake_file="t-linux-aout i386/t-crtstuff"
-               tm_file=i386/linux-aout.h
-               gnu_ld=yes
-               float_format=i386
-               ;;
-       i[34567]86-*-linux-gnulibc1)    # Intel 80386's running GNU/Linux
-                                       # GNU/Linux C library 5
-               xmake_file=x-linux      
-               tm_file=i386/linux.h    
-               tmake_file="t-linux t-linux-gnulibc1 i386/t-crtstuff"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               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
-                                       # aka GNU/Linux C library 6
-               xmake_file=x-linux
-               tm_file=i386/linux.h
-               tmake_file="t-linux i386/t-crtstuff"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               float_format=i386
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       i[34567]86-*-gnu*)
-               float_format=i386
-               ;;
-       i[34567]86-go32-msdos | i[34567]86-*-go32*)
-               echo "GO32/DJGPP V1.X is no longer supported. Use *-pc-msdosdjgpp for DJGPP V2.X instead."
-               exit 1
-               ;;
-       i[34567]86-pc-msdosdjgpp*)
-               xm_file=i386/xm-djgpp.h
-               tm_file=i386/djgpp.h
-               tmake_file=i386/t-djgpp
-               xmake_file=i386/x-djgpp
-               gnu_ld=yes
-               gas=yes
-               exeext=.exe
-               float_format=none
-               case $host in *pc-msdosdjgpp*)
-                       target_alias=djgpp
-                       ;;
-               esac
-               ;;
-       i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-               tm_file=i386/moss.h
-               tmake_file=t-libc-ok
-               gnu_ld=yes
-               gas=yes
-               ;;
-       i[34567]86-*-lynxos*)
-               if test x$gas = xyes
-               then
-                       tm_file=i386/lynx.h
-               else
-                       tm_file=i386/lynx-ng.h
-               fi
-               xm_file=i386/xm-lynx.h
-               tmake_file=i386/t-i386bare
-               xmake_file=x-lynx
-               ;;
-       i[34567]86-*-mach*)
-               tm_file=i386/mach.h
-#              tmake_file=t-libc-ok
-               use_collect2=yes
-               ;;
-       i[34567]86-*-osfrose*)          # 386 using OSF/rose
-                if test x$elf = xyes
-               then
-                       tm_file=i386/osfelf.h
-                       use_collect2=
-               else
-                       tm_file=i386/osfrose.h
-                       use_collect2=yes
-               fi
-               xm_file="i386/xm-osf.h ${xm_file}"
-               xmake_file=i386/x-osfrose
-               tmake_file=i386/t-osf
-               extra_objs=halfpic.o
-               ;;
-       i[34567]86-go32-rtems*)
-               cpu_type=i386
-               xm_file=i386/xm-go32.h
-               tm_file=i386/go32-rtems.h
-               tmake_file="i386/t-go32 t-rtems"
-               ;;
-       i[34567]86-*-rtemscoff*)
-               cpu_type=i386
-               tm_file=i386/rtems.h
-               tmake_file="i386/t-i386bare t-rtems"
-               ;;
-       i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
-               cpu_type=i386
-               tm_file=i386/rtemself.h
-               extra_parts="crtbegin.o crtend.o crti.o crtn.o"
-               tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
-               ;;
-       i[34567]86-*-sco3.2v5*) # 80386 running SCO Open Server 5
-               xm_file="xm-alloca.h ${xm_file} i386/xm-sco5.h"
-               xm_defines="USG SVR3"
-               xmake_file=i386/x-sco5
-               install_headers_dir=install-headers-cpio
-               tm_file=i386/sco5.h
-               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
-               tmake_file="$tmake_file i386/t-i386bare"
-               extra_parts="crti.o crtbegin.o crtend.o crtbeginS.o crtendS.o"
-               ;;
-       i[34567]86-*-sco3.2v4*)         # 80386 running SCO 3.2v4 system
-               xm_file="${xm_file} i386/xm-sco.h"
-               xm_defines="USG SVR3 BROKEN_LDEXP SMALL_ARG_MAX"
-               xmake_file=i386/x-sco4
-               install_headers_dir=install-headers-cpio
-                if test x$stabs = xyes
-               then
-                       tm_file=i386/sco4dbx.h
-                       tmake_file=i386/t-svr3dbx
-                       extra_parts="svr3.ifile svr3z.rfile"
-               else
-                       tm_file=i386/sco4.h
-                       tmake_file=i386/t-crtstuff
-                       extra_parts="crtbegin.o crtend.o"
-               fi
-               tmake_file="$tmake_file i386/t-i386bare"
-               # The default EAFS filesystem supports long file names.
-               # Truncating the target makes $host != $target which
-               # makes gcc think it is doing a cross-compile.
-               # truncate_target=yes
-               ;;
-       i[34567]86-*-sco*)              # 80386 running SCO system
-               xm_file=i386/xm-sco.h
-               xmake_file=i386/x-sco
-               install_headers_dir=install-headers-cpio
-                if test x$stabs = xyes
-               then
-                       tm_file=i386/scodbx.h
-                       tmake_file=i386/t-svr3dbx
-                       extra_parts="svr3.ifile svr3z.rfile"
-               else
-                       tm_file=i386/sco.h
-                       extra_parts="crtbegin.o crtend.o"
-                       tmake_file=i386/t-crtstuff
-               fi
-               tmake_file="$tmake_file i386/t-i386bare"
-               truncate_target=yes
-               ;;
-       i[34567]86-*-solaris2*)
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG POSIX SMALL_ARG_MAX"
-               tm_file=i386/sol2.h
-               if test x$gas = xyes; then
-                       # Only needed if gas does not support -s
-                       tm_file="i386/sol2gas.h ${tm_file}"
-               fi
-               tmake_file="i386/t-i386bare i386/t-sol2"
-               extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-               xmake_file=x-svr4
-               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
-               ;;
-       i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG POSIX"
-               tm_file=i386/sysv5.h
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               tmake_file="i386/t-i386bare i386/t-crtpic"
-               xmake_file=x-svr4
-               extra_parts="crtbegin.o crtend.o"
-              if test x$enable_threads = xyes; then
-                      thread_file='posix'
-              fi
-               ;;
-       i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG POSIX SMALL_ARG_MAX"
-               tm_file=i386/sysv4.h
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               tmake_file="i386/t-i386bare i386/t-crtpic"
-               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_file}"
-               xm_defines="USG POSIX"
-               tm_file=i386/udk.h
-               tmake_file="i386/t-i386bare i386/t-crtpic i386/t-udk"
-               xmake_file=x-svr4
-               extra_parts="crtbegin.o crtend.o"
-               install_headers_dir=install-headers-cpio
-               ;;
-       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"
-               if test x$stabs = xyes
-               then
-                       tm_file=i386/osf1elfgdb.h
-               else
-                       tm_file=i386/osf1elf.h
-               fi
-               tmake_file=i386/t-osf1elf
-               xmake_file=i386/x-osf1elf
-               extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-               ;;
-       i[34567]86-*-sysv*)             # Intel 80386's running system V
-               xm_defines="USG SVR3"
-               xmake_file=i386/x-sysv3
-               if test x$gas = xyes
-               then
-                       if test x$stabs = xyes
-                       then
-                               tm_file=i386/svr3dbx.h
-                               tmake_file=i386/t-svr3dbx
-                               extra_parts="svr3.ifile svr3z.rfile"
-                       else
-                               tm_file=i386/svr3gas.h
-                               extra_parts="crtbegin.o crtend.o"
-                               tmake_file=i386/t-crtstuff
-                       fi
-               else
-                       tm_file=i386/sysv3.h
-                       extra_parts="crtbegin.o crtend.o"
-                       tmake_file=i386/t-crtstuff
-               fi
-               tmake_file="$tmake_file i386/t-crtpic"
-               ;;
-       i386-*-vsta)                    # Intel 80386's running VSTa kernel
-               xm_file="${xm_file} i386/xm-vsta.h"
-               tm_file=i386/vsta.h
-               tmake_file=i386/t-vsta
-               xmake_file=i386/x-vsta
-               ;;
-       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
-               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
-               if test x$enable_threads = xyes; then
-                       thread_file='win32'
-               fi
-               exeext=.exe
-               ;;
-       i[34567]86-*-mingw32*)
-               tm_file=i386/mingw32.h
-               xm_file="${xm_file} i386/xm-mingw32.h"
-               tmake_file="i386/t-cygwin i386/t-mingw32"
-               extra_objs=winnt.o
-               xmake_file=i386/x-cygwin
-               if test x$enable_threads = xyes; then
-                       thread_file='win32'
-               fi
-               exeext=.exe
-               case $machine in
-                       *mingw32msv*)
-                               ;;
-                       *minwg32crt* | *mingw32*)
-                               tm_file="${tm_file} i386/crtdll.h"
-                               ;;
-               esac
-               ;;
-       i[34567]86-*-uwin*)
-               tm_file=i386/uwin.h
-               xm_file="${xm_file} i386/xm-uwin.h"
-               xm_defines="USG NO_STAB_H"
-               tmake_file="i386/t-cygwin i386/t-uwin"
-               extra_objs=winnt.o
-               xmake_file=i386/x-cygwin
-               if test x$enable_threads = xyes; then
-                       thread_file='win32'
-               fi
-               exeext=.exe
-               ;;
-       i[34567]86-*-interix*)
-               tm_file="i386/i386-interix.h interix.h"
-               xm_file="i386/xm-i386-interix.h xm-interix.h"
-               xm_defines="USG"
-               tmake_file="i386/t-interix"
-               extra_objs=interix.o
-               xmake_file=x-interix
-               if test x$enable_threads = xyes ; then
-                       thread_file='posix'
-               fi
-               if test x$stabs = xyes ; then
-                       tm_file="${tm_file} dbxcoff.h"
-               fi
-               ;;
-       i[34567]86-*-winnt3*)
-               tm_file=i386/win-nt.h
-               out_file=i386/i386.c
-               xm_file="xm-winnt.h ${xm_file}"
-               xmake_file=winnt/x-winnt
-               tmake_file=i386/t-winnt
-               extra_host_objs="winnt.o oldnames.o"
-               extra_gcc_objs="spawnv.o oldnames.o"
-               if test x$gnu_ld != xyes
-               then
-                       extra_programs=ld.exe
-               fi
-               if test x$enable_threads = xyes; then
-                       thread_file='win32'
-               fi
-               ;;
-       i[34567]86-dg-dgux*)
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG POSIX"
-               out_file=i386/dgux.c
-               tm_file=i386/dgux.h
-               tmake_file=i386/t-dgux
-               xmake_file=i386/x-dgux
-               install_headers_dir=install-headers-cpio
-              ;;
-       i860-alliant-*)         # Alliant FX/2800
-               tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h"
-               xm_file="${xm_file}"
-               xmake_file=i860/x-fx2800
-               tmake_file=i860/t-fx2800
-               extra_parts="crtbegin.o crtend.o"
-               ;;
-       i860-*-bsd*)
-               tm_file="${tm_file} i860/bsd.h"
-               if test x$gas = xyes
-               then
-                       tm_file="${tm_file} i860/bsd-gas.h"
-               fi
-               use_collect2=yes
-               ;;
-       i860-*-mach*)
-               tm_file="${tm_file} i860/mach.h"
-               tmake_file=t-libc-ok
-               ;;
-       i860-*-osf*)                    # Intel Paragon XP/S, OSF/1AD
-               tm_file="${tm_file} svr3.h i860/paragon.h"
-               xm_defines="USG SVR3"
-               tmake_file=t-osf
-               ;;
-       i860-*-sysv3*)
-               tm_file="${tm_file} svr3.h i860/sysv3.h"
-               xm_defines="USG SVR3"
-               xmake_file=i860/x-sysv3
-               extra_parts="crtbegin.o crtend.o"
-               ;;
-       i860-*-sysv4*)
-               tm_file="${tm_file} svr4.h i860/sysv4.h"
-               xm_defines="USG SVR3"
-               xmake_file=i860/x-sysv4
-               tmake_file=t-svr4
-               extra_parts="crtbegin.o crtend.o"
-               ;;
-       i960-wrs-vxworks5 | i960-wrs-vxworks5.0*)
-               tm_file="${tm_file} i960/vx960.h"
-               tmake_file=i960/t-vxworks960
-               use_collect2=yes
-               thread_file='vxworks'
-               ;;
-       i960-wrs-vxworks5* | i960-wrs-vxworks)
-               tm_file="${tm_file} dbxcoff.h i960/i960-coff.h i960/vx960-coff.h"
-               tmake_file=i960/t-vxworks960
-               use_collect2=yes
-               thread_file='vxworks'
-               ;;
-       i960-wrs-vxworks*)
-               tm_file="${tm_file} i960/vx960.h"
-               tmake_file=i960/t-vxworks960
-               use_collect2=yes
-               thread_file='vxworks'
-               ;;
-       i960-*-coff*)
-               tm_file="${tm_file} dbxcoff.h i960/i960-coff.h libgloss.h"
-               tmake_file=i960/t-960bare
-               use_collect2=yes
-               ;;
-       i960-*-rtems)
-               tmake_file="i960/t-960bare t-rtems"
-               tm_file="${tm_file} dbxcoff.h i960/rtems.h"
-               use_collect2=yes
-               ;;
-       i960-*-*)                       # Default i960 environment.
-               use_collect2=yes
-               ;;
-       ia64*-*-elf*)
-               tm_file=ia64/elf.h
-               tmake_file="ia64/t-ia64"
-               target_cpu_default="0"
-               if test x$gas = xyes
-               then
-                       target_cpu_default="${target_cpu_default}|MASK_GNU_AS"
-               fi
-               if test x$gnu_ld = xyes
-               then
-                       target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
-               fi
-               ;;
-       ia64*-*-linux*)
-               tm_file=ia64/linux.h
-               tmake_file="t-linux ia64/t-ia64"
-               target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       m32r-*-elf*)
-               extra_parts="crtinit.o crtfini.o"
-               ;;
-       m68000-convergent-sysv*)
-               tm_file=m68k/ctix.h
-               xm_file="m68k/xm-3b1.h ${xm_file}"
-               xm_defines=USG
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68000-hp-bsd*)                 # HP 9000/200 running BSD
-               tm_file=m68k/hp2bsd.h
-               xmake_file=m68k/x-hp2bsd
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68000-hp-hpux*)                # HP 9000 series 300
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG"
-               if test x$gas = xyes
-               then
-                       xmake_file=m68k/x-hp320g
-                       tm_file=m68k/hp310g.h
-               else
-                       xmake_file=m68k/x-hp320
-                       tm_file=m68k/hp310.h
-               fi
-               install_headers_dir=install-headers-cpio
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68000-sun-sunos3*)
-               tm_file=m68k/sun2.h
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68000-sun-sunos4*)
-               tm_file=m68k/sun2o4.h
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68000-att-sysv*)
-               xm_file="m68k/xm-3b1.h ${xm_file}"
-               xm_defines=USG
-               if test x$gas = xyes
-               then
-                       tm_file=m68k/3b1g.h
-               else
-                       tm_file=m68k/3b1.h
-               fi
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68k-apple-aux*)                # Apple Macintosh running A/UX
-               xm_defines="USG AUX"
-               tmake_file=m68k/t-aux
-               install_headers_dir=install-headers-cpio
-               extra_headers=math-68881.h
-               extra_parts="crt1.o mcrt1.o maccrt1.o crt2.o crtn.o"
-               tm_file=
-               if test "$gnu_ld" = yes
-               then
-                       tm_file="${tm_file} m68k/auxgld.h"
-               else
-                       tm_file="${tm_file} m68k/auxld.h"
-               fi
-               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 test x$gas = xyes
-               then
-                       tm_file=m68k/altos3068.h
-                       xm_defines=USG
-               else
-                       echo "The Altos is supported only with the GNU assembler" 1>&2
-                       exit 1
-               fi
-               extra_headers=math-68881.h
-               ;;
-       m68k-bull-sysv*)                # Bull DPX/2
-               if test x$gas = xyes
-               then
-                       if test x$stabs = xyes
-                       then
-                               tm_file=m68k/dpx2cdbx.h
-                       else
-                               tm_file=m68k/dpx2g.h
-                       fi
-               else
-                       tm_file=m68k/dpx2.h
-               fi
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines=USG
-               xmake_file=m68k/x-dpx2
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68k-atari-sysv4*)              # Atari variant of V.4.
-               tm_file=m68k/atari.h
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG FULL_PROTOTYPES"
-               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}"
-               if test x$gas = xyes
-               then
-                       xmake_file=m68k/x-mot3300-gas
-                       if test x$gnu_ld = xyes
-                       then
-                               tmake_file=m68k/t-mot3300-gald
-                       else
-                               tmake_file=m68k/t-mot3300-gas
-                               use_collect2=yes
-                       fi
-               else
-                       xmake_file=m68k/x-mot3300
-                       if test x$gnu_ld = xyes
-                       then
-                               tmake_file=m68k/t-mot3300-gld
-                       else
-                               tmake_file=m68k/t-mot3300
-                               use_collect2=yes
-                       fi
-               fi
-               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
-               xm_defines="USG SVR3"
-               xmake_file=m68k/x-tower
-               extra_parts="crtbegin.o crtend.o"
-               extra_headers=math-68881.h
-               ;;
-        m68k-plexus-sysv*)
-               tm_file=m68k/plexus.h
-               xm_file="xm-alloca.h m68k/xm-plexus.h ${xm_file}"
-               xm_defines=USG
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68k-tti-*)
-               tm_file=m68k/pbb.h
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines=USG
-               extra_headers=math-68881.h
-               ;;
-       m68k-crds-unos*)
-               xm_file="xm-alloca.h m68k/xm-crds.h ${xm_file}"
-               xm_defines="USG unos"
-               xmake_file=m68k/x-crds
-               tm_file=m68k/crds.h
-               use_collect2=yes
-               extra_headers=math-68881.h
-               ;;
-       m68k-cbm-sysv4*)                # Commodore variant of V.4.
-               tm_file=m68k/amix.h
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG FULL_PROTOTYPES"
-               xmake_file=m68k/x-amix
-               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 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
-               ;;
-       m68k-hp-hpux7*) # HP 9000 series 300 running HPUX version 7.
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines="USG"
-               if test x$gas = xyes
-               then
-                       xmake_file=m68k/x-hp320g
-                       tm_file=m68k/hp320g.h
-               else
-                       xmake_file=m68k/x-hp320
-                       tm_file=m68k/hpux7.h
-               fi
-               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"
-               if test x$gas = xyes
-               then
-                       xmake_file=m68k/x-hp320g
-                       tm_file=m68k/hp320g.h
-               else
-                       xmake_file=m68k/x-hp320
-                       tm_file=m68k/hp320.h
-               fi
-               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 test x$gas = xyes
-               then
-                       tm_file=m68k/news3gas.h
-               else
-                       tm_file=m68k/news3.h
-               fi
-               use_collect2=yes
-               extra_headers=math-68881.h
-               float_format=m68k
-               ;;
-       m68k-sony-bsd* | m68k-sony-newsos*)
-               if test x$gas = xyes
-               then
-                       tm_file=m68k/newsgas.h
-               else
-                       tm_file=m68k/news.h
-               fi
-               use_collect2=yes
-               extra_headers=math-68881.h
-               float_format=m68k
-               ;;
-       m68k-next-nextstep2*)
-               tm_file=m68k/next21.h
-               xm_file="m68k/xm-next.h ${xm_file}"
-               tmake_file=m68k/t-next
-               xmake_file=m68k/x-next
-               extra_objs=nextstep.o
-               extra_headers=math-68881.h
-               use_collect2=yes
-               float_format=m68k
-                ;;
-       m68k-next-nextstep[34]*)
-               tm_file=m68k/next.h
-               xm_file="m68k/xm-next.h ${xm_file}"
-               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
-               float_format=m68k
-               if test x$enable_threads = xyes; then
-                       thread_file='mach'
-               fi
-               ;;
-       m68k-sun-sunos3*)
-               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 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
-               ;;
-       m68k-wrs-vxworks*)
-               tm_file=m68k/vxm68k.h
-               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
-               ;;
-       m68020-*-elf* | m68k-*-elf*)
-               tm_file="m68k/m68020-elf.h"
-               xm_file=m68k/xm-m68kv.h
-               tmake_file=m68k/t-m68kelf
-               header_files=math-68881.h
-               ;;
-       m68k-*-lynxos*)
-               if test x$gas = xyes
-               then
-                       tm_file=m68k/lynx.h
-               else
-                       tm_file=m68k/lynx-ng.h
-               fi
-               xm_file=m68k/xm-lynx.h
-               xmake_file=x-lynx
-               tmake_file=m68k/t-lynx
-               extra_headers=math-68881.h
-               float_format=m68k
-               ;;
-       m68k*-*-netbsd*)
-               tm_file=m68k/netbsd.h
-               tmake_file=t-netbsd
-               float_format=m68k
-               use_collect2=yes
-               ;;
-       m68k*-*-openbsd*)
-               float_format=m68k
-               # we need collect2 until our bug is fixed...
-               use_collect2=yes
-               ;;
-       m68k-*-sysv3*)                  # Motorola m68k's running system V.3
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines=USG
-               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
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines=USG
-               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
-               xmake_file=x-linux
-               tm_file=m68k/linux-aout.h
-               tmake_file="t-linux-aout m68k/t-linux-aout"
-               extra_headers=math-68881.h
-               float_format=m68k
-               gnu_ld=yes
-               ;;
-       m68k-*-linux-gnulibc1)          # Motorola m68k's running GNU/Linux
-                                       # with ELF format using the
-                                       # GNU/Linux C library 5
-               xmake_file=x-linux
-               tm_file=m68k/linux.h
-               tmake_file="t-linux t-linux-gnulibc1 m68k/t-linux"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               extra_headers=math-68881.h
-               float_format=m68k
-               gnu_ld=yes
-               ;;
-       m68k-*-linux-gnu*)              # Motorola m68k's running GNU/Linux
-                                       # with ELF format using glibc 2
-                                       # aka the GNU/Linux C library 6.
-               xmake_file=x-linux
-               tm_file=m68k/linux.h
-               tmake_file="t-linux m68k/t-linux"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               extra_headers=math-68881.h
-               float_format=m68k
-               gnu_ld=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       m68k-*-psos*)
-               tmake_file=m68k/t-m68kbare
-               tm_file=m68k/m68k-psos.h
-               extra_headers=math-68881.h
-               float_format=m68k
-               ;;
-       m68k-*-rtemscoff*)
-               tmake_file="m68k/t-m68kbare t-rtems"
-               tm_file=m68k/rtems.h
-               extra_headers=math-68881.h
-               float_format=m68k
-               ;;
-       m68k-*-rtemself*|m68k-*-rtems*)
-               tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff"
-               tm_file=m68k/rtemself.h
-               extra_headers=math-68881.h
-               float_format=m68k
-               ;;
-       m88k-dg-dgux*)
-               case $machine in
-                 m88k-dg-dguxbcs*)
-                   tm_file=m88k/dguxbcs.h
-                   tmake_file=m88k/t-dguxbcs
-                   ;;
-                 *)
-                   tm_file=m88k/dgux.h
-                   tmake_file=m88k/t-dgux
-                   ;;
-               esac
-               extra_parts="crtbegin.o bcscrtbegin.o crtend.o m88kdgux.ld"
-               xmake_file=m88k/x-dgux
-               if test x$gas = xyes
-               then
-                       tmake_file=m88k/t-dgux-gas
-               fi
-               ;;
-       m88k-dolphin-sysv3*)
-               tm_file=m88k/dolph.h
-               extra_parts="crtbegin.o crtend.o"
-               xm_file="m88k/xm-sysv3.h ${xm_file}"
-               xmake_file=m88k/x-dolph
-               if test x$gas = xyes
-               then
-                       tmake_file=m88k/t-m88k-gas
-               fi
-               ;;
-       m88k-tektronix-sysv3)
-               tm_file=m88k/tekXD88.h
-               extra_parts="crtbegin.o crtend.o"
-               xm_file="m88k/xm-sysv3.h ${xm_file}"
-               xmake_file=m88k/x-tekXD88
-               if test x$gas = xyes
-               then
-                       tmake_file=m88k/t-m88k-gas
-               fi
-               ;;
-       m88k-*-aout*)
-               tm_file=m88k/m88k-aout.h
-               ;;
-       m88k-*-coff*)
-               tm_file=m88k/m88k-coff.h
-               tmake_file=m88k/t-bug
-               ;;
-       m88k-*-luna*)
-               tm_file=m88k/luna.h
-               extra_parts="crtbegin.o crtend.o"
-               if test x$gas = xyes
-               then
-                       tmake_file=m88k/t-luna-gas
-               else
-                       tmake_file=m88k/t-luna
-               fi
-               ;;
-       m88k-*-openbsd*)
-               tmake_file="${tmake_file} m88k/t-luna-gas"
-               tm_file="m88k/aout-dbx.h aoutos.h m88k/m88k.h openbsd.h ${tm_file}"
-               xm_file="xm-openbsd.h m88k/xm-m88k.h ${xm_file}"
-               ;;
-       m88k-*-sysv3*)
-               tm_file=m88k/sysv3.h
-               extra_parts="crtbegin.o crtend.o"
-               xm_file="m88k/xm-sysv3.h ${xm_file}"
-               xmake_file=m88k/x-sysv3
-               if test x$gas = xyes
-               then
-                       tmake_file=m88k/t-m88k-gas
-               fi
-               ;;
-       m88k-*-sysv4*)
-               tm_file=m88k/sysv4.h
-               extra_parts="crtbegin.o crtend.o"
-               xmake_file=m88k/x-sysv4
-               tmake_file=m88k/t-sysv4
-               ;;
-       mcore-*-elf)
-               tm_file=mcore/mcore-elf.h
-               tmake_file=mcore/t-mcore
-               ;;
-       mcore-*-pe*)
-               tm_file=mcore/mcore-pe.h
-               tmake_file=mcore/t-mcore-pe
-               ;;
-       mips-sgi-irix6*)                # SGI System V.4., IRIX 6
-               if test "x$gnu_ld" = xyes
-               then
-                       tm_file="mips/iris6.h mips/iris6gld.h"
-               else
-                       tm_file=mips/iris6.h
-               fi
-               tmake_file=mips/t-iris6
-               xm_file=mips/xm-iris6.h
-               xmake_file=mips/x-iris6
-#              if test x$enable_threads = xyes; then
-#                      thread_file='irix'
-#              fi
-               ;;
-       mips-wrs-vxworks)
-               tm_file="mips/elf.h mips/vxworks.h"
-               tmake_file=mips/t-ecoff
-               gas=yes
-               gnu_ld=yes
-               extra_parts="crtbegin.o crtend.o"
-               thread_file='vxworks'
-               ;;
-       mips-sgi-irix5cross64)          # Irix5 host, Irix 6 target, cross64
-               tm_file="mips/iris6.h mips/cross64.h"
-               xm_defines=USG
-               xm_file="mips/xm-iris5.h"
-               xmake_file=mips/x-iris
-               tmake_file=mips/t-cross64
-               # See comment in mips/iris[56].h files.
-               use_collect2=yes
-#              if test x$enable_threads = xyes; then
-#                      thread_file='irix'
-#              fi
-               ;;
-        mips-sni-sysv4)
-               if test x$gas = xyes
-               then
-                       if test x$stabs = xyes
-                       then
-                               tm_file=mips/iris5gdb.h
-                       else
-                               tm_file="mips/sni-svr4.h mips/sni-gas.h"
-                       fi
-               else
-                       tm_file=mips/sni-svr4.h
-               fi
-               xm_defines=USG
-                xmake_file=mips/x-sni-svr4
-                tmake_file=mips/t-mips-gas
-                if test x$gnu_ld != xyes
-                then
-                        use_collect2=yes
-                fi
-                ;;
-       mips-sgi-irix5*)                # SGI System V.4., IRIX 5
-               if test x$gas = xyes
-               then
-                       tm_file="mips/iris5.h mips/iris5gas.h"
-                       if test x$stabs = xyes
-                       then
-                               tm_file="${tm_file} dbx.h"
-                       fi
-               else
-                       tm_file=mips/iris5.h
-               fi
-               xm_defines=USG
-               xm_file="mips/xm-iris5.h"
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-iris
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               if test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-iris
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               if test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-iris3
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               if test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               fi
-               ;;
-       mips-dec-osfrose*)              # Decstation running OSF/1 reference port with OSF/rose.
-               tm_file="mips/osfrose.h ${tm_file}"
-               xmake_file=mips/x-osfrose
-               tmake_file=mips/t-osfrose
-               extra_objs=halfpic.o
-               use_collect2=yes
-               ;;
-       mips-dec-osf*)                  # Decstation running OSF/1 as shipped by DIGITAL
-               tm_file=mips/dec-osf1.h
-               if test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xmake_file=mips/x-dec-osf1
-               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 test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               fi
-               ;;
-       mips-dec-bsd*)                  # Decstation running 4.4 BSD
-              tm_file=mips/dec-bsd.h
-             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 test x$gnu_ld != xyes
-             then
-                       use_collect2=yes
-             fi
-             ;;
-       mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
-               tm_file=mips/netbsd.h
-               # On NetBSD, the headers are already okay, except for math.h.
-               tmake_file=t-netbsd
-               ;;
-       mips*-*-linux*)                         # Linux MIPS, either endian.
-               xmake_file=x-linux
-               case $machine in
-                      mips*el-*)  tm_file="mips/elfl.h mips/linux.h" ;;
-                      *)         tm_file="mips/elf.h mips/linux.h" ;;
-               esac
-               tmake_file=t-linux
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               gas=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       mips*el-*-openbsd*)     # mips little endian
-               target_cpu_default="MASK_GAS|MASK_ABICALLS"
-               ;;
-       mips*-*-openbsd*)               # mips big endian
-               target_cpu_default="MASK_GAS|MASK_ABICALLS"
-               tm_file="mips/openbsd-be.h ${tm_file}"
-               ;;
-       mips-sony-bsd* | mips-sony-newsos*)     # Sony NEWS 3600 or risc/news.
-               tm_file="mips/news4.h ${tm_file}"
-               if test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               if test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               fi
-               xmake_file=mips/x-sony
-               ;;
-       mips-sony-sysv*)                # Sony NEWS 3800 with NEWSOS5.0.
-                                       # 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-sysv
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-                       extra_parts="crtbegin.o crtend.o"
-               else
-                       tmake_file=mips/t-mips
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xmake_file=mips/x-ultrix
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xmake_file=mips/x-sysv
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-sysv
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-sysv
-               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 test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               fi
-               ;;
-       mips-*-sysv* | mips-*-riscos*sysv*)
-               tm_file="mips/svr3-4.h ${tm_file}"
-               if test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               xm_defines=USG
-               xmake_file=mips/x-sysv
-               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 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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               if test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               fi
-               ;;
-       mips-*-gnu*)
-               ;;
-       mipsel-*-ecoff*)
-               tm_file=mips/ecoffl.h
-               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 test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               tmake_file=mips/t-ecoff
-               ;;
-       mipsel-*-elf*)
-               tm_file="mips/elfl.h"
-               tmake_file=mips/t-elf
-               ;;
-       mips-*-elf*)
-               tm_file="mips/elf.h"
-               tmake_file=mips/t-elf
-               ;;
-       mips64el-*-elf*)
-               tm_file="mips/elfl64.h"
-               tmake_file=mips/t-elf
-               ;;
-       mips64orionel-*-elf*)
-               tm_file="mips/elforion.h mips/elfl64.h"
-               tmake_file=mips/t-elf
-               ;;
-       mips64-*-elf*)
-               tm_file="mips/elf64.h"
-               tmake_file=mips/t-elf
-               ;;
-       mips64orion-*-elf*)
-               tm_file="mips/elforion.h mips/elf64.h"
-               tmake_file=mips/t-elf
-               ;;
-       mips64orion-*-rtems*)
-               tm_file="mips/elforion.h mips/elf64.h mips/rtems64.h"
-               tmake_file="mips/t-elf t-rtems"
-               ;;
-       mipstx39el-*-elf*)
-               tm_file="mips/r3900.h mips/elfl.h mips/abi64.h"
-               tmake_file=mips/t-r3900
-               ;;
-       mipstx39-*-elf*)
-               tm_file="mips/r3900.h mips/elf.h mips/abi64.h"
-               tmake_file=mips/t-r3900
-               ;;
-       mips-*-*)                               # Default MIPS RISC-OS 4.0.
-               if test x$stabs = xyes; then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               if test x$gas = xyes
-               then
-                       tmake_file=mips/t-mips-gas
-               else
-                       extra_passes="mips-tfile mips-tdump"
-               fi
-               if test x$gnu_ld != xyes
-               then
-                       use_collect2=yes
-               fi
-               ;;
-       mn10200-*-*)
-               float_format=i32
-               cpu_type=mn10200
-               tm_file="mn10200/mn10200.h"
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               use_collect2=no
-               ;;
-       mn10300-*-*)
-               cpu_type=mn10300
-               tm_file="mn10300/mn10300.h"
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               use_collect2=no
-               ;;
-       ns32k-encore-bsd*)
-               tm_file=ns32k/encore.h
-               use_collect2=yes
-               ;;
-       ns32k-sequent-bsd*)
-               tm_file=ns32k/sequent.h
-               use_collect2=yes
-               ;;
-       ns32k-tek6100-bsd*)
-               tm_file=ns32k/tek6100.h
-               use_collect2=yes
-               ;;
-       ns32k-tek6200-bsd*)
-               tm_file=ns32k/tek6200.h
-               use_collect2=yes
-               ;;
-# This has not been updated to GCC 2.
-#      ns32k-ns-genix*)
-#              xm_defines=USG
-#              xmake_file=ns32k/x-genix
-#              tm_file=ns32k/genix.h
-#              use_collect2=yes
-#              ;;
-       ns32k-merlin-*)
-               tm_file=ns32k/merlin.h
-               use_collect2=yes
-               ;;
-       ns32k-pc532-mach*)
-               tm_file=ns32k/pc532-mach.h
-               use_collect2=yes
-               ;;
-       ns32k-pc532-minix*)
-               tm_file=ns32k/pc532-min.h
-               xm_file="ns32k/xm-pc532-min.h ${xm-file}"
-               xm_defines=USG
-               use_collect2=yes
-               ;;
-       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.
-               tmake_file=t-netbsd
-               use_collect2=yes
-               ;;
-        pdp11-*-bsd)
-               tm_file="${tm_file} pdp11/2bsd.h"
-                ;;
-        pdp11-*-*)
-               ;;
-        avr-*-*)
-               ;;
-       ns32k-*-openbsd*)
-               # Nothing special
-               ;;
-# This has not been updated to GCC 2.
-#      pyramid-*-*)
-#              cpu_type=pyr
-#              xmake_file=pyr/x-pyr
-#              use_collect2=yes
-#              ;;
-
-       pj*-linux*)
-               tm_file="svr4.h pj/linux.h ${tm_file}"
-               ;;
-       pj-*)
-               ;;
-       pjl-*)
-               tm_file="svr4.h pj/pjl.h ${tm_file}"
-               ;;
-
-       romp-*-aos*)
-               use_collect2=yes
-               ;;
-       romp-*-mach*)
-               xmake_file=romp/x-mach
-               use_collect2=yes
-               ;;
-       romp-*-openbsd*)
-               # Nothing special
-               ;;
-       powerpc-*-openbsd*)
-               tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
-               ;;
-       powerpc-*-beos*)
-               cpu_type=rs6000
-               tm_file=rs6000/beos.h
-               xm_file=rs6000/xm-beos.h
-               tmake_file=rs6000/t-beos
-               xmake_file=rs6000/x-beos
-               ;;
-       powerpc-*-sysv*)
-               tm_file=rs6000/sysv4.h
-               xm_file="rs6000/xm-sysv4.h"
-               xm_defines="USG POSIX"
-               extra_headers=ppc-asm.h
-               tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-               xmake_file=rs6000/x-sysv4
-               ;;
-       powerpc-*-eabiaix*)
-               tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpc-*-eabisim*)
-               tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpc-*-elf*)
-               tm_file="rs6000/sysv4.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpc-*-eabi*)
-               tm_file="rs6000/sysv4.h rs6000/eabi.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpc-*-rtems*)
-               tm_file="rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h"
-               tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpc-*-linux-gnulibc1)
-               tm_file="rs6000/sysv4.h rs6000/linux.h"
-               xm_file=rs6000/xm-sysv4.h
-               out_file=rs6000/rs6000.c
-               tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-               xmake_file=x-linux
-               extra_headers=ppc-asm.h
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-       powerpc-*-linux-gnu*)
-               tm_file="rs6000/sysv4.h rs6000/linux.h"
-               xm_file="rs6000/xm-sysv4.h"
-               xm_defines="USG ${xm_defines}"
-               out_file=rs6000/rs6000.c
-               tmake_file="rs6000/t-ppcos t-linux rs6000/t-ppccomm"
-               xmake_file=x-linux
-               extra_headers=ppc-asm.h
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               ;;
-        powerpc-wrs-vxworks*)
-                cpu_type=rs6000
-               xm_file="rs6000/xm-sysv4.h"
-               xm_defines="USG POSIX"
-                tm_file="rs6000/sysv4.h rs6000/vxppc.h"
-                tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               thread_file='vxworks'
-                ;;
-        powerpcle-wrs-vxworks*)
-                cpu_type=rs6000
-               xm_file="rs6000/xm-sysv4.h"
-               xm_defines="USG POSIX"
-                tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
-                tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               thread_file='vxworks'
-                ;;
-       powerpcle-*-sysv*)
-               tm_file="rs6000/sysv4.h rs6000/sysv4le.h"
-               xm_file="rs6000/xm-sysv4.h"
-               xm_defines="USG POSIX"
-               tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-               xmake_file=rs6000/x-sysv4
-               extra_headers=ppc-asm.h
-               ;;
-       powerpcle-*-elf*)
-               tm_file="rs6000/sysv4.h rs6000/sysv4le.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpcle-*-eabisim*)
-               tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpcle-*-eabi*)
-               tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
-               tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-               extra_headers=ppc-asm.h
-               ;;
-       powerpcle-*-solaris2*)
-               tm_file="rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
-               xm_file="rs6000/xm-sysv4.h"
-               xm_defines="USG POSIX"
-               tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-               xmake_file=rs6000/x-sysv4
-               extra_headers=ppc-asm.h
-               ;;
-       rs6000-ibm-aix3.[01]*)
-               tm_file=rs6000/aix31.h
-               xmake_file=rs6000/x-aix31
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
-               tm_file=rs6000/aix3newas.h
-               if test x$host != x$target
-               then
-                       tmake_file=rs6000/t-xnewas
-               else
-                       tmake_file=rs6000/t-newas
-               fi
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
-               tm_file=rs6000/aix41.h
-               if test x$host != x$target
-               then
-                       tmake_file=rs6000/t-xnewas
-               else
-                       tmake_file=rs6000/t-newas
-               fi
-               if test "$gnu_ld" = yes
-               then
-                       xmake_file=rs6000/x-aix41-gld
-               else
-                       tmake_file="rs6000/t-newas rs6000/t-aix41"
-               fi
-               xmake_file=rs6000/x-aix41
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-               tm_file=rs6000/aix43.h
-               tmake_file=rs6000/t-aix43
-               xmake_file=rs6000/x-aix41
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
-               tm_file=rs6000/aix43.h
-               tmake_file=rs6000/t-aix43
-               xmake_file=rs6000/x-aix41
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-ibm-aix*)
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-bull-bosx)
-               float_format=none
-               use_collect2=yes
-               ;;
-       rs6000-*-mach*)
-               tm_file=rs6000/mach.h
-               xm_file="${xm_file} rs6000/xm-mach.h"
-               xmake_file=rs6000/x-mach
-               use_collect2=yes
-               ;;
-       rs6000-*-lynxos*)
-               tm_file=rs6000/lynx.h
-               xm_file=rs6000/xm-lynx.h
-               tmake_file=rs6000/t-rs6000
-               xmake_file=rs6000/x-lynx
-               use_collect2=yes
-               ;;
-       sh-*-elf*)
-               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
-               float_format=sh
-               ;;
-       sh-*-*)
-               float_format=sh
-               ;;
-       sparc-tti-*)
-               tm_file=sparc/pbd.h
-               xm_file="xm-alloca.h ${xm_file}"
-               xm_defines=USG
-               ;;
-       sparc-wrs-vxworks* | sparclite-wrs-vxworks*)
-               tm_file=sparc/vxsparc.h
-               tmake_file=sparc/t-vxsparc
-               use_collect2=yes
-               thread_file='vxworks'
-               ;;
-       sparc-*-aout*)
-               tmake_file=sparc/t-sparcbare
-               tm_file="sparc/aout.h libgloss.h"
-               ;;
-       sparc-*-netbsd*)
-               tm_file=sparc/netbsd.h
-               tmake_file=t-netbsd
-               use_collect2=yes
-               ;;
-       sparc-*-openbsd*)
-               # we need collect2 until our bug is fixed...
-               use_collect2=yes
-               ;;
-       sparc-*-bsd*)
-               tm_file=sparc/bsd.h
-               ;;
-       sparc-*-elf*)
-               tm_file=sparc/elf.h
-               tmake_file=sparc/t-elf
-               extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-               #float_format=i128
-               float_format=i64
-               ;;
-       sparc-*-linux-gnuaout*)         # Sparc's running GNU/Linux, a.out
-               xm_file="${xm_file} sparc/xm-linux.h"
-               tm_file=sparc/linux-aout.h
-               xmake_file=x-linux
-               gnu_ld=yes
-               ;;
-       sparc-*-linux-gnulibc1*)        # Sparc's running GNU/Linux, libc5
-               xm_file="${xm_file} sparc/xm-linux.h"
-               xmake_file=x-linux
-               tm_file=sparc/linux.h
-               tmake_file="t-linux t-linux-gnulibc1"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               float_format=sparc
-               ;;
-       sparc-*-linux-gnu*)             # Sparc's running GNU/Linux, libc6
-               xm_file="${xm_file} sparc/xm-linux.h"
-               xmake_file=x-linux
-               tm_file=sparc/linux.h
-               tmake_file="t-linux"
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               float_format=sparc
-               ;;
-       sparc-*-lynxos*)
-               if test x$gas = xyes
-               then
-                       tm_file=sparc/lynx.h
-               else
-                       tm_file=sparc/lynx-ng.h
-               fi
-               xm_file=sparc/xm-lynx.h
-               tmake_file=sparc/t-sunos41
-               xmake_file=x-lynx
-               ;;
-       sparc-*-rtemsaout*)
-               tmake_file="sparc/t-sparcbare t-rtems"
-               tm_file=sparc/rtems.h
-               ;;
-       sparc-*-rtems*|sparc-*-rtemself*)
-               tm_file="sparc/rtemself.h"
-               tmake_file="sparc/t-elf t-rtems"
-               extra_parts="crti.o crtn.o crtbegin.o crtend.o"
-               #float_format=i128
-               float_format=i64
-               ;;
-       sparcv9-*-solaris2*)
-               if test x$gnu_ld = xyes
-               then
-                       tm_file=sparc/sol2-64.h
-               else
-                       tm_file=sparc/sol2-sld-64.h
-               fi
-               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"
-               float_format=none
-               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-hal-solaris2*)
-                xm_file="sparc/xm-sysv4.h sparc/xm-sol2.h"
-                xm_defines="USG POSIX"
-                tm_file="sparc/sol2.h sparc/hal.h"
-                tmake_file="sparc/t-halos sparc/t-sol2"
-                xmake_file=sparc/x-sysv4
-                extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
-                case $machine in
-                *-*-solaris2.[0-4])
-                        float_format=i128
-                ;;
-                *)
-                        float_format=none
-                        ;;
-                esac
-               thread_file='solaris'
-                ;;
-       sparc-*-solaris2*)
-               if test x$gnu_ld = xyes
-               then
-                       tm_file=sparc/sol2.h
-               else
-                       tm_file=sparc/sol2-sld.h
-               fi
-               xm_file="sparc/xm-sysv4.h sparc/xm-sol2.h"
-               xm_defines="USG POSIX"
-               tmake_file=sparc/t-sol2
-               xmake_file=sparc/x-sysv4
-               extra_parts="crt1.o crti.o crtn.o gcrt1.o gmon.o crtbegin.o crtend.o"
-               case $machine in
-               *-*-solaris2.[0-6] | *-*-solaris2.[0-6].*) ;;
-               *-*-solaris2*)
-                       if test x$gnu_ld = xyes
-                       then
-                               tm_file=sparc/sol2-64.h
-                       else
-                               tm_file=sparc/sol2-sld-64.h
-                       fi
-                       tmake_file="$tmake_file sparc/t-sol2-64"
-                       ;;
-               esac
-               case $machine in
-               *-*-solaris2.[0-4])
-                       float_format=i128
-                       ;;
-               *)
-                       float_format=none
-                       ;;
-               esac
-               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-*-sunos4.0*)
-               tm_file=sparc/sunos4.h
-               tmake_file=sparc/t-sunos40
-               use_collect2=yes
-               ;;
-       sparc-*-sunos4*)
-               tm_file=sparc/sunos4.h
-               tmake_file=sparc/t-sunos41
-               use_collect2=yes
-               if test x$gas = xyes; then
-                       tm_file="${tm_file} sparc/sun4gas.h"
-               fi
-               ;;
-       sparc-*-sunos3*)
-               tm_file=sparc/sun4o3.h
-               use_collect2=yes
-               ;;
-       sparc-*-sysv4*)
-               tm_file=sparc/sysv4.h
-               xm_file="sparc/xm-sysv4.h"
-               xm_defines="USG POSIX"
-               tmake_file=t-svr4
-               xmake_file=sparc/x-sysv4
-               extra_parts="crtbegin.o crtend.o"
-               ;;
-       sparc-*-vxsim*)
-               xm_file="sparc/xm-sysv4.h sparc/xm-sol2.h"
-               xm_defines="USG POSIX"
-               tm_file=sparc/vxsim.h
-               tmake_file=sparc/t-vxsparc
-               xmake_file=sparc/x-sysv4
-               ;;
-       sparclet-*-aout*)
-               tm_file="sparc/splet.h libgloss.h"
-               tmake_file=sparc/t-splet
-               ;;
-       sparclite-*-coff*)
-               tm_file="sparc/litecoff.h libgloss.h"
-               tmake_file=sparc/t-sparclite
-               ;;
-       sparclite-*-aout*)
-               tm_file="sparc/lite.h aoutos.h libgloss.h"
-               tmake_file=sparc/t-sparclite
-               ;;
-       sparclite-*-elf*)
-               tm_file="sparc/liteelf.h"
-               tmake_file=sparc/t-sparclite
-                extra_parts="crtbegin.o crtend.o"
-               ;;
-       sparc86x-*-aout*)
-               tm_file="sparc/sp86x-aout.h aoutos.h libgloss.h"
-               tmake_file=sparc/t-sp86x
-               ;;
-       sparc86x-*-elf*)        
-               tm_file="sparc/sp86x-elf.h"
-               tmake_file=sparc/t-sp86x
-                extra_parts="crtbegin.o crtend.o"
-               ;;
-       sparc64-*-aout*)
-               tmake_file=sparc/t-sp64
-               tm_file=sparc/sp64-aout.h
-               ;;
-       sparc64-*-elf*)
-               tmake_file=sparc/t-sp64
-               tm_file=sparc/sp64-elf.h
-               extra_parts="crtbegin.o crtend.o"
-               ;;
-       sparc64-*-linux*)               # 64-bit Sparc's running GNU/Linux
-               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
-               extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-               gnu_ld=yes
-               if test x$enable_threads = xyes; then
-                       thread_file='posix'
-               fi
-               float_format=sparc
-               ;;
-# This hasn't been upgraded to GCC 2.
-#      tahoe-harris-*)                 # Harris tahoe, using COFF.
-#              tm_file=tahoe/harris.h
-#              ;;
-#      tahoe-*-bsd*)                   # tahoe running BSD
-#              ;;
-
-       thumb*-*-*)
-               { echo "configure: error: 
-*** The Thumb targets have been depreciated.  The equivalent
-*** ARM based toolchain can now generated Thumb instructions
-*** when the -mthumb switch is given to the compiler." 1>&2; exit 1; }
-               ;;
-# This hasn't been upgraded to GCC 2.
-#      tron-*-*)
-#              cpu_type=gmicro
-#              use_collect2=yes
-#              ;;
-       v850-*-rtems*)
-               cpu_type=v850
-               tm_file="v850/rtems.h"
-               xm_file="v850/xm-v850.h"
-               tmake_file="v850/t-v850 t-rtems"
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               use_collect2=no
-               ;;
-       v850-*-*)
-               target_cpu_default="TARGET_CPU_generic"
-               cpu_type=v850
-               tm_file="v850/v850.h"
-               xm_file="v850/xm-v850.h"
-               tmake_file=v850/t-v850
-               if test x$stabs = xyes
-               then
-                       tm_file="${tm_file} dbx.h"
-               fi
-               use_collect2=no
-               ;;
-       vax-*-bsd*)                     # vaxen running BSD
-               use_collect2=yes
-               float_format=vax
-               ;;
-       vax-*-sysv*)                    # vaxen running system V
-               tm_file="${tm_file} vax/vaxv.h"
-               xm_defines=USG
-               float_format=vax
-               ;;
-       vax-*-netbsd*)
-               tm_file="${tm_file} netbsd.h vax/netbsd.h"
-               tmake_file=t-netbsd
-               float_format=vax
-               use_collect2=yes
-               ;;
-       vax-*-openbsd*)
-               tmake_file="${tmake_file} vax/t-openbsd"
-               tm_file="vax/vax.h vax/openbsd1.h openbsd.h ${tm_file}"
-               xm_file="xm-openbsd.h vax/xm-vax.h"
-               float_format=vax
-               use_collect2=yes
-               ;;
-       vax-*-ultrix*)                  # vaxen running ultrix
-               tm_file="${tm_file} vax/ultrix.h"
-               use_collect2=yes
-               float_format=vax
-               ;;
-       vax-*-vms*)                     # vaxen running VMS
-               xm_file=vax/xm-vms.h
-               tm_file=vax/vms.h
-               float_format=vax
-               ;;
-       vax-*-*)                        # vax default entry
-               float_format=vax
-               ;;
-       we32k-att-sysv*)
-               xm_file="${xm_file} xm-svr3"
-               use_collect2=yes
-               ;;
-       *)
-               echo "Configuration $machine not supported" 1>&2
-               exit 1
-               ;;
-       esac
-
-       case $machine in
-       *-*-linux-gnu*)
-               ;; # Existing GNU/Linux systems do not use the GNU setup.
-       *-*-gnu*)
-               # On the GNU system, the setup is just about the same on
-               # each different CPU.  The specific machines that GNU
-               # supports are matched above and just set $cpu_type.
-               xm_file="xm-gnu.h ${xm_file}"
-               tm_file=${cpu_type}/gnu.h
-               extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
-               # GNU always uses ELF.
-               elf=yes
-               # GNU tools are the only tools.
-               gnu_ld=yes
-               gas=yes
-               xmake_file=x-linux      # These details are the same as Linux.
-               tmake_file=t-gnu        # These are not.
-               ;;
-       *-*-sysv4*)
-               xmake_try_sysv=x-sysv
-               install_headers_dir=install-headers-cpio
-               ;;
-       *-*-sysv*)
-               install_headers_dir=install-headers-cpio
-               ;;
-       esac
+# Restore CFLAGS from before the gcc_AC_NEED_DECLARATIONS tests.
+CFLAGS="$saved_CFLAGS"
 
-       # Distinguish i[34567]86
-       # Also, do not run mips-tfile on MIPS if using gas.
-       # Process --with-cpu= for PowerPC/rs6000
-       target_cpu_default2=
-       case $machine in
-       i486-*-*)
-               target_cpu_default2=1
-               ;;
-       i586-*-*)
-               case $target_alias in
-                       k6-*)
-                               target_cpu_default2=4
-                               ;;
-                       *)
-                               target_cpu_default2=2
-                               ;;
-               esac
-               ;;
-       i686-*-* | i786-*-*)
-               target_cpu_default2=3
-               ;;
-       alpha*-*-*)
-               case $machine in
-                       alphaev6[78]*)
-                               target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
-                               ;;
-                       alphaev6*)
-                               target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX"
-                               ;;
-                       alphapca56*)
-                               target_cpu_default2="MASK_CPU_EV5|MASK_BWX|MASK_MAX"
-                               ;;
-                       alphaev56*)
-                               target_cpu_default2="MASK_CPU_EV5|MASK_BWX"
-                               ;;
-                       alphaev5*)
-                               target_cpu_default2="MASK_CPU_EV5"
-                               ;;
-               esac
-                               
-               if test x$gas = xyes
-               then
-                       if test "$target_cpu_default2" = ""
-                       then
-                               target_cpu_default2="MASK_GAS"
-                       else
-                               target_cpu_default2="${target_cpu_default2}|MASK_GAS"
-                       fi
-               fi
-               ;;
-       arm*-*-*)
-               case "x$with_cpu" in
-                       x)
-                               # The most generic
-                               target_cpu_default2="TARGET_CPU_generic"
-                               ;;
-
-                       # Distinguish cores, and major variants
-                       # arm7m doesn't exist, but D & I don't affect code
-                       xarm[23678] | xarm250 | xarm[67][01]0 \
-                       | xarm7m | xarm7dm | xarm7dmi | xarm7tdmi \
-                       | xarm7100 | xarm7500 | xarm7500fe | xarm810 \
-                       | xstrongarm | xstrongarm110 | xstrongarm1100)
-                               target_cpu_default2="TARGET_CPU_$with_cpu"
-                               ;;
-
-                       xyes | xno)
-                               echo "--with-cpu must be passed a value" 1>&2
-                               exit 1
-                               ;;
-
-                       *)
-                               if test x$pass2done = xyes
-                               then
-                                       echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                                       exit 1
-                               fi
-                               ;;
-               esac
-               ;;
+# mkdir takes a single argument on some systems. 
+echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
+echo "configure:3885: checking if mkdir takes one argument" >&5
+if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 3890 "configure"
+#include "confdefs.h"
 
-       mips*-*-ecoff* | mips*-*-elf*)
-               if test x$gas = xyes
-               then
-                       if test x$gnu_ld = xyes
-                       then
-                               target_cpu_default2="MASK_GAS|MASK_SPLIT_ADDR"
-                       else
-                               target_cpu_default2="MASK_GAS"
-                       fi
-               fi
-               ;;
-       mips*-*-*)
-               if test x$gas = xyes
-               then
-                       target_cpu_default2="MASK_GAS"
-               fi
-               ;;
-       powerpc*-*-* | rs6000-*-*)
-               case "x$with_cpu" in
-                       x)
-                               ;;
-
-                       xcommon | xpower | xpower2 | xpowerpc | xrios \
-                         | xrios1 | xrios2 | xrsc | xrsc1 \
-                         | x601 | x602 | x603 | x603e | x604 | x604e | x620 \
-                         | xec603e | x740 | x750 | x401 \
-                         | x403 | x505 | x801 | x821 | x823 | x860)
-                               target_cpu_default2="\"$with_cpu\""
-                               ;;
-
-                       xyes | xno)
-                               echo "--with-cpu must be passed a value" 1>&2
-                               exit 1
-                               ;;
-
-                       *)
-                               if test x$pass2done = xyes
-                               then
-                                       echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                                       exit 1
-                               fi
-                               ;;
-               esac
-               ;;
-       sparc*-*-*)
-               case ".$with_cpu" in
-                       .)
-                               target_cpu_default2=TARGET_CPU_"`echo $machine | sed 's/-.*$//'`"
-                               ;;
-                       .supersparc | .hypersparc | .ultrasparc | .v7 | .v8 | .v9)
-                               target_cpu_default2="TARGET_CPU_$with_cpu"
-                               ;;
-                       *)
-                               if test x$pass2done = xyes
-                               then
-                                       echo "Unknown cpu used with --with-cpu=$with_cpu" 1>&2
-                                       exit 1
-                               fi
-                               ;;
-               esac
-               ;;
-       esac
+#include <sys/types.h>
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#ifdef HAVE_DIRECT_H
+# include <direct.h>
+#endif
+int main() {
+mkdir ("foo", 0);
+; return 0; }
+EOF
+if { (eval echo configure:3907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_mkdir_takes_one_arg=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_mkdir_takes_one_arg=yes
+fi
+rm -f conftest*
+fi
 
-       if test "$target_cpu_default2" != ""
-       then
-               if test "$target_cpu_default" != ""
-               then
-                       target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
-               else
-                       target_cpu_default=$target_cpu_default2
-               fi
-       fi
+echo "$ac_t""$gcc_cv_mkdir_takes_one_arg" 1>&6
+if test $gcc_cv_mkdir_takes_one_arg = yes ; then
+  cat >> confdefs.h <<\EOF
+#define MKDIR_TAKES_ONE_ARG 1
+EOF
 
-       # No need for collect2 if we have the GNU linker.
-       # 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 test x$pass1done = x
-       then
-               if test x"$xm_file" = x
-               then build_xm_file=$cpu_type/xm-$cpu_type.h
-               else build_xm_file=$xm_file
-               fi
-               build_xm_defines=$xm_defines
-               build_install_headers_dir=$install_headers_dir
-               build_exeext=$exeext
-               pass1done=yes
-       else
-               if test x$pass2done = x
-               then
-                       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 test x"$xmake_file" = x
-                       then xmake_file=$cpu_type/x-$cpu_type
-                       fi
-                       host_xmake_file="$xmake_file"
-                       host_truncate_target=$truncate_target
-                       host_extra_gcc_objs=$extra_gcc_objs
-                       host_extra_objs=$extra_host_objs
-                       host_exeext=$exeext
-                       pass2done=yes
-               fi
-       fi
+fi
+
+
+# File extensions
+manext='.1'
+objext='.o'
+
+
+
+build_xm_file=
+build_xm_defines=
+build_install_headers_dir=install-headers-tar
+build_exeext=
+host_xm_file=
+host_xm_defines=
+host_xmake_file=
+host_truncate_target=
+host_exeext=
+
+# Decode the host machine, then the target machine.
+# For the host machine, we save the xm_file variable as host_xm_file;
+# then we decode the target machine and forget everything else
+# that came from the host machine.
+for machine in $build $host $target; do
+       . ${srcdir}/config.gcc
 done
 
 extra_objs="${host_extra_objs} ${extra_objs}"
@@ -6854,7 +3954,7 @@ extra_objs="${host_extra_objs} ${extra_objs}"
 if test x"$tm_file" = x
 then tm_file=$cpu_type/$cpu_type.h; fi
 
-if test x$extra_headers = x
+if test x"$extra_headers" = x
 then extra_headers=; fi
 
 if test x"$xm_file" = x
@@ -6948,14 +4048,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 gansidecl.h ${host_xm_file} hwint.h"
+host_xm_file="auto-host.h gansidecl.h ${host_xm_file} defaults.h hwint.h"
 
 # 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 test x$host = x$build
 then
-       build_xm_file="auto-host.h gansidecl.h ${build_xm_file} hwint.h"
+       build_xm_file="auto-host.h gansidecl.h ${build_xm_file} defaults.h hwint.h"
 else
        # We create a subdir, then run autoconf in the subdir.
        # To prevent recursion we set host and build for the new
@@ -6966,7 +4066,7 @@ else
        mkdir $tempdir
        cd $tempdir
        case ${srcdir} in
-       /*) realsrcdir=${srcdir};;
+       /* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
        *) realsrcdir=../${srcdir};;
        esac
        CC=${CC_FOR_BUILD} ${realsrcdir}/configure \
@@ -6977,11 +4077,11 @@ else
        mv auto-host.h ../auto-build.h
        cd ..
        rm -rf $tempdir
-       build_xm_file="auto-build.h gansidecl.h ${build_xm_file} hwint.h"
+       build_xm_file="auto-build.h gansidecl.h ${build_xm_file} defaults.h hwint.h"
 fi
 
-xm_file="gansidecl.h ${xm_file}"
-tm_file="gansidecl.h ${tm_file}"
+xm_file="gansidecl.h ${xm_file} defaults.h"
+tm_file="gansidecl.h ${tm_file} defaults.h"
 
 vars="host_xm_file tm_file tm_p_file xm_file build_xm_file"
 links="config.h tm.h tm_p.h tconfig.h hconfig.h"
@@ -7031,6 +4131,15 @@ do
                echo "#define $def" >>$link
                echo "#endif" >>$link
        done
+
+       if test $link = tm.h
+       then
+               # Include insn-codes.h last, because it includes machmode.h,
+               # and we want EXTRA_CC_MODES to be taken into account.
+               echo "#ifndef GENERATOR_FILE" >>$link
+               echo "#include \"insn-codes.h\"" >>$link
+               echo "#endif" >>$link
+       fi
 done
 
 # Truncate the target if necessary
@@ -7044,7 +4153,21 @@ if test "${with_gcc_version_trigger+set}" = set; then
 else
        gcc_version_trigger=${srcdir}/version.c
 fi
-gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
+gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
+
+# Compile in configure arguments.
+if test -f configargs.h ; then
+       # Being re-configured.
+       gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
+       gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS"
+else
+       gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS"
+fi
+cat > configargs.h <<EOF
+/* Generated automatically. */
+static const char configuration_arguments[] = "$gcc_config_arguments";
+EOF
 
 # Internationalization
 PACKAGE=gcc
@@ -7060,7 +4183,7 @@ EOF
 
 
 
-ALL_LINGUAS="en_GB"
+ALL_LINGUAS="sv"
 
 # Enable NLS support by default
 # Check whether --enable-nls or --disable-nls was given.
@@ -7080,9 +4203,18 @@ if test "${build}" != "${host}" && test "x$enable_nls" = "xyes"; then
   enable_nls=no
 fi
 
+# if NLS is enabled, also enable check in po subdir
+if test $enable_nls = yes; then
+  CHECK_PO=check-po
+else
+  CHECK_PO=""
+fi
+
+
+
 
         echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:7086: checking for strerror in -lcposix" >&5
+echo "configure:4218: checking for strerror in -lcposix" >&5
 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7090,7 +4222,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7094 "configure"
+#line 4226 "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
@@ -7101,7 +4233,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4237: \"$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
@@ -7124,12 +4256,12 @@ fi
   
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:7128: checking for working const" >&5
+echo "configure:4260: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7133 "configure"
+#line 4265 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -7178,7 +4310,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:7182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -7199,12 +4331,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:7203: checking for off_t" >&5
+echo "configure:4335: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7208 "configure"
+#line 4340 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7232,12 +4364,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:7236: checking for size_t" >&5
+echo "configure:4368: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7241 "configure"
+#line 4373 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7267,19 +4399,19 @@ fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:7271: checking for working alloca.h" >&5
+echo "configure:4403: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7276 "configure"
+#line 4408 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -7300,12 +4432,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7304: checking for alloca" >&5
+echo "configure:4436: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7309 "configure"
+#line 4441 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7333,7 +4465,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -7365,12 +4497,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7369: checking whether alloca needs Cray hooks" >&5
+echo "configure:4501: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7374 "configure"
+#line 4506 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7395,12 +4527,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7399: checking for $ac_func" >&5
+echo "configure:4531: 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 7404 "configure"
+#line 4536 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7423,7 +4555,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4559: \"$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
@@ -7450,7 +4582,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7454: checking stack direction for C alloca" >&5
+echo "configure:4586: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7458,7 +4590,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 7462 "configure"
+#line 4594 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7477,7 +4609,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -7504,17 +4636,17 @@ unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7508: checking for $ac_hdr" >&5
+echo "configure:4640: 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 7513 "configure"
+#line 4645 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4650: \"$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*
@@ -7544,12 +4676,12 @@ done
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7548: checking for $ac_func" >&5
+echo "configure:4680: 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 7553 "configure"
+#line 4685 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7572,7 +4704,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4708: \"$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
@@ -7601,12 +4733,12 @@ done
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7605: checking for $ac_func" >&5
+echo "configure:4737: 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 7610 "configure"
+#line 4742 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7629,7 +4761,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4765: \"$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
@@ -7663,19 +4795,19 @@ EOF
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:7667: checking for LC_MESSAGES" >&5
+echo "configure:4799: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7672 "configure"
+#line 4804 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7696,7 +4828,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:7700: checking whether NLS is requested" >&5
+echo "configure:4832: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -7716,13 +4848,13 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:7720: checking whether included gettext is requested" >&5
+echo "configure:4852: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
   nls_cv_force_use_gnu_gettext=$withval
 else
-  nls_cv_force_use_gnu_gettext=yes
+  nls_cv_force_use_gnu_gettext=no
 fi
 
       echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
@@ -7735,17 +4867,17 @@ fi
 
        ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:7739: checking for libintl.h" >&5
+echo "configure:4871: checking for libintl.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 7744 "configure"
+#line 4876 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4881: \"$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*
@@ -7762,19 +4894,19 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:7766: checking for gettext in libc" >&5
+echo "configure:4898: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7771 "configure"
+#line 4903 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:7778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -7790,7 +4922,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
 
           if test "$gt_cv_func_gettext_libc" != "yes"; then
             echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:7794: checking for bindtextdomain in -lintl" >&5
+echo "configure:4926: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7798,7 +4930,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7802 "configure"
+#line 4934 "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
@@ -7809,7 +4941,7 @@ int main() {
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:7813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4945: \"$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
@@ -7825,12 +4957,12 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:7829: checking for gettext in libintl" >&5
+echo "configure:4961: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:7834: checking for gettext in -lintl" >&5
+echo "configure:4966: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7838,7 +4970,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7842 "configure"
+#line 4974 "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
@@ -7849,7 +4981,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:7853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4985: \"$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
@@ -7879,6 +5011,10 @@ fi
 
           fi
 
+          if test "$gt_cv_func_gettext_libintl" = "yes"; then
+            LIBS="-lintl $LIBS"
+          fi
+
           if test "$gt_cv_func_gettext_libc" = "yes" \
              || test "$gt_cv_func_gettext_libintl" = "yes"; then
              cat >> confdefs.h <<\EOF
@@ -7888,13 +5024,13 @@ EOF
              # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7892: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:5028: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$MSGFMT" in
   /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  gcc_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -7902,17 +5038,17 @@ else
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-       ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+       gcc_cv_path_MSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
+  test -z "$gcc_cv_path_MSGFMT" && gcc_cv_path_MSGFMT="no"
   ;;
 esac
 fi
-MSGFMT="$ac_cv_path_MSGFMT"
+MSGFMT="$gcc_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
   echo "$ac_t""$MSGFMT" 1>&6
 else
@@ -7922,12 +5058,12 @@ fi
                for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7926: checking for $ac_func" >&5
+echo "configure:5062: 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 7931 "configure"
+#line 5067 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7950,7 +5086,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5090: \"$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
@@ -7977,16 +5113,16 @@ done
                # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7981: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:5117: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
   /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
   ?:/*)                         
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
@@ -7994,16 +5130,16 @@ else
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+      gcc_cv_path_GMSGFMT="$ac_dir/$ac_word"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  test -z "$gcc_cv_path_GMSGFMT" && gcc_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
+GMSGFMT="$gcc_cv_path_GMSGFMT"
 if test -n "$GMSGFMT"; then
   echo "$ac_t""$GMSGFMT" 1>&6
 else
@@ -8013,13 +5149,13 @@ fi
                # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8017: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:5153: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$XGETTEXT" in
   /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  gcc_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -8027,17 +5163,17 @@ else
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-       ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+       gcc_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  test -z "$gcc_cv_path_XGETTEXT" && gcc_cv_path_XGETTEXT=":"
   ;;
 esac
 fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
+XGETTEXT="$gcc_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
@@ -8045,7 +5181,7 @@ else
 fi
 
                cat > conftest.$ac_ext <<EOF
-#line 8049 "configure"
+#line 5185 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -8053,7 +5189,7 @@ extern int _nl_msg_cat_cntr;
                               return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:8057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
                   DATADIRNAME=share
@@ -8066,6 +5202,8 @@ else
 fi
 rm -f conftest*
                INSTOBJEXT=.mo
+             else
+               create_catalogs="no"
              fi
            fi
        
@@ -8076,7 +5214,7 @@ fi
 
         if test "$CATOBJEXT" = "NONE"; then
          echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:8080: checking whether catgets can be used" >&5
+echo "configure:5218: checking whether catgets can be used" >&5
          # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -8089,7 +5227,7 @@ fi
 
          if test "$nls_cv_use_catgets" = "yes"; then
                    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:8093: checking for main in -li" >&5
+echo "configure:5231: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8097,14 +5235,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8101 "configure"
+#line 5239 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:8108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5246: \"$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
@@ -8132,12 +5270,12 @@ else
 fi
 
            echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:8136: checking for catgets" >&5
+echo "configure:5274: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8141 "configure"
+#line 5279 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -8160,7 +5298,7 @@ catgets();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -8182,16 +5320,16 @@ EOF
               # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8186: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
+echo "configure:5324: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GENCAT" in
   /*)
-  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
+  gcc_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path.
   ;;
   ?:/*)                         
-  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
+  gcc_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
@@ -8199,16 +5337,16 @@ else
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GENCAT="$ac_dir/$ac_word"
+      gcc_cv_path_GENCAT="$ac_dir/$ac_word"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
+  test -z "$gcc_cv_path_GENCAT" && gcc_cv_path_GENCAT="no"
   ;;
 esac
 fi
-GENCAT="$ac_cv_path_GENCAT"
+GENCAT="$gcc_cv_path_GENCAT"
 if test -n "$GENCAT"; then
   echo "$ac_t""$GENCAT" 1>&6
 else
@@ -8218,16 +5356,16 @@ fi
                 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8222: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:5360: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
   /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
   ?:/*)                         
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
@@ -8235,16 +5373,16 @@ else
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+      gcc_cv_path_GMSGFMT="$ac_dir/$ac_word"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
+  test -z "$gcc_cv_path_GMSGFMT" && gcc_cv_path_GMSGFMT="no"
   ;;
 esac
 fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
+GMSGFMT="$gcc_cv_path_GMSGFMT"
 if test -n "$GMSGFMT"; then
   echo "$ac_t""$GMSGFMT" 1>&6
 else
@@ -8255,13 +5393,13 @@ fi
                   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8259: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:5397: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
   /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -8269,17 +5407,17 @@ else
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-       ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+       gcc_cv_path_GMSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="msgfmt"
+  test -z "$gcc_cv_path_GMSGFMT" && gcc_cv_path_GMSGFMT="msgfmt"
   ;;
 esac
 fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
+GMSGFMT="$gcc_cv_path_GMSGFMT"
 if test -n "$GMSGFMT"; then
   echo "$ac_t""$GMSGFMT" 1>&6
 else
@@ -8287,20 +5425,19 @@ else
 fi
 
                   if test "$GMSGFMT" = "msgfmt"; then
-                    echo "configure: warning: No program for catalog building found" 1>&2
                     create_catalogs="no"
                   fi
                 fi
                 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8298: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:5435: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$XGETTEXT" in
   /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  gcc_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -8308,17 +5445,17 @@ else
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-       ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+       gcc_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  test -z "$gcc_cv_path_XGETTEXT" && gcc_cv_path_XGETTEXT=":"
   ;;
 esac
 fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
+XGETTEXT="$gcc_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
@@ -8352,13 +5489,13 @@ fi
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8356: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
+echo "configure:5493: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$MSGFMT" in
   /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  gcc_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -8366,17 +5503,17 @@ else
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-       ac_cv_path_MSGFMT="$ac_dir/$ac_word"
+       gcc_cv_path_MSGFMT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
+  test -z "$gcc_cv_path_MSGFMT" && gcc_cv_path_MSGFMT="msgfmt"
   ;;
 esac
 fi
-MSGFMT="$ac_cv_path_MSGFMT"
+MSGFMT="$gcc_cv_path_MSGFMT"
 if test -n "$MSGFMT"; then
   echo "$ac_t""$MSGFMT" 1>&6
 else
@@ -8386,16 +5523,16 @@ fi
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8390: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
+echo "configure:5527: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$GMSGFMT" in
   /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
   ;;
   ?:/*)                         
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
+  gcc_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
@@ -8403,16 +5540,16 @@ else
   for ac_dir in $ac_dummy; do 
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+      gcc_cv_path_GMSGFMT="$ac_dir/$ac_word"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  test -z "$gcc_cv_path_GMSGFMT" && gcc_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
+GMSGFMT="$gcc_cv_path_GMSGFMT"
 if test -n "$GMSGFMT"; then
   echo "$ac_t""$GMSGFMT" 1>&6
 else
@@ -8420,19 +5557,18 @@ else
 fi
 
                        if test "$MSGFMT" = "msgfmt" && test "$GMSGFMT" = "msgfmt"; then
-         echo "configure: warning: Neither msgfmt nor gmsgfmt found. No catalogs will be built" 1>&2
          create_catalogs="no"
        fi
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8430: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:5566: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   case "$XGETTEXT" in
   /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  gcc_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
@@ -8440,17 +5576,17 @@ else
     test -z "$ac_dir" && ac_dir=.
     if test -f $ac_dir/$ac_word; then
       if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-       ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
+       gcc_cv_path_XGETTEXT="$ac_dir/$ac_word"
        break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  test -z "$gcc_cv_path_XGETTEXT" && gcc_cv_path_XGETTEXT=":"
   ;;
 esac
 fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
+XGETTEXT="$gcc_cv_path_XGETTEXT"
 if test -n "$XGETTEXT"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
@@ -8516,12 +5652,16 @@ fi
     
   
 
+   if test "x$create_catalogs" = "xno"; then
+     echo "configure: warning: No program for building catalogs found -> building disabled" 1>&2
+   fi
+
    if test "x$CATOBJEXT" != "x" && test "x$create_catalogs" != "xno" ; then
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:8525: checking for catalogs to be installed" >&5
+echo "configure:5665: checking for catalogs to be installed" >&5
        if test "x$LINGUAS" = "x"; then
         LINGUAS=$ALL_LINGUAS
        else
@@ -8553,17 +5693,17 @@ echo "configure:8525: checking for catalogs to be installed" >&5
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:8557: checking for linux/version.h" >&5
+echo "configure:5697: checking for linux/version.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 8562 "configure"
+#line 5702 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5707: \"$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*
@@ -8638,7 +5778,7 @@ fi
 
 
 echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
-echo "configure:8642: checking whether windows registry support is requested" >&5
+echo "configure:5782: checking whether windows registry support is requested" >&5
 if test x$enable_win32_registry != xno; then
   cat >> confdefs.h <<\EOF
 #define ENABLE_WIN32_REGISTRY 1
@@ -8667,7 +5807,7 @@ esac
 
 if test x$enable_win32_registry != xno; then
   echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
-echo "configure:8671: checking registry key on windows hosts" >&5
+echo "configure:5811: checking registry key on windows hosts" >&5
   cat >> confdefs.h <<EOF
 #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
 EOF
@@ -8735,7 +5875,7 @@ out_object_file=`basename $out_file .c`.o
 tm_file_list=
 for f in $tm_file; do
   case $f in
-    gansidecl.h )
+    gansidecl.h | defaults.h )
        tm_file_list="${tm_file_list} $f" ;;
     *) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" ;;
   esac
@@ -8744,7 +5884,7 @@ done
 host_xm_file_list=
 for f in $host_xm_file; do
   case $f in
-    auto-host.h | gansidecl.h | hwint.h )
+    auto-host.h | gansidecl.h | defaults.h | hwint.h )
        host_xm_file_list="${host_xm_file_list} $f" ;;
     *) host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f" ;;
   esac
@@ -8753,7 +5893,7 @@ done
 build_xm_file_list=
 for f in $build_xm_file; do
   case $f in
-    auto-build.h | auto-host.h | gansidecl.h | hwint.h )
+    auto-build.h | auto-host.h | gansidecl.h | defaults.h | hwint.h )
        build_xm_file_list="${build_xm_file_list} $f" ;;
     *) build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f" ;;
   esac
@@ -8826,20 +5966,6 @@ else
        maybe_use_collect2="-DUSE_COLLECT2"
 fi
 
-# NEED TO CONVERT
-# Set MD_DEPS if the real md file is in md.pre-cpp.
-# Set MD_CPP to the cpp to pass the md file through.  Md files use ';'
-# for line oriented comments, so we must always use a GNU cpp.  If
-# building gcc with a cross compiler, use the cross compiler just
-# built.  Otherwise, we can use the cpp just built.
-md_file_sub=
-if test "x$md_cppflags" = x
-then
-       md_file_sub=$srcdir/config/$md_file
-else
-       md_file=md
-fi
-
 # If we have gas in the build tree, make a link to it.
 if test -f ../gas/Makefile; then
        rm -f as; $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null
@@ -8859,11 +5985,12 @@ if test -f ../ld/Makefile; then
 #      fi
 fi
 
-# Figure out what assembler alignment features are present.
-echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:8865: checking assembler alignment features" >&5
+# Figure out what assembler we will be using.
+echo $ac_n "checking what assembler to use""... $ac_c" 1>&6
+echo "configure:5991: checking what assembler to use" >&5
 gcc_cv_as=
-gcc_cv_as_alignment_features=
+gcc_cv_gas_major_version=
+gcc_cv_gas_minor_version=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
 if test -x "$DEFAULT_ASSEMBLER"; then
        gcc_cv_as="$DEFAULT_ASSEMBLER"
@@ -8883,27 +6010,9 @@ elif test -f $gcc_cv_as_gas_srcdir/configure.in -a -f ../gas/Makefile; then
        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
-       fi
-elif test x$host = x$target; then
+if test "x$gcc_cv_as" = x -a x$host = x$target; then
        # Native build.
        # Search the same directories that the installed compiler will
        # search.  Else we may find the wrong assembler and lose.  If we
@@ -8955,7 +6064,47 @@ elif test x$host = x$target; then
                fi
        done
 fi
-if test x$gcc_cv_as != x; then
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+  echo "$ac_t"""newly built gas"" 1>&6
+else
+  echo "$ac_t""$gcc_cv_as" 1>&6
+fi
+
+# Figure out what nm we will be using.
+echo $ac_n "checking what nm to use""... $ac_c" 1>&6
+echo "configure:6076: checking what nm to use" >&5
+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
+echo "$ac_t""$gcc_cv_nm" 1>&6
+
+# Figure out what assembler alignment features are present.
+echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
+echo "configure:6087: checking assembler alignment features" >&5
+gcc_cv_as_alignment_features=none
+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
+elif test x$gcc_cv_as != x; then
        # Check if we have .balign and .p2align
        echo ".balign  4" > conftest.s
        echo ".p2align  2" >> conftest.s
@@ -8982,19 +6131,17 @@ fi
 echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
 
 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
-echo "configure:8986: checking assembler subsection support" >&5
-gcc_cv_as_subsections=
-if test x$gcc_cv_as != x; then
+echo "configure:6135: checking assembler subsection support" >&5
+gcc_cv_as_subsections=no
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+  if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+    gcc_cv_as_subsections="working .subsection -1"
+  fi
+elif 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
@@ -9009,57 +6156,71 @@ EOF
                                        :
                                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
+if test x"$gcc_cv_as_subsections" = x"working .subsection -1"; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_GAS_SUBSECTION_ORDERING 1
+EOF
+
 fi
 echo "$ac_t""$gcc_cv_as_subsections" 1>&6
 
 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
-echo "configure:9026: checking assembler weak support" >&5
-gcc_cv_as_weak=
-if test x$gcc_cv_as != x; then
+echo "configure:6175: checking assembler weak support" >&5
+gcc_cv_as_weak=no
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+  if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then
+    gcc_cv_as_weak="yes"
+  fi
+elif test x$gcc_cv_as != x; then
        # Check if we have .weak
        echo "  .weak foobar" > conftest.s
        if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
-               cat >> confdefs.h <<\EOF
-#define HAVE_GAS_WEAK 1
-EOF
-
                gcc_cv_as_weak="yes"
        fi
        rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
+fi
+if test x"$gcc_cv_as_weak" = xyes; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_GAS_WEAK 1
+EOF
+
 fi
 echo "$ac_t""$gcc_cv_as_weak" 1>&6
 
 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6
-echo "configure:9043: checking assembler hidden support" >&5
-gcc_cv_as_hidden=
-if test x$gcc_cv_as != x; then
+echo "configure:6198: checking assembler hidden support" >&5
+gcc_cv_as_hidden=no
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+  if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+    gcc_cv_as_hidden="yes"
+  fi
+elif test x$gcc_cv_as != x; then
        # Check if we have .hidden
        echo "  .hidden foobar" > conftest.s
        echo "foobar:" >> conftest.s
        if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
-               cat >> confdefs.h <<\EOF
-#define HAVE_GAS_HIDDEN 1
-EOF
-
                gcc_cv_as_hidden="yes"
        fi
        rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
+fi
+if test x"$gcc_cv_as_hidden" = xyes; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_GAS_HIDDEN 1
+EOF
+
 fi
 echo "$ac_t""$gcc_cv_as_hidden" 1>&6
 
 case "$target" in 
   sparc*-*-*)
     echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
-echo "configure:9063: checking assembler .register pseudo-op support" >&5
+echo "configure:6224: checking assembler .register pseudo-op support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9087,7 +6248,7 @@ EOF
     fi
 
     echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
-echo "configure:9091: checking assembler supports -relax" >&5
+echo "configure:6252: checking assembler supports -relax" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9117,7 +6278,7 @@ EOF
     case "$tm_file" in
     *64*)
        echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
-echo "configure:9121: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
+echo "configure:6282: checking for 64 bit support in assembler ($gcc_cv_as)" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9162,7 +6323,7 @@ EOF
 
     if test "x$gcc_cv_as_flags64" != xno; then
        echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
-echo "configure:9166: checking for assembler offsetable %lo() support" >&5
+echo "configure:6327: checking for assembler offsetable %lo() support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9201,28 +6362,78 @@ EOF
 
   i[34567]86-*-*)
     echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
-echo "configure:9205: checking assembler instructions" >&5
+echo "configure:6366: checking assembler instructions" >&5
     gcc_cv_as_instructions=
-    if test x$gcc_cv_as != x; then
+    if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then
+      if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then
+       gcc_cv_as_instructions="filds fists"
+      fi
+    elif test x$gcc_cv_as != x; then
        set "filds fists" "filds mem; fists mem"
        while test $# -gt 0
        do
                echo "$2" > conftest.s
                if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
                        gcc_cv_as_instructions=${gcc_cv_as_instructions}$1" "
-                       cat >> confdefs.h <<EOF
-#define HAVE_GAS_`echo "$1" | tr 'a-z ' 'A-Z_'` 1
-EOF
-
                fi
                shift 2
        done
        rm -f conftest.s conftest.o
     fi
+    if test x"$gcc_cv_as_instructions" != x; then
+       cat >> confdefs.h <<EOF
+#define HAVE_GAS_`echo "$gcc_cv_as_instructions" | sed -e 's/ $//' | tr 'a-z ' 'A-Z_'` 1
+EOF
+
+    fi
     echo "$ac_t""$gcc_cv_as_instructions" 1>&6
     ;;
 esac
 
+echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
+echo "configure:6395: checking assembler dwarf2 debug_line support" >&5
+gcc_cv_as_dwarf2_debug_line=no
+# ??? Not all targets support dwarf2 debug_line, even within a version
+# of gas.  Moreover, we need to emit a valid instruction to trigger any
+# info to the output file.  So, as supported targets are added to gas 2.11,
+# add some instruction here to (also) show we expect this might work.
+# ??? Once 2.11 is released, probably need to add first known working
+# version to the per-target configury.
+case "$target" in
+  i?86*-*-* | mips*-*-* | alpha*-*-* | powerpc*-*-* | sparc*-*-*)
+    insn="nop"
+    ;;
+  ia64*-*-*)
+    insn="nop 0"
+    ;;
+  esac
+if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x;
+then
+  if test "$gcc_cv_gas_major_version" -eq 2 \
+       -a "$gcc_cv_gas_minor_version" -ge 11 \
+       -o "$gcc_cv_gas_major_version" -gt 2 \
+     && grep 'obj_format = elf' ../gas/Makefile > /dev/null \
+     && test x"$insn" != x ; then
+    gcc_cv_as_dwarf2_debug_line="yes"
+  fi
+elif test x$gcc_cv_as != x -a x"$insn" != x ; then
+       echo '  .file 0 "conftest.s"' > conftest.s
+       echo '  .loc 0 3 0' >> conftest.s
+       echo "  $insn" >> conftest.s
+       if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \
+          && grep debug_line conftest.o > /dev/null 2>&1 ; then
+               gcc_cv_as_dwarf2_debug_line="yes"
+       fi
+       rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
+fi
+if test x"$gcc_cv_as_dwarf2_debug_line" = xyes; then
+       cat >> confdefs.h <<\EOF
+#define HAVE_AS_DWARF2_DEBUG_LINE 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6
+
 # Figure out what language subdirectories are present.
 # Look if the user specified --enable-languages="..."; if not, use
 # the environment variable $LANGUAGES if defined. $LANGUAGES might
@@ -9248,27 +6459,23 @@ do
        ${srcdir}/[*]/config-lang.in) ;;
        *)
          lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^   ]*\).*$,\1,p' $lang`
+         this_lang_libs=`sed -n -e 's,^target_libs=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^target_libs=\([^         ]*\).*$,\1,p' $lang`
+         build_by_default=`sed -n -e 's,^build_by_default=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^build_by_default=\([^     ]*\).*$,\1,p' $lang`
          if test "x$lang_alias" = x
          then
                echo "$lang doesn't set \$language." 1>&2
                exit 1
          fi
-         if test x"${enable_languages}" = xall; then
-               add_this_lang=yes
-         else
-               case "${enable_languages}" in
-                   ${lang_alias} | "${lang_alias},"* | *",${lang_alias},"* | *",${lang_alias}" )
-                       add_this_lang=yes
-                       ;;
-                   * )
-                       add_this_lang=no
-                       ;;
-               esac
-         fi
+         case ${build_by_default},${enable_languages}, in
+         *,$lang_alias,*) add_this_lang=yes ;;
+         no,*) add_this_lang=no ;;
+         *,all,*) add_this_lang=yes ;;
+         *) add_this_lang=no ;;
+         esac
          if test x"${add_this_lang}" = xyes; then
                case $lang in
                    ${srcdir}/ada/config-lang.in)
-                       if test x$gnat = xyes ; then
+                       if test x$have_gnat = xyes ; then
                                subdirs="$subdirs `echo $lang | sed -e 's,^.*/\([^/]*\)/config-lang.in$,\1,'`"
                        fi
                        ;;
@@ -9303,59 +6510,34 @@ if test "${with_gc+set}" = set; then
     ;;
 esac
 else
-  if test $ac_cv_func_mmap_anywhere = yes \
-    || test $ac_cv_func_valloc = yes; then
   GGC=ggc-page
-else
-  GGC=ggc-simple
-fi
 fi
 
 
 echo "Using $GGC for garbage collection."
 
-# Build a new-abi (c++) system
-# Check whether --enable-new-gxx-abi or --disable-new-gxx-abi was given.
-if test "${enable_new_gxx_abi+set}" = set; then
-  enableval="$enable_new_gxx_abi"
-  cat >> confdefs.h <<\EOF
-#define ENABLE_NEW_GXX_ABI 1
-EOF
-
-GXX_ABI_FLAG='-fnew-abi'
-echo "Building a new-abi g++ compiler."
+# Use the system's zlib library.
+zlibdir=-L../zlib
+zlibinc="-I\$(srcdir)/../zlib"
+# Check whether --with-system-zlib or --without-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then
+  withval="$with_system_zlib"
+  zlibdir=
+zlibinc=
 
 fi
 
 
 
-# Build a new-libstdc++ system (ie libstdc++-v3)
-echo $ac_n "checking for libstdc++ to install""... $ac_c" 1>&6
-echo "configure:9335: checking for libstdc++ to install" >&5
-# Check whether --enable-libstdcxx-v3 or --disable-libstdcxx-v3 was given.
-if test "${enable_libstdcxx_v3+set}" = set; then
-  enableval="$enable_libstdcxx_v3"
-  enable_libstdcxx_v3=yes
-else
-  enable_libstdcxx_v3=no
-fi
 
-
-if test x$enable_libstdcxx_v3 = xyes; then
-  echo "$ac_t""v3" 1>&6
-  ac_esn=1
-else
-  echo "$ac_t""v2" 1>&6
-  ac_esn=0
-fi
 cat >> confdefs.h <<EOF
-#define ENABLE_STD_NAMESPACE $ac_esn
+#define ENABLE_STD_NAMESPACE 1
 EOF
 
 
 
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:9359: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:6541: checking whether to enable maintainer-specific portions of Makefiles" >&5
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
   enableval="$enable_maintainer_mode"
@@ -9419,7 +6601,6 @@ all_lib2funcs=
 
 language_fragments="Make-lang"
 language_hooks="Make-hooks"
-oldstyle_subdirs=
 
 for s in .. $subdirs
 do
@@ -9439,7 +6620,10 @@ do
                        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_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in"
+               if test -f ${srcdir}/$s/Makefile.in
+               then all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Makefile.in"
+               fi
                all_languages="$all_languages $language"
                if test "x$boot_language" = xyes
                then
@@ -9450,14 +6634,19 @@ do
                all_diff_excludes="$all_diff_excludes $diff_excludes"
                all_headers="$all_headers $headers"
                all_outputs="$all_outputs $outputs"
-               if test x$outputs = x
-               then
-                       oldstyle_subdirs="$oldstyle_subdirs $s"
-               fi
                all_lib2funcs="$all_lib2funcs $lib2funcs"
        fi
 done
 
+check_languages=
+for language in .. $all_languages
+do
+       if test $language != ".."
+       then
+               check_languages="$check_languages check-$language"
+       fi
+done
+
 # Since we can't use `::' targets, we link each language in
 # with a set of hooks, reached indirectly via lang.${target}.
 
@@ -9466,7 +6655,7 @@ touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap \
        info dvi \
        install-normal install-common install-info install-man \
-       uninstall distdir \
+       uninstall \
        mostlyclean clean distclean extraclean maintainer-clean \
        stage1 stage2 stage3 stage4"
 for t in $target_list
@@ -9481,23 +6670,21 @@ do
        echo "lang.$t: $x" >> Make-hooks
 done
 
-# If we're not building in srcdir, create .gdbinit.
+# Create .gdbinit.
 
-if test ! -f Makefile.in; then
-       echo "dir ." > .gdbinit
-       echo "dir ${srcdir}" >> .gdbinit
-       if test x$gdb_needs_out_file_path = xyes
-       then
-               echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
-       fi
-       if test "x$subdirs" != x; then
-               for s in $subdirs
-               do
-                       echo "dir ${srcdir}/$s" >> .gdbinit
-               done
-       fi
-       echo "source ${srcdir}/.gdbinit" >> .gdbinit
+echo "dir ." > .gdbinit
+echo "dir ${srcdir}" >> .gdbinit
+if test x$gdb_needs_out_file_path = xyes
+then
+       echo "dir ${srcdir}/config/"`dirname ${out_file}` >> .gdbinit
+fi
+if test "x$subdirs" != x; then
+       for s in $subdirs
+       do
+               echo "dir ${srcdir}/$s" >> .gdbinit
+       done
 fi
+echo "source ${srcdir}/gdbinit.in" >> .gdbinit
 
 # Define variables host_canonical and build_canonical
 # because some Cygnus local changes in the Makefile depend on them.
@@ -9548,6 +6735,31 @@ fi
 
 
 
+# Find a directory in which to install a shared libgcc.
+
+# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
+if test "${enable_version_specific_runtime_libs+set}" = set; then
+  enableval="$enable_version_specific_runtime_libs"
+  :
+fi
+
+
+# Check whether --with-slibdir or --without-slibdir was given.
+if test "${with_slibdir+set}" = set; then
+  withval="$with_slibdir"
+  slibdir="$with_slibdir"
+else
+  if test "${enable_version_specific_runtime_libs+set}" = set; then
+  slibdir='$(libsubdir)'
+elif test "$host" != "$target"; then
+  slibdir='$(build_tooldir)/lib'
+else
+  slibdir='$(libdir)'
+fi
+fi
+
+
+
 # Nothing to do for FLOAT_H, float_format already handled.
 objdir=`pwd`
 
@@ -9610,6 +6822,9 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma
 
 
 
+
+
+
 
 
 
@@ -9782,6 +6997,8 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@enable_multilib@%$enable_multilib%g
+s%@enable_shared@%$enable_shared%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
@@ -9799,31 +7016,35 @@ s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@NO_MINUS_C_MINUS_O@%$NO_MINUS_C_MINUS_O%g
-s%@stage1_warn_cflags@%$stage1_warn_cflags%g
-s%@stage2_warn_cflags@%$stage2_warn_cflags%g
+s%@OUTPUT_OPTION@%$OUTPUT_OPTION%g
+s%@strict1_warn@%$strict1_warn%g
+s%@warn_cflags@%$warn_cflags%g
+s%@stage1_cflags@%$stage1_cflags%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@AWK@%$AWK%g
-s%@LEX@%$LEX%g
-s%@LEXLIB@%$LEXLIB%g
 s%@LN@%$LN%g
 s%@LN_S@%$LN_S%g
 s%@RANLIB@%$RANLIB%g
-s%@YACC@%$YACC%g
 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%@have_gnat@%$have_gnat%g
+s%@have_mktemp_command@%$have_mktemp_command%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@BUILD_INFO@%$BUILD_INFO%g
-s%@INSTALL_INFO@%$INSTALL_INFO%g
+s%@GENERATED_MANPAGES@%$GENERATED_MANPAGES%g
+s%@FLEX@%$FLEX%g
+s%@BISON@%$BISON%g
 s%@TARGET_GETGROUPS_T@%$TARGET_GETGROUPS_T%g
 s%@vfprintf@%$vfprintf%g
 s%@doprint@%$doprint%g
+s%@strstr@%$strstr%g
 s%@manext@%$manext%g
 s%@objext@%$objext%g
 s%@PACKAGE@%$PACKAGE%g
 s%@VERSION@%$VERSION%g
+s%@CHECK_PO@%$CHECK_PO%g
 s%@ALLOCA@%$ALLOCA%g
 s%@USE_NLS@%$USE_NLS%g
 s%@MSGFMT@%$MSGFMT%g
@@ -9849,13 +7070,15 @@ s%@l@%$l%g
 s%@inhibit_libc@%$inhibit_libc%g
 s%@gthread_flags@%$gthread_flags%g
 s%@GGC@%$GGC%g
-s%@GXX_ABI_FLAG@%$GXX_ABI_FLAG%g
+s%@zlibdir@%$zlibdir%g
+s%@zlibinc@%$zlibinc%g
 s%@MAINT@%$MAINT%g
 s%@build_canonical@%$build_canonical%g
 s%@host_canonical@%$host_canonical%g
 s%@target_subdir@%$target_subdir%g
 s%@gcc_tooldir@%$gcc_tooldir%g
 s%@dollar@%$dollar%g
+s%@slibdir@%$slibdir%g
 s%@objdir@%$objdir%g
 s%@subdirs@%$subdirs%g
 s%@all_boot_languages@%$all_boot_languages%g
@@ -9869,23 +7092,24 @@ s%@all_stagestuff@%$all_stagestuff%g
 s%@build_exeext@%$build_exeext%g
 s%@build_install_headers_dir@%$build_install_headers_dir%g
 s%@build_xm_file_list@%$build_xm_file_list%g
+s%@check_languages@%$check_languages%g
 s%@cc_set_by_configure@%$cc_set_by_configure%g
 s%@quoted_cc_set_by_configure@%$quoted_cc_set_by_configure%g
 s%@cpp_install_dir@%$cpp_install_dir%g
 s%@dep_host_xmake_file@%$dep_host_xmake_file%g
 s%@dep_tmake_file@%$dep_tmake_file%g
 s%@extra_c_flags@%$extra_c_flags%g
-s%@extra_c_objs@%$extra_c_objs%g
-s%@extra_cpp_objs@%$extra_cpp_objs%g
-s%@extra_cxx_objs@%$extra_cxx_objs%g
 s%@extra_headers_list@%$extra_headers_list%g
 s%@extra_objs@%$extra_objs%g
 s%@extra_parts@%$extra_parts%g
 s%@extra_passes@%$extra_passes%g
 s%@extra_programs@%$extra_programs%g
 s%@float_h_file@%$float_h_file%g
+s%@gcc_config_arguments@%$gcc_config_arguments%g
 s%@gcc_gxx_include_dir@%$gcc_gxx_include_dir%g
+s%@libstdcxx_incdir@%$libstdcxx_incdir%g
 s%@gcc_version@%$gcc_version%g
+s%@gcc_version_full@%$gcc_version_full%g
 s%@gcc_version_trigger@%$gcc_version_trigger%g
 s%@host_exeext@%$host_exeext%g
 s%@host_extra_gcc_objs@%$host_extra_gcc_objs%g
@@ -9905,6 +7129,8 @@ s%@symbolic_link@%$symbolic_link%g
 s%@thread_file@%$thread_file%g
 s%@tm_file_list@%$tm_file_list%g
 s%@will_use_collect2@%$will_use_collect2%g
+s%@c_target_objs@%$c_target_objs%g
+s%@cxx_target_objs@%$cxx_target_objs%g
 /@target_overrides@/r $target_overrides
 s%@target_overrides@%%g
 /@host_overrides@/r $host_overrides
@@ -10175,7 +7401,6 @@ target='${target}'
 target_alias='${target_alias}'
 srcdir='${srcdir}'
 subdirs='${subdirs}'
-oldstyle_subdirs='${oldstyle_subdirs}'
 symbolic_link='${symbolic_link}'
 program_transform_set='${program_transform_set}'
 program_transform_name='${program_transform_name}'
@@ -10184,7 +7409,9 @@ host_xmake_file='${host_xmake_file}'
 dep_tmake_file='${dep_tmake_file}'
 tmake_file='${tmake_file}'
 thread_file='${thread_file}'
+gcc_config_arguments='${gcc_config_arguments}'
 gcc_version='${gcc_version}'
+gcc_version_full='${gcc_version_full}'
 gcc_version_trigger='${gcc_version_trigger}'
 local_prefix='${local_prefix}'
 build_install_headers_dir='${build_install_headers_dir}'
@@ -10207,7 +7434,6 @@ case "$CONFIG_FILES" in *po/Makefile.in*)
         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
       esac
 
-. $srcdir/configure.lang
 case x$CONFIG_HEADERS in
 xauto-host.h:config.in)
 echo > cstamp-h ;;