The stock (3.1-snap) version of this file is used now.

The FreeBSD hacks now apply to `config.gcc'.

1 files changed, 4361 insertions, 4849 deletions

diff --git a/contrib/gcc/configure b/contrib/gcc/configure
index cc08daf..495a07e 100755
--- a/contrib/gcc/configure
+++ b/contrib/gcc/configure
@@ -16,62 +16,82 @@ ac_default_prefix=/usr/local
 ac_help="$ac_help
   --with-gnu-ld           arrange to work with GNU ld."
 ac_help="$ac_help
-  --with-ld               arrange to use the specified ld (full pathname)."
+  --with-ld               arrange to use the specified ld (full pathname)"
 ac_help="$ac_help
-  --with-gnu-as           arrange to work with GNU as."
+  --with-gnu-as           arrange to work with GNU as"
 ac_help="$ac_help
-  --with-as               arrange to use the specified as (full pathname)."
+  --with-as               arrange to use the specified as (full pathname)"
 ac_help="$ac_help
-  --with-stabs            arrange to use stabs instead of host debug format."
+  --with-stabs            arrange to use stabs instead of host debug format"
 ac_help="$ac_help
-  --with-elf              arrange to use ELF instead of host debug format."
+  --with-elf              arrange to use ELF instead of host debug format"
 ac_help="$ac_help
-  --with-local-prefix=DIR specifies directory to put local include."
+  --with-local-prefix=DIR specifies directory to put local include"
 ac_help="$ac_help
   --with-gxx-include-dir=DIR
-                          specifies directory to put g++ header files."
+                          specifies directory to put g++ header files"
 ac_help="$ac_help
-  --enable-checking       enable expensive run-time checks."
+  --enable-multilib       enable library support for multiple ABIs"
 ac_help="$ac_help
-  --disable-cpp           don't provide a user-visible C preprocessor."
+  --enable-checking[=LIST]
+			  enable expensive run-time checks.  With LIST,
+			  enable only specific categories of checks.
+			  Categories are: misc,tree,rtl,gc,gcac; default
+			  is misc,tree,gc"
+ac_help="$ac_help
+  --disable-cpp           don't provide a user-visible C preprocessor"
 ac_help="$ac_help
   --with-cpp-install-dir=DIR
                           install the user visible C preprocessor in DIR
-                          (relative to PREFIX) as well as PREFIX/bin."
-ac_help="$ac_help
-  --enable-cpplib         use cpplib for the C preprocessor."
+                          (relative to PREFIX) as well as PREFIX/bin"
 ac_help="$ac_help
-  --enable-c-cpplib       link cpplib directly into C and C++ compilers
-                          (EXPERIMENTAL) (implies --enable-cpplib)."
+  --enable-c-mbchar       enable multibyte characters for C and C++"
 ac_help="$ac_help
-  --enable-c-mbchar       enable multibyte characters for C and C++."
+  --enable-threads        enable thread usage for target GCC
+  --enable-threads=LIB    use LIB thread package for target GCC"
 ac_help="$ac_help
-  --disable-fast-fixincludes
-                         Disable the new fast fixincludes.
-                         Run the old fixincludes script unconditionally"
+  --enable-objc-gc	  enable the use of Boehm's garbage collector with
+			  the GNU Objective-C runtime"
 ac_help="$ac_help
-  --enable-haifa          use the experimental scheduler.
-  --disable-haifa         don't use the experimental scheduler for the
-                          targets which normally enable it."
+  --with-dwarf2           force the default debug format to be DWARF 2"
 ac_help="$ac_help
-  --enable-threads        enable thread usage for target GCC.
-  --enable-threads=LIB    use LIB thread package for target GCC."
+  --disable-shared        don't provide a shared libgcc"
 ac_help="$ac_help
-  --enable-objc-gc	  enable the use of Boehm's garbage collector with
-			  the GNU Objective-C runtime."
+  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
 ac_help="$ac_help
-  --enable-java-gc=TYPE   choose garbage collector [boehm]"
+  --enable-nls            use Native Language Support (default)"
 ac_help="$ac_help
-  --enable-dwarf2	  enable DWARF2 debugging as default."
-ac_help="$ac_help
-  --enable-nls            use Native Language Support (disabled by default).
-                          EXPERIMENTAL, see ABOUT-GCC-NLS."
+  --with-libiconv-prefix=DIR  search for libiconv in DIR/include and DIR/lib"
 ac_help="$ac_help
   --disable-nls           do not use Native Language Support"
 ac_help="$ac_help
   --with-included-gettext use the GNU gettext library included here"
 ac_help="$ac_help
-  --with-catgets          use catgets functions if available"
+  --disable-win32-registry
+                          disable lookup of installation paths in the
+                          Registry on Windows hosts
+  --enable-win32-registry enable registry lookup (default)
+  --enable-win32-registry=KEY
+                          use KEY instead of GCC version as the last portion
+                          of the registry key"
+ac_help="$ac_help
+  --with-gc={simple,page} choose the garbage collection mechanism to use
+                          with the compiler"
+ac_help="$ac_help
+  --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-sjlj-exceptions
+                          arrange to use setjmp/longjmp exception handling"
+ac_help="$ac_help
+  --enable-version-specific-runtime-libs
+                          specify that runtime libraries should 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
@@ -598,7 +618,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:600: checking LIBRARY_PATH variable" >&5
+echo "configure:620: checking LIBRARY_PATH variable" >&5
 case ${LIBRARY_PATH} in
   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
     library_path_setting="contains current directory"
@@ -623,7 +643,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:625: checking GCC_EXEC_PREFIX variable" >&5
+echo "configure:645: checking GCC_EXEC_PREFIX variable" >&5
 case ${GCC_EXEC_PREFIX} in
   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
     gcc_exec_prefix_setting="contains current directory"
@@ -758,22 +778,84 @@ 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
   enableval="$enable_checking"
-  case "${enableval}" in
-yes)	cat >> confdefs.h <<\EOF
-#define ENABLE_CHECKING 1
-EOF
- ;;
+  ac_checking=
+ac_tree_checking=
+ac_rtl_checking=
+ac_gc_checking=
+ac_gc_always_collect=
+case "${enableval}" in
+yes)	ac_checking=1 ; ac_tree_checking=1 ; ac_gc_checking=1 ;;
 no)	;;
-*)	{ echo "configure: error: bad value ${enableval} given for checking option" 1>&2; exit 1; } ;;
+*)	IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="$IFS,"
+	set fnord $enableval; shift
+	IFS="$ac_save_IFS"
+	for check
+	do
+		case $check in
+		misc)	ac_checking=1 ;;
+		tree)	ac_tree_checking=1 ;;
+		rtl)	ac_rtl_checking=1 ;;
+		gc)	ac_gc_checking=1 ;;
+		gcac)	ac_gc_always_collect=1 ;;
+		*)	{ echo "configure: error: unknown check category $check" 1>&2; exit 1; } ;;
+		esac
+	done
+	;;
 esac
+
+else
+  # Enable some checks by default for development versions of GCC
+ac_checking=1; ac_tree_checking=1; ac_gc_checking=1;
+fi
+
+if test x$ac_checking != x ; then
+  cat >> confdefs.h <<\EOF
+#define ENABLE_CHECKING 1
+EOF
+
+fi
+if test x$ac_tree_checking != x ; then
+  cat >> confdefs.h <<\EOF
+#define ENABLE_TREE_CHECKING 1
+EOF
+
+fi
+if test x$ac_rtl_checking != x ; then
+  cat >> confdefs.h <<\EOF
+#define ENABLE_RTL_CHECKING 1
+EOF
+
+fi
+if test x$ac_gc_checking != x ; then
+  cat >> confdefs.h <<\EOF
+#define ENABLE_GC_CHECKING 1
+EOF
+
+fi
+if test x$ac_gc_always_collect != x ; then
+  cat >> confdefs.h <<\EOF
+#define ENABLE_GC_ALWAYS_COLLECT 1
+EOF
+
 fi
 
 
@@ -797,67 +879,26 @@ fi
 fi
 
 
-# Use cpplib+cppmain for the preprocessor, but don't link it with the compiler.
-cpp_main=cccp
-# Check whether --enable-cpplib or --disable-cpplib was given.
-if test "${enable_cpplib+set}" = set; then
-  enableval="$enable_cpplib"
-  if test x$enable_cpplib != xno; then
-  cpp_main=cppmain
-fi
-fi
-
-
-# Link cpplib into the compiler proper, for C/C++/ObjC.
-# Check whether --enable-c-cpplib or --disable-c-cpplib was given.
-if test "${enable_c_cpplib+set}" = set; then
-  enableval="$enable_c_cpplib"
-  if test x$enable_c_cpplib != xno; then
-  extra_c_objs="${extra_c_objs} libcpp.a"
-  extra_cxx_objs="${extra_cxx_objs} ../libcpp.a"
-  extra_c_flags="${extra_c_flags} -DUSE_CPPLIB=1"
-  cpp_main=cppmain
-fi
-fi
-
-
 # Enable Multibyte Characters for C/C++
 # Check whether --enable-c-mbchar or --disable-c-mbchar was given.
 if test "${enable_c_mbchar+set}" = set; then
   enableval="$enable_c_mbchar"
   if test x$enable_c_mbchar != xno; then
-  extra_c_flags=-DMULTIBYTE_CHARS=1
-fi
-fi
-
+  cat >> confdefs.h <<\EOF
+#define MULTIBYTE_CHARS 1
+EOF
 
-# Disable fast fixincludes
-# Check whether --enable-fast-fixincludes or --disable-fast-fixincludes was given.
-if test "${enable_fast_fixincludes+set}" = set; then
-  enableval="$enable_fast_fixincludes"
-  if test x$enable_fast_fixincludes = xno ; then
-  cp $srcdir/fixincludes ./fixinc.sh
-fi
 fi
-
-
-# Enable Haifa scheduler.
-# Check whether --enable-haifa or --disable-haifa was given.
-if test "${enable_haifa+set}" = set; then
-  enableval="$enable_haifa"
-  :
 fi
 
-
+  
 # Enable threads
 # Pass with no value to take the default
 # Pass with a value to specify a thread package
 # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
-  if test x$enable_threads = xno; then
-	enable_threads=''
-fi
+  :
 else
   enable_threads=''
 fi
@@ -875,7 +916,7 @@ case x${enable_threads_flag} in
 		target_thread_file=''
 		;;
 	xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
-	xsolaris | xwin32 | xdce | xvxworks)
+	xsolaris | xwin32 | xdce | xrtems| xvxworks | xaix)
 		target_thread_file=$enable_threads_flag
 		;;
 	*)
@@ -887,7 +928,7 @@ esac
 # Check whether --enable-objc-gc or --disable-objc-gc was given.
 if test "${enable_objc_gc+set}" = set; then
   enableval="$enable_objc_gc"
-  if [ x$enable_objc_gc = xno ]; then
+  if test x$enable_objc_gc = xno; then
 	objc_boehm_gc=''
 else
 	objc_boehm_gc=1
@@ -897,16 +938,6 @@ else
 fi
 
 
-# Check whether --enable-java-gc or --disable-java-gc was given.
-if test "${enable_java_gc+set}" = set; then
-  enableval="$enable_java_gc"
-  
-  JAVAGC=$enableval
-else
-  JAVAGC=boehm
-fi
-
-
 # Check whether --with-dwarf2 or --without-dwarf2 was given.
 if test "${with_dwarf2+set}" = set; then
   withval="$with_dwarf2"
@@ -916,6 +947,30 @@ else
 fi
 
 
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  
+  case $enable_shared in
+  yes | no) ;;
+  *)
+    enable_shared=no
+    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+    for pkg in $enableval; do
+      if test "X$pkg" = "Xgcc" || test "X$pkg" = "Xlibgcc"; then
+        enable_shared=yes
+      fi
+    done
+    IFS="$ac_save_ifs"
+    ;;
+  esac
+
+else
+  enable_shared=yes
+fi
+
+
+
 # Determine the host, build, and target systems
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -964,7 +1019,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:966: checking host system type" >&5
+echo "configure:1021: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -985,7 +1040,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:987: checking target system type" >&5
+echo "configure:1042: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1003,7 +1058,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:1005: checking build system type" >&5
+echo "configure:1060: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1026,11 +1081,32 @@ test "$host_alias" != "$target_alias" &&
   program_prefix=${target_alias}-
 
 
+# Set program_transform_name
+if test "$program_transform_name" = s,x,x,; then
+  program_transform_name=
+else
+  # Double any \ or $.  echo might interpret backslashes.
+  cat <<\EOF_SED > conftestsed
+s,\\,\\\\,g; s,\$,$$,g
+EOF_SED
+  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
+  rm -f conftestsed
+fi
+test "$program_prefix" != NONE &&
+  program_transform_name="s,^,${program_prefix},; $program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
+
+# sed with no file args requires a program.
+test "$program_transform_name" = "" && program_transform_name="s,x,x,"
+
+
 # Find the native compiler
 # 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:1032: checking for $ac_word" >&5
+echo "configure:1108: 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
@@ -1060,7 +1136,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:1062: checking for $ac_word" >&5
+echo "configure:1138: 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
@@ -1111,7 +1187,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:1113: checking for $ac_word" >&5
+echo "configure:1189: 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
@@ -1143,7 +1219,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1145: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1221: 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.
@@ -1154,12 +1230,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 1156 "configure"
+#line 1232 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1237: \"$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
@@ -1185,12 +1261,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:1187: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1263: 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:1192: checking whether we are using GNU C" >&5
+echo "configure:1268: 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
@@ -1199,7 +1275,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1201: \"$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:1277: \"$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
@@ -1218,7 +1294,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:1220: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1296: 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
@@ -1249,19 +1325,681 @@ else
   fi
 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:1329: 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:1332: 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]/_/'`"
+if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  echo 'foo(){}' > conftest.c
+# Make sure it works both with $CC and with simple cc.
+# 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:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:1345: \"$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:1350: \"$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:1352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+	 test -f conftest.o && { (eval echo configure:1353: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
+      then
+        # cc works too.
+        :
+      else
+        # cc exists but doesn't like -o.
+        eval ac_cv_prog_cc_${ac_cc}_c_o=no
+      fi
+    fi
+  fi
+else
+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
+fi
+rm -f conftest*
+
+fi
+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<\EOF
+#define NO_MINUS_C_MINUS_O 1
+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 whether ${CC-cc} accepts -Wno-long-long""... $ac_c" 1>&6
+echo "configure:1389: 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 1396 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:1403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_prog_cc_no_long_long=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_prog_cc_no_long_long=no
+fi
+rm -f conftest*
+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
+
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:1424: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 1439 "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:1445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 1456 "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:1462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 1473 "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:1479: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:1504: 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 1511 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:1518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
+
+echo $ac_n "checking for volatile""... $ac_c" 1>&6
+echo "configure:1544: 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 1549 "configure"
+#include "confdefs.h"
+
+int main() {
+volatile int foo;
+; return 0; }
+EOF
+if { (eval echo configure:1556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_c_volatile=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_c_volatile=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gcc_cv_c_volatile" 1>&6
+if test $gcc_cv_c_volatile = yes ; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_VOLATILE 1
+EOF
+
+fi
+
+
+echo $ac_n "checking for long double""... $ac_c" 1>&6
+echo "configure:1578: 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
+  if test "$GCC" = yes; then
+  gcc_cv_c_long_double=yes
+else
+cat > conftest.$ac_ext <<EOF
+#line 1586 "configure"
+#include "confdefs.h"
+
+int main() {
+/* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+long double foo = 0.0;
+/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+switch (0) case 0: case (sizeof(long double) >= sizeof(double)):;
+; return 0; }
+EOF
+if { (eval echo configure:1596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_c_long_double=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_c_long_double=no
+fi
+rm -f conftest*
+fi
+fi
+
+echo "$ac_t""$gcc_cv_c_long_double" 1>&6
+if test $gcc_cv_c_long_double = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_LONG_DOUBLE 1
+EOF
+
+fi
+
+echo $ac_n "checking for long long int""... $ac_c" 1>&6
+echo "configure:1618: checking for long long int" >&5
+if eval "test \"`echo '$''{'ac_cv_c_long_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1623 "configure"
+#include "confdefs.h"
+
+int main() {
+long long int i;
+; return 0; }
+EOF
+if { (eval echo configure:1630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_long_long=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_long_long=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_long_long" 1>&6
+  if test $ac_cv_c_long_long = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_LONG_LONG 1
+EOF
+
+  fi
+echo $ac_n "checking for __int64""... $ac_c" 1>&6
+echo "configure:1650: checking for __int64" >&5
+if eval "test \"`echo '$''{'ac_cv_c___int64'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1655 "configure"
+#include "confdefs.h"
+
+int main() {
+__int64 i;
+; return 0; }
+EOF
+if { (eval echo configure:1662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c___int64=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c___int64=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c___int64" 1>&6
+  if test $ac_cv_c___int64 = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE___INT64 1
+EOF
+
+  fi
+
+echo $ac_n "checking for built-in _Bool""... $ac_c" 1>&6
+echo "configure:1683: checking for built-in _Bool" >&5
+if eval "test \"`echo '$''{'gcc_cv_c__bool'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1688 "configure"
+#include "confdefs.h"
+
+int main() {
+_Bool foo;
+; return 0; }
+EOF
+if { (eval echo configure:1695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_c__bool=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_c__bool=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$gcc_cv_c__bool" 1>&6
+if test $gcc_cv_c__bool = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE__BOOL 1
+EOF
+
+fi
+
+
+# sizeof(char) is 1 by definition.
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:1719: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+  cat > conftest.$ac_ext <<EOF
+#line 1725 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (short) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_short=$ac_size
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_short != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_short = x ; then
+  { echo "configure: error: cannot determine a size for short" 1>&2; exit 1; }
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:1758: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+  cat > conftest.$ac_ext <<EOF
+#line 1764 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (int) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_int=$ac_size
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_int != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_int = x ; then
+  { echo "configure: error: cannot determine a size for int" 1>&2; exit 1; }
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:1797: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+  cat > conftest.$ac_ext <<EOF
+#line 1803 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (long) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_long=$ac_size
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_long != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_long = x ; then
+  { echo "configure: error: cannot determine a size for long" 1>&2; exit 1; }
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+if test $ac_cv_c_long_long = yes; then
+  echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:1837: checking size of long long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+  cat > conftest.$ac_ext <<EOF
+#line 1843 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (long long) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof_long_long=$ac_size
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof_long_long != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof_long_long = x ; then
+  { echo "configure: error: cannot determine a size for long long" 1>&2; exit 1; }
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
+
+
+fi
+if test $ac_cv_c___int64 = yes; then
+  echo $ac_n "checking size of __int64""... $ac_c" 1>&6
+echo "configure:1878: checking size of __int64" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  for ac_size in 4 8 1 2 16  ; do # List sizes in rough order of prevalence.
+  cat > conftest.$ac_ext <<EOF
+#line 1884 "configure"
+#include "confdefs.h"
+#include "confdefs.h"
+#include <sys/types.h>
+
+
+int main() {
+switch (0) case 0: case (sizeof (__int64) == $ac_size):;
+; return 0; }
+EOF
+if { (eval echo configure:1894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_sizeof___int64=$ac_size
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+  if test x$ac_cv_sizeof___int64 != x ; then break; fi
+done
+
+fi
+
+if test x$ac_cv_sizeof___int64 = x ; then
+  { echo "configure: error: cannot determine a size for __int64" 1>&2; exit 1; }
+fi
+echo "$ac_t""$ac_cv_sizeof___int64" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF___INT64 $ac_cv_sizeof___int64
+EOF
+
+
+fi
+
+echo $ac_n "checking execution character set""... $ac_c" 1>&6
+echo "configure:1919: checking execution character set" >&5
+if eval "test \"`echo '$''{'ac_cv_c_charset'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1924 "configure"
+#include "confdefs.h"
+#if '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \
+   && 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21
+ASCII
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "ASCII" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_c_charset=ASCII
+fi
+rm -f conftest*
+
+  if test x${ac_cv_c_charset+set} != xset; then
+    cat > conftest.$ac_ext <<EOF
+#line 1940 "configure"
+#include "confdefs.h"
+#if '\n' == 0x15 && ' ' == 0x40 && '0' == 0xF0 \
+   && 'A' == 0xC1 && 'a' == 0x81 && '!' == 0x5A
+EBCDIC
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "EBCDIC" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_c_charset=EBCDIC
+fi
+rm -f conftest*
+
+  fi
+  if test x${ac_cv_c_charset+set} != xset; then
+    ac_cv_c_charset=unknown
+  fi
+fi
+
+echo "$ac_t""$ac_cv_c_charset" 1>&6
+if test $ac_cv_c_charset = unknown; then
+  { echo "configure: error: *** Cannot determine host character set." 1>&2; exit 1; }
+elif test $ac_cv_c_charset = EBCDIC; then
+  cat >> confdefs.h <<\EOF
+#define HOST_EBCDIC 1
+EOF
+
+fi
 
 # If the native compiler is GCC, we can enable warnings even in stage1.  
 # That's useful for people building cross-compilers, or just running a
 # quick `make'.
-if test "x$GCC" = "xyes"; then 
-  stage1_warn_cflags='$(WARN_CFLAGS)'
-else
-  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
+  ;;
+powerpc-*-darwin*)
+  # The spiffy cpp-precomp chokes on some legitimate constructs in GCC
+  # sources; use -no-cpp-precomp to get to GNU cpp.
+  # Apple's GCC has bugs in designated initializer handling, so disable
+  # that too.
+  stage1_cflags="-no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
+  ;;
+esac
+
+
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1263: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2001: 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
@@ -1289,7 +2027,7 @@ fi
 
 
 echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6
-echo "configure:1291: checking whether a default assembler was specified" >&5
+echo "configure:2029: 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
@@ -1301,7 +2039,7 @@ else
 fi
 
 echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6
-echo "configure:1303: checking whether a default linker was specified" >&5
+echo "configure:2041: 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
@@ -1312,13 +2050,49 @@ else
     echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking for GNU C library""... $ac_c" 1>&6
+echo "configure:2053: 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 2058 "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:2068: \"$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
+
 # Find some useful tools
 for ac_prog in gawk mawk 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:1320: checking for $ac_word" >&5
+echo "configure:2094: 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
@@ -1347,86 +2121,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:1352: 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:1386: 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 1394 "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:1405: \"$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:1428: checking whether ln works" >&5
+echo "configure:2124: 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
@@ -1458,7 +2154,7 @@ else
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1460: checking whether ln -s works" >&5
+echo "configure:2156: 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
@@ -1489,43 +2185,10 @@ else
   fi
 fi
 
-echo $ac_n "checking for volatile""... $ac_c" 1>&6
-echo "configure:1492: 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 1497 "configure"
-#include "confdefs.h"
-
-int main() {
-volatile int foo;
-; return 0; }
-EOF
-if { (eval echo configure:1504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  gcc_cv_c_volatile=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  gcc_cv_c_volatile=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$gcc_cv_c_volatile" 1>&6
-if test $gcc_cv_c_volatile = yes ; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_VOLATILE 1
-EOF
-
-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:1527: checking for $ac_word" >&5
+echo "configure:2190: 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
@@ -1552,41 +2215,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:1559: 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:
@@ -1598,7 +2226,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:1600: checking for a BSD compatible install" >&5
+echo "configure:2228: 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
@@ -1648,93 +2276,13 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 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:1651: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 1666 "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:1672: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 1683 "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:1689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 1700 "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:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1731: checking for ANSI C header files" >&5
+echo "configure:2279: 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 1736 "configure"
+#line 2284 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1742,7 +2290,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2292: \"$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*
@@ -1759,7 +2307,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 1761 "configure"
+#line 2309 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1777,7 +2325,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 1779 "configure"
+#line 2327 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1798,7 +2346,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1800 "configure"
+#line 2348 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1809,7 +2357,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1833,12 +2381,12 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1835: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2383: 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 1840 "configure"
+#line 2388 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1847,7 +2395,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1867,13 +2415,46 @@ EOF
 
 fi
 
+echo $ac_n "checking for working stdbool.h""... $ac_c" 1>&6
+echo "configure:2418: checking for working stdbool.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdbool_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2423 "configure"
+#include "confdefs.h"
+#include <stdbool.h>
+int main() {
+bool foo = false;
+; return 0; }
+EOF
+if { (eval echo configure:2430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_stdbool_h=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdbool_h=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_header_stdbool_h" 1>&6
+if test $ac_cv_header_stdbool_h = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_STDBOOL_H 1
+EOF
+
+fi
+
 echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6
-echo "configure:1870: checking whether string.h and strings.h may both be included" >&5
+echo "configure:2451: 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 1875 "configure"
+#line 2456 "configure"
 #include "confdefs.h"
 #include <string.h>
 #include <strings.h>
@@ -1881,7 +2462,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_header_string=yes
 else
@@ -1902,12 +2483,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1904: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:2485: 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 1909 "configure"
+#line 2490 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1923,7 +2504,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -1943,21 +2524,24 @@ EOF
 
 fi
 
-for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h fcntl.h unistd.h stab.h sys/file.h sys/time.h sys/resource.h sys/param.h sys/times.h sys/stat.h direct.h
+for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h \
+		 fcntl.h unistd.h sys/file.h sys/time.h \
+		 sys/resource.h sys/param.h sys/times.h sys/stat.h \
+		 direct.h malloc.h langinfo.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1949: checking for $ac_hdr" >&5
+echo "configure:2533: 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 1954 "configure"
+#line 2538 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2543: \"$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*
@@ -1987,17 +2571,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:1989: checking for thread.h" >&5
+echo "configure:2573: 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 1994 "configure"
+#line 2578 "configure"
 #include "confdefs.h"
 #include <thread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1999: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2583: \"$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*
@@ -2021,17 +2605,17 @@ fi
 
 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:2023: checking for pthread.h" >&5
+echo "configure:2607: 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 2028 "configure"
+#line 2612 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2617: \"$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*
@@ -2054,83 +2638,746 @@ have_pthread_h=
 fi
 
 
+# These tests can't be done till we know if we have limits.h.
+echo $ac_n "checking for CHAR_BIT""... $ac_c" 1>&6
+echo "configure:2642: checking for CHAR_BIT" >&5
+if eval "test \"`echo '$''{'gcc_cv_decl_char_bit'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2647 "configure"
+#include "confdefs.h"
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+#ifdef CHAR_BIT
+found
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "found" >/dev/null 2>&1; then
+  rm -rf conftest*
+  gcc_cv_decl_char_bit=yes
+else
+  rm -rf conftest*
+  gcc_cv_decl_char_bit=no
+fi
+rm -f conftest*
+
+
+fi
+
+echo "$ac_t""$gcc_cv_decl_char_bit" 1>&6
+if test $gcc_cv_decl_char_bit = no; then
+  echo $ac_n "checking number of bits in a byte""... $ac_c" 1>&6
+echo "configure:2672: checking number of bits in a byte" >&5
+if eval "test \"`echo '$''{'gcc_cv_c_nbby'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  i=8
+ gcc_cv_c_nbby=
+ while test $i -lt 65; do
+   cat > conftest.$ac_ext <<EOF
+#line 2680 "configure"
+#include "confdefs.h"
+
+int main() {
+switch(0) {
+  case (unsigned char)((unsigned long)1 << $i) == ((unsigned long)1 << $i):
+  case (unsigned char)((unsigned long)1<<($i-1)) == ((unsigned long)1<<($i-1)):
+  ; }
+; return 0; }
+EOF
+if { (eval echo configure:2690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_c_nbby=$i; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+   i=`expr $i + 1`
+ done
+ test -z "$gcc_cv_c_nbby" && gcc_cv_c_nbby=failed
+
+fi
+
+echo "$ac_t""$gcc_cv_c_nbby" 1>&6
+if test $gcc_cv_c_nbby = failed; then
+  { echo "configure: error: cannot determine number of bits in a byte" 1>&2; exit 1; }
+else
+  cat >> confdefs.h <<EOF
+#define CHAR_BIT $gcc_cv_c_nbby
+EOF
+
+fi
+fi
+echo $ac_n "checking byte ordering""... $ac_c" 1>&6
+echo "configure:2715: checking byte ordering" >&5
+if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_c_compile_endian=unknown
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 2729 "configure"
+#include "confdefs.h"
+
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+/* This structure must have no internal padding.  */
+  struct {
+    char prefix[sizeof "\nendian:" - 1];
+    short word;
+    char postfix[2];
+ } tester = {
+    "\nendian:",
+#if SIZEOF_SHORT == 4
+    ('A' << (CHAR_BIT * 3)) | ('B' << (CHAR_BIT * 2)) |
+#endif
+    ('A' << CHAR_BIT) | 'B',
+    'X', '\n'
+};
+EOF
+if { (eval echo configure:2749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  od -c conftest.o |
+    sed 's/^[0-7]*[ 	]*/ /
+	  s/\*/./g
+	  s/ \\n/*/g
+	  s/ [0-9][0-9][0-9]/./g
+	  s/  \\[^ ]/./g' |
+    tr -d '
+ ' | tr -s '*' '
+' | fold | sed '$a\
+' > conftest.dmp
+  if   grep 'endian:AB' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_compile_endian=big-endian
+  elif grep 'endian:BA' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_compile_endian=little-endian
+  fi
+fi
+rm -rf conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+fi
+
+echo "$ac_t""$ac_cv_c_compile_endian" 1>&6
+if test $ac_cv_c_compile_endian = unknown; then
+  { echo "configure: error: *** unable to determine endianness" 1>&2; exit 1; }
+elif test $ac_cv_c_compile_endian = big-endian; then
+  cat >> confdefs.h <<\EOF
+#define HOST_WORDS_BIG_ENDIAN 1
+EOF
+
+fi
+
+echo $ac_n "checking floating point format""... $ac_c" 1>&6
+echo "configure:2788: checking floating point format" >&5
+if eval "test \"`echo '$''{'ac_cv_c_float_format'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext <<EOF
+#line 2801 "configure"
+#include "confdefs.h"
+/* This will not work unless sizeof(double) == 8.  */
+extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1];
+
+/* This structure must have no internal padding.  */
+struct possibility {
+  char prefix[8];
+  double candidate;
+  char postfix[8];
+};
+
+#define C(cand) { "\nformat:", cand, ":tamrof\n" }
+struct possibility table [] =
+{
+  C( 3.25724264705901305206e+01), /* @@IEEEFP - IEEE 754 */
+  C( 3.53802595280598432000e+18), /* D__float - VAX */
+  C( 5.32201830133125317057e-19), /* D.PDP-10 - PDP-10 - the dot is 0x13a */
+  C( 1.77977764695171661377e+10), /* IBMHEXFP - s/390 format, ascii */
+  C(-5.22995989424860458374e+10)  /* IBMHEXFP - s/390 format, EBCDIC */
+};
+EOF
+if { (eval echo configure:2823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  od -c conftest.o |
+    sed 's/^[0-7]*[ 	]*/ /
+	  s/\*/./g
+	  s/ \\n/*/g
+	  s/ [0-9][0-9][0-9]/./g
+	  s/  \\[^ ]/./g' |
+    tr -d '
+ ' | tr -s '*' '
+' | fold | sed '$a\
+' > conftest.dmp
+  if   grep 'format:.@IEEEF.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='IEEE (big-endian)'
+  elif grep 'format:.I@@PFE.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='IEEE (big-endian)'
+  elif grep 'format:.FEEEI@.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='IEEE (little-endian)'
+  elif grep 'format:.EFP@@I.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='IEEE (little-endian)'
+  elif grep 'format:.__floa.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='VAX D-float'
+  elif grep 'format:..PDP-1.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='PDP-10'
+  elif grep 'format:.BMHEXF.:tamrof' conftest.dmp >/dev/null 2>&1; then
+    ac_cv_c_float_format='IBM 370 hex'
+  else
+    { echo "configure: error: Unknown floating point format" 1>&2; exit 1; }
+  fi
+else
+  { echo "configure: error: compile failed" 1>&2; exit 1; }
+fi
+rm -rf conftest*
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+fi
+
+echo "$ac_t""$ac_cv_c_float_format" 1>&6
+# IEEE is the default format.  If the float endianness isn't the same
+# as the integer endianness, we have to set FLOAT_WORDS_BIG_ENDIAN
+# (which is a tristate: yes, no, default).  This is only an issue with
+# IEEE; the other formats are only supported by a few machines each,
+# all with the same endianness.
+format=
+fbigend=
+case $ac_cv_c_float_format in
+    'IEEE (big-endian)' )
+	if test $ac_cv_c_compile_endian = little-endian; then
+	    fbigend=1
+	fi
+	;;
+    'IEEE (little-endian)' )
+	if test $ac_cv_c_compile_endian = big-endian; then
+	    fbigend=0
+	fi
+	;;
+    'VAX D-float' )
+	format=VAX_FLOAT_FORMAT
+	;;
+    'PDP-10' )
+	format=PDP10_FLOAT_FORMAT
+	;;
+    'IBM 370 hex' )
+	format=IBM_FLOAT_FORMAT
+	;;
+esac
+if test -n "$format"; then
+	cat >> confdefs.h <<EOF
+#define HOST_FLOAT_FORMAT $format
+EOF
+
+fi
+if test -n "$fbigend"; then
+	cat >> confdefs.h <<EOF
+#define HOST_FLOAT_WORDS_BIG_ENDIAN $fbigend
+EOF
+
+fi
+
+
 # See if GNAT has been installed
-# Extract the first word of "gnatbind", so it can be a program name with args.
+if test $host != $build; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+
+# Extract the first word of "${ac_tool_prefix}gnatbind", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gnatbind; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2919: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$GNATBIND"; then
+  ac_cv_prog_GNATBIND="$GNATBIND" # 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_GNATBIND="${ac_tool_prefix}gnatbind"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+GNATBIND="$ac_cv_prog_GNATBIND"
+if test -n "$GNATBIND"; then
+  echo "$ac_t""$GNATBIND" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_GNATBIND"; then
+if test -n "$ac_tool_prefix"; then
+  # 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:2060: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnat'+set}'`\" = set"; then
+echo "configure:2951: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_GNATBIND'+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 "$GNATBIND"; then
+  ac_cv_prog_GNATBIND="$GNATBIND" # 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_GNATBIND="gnatbind"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_gnat" && ac_cv_prog_gnat="no"
+  test -z "$ac_cv_prog_GNATBIND" && ac_cv_prog_GNATBIND="no"
 fi
 fi
-gnat="$ac_cv_prog_gnat"
-if test -n "$gnat"; then
-  echo "$ac_t""$gnat" 1>&6
+GNATBIND="$ac_cv_prog_GNATBIND"
+if test -n "$GNATBIND"; then
+  echo "$ac_t""$GNATBIND" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
+else
+  GNATBIND="no"
+fi
+fi
 
-# See if the system preprocessor understands the ANSI C preprocessor
-# stringification operator.
-echo $ac_n "checking whether cpp understands the stringify operator""... $ac_c" 1>&6
-echo "configure:2091: checking whether cpp understands the stringify operator" >&5
-if eval "test \"`echo '$''{'gcc_cv_c_have_stringify'+set}'`\" = set"; then
+echo $ac_n "checking for compiler driver that understands Ada""... $ac_c" 1>&6
+echo "configure:2984: checking for compiler driver that understands Ada" >&5
+if eval "test \"`echo '$''{'gcc_cv_prog_adac'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 2096 "configure"
+  cat >conftest.adb <<EOF
+procedure conftest is begin null; end conftest;
+EOF
+gcc_cv_prog_adac=no
+# Have to do ac_tool_prefix and user overrides by hand.
+user_adac=$ADAC
+user_cc=$CC
+for cand in ${ac_tool_prefix}$user_adac	$user_adac	\
+	    ${ac_tool_prefix}$user_cc	$user_cc	\
+	    ${ac_tool_prefix}gcc	gcc		\
+	    ${ac_tool_prefix}cc		cc		\
+	    ${ac_tool_prefix}gnatgcc	gnatgcc		\
+	    ${ac_tool_prefix}gnatcc	gnatcc		\
+	    ${ac_tool_prefix}adagcc	adagcc		\
+	    ${ac_tool_prefix}adacc	adacc		; do
+  # There is a bug in all released versions of GCC which causes the
+  # driver to exit successfully when the appropriate language module
+  # has not been installed.  This is fixed in 2.95.4, 3.0.2, and 3.1.
+  # Therefore we must check for the error message as well as an
+  # unsuccessful exit.
+  errors=`($cand -c conftest.adb) 2>&1 || echo failure`
+  if test x"$errors" = x; then
+    gcc_cv_prog_adac=$cand
+    break
+  fi
+done
+rm -f conftest.*
+fi
+
+echo "$ac_t""$gcc_cv_prog_adac" 1>&6
+ADAC=$gcc_cv_prog_adac
+
+
+if test x$GNATBIND != xno && test x$ADAC != xno; then
+  have_gnat=yes
+else
+  have_gnat=no
+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:3032: 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 "$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_have_mktemp_command="yes"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_have_mktemp_command" && ac_cv_prog_have_mktemp_command="no"
+fi
+fi
+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
+
+
+# Do we have a single-tree copy of texinfo?
+if test -f $srcdir/../texinfo/Makefile.in; then
+  MAKEINFO='$(objdir)/../texinfo/makeinfo/makeinfo'
+  gcc_cv_prog_makeinfo_modern=yes
+  echo "$ac_t""Using makeinfo from the unified source tree." 1>&6
+else
+  # See if makeinfo has been installed and is modern enough
+  # that we can use it.
+  # 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:3071: 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
+  if test -n "$MAKEINFO"; then
+  ac_cv_prog_MAKEINFO="$MAKEINFO" # 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_MAKEINFO="makeinfo"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+MAKEINFO="$ac_cv_prog_MAKEINFO"
+if test -n "$MAKEINFO"; then
+  echo "$ac_t""$MAKEINFO" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+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:3100: 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:3106: version of makeinfo is $ac_prog_version" >&5
+  case $ac_prog_version in
+    '')     gcc_cv_prog_makeinfo_modern=no;;
+    4.*)
+            gcc_cv_prog_makeinfo_modern=yes;;
+    *)      gcc_cv_prog_makeinfo_modern=no;;
+  esac
+
+fi
+
+echo "$ac_t""$gcc_cv_prog_makeinfo_modern" 1>&6
+else
+  gcc_cv_prog_makeinfo_modern=no
+fi
+
+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." 1>&2
+  BUILD_INFO=
+else
+  BUILD_INFO=info		
+fi
+
+# Is pod2man recent enough to regenerate manpages?
+echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6
+echo "configure:3134: 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:3150: 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:3187: 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
+
+# These libraries may be used by collect2.
+# We may need a special search path to get them linked.
+echo $ac_n "checking for collect2 libraries""... $ac_c" 1>&6
+echo "configure:3219: checking for collect2 libraries" >&5
+if eval "test \"`echo '$''{'gcc_cv_collect2_libs'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  save_LIBS="$LIBS"
+for libs in '' -lld -lmld \
+		'-L/usr/lib/cmplrs/cc2.11 -lmld' \
+		'-L/usr/lib/cmplrs/cc3.11 -lmld'
+do
+	LIBS="$libs"
+	cat > conftest.$ac_ext <<EOF
+#line 3230 "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 ldopen();
+
+int main() {
+ldopen()
+; return 0; }
+EOF
+if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  gcc_cv_collect2_libs="$libs"; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+LIBS="$save_LIBS"
+test -z "$gcc_cv_collect2_libs" && gcc_cv_collect2_libs='none required'
+fi
+
+echo "$ac_t""$gcc_cv_collect2_libs" 1>&6
+case $gcc_cv_collect2_libs in
+	"none required")	;;
+	*)	COLLECT2_LIBS=$gcc_cv_collect2_libs ;;
+esac
+
+
+# When building Ada code on Alpha, we need exc_resume which is usually in
+# -lexc.  So test for it.
+save_LIBS="$LIBS"
+LIBS=
+
+echo $ac_n "checking for library containing exc_resume""... $ac_c" 1>&6
+echo "configure:3267: checking for library containing exc_resume" >&5
+if eval "test \"`echo '$''{'ac_cv_search_exc_resume'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_exc_resume="no"
+cat > conftest.$ac_ext <<EOF
+#line 3274 "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 exc_resume();
+
+int main() {
+exc_resume()
+; return 0; }
+EOF
+if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_exc_resume="none required"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_exc_resume" = "no" && for i in exc; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 3296 "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 exc_resume();
 
 int main() {
-#define S(x)   #x
-char *test = S(foo);
+exc_resume()
 ; return 0; }
 EOF
-if { (eval echo configure:2104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gcc_cv_c_have_stringify=yes
+  ac_cv_search_exc_resume="-l$i"
+break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+
+echo "$ac_t""$ac_cv_search_exc_resume" 1>&6
+if test "$ac_cv_search_exc_resume" != "no"; then
+  test "$ac_cv_search_exc_resume" = "none required" || LIBS="$ac_cv_search_exc_resume $LIBS"
+  
+else :
+  
+fi
+GNAT_LIBEXC="$LIBS"
+LIBS="$save_LIBS"
+
+
+# See if the stage1 system preprocessor understands the ANSI C
+# preprocessor stringification operator.  (Used by symcat.h.)
+
+
+echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6
+echo "configure:3336: 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 3341 "configure"
+#include "confdefs.h"
+
+#define x(y) #y
+
+char *s = x(teststring);
+
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "#teststring" >/dev/null 2>&1; then
   rm -rf conftest*
-  gcc_cv_c_have_stringify=no
+  ac_cv_c_stringize=no
+else
+  rm -rf conftest*
+  ac_cv_c_stringize=yes
 fi
 rm -f conftest*
+
 fi
 
-echo "$ac_t""$gcc_cv_c_have_stringify" 1>&6
-if test $gcc_cv_c_have_stringify = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_CPP_STRINGIFY 1
+if test "${ac_cv_c_stringize}" = yes
+then
+        cat >> confdefs.h <<\EOF
+#define HAVE_STRINGIZE 1
 EOF
 
 fi
+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:2127: checking for inttypes.h" >&5
+echo "configure:3374: 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 2132 "configure"
+#line 3379 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -2138,7 +3385,7 @@ int main() {
 intmax_t i = -1;
 ; return 0; }
 EOF
-if { (eval echo configure:2140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_header_inttypes_h=yes
 else
@@ -2158,18 +3405,18 @@ EOF
 
 fi
 
-for ac_func in strtoul bsearch strerror putenv popen bcopy bzero bcmp \
-	index rindex strchr strrchr kill getrlimit setrlimit atoll atoq \
-	sysconf isascii gettimeofday strsignal putc_unlocked fputc_unlocked \
-	fputs_unlocked
+
+for ac_func in times clock dup2 kill getrlimit setrlimit atoll atoq \
+	sysconf strsignal putc_unlocked fputc_unlocked fputs_unlocked \
+	fwrite_unlocked fprintf_unlocked getrusage nl_langinfo lstat
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2166: checking for $ac_func" >&5
+echo "configure:3413: 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 2171 "configure"
+#line 3418 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2192,7 +3439,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3441: \"$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
@@ -2217,127 +3464,166 @@ fi
 done
 
 
-# Make sure wchar_t is available
-#AC_CHECK_TYPE(wchar_t, unsigned int)
-
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2223: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+echo "configure:3467: 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 2228 "configure"
+#line 3472 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vprintf(); 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 vprintf();
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_ssize_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_ssize_t=no
+fi
+rm -f conftest*
 
-int main() {
+fi
+echo "$ac_t""$ac_cv_type_ssize_t" 1>&6
+if test $ac_cv_type_ssize_t = no; then
+  cat >> confdefs.h <<\EOF
+#define ssize_t int
+EOF
 
-/* 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_vprintf) || defined (__stub___vprintf)
-choke me
-#else
-vprintf();
-#endif
+fi
 
-; return 0; }
+
+# 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:3503: 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 3508 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
 EOF
-if { (eval echo configure:2251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "uid_t" >/dev/null 2>&1; then
   rm -rf conftest*
-  eval "ac_cv_func_vprintf=yes"
+  ac_cv_type_uid_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_vprintf=no"
+  ac_cv_type_uid_t=no
 fi
 rm -f conftest*
+
 fi
 
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
   cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
+#define uid_t int
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define gid_t int
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:2275: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
+echo "configure:3537: 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
+  if test "$cross_compiling" = yes; then
+  ac_cv_type_getgroups=cross
+else
   cat > conftest.$ac_ext <<EOF
-#line 2280 "configure"
+#line 3545 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt(); 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 _doprnt();
-
-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__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
+/* Thanks to Mike Rendell for this test.  */
+#include <sys/types.h>
+#define NGID 256
+#undef MAX
+#define MAX(x, y) ((x) > (y) ? (x) : (y))
+main()
+{
+  gid_t gidset[NGID];
+  int i, n;
+  union { gid_t gval; long lval; }  val;
+
+  val.lval = -1;
+  for (i = 0; i < NGID; i++)
+    gidset[i] = val.gval;
+  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
+                 gidset);
+  /* Exit non-zero if getgroups seems to require an array of ints.  This
+     happens when gid_t is short but getgroups modifies an array of ints.  */
+  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
+}
 
-; return 0; }
 EOF
-if { (eval echo configure:2303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=yes"
+if { (eval echo configure:3570: \"$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
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=no"
+  rm -fr conftest*
+  ac_cv_type_getgroups=int
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
+if test $ac_cv_type_getgroups = cross; then
+        cat > conftest.$ac_ext <<EOF
+#line 3584 "configure"
+#include "confdefs.h"
+#include <unistd.h>
 EOF
-
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "getgroups.*int.*gid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_getgroups=gid_t
 else
-  echo "$ac_t""no" 1>&6
+  rm -rf conftest*
+  ac_cv_type_getgroups=int
 fi
+rm -f conftest*
 
 fi
-
-vfprintf=
-doprint=
-if test $ac_cv_func_vprintf != yes ; then
-  vfprintf=vfprintf.o
-  if test $ac_cv_func__doprnt != yes ; then
-    doprint=doprint.o
-  fi
 fi
 
+echo "$ac_t""$ac_cv_type_getgroups" 1>&6
+cat >> confdefs.h <<EOF
+#define GETGROUPS_T $ac_cv_type_getgroups
+EOF
+
+
+if test "${target}" = "${build}"; then
+  TARGET_GETGROUPS_T=$ac_cv_type_getgroups
+else
+  case "${target}" in
+	# This condition may need some tweaking.  It should include all
+	# targets where the array type of the second argument of getgroups
+	# is int and the type of gid_t is not equivalent to int.
+	*-*-sunos* | *-*-ultrix*)
+		TARGET_GETGROUPS_T=int
+		;;
+	*)
+		TARGET_GETGROUPS_T=gid_t
+		;;
+  esac
+fi
 
 
 echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
-echo "configure:2339: checking whether the printf functions support %p" >&5
+echo "configure:3625: 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
@@ -2345,20 +3631,20 @@ else
   gcc_cv_func_printf_ptr=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2347 "configure"
+#line 3633 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 
-main()
+int main()
 {
   char buf[64];
   char *p = buf, *q = NULL;
   sprintf(buf, "%p", p);
   sscanf(buf, "%p", &q);
-  exit (p != q);
+  return (p != q);
 }
 EOF
-if { (eval echo configure:2360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3646: \"$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
@@ -2388,14 +3674,20 @@ case "${host}" in
 *** 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; }
   ;;
+*-*-*vms*)
+  # Under VMS, vfork works very different than on Unix. The standard test 
+  # won't work, and it isn't easily adaptable. It makes more sense to
+  # just force it.
+  ac_cv_func_vfork_works=yes
+  ;;
 esac
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:2392: checking for pid_t" >&5
+echo "configure:3684: 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 2397 "configure"
+#line 3689 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -2424,17 +3716,17 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:2426: checking for vfork.h" >&5
+echo "configure:3718: 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 2431 "configure"
+#line 3723 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3728: \"$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*
@@ -2459,18 +3751,18 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:2461: checking for working vfork" >&5
+echo "configure:3753: 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:2467: checking for vfork" >&5
+echo "configure:3759: 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 2472 "configure"
+#line 3764 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vfork(); below.  */
@@ -2493,7 +3785,7 @@ vfork();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3787: \"$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
@@ -2515,7 +3807,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
   cat > conftest.$ac_ext <<EOF
-#line 2517 "configure"
+#line 3809 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -2610,7 +3902,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:2612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3904: \"$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
@@ -2632,194 +3924,942 @@ EOF
 
 fi
 
-
-for ac_func in malloc realloc calloc free bcopy bzero bcmp \
-	index rindex getenv atol sbrk abort atof strerror getcwd getwd \
-	strsignal putc_unlocked fputs_unlocked strstr
+for ac_func in getpagesize
 do
-echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
-echo "configure:2640: checking whether $ac_func must be declared" >&5
-if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:3929: 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 2645 "configure"
+#line 3934 "configure"
 #include "confdefs.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();
 
-#include <stdio.h>
-#ifdef STRING_WITH_STRINGS
-# include <string.h>
-# include <strings.h>
+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
-# ifdef HAVE_STRING_H
-#  include <string.h>
-# else
-#  ifdef HAVE_STRINGS_H
-#   include <strings.h>
-#  endif
-# endif
+$ac_func();
 #endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+
+; return 0; }
+EOF
+if { (eval echo configure:3957: \"$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 -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+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
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+# 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 <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
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+# endif
+
+/* Assume that all systems that can run configure have sys/param.h.  */
+# ifndef HAVE_SYS_PARAM_H
+#  define HAVE_SYS_PARAM_H 1
+# endif
+
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
+#ifndef MAP_FAILED
+# define MAP_FAILED -1
 #endif
-#ifndef HAVE_RINDEX
-#define rindex strrchr
+
+#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
+  return (char *) mmap (0, size, PROT_READ|PROT_WRITE,
+			MAP_PRIVATE, devzero, 0);
 #endif
-#ifndef HAVE_INDEX
-#define index strchr
+}
+
+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)
+    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
+
+echo $ac_n "checking for working mmap from /dev/zero""... $ac_c" 1>&6
+echo "configure:4228: 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 4244 "configure"
+#include "confdefs.h"
+#include "ct-mmap.inc"
+EOF
+if { (eval echo configure:4248: \"$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:4275: 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 4285 "configure"
+#include "confdefs.h"
+#define USE_MAP_ANON
+#include "ct-mmap.inc"
+EOF
+if { (eval echo configure:4290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_func_mmap_anon=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_anon=no
+ else ac_cv_func_mmap_anon=buggy
+ fi
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+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_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:4318: 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
+  # Create a file one thousand bytes long.
+for i in 1 2 3 4 5 6 7 8 9 0
+do for j in 1 2 3 4 5 6 7 8 9 0
+do echo $i $j xxxxx
+done
+done > conftestdata$$
+
+if test "$cross_compiling" = yes; then
+  ac_cv_func_mmap_file=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4333 "configure"
+#include "confdefs.h"
+
+/* Test by Zack Weinberg.  Modified from MMAP_ANYWHERE test by
+   Richard Henderson and Alexandre Oliva.
+   Check whether read-only mmap of a plain file works. */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+
+int main()
+{
+  char *x;
+  int fd;
+  struct stat st;
+
+  fd = open("conftestdata$$", O_RDONLY);
+  if (fd < 0)
+    exit(1);
+
+  if (fstat (fd, &st))
+    exit(2);
+
+  x = (char*)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
+  if (x == (char *) -1)
+    exit(3);
+
+  if (x[0] != '1' || x[1] != ' ' || x[2] != '1' || x[3] != ' ')
+    exit(4);
+
+  if (munmap(x, st.st_size) < 0)
+    exit(5);
+
+  exit(0);
+}
+EOF
+if { (eval echo configure:4370: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_func_mmap_file=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_func_mmap_file" 1>&6
+if test $ac_cv_func_mmap_file = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_MMAP_FILE 1
+EOF
+
+fi
+
+
+
+    
+  am_cv_lib_iconv_ldpath=
+  # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+  withval="$with_libiconv_prefix"
+  
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then am_cv_lib_iconv_ldpath="-L$dir/lib"; fi
+    done
+   
+fi
+
+
+  echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:4409: checking for iconv" >&5
+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat > conftest.$ac_ext <<EOF
+#line 4417 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
 int main() {
-char *(*pfn) = (char *(*)) $ac_func
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:2678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "gcc_cv_decl_needed_$ac_func=no"
+  am_cv_func_iconv=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
+      cat > conftest.$ac_ext <<EOF
+#line 4439 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+; return 0; }
+EOF
+if { (eval echo configure:4449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "gcc_cv_decl_needed_$ac_func=yes"
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+      LIBS="$am_save_LIBS"
+    fi
+  
 fi
 
-if eval "test \"`echo '$gcc_cv_decl_needed_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  gcc_tr_decl=NEED_DECLARATION_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $gcc_tr_decl 1
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+  if test "$am_cv_func_iconv" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_ICONV 1
 EOF
 
+    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+echo "configure:4470: checking for iconv declaration" >&5
+    if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  
+      cat > conftest.$ac_ext <<EOF
+#line 4476 "configure"
+#include "confdefs.h"
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  am_cv_proto_iconv_arg1=""
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  am_cv_proto_iconv_arg1="const"
+fi
+rm -f conftest*
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
-done
+    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    echo "$ac_t""${ac_t:-
+         }$am_cv_proto_iconv" 1>&6
+    cat >> confdefs.h <<EOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
+EOF
 
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="$am_cv_lib_iconv_ldpath -liconv"
+  fi
+  
 
-for ac_func in getrlimit setrlimit
+
+# We will need to find libiberty.h and ansidecl.h
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
+for ac_func in getenv atol sbrk abort atof getcwd getwd \
+	strsignal putc_unlocked fputs_unlocked fwrite_unlocked \
+        fprintf_unlocked strstr errno \
+	malloc realloc calloc free basename getopt clock
 do
-echo $ac_n "checking whether $ac_func must be declared""... $ac_c" 1>&6
-echo "configure:2707: checking whether $ac_func must be declared" >&5
-if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
+  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:4533: 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 2712 "configure"
+#line 4538 "configure"
 #include "confdefs.h"
+#undef $ac_tr_decl
+#define $ac_tr_decl 1
+  
+#include "ansidecl.h"
+#include "system.h"
 
-#include <stdio.h>
-#ifdef STRING_WITH_STRINGS
-# include <string.h>
-# include <strings.h>
-#else
-# ifdef HAVE_STRING_H
-#  include <string.h>
-# else
-#  ifdef HAVE_STRINGS_H
-#   include <strings.h>
-#  endif
-# endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifndef HAVE_RINDEX
-#define rindex strrchr
-#endif
-#ifndef HAVE_INDEX
-#define index strchr
+int main() {
+#ifndef $ac_func
+char *(*pfn) = (char *(*)) $ac_func ;
 #endif
-#include <sys/types.h>
+; return 0; }
+EOF
+if { (eval echo configure:4552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "gcc_cv_have_decl_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "gcc_cv_have_decl_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$gcc_cv_have_decl_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6 ; cat >> confdefs.h <<EOF
+#define $ac_tr_decl 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6 ; cat >> confdefs.h <<EOF
+#define $ac_tr_decl 0
+EOF
+ 
+fi
+
+done
+if test x = y ; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_DECL_GETENV 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_ATOL 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_SBRK 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_ABORT 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_ATOF 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_GETCWD 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_GETWD 1
+EOF
+ \
+	cat >> confdefs.h <<\EOF
+#define HAVE_DECL_STRSIGNAL 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_PUTC_UNLOCKED 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_FPUTS_UNLOCKED 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_FWRITE_UNLOCKED 1
+EOF
+ \
+        cat >> confdefs.h <<\EOF
+#define HAVE_DECL_FPRINTF_UNLOCKED 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_STRSTR 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_ERRNO 1
+EOF
+ \
+	cat >> confdefs.h <<\EOF
+#define HAVE_DECL_MALLOC 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_REALLOC 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_CALLOC 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_FREE 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_BASENAME 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_GETOPT 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_CLOCK 1
+EOF
+fi
+
+
+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:4651: 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 4656 "configure"
+#include "confdefs.h"
+#undef $ac_tr_decl
+#define $ac_tr_decl 1
+  
+#include "ansidecl.h"
+#include "system.h"
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
+
 int main() {
-char *(*pfn) = (char *(*)) $ac_func
+#ifndef $ac_func
+char *(*pfn) = (char *(*)) $ac_func ;
+#endif
 ; return 0; }
 EOF
-if { (eval echo configure:2749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "gcc_cv_decl_needed_$ac_func=no"
+  eval "gcc_cv_have_decl_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "gcc_cv_decl_needed_$ac_func=yes"
+  eval "gcc_cv_have_decl_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$gcc_cv_decl_needed_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  gcc_tr_decl=NEED_DECLARATION_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $gcc_tr_decl 1
+if eval "test \"`echo '$gcc_cv_have_decl_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6 ; cat >> confdefs.h <<EOF
+#define $ac_tr_decl 1
 EOF
-
+ 
 else
-  echo "$ac_t""no" 1>&6
+  echo "$ac_t""no" 1>&6 ; cat >> confdefs.h <<EOF
+#define $ac_tr_decl 0
+EOF
+ 
 fi
 
 done
+if test x = y ; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_DECL_GETRLIMIT 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_SETRLIMIT 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DECL_GETRUSAGE 1
+EOF
+fi
 
 
-echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2776: checking for sys_siglist declaration in signal.h or unistd.h" >&5
-if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
+for ac_func in times
+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:4716: 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 2781 "configure"
+#line 4721 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <signal.h>
-/* NetBSD declares sys_siglist in unistd.h.  */
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#undef $ac_tr_decl
+#define $ac_tr_decl 1
+  
+#include "ansidecl.h"
+#include "system.h"
+#ifdef HAVE_SYS_TIMES_H
+#include <sys/times.h>
+#endif
+
+
+int main() {
+#ifndef $ac_func
+char *(*pfn) = (char *(*)) $ac_func ;
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:4739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "gcc_cv_have_decl_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "gcc_cv_have_decl_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$gcc_cv_have_decl_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6 ; cat >> confdefs.h <<EOF
+#define $ac_tr_decl 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6 ; cat >> confdefs.h <<EOF
+#define $ac_tr_decl 0
+EOF
+ 
+fi
+
+done
+if test x = y ; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_DECL_TIMES 1
+EOF
+fi
+
+
+# More time-related stuff.
+echo $ac_n "checking for struct tms""... $ac_c" 1>&6
+echo "configure:4773: checking for struct tms" >&5
+if eval "test \"`echo '$''{'ac_cv_struct_tms'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 4779 "configure"
+#include "confdefs.h"
+
+#include "ansidecl.h"
+#include "system.h"
+#ifdef HAVE_SYS_TIMES_H
+#include <sys/times.h>
 #endif
+
 int main() {
-char *msg = *(sys_siglist + 1);
+struct tms tms;
 ; return 0; }
 EOF
-if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_decl_sys_siglist=yes
+  ac_cv_struct_tms=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_decl_sys_siglist=no
+  ac_cv_struct_tms=no
 fi
 rm -f conftest*
 fi
 
-echo "$ac_t""$ac_cv_decl_sys_siglist" 1>&6
-if test $ac_cv_decl_sys_siglist = yes; then
+echo "$ac_t""$ac_cv_struct_tms" 1>&6
+if test $ac_cv_struct_tms = yes; then
   cat >> confdefs.h <<\EOF
-#define SYS_SIGLIST_DECLARED 1
+#define HAVE_STRUCT_TMS 1
 EOF
 
 fi
 
+# use gcc_cv_* here because this doesn't match the behavior of AC_CHECK_TYPE.
+# revisit after autoconf 2.50.
+echo $ac_n "checking for clock_t""... $ac_c" 1>&6
+echo "configure:4815: checking for clock_t" >&5
+if eval "test \"`echo '$''{'gcc_cv_type_clock_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+cat > conftest.$ac_ext <<EOF
+#line 4821 "configure"
+#include "confdefs.h"
+
+#include "ansidecl.h"
+#include "system.h"
+
+int main() {
+clock_t x;
+; return 0; }
+EOF
+if { (eval echo configure:4831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  gcc_cv_type_clock_t=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  gcc_cv_type_clock_t=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$gcc_cv_type_clock_t" 1>&6
+if test $gcc_cv_type_clock_t = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_CLOCK_T 1
+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:2816: checking if mkdir takes one argument" >&5
+echo "configure:4856: 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 2821 "configure"
+#line 4861 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -2836,7 +4876,7 @@ int main() {
 mkdir ("foo", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:2838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   gcc_cv_mkdir_takes_one_arg=no
 else
@@ -2878,2979 +4918,7 @@ host_exeext=
 # 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 and xm_file so it can be updated in
-	# each machine entry.
-	cpu_type=`echo $machine | sed 's/-.*$//'`
-	case $machine in
-	alpha*-*-*)
-		cpu_type=alpha
-		;;
-	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
-		;;
-	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
-	
-	# 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-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-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-linux alpha/t-crtbe alpha/t-ieee"
-		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
-		;;
-	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-linux alpha/t-crtbe alpha/t-ieee"
-		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
-		;;
-	alpha*-*-freebsd*)
-		tm_file="${tm_file} freebsd.h alpha/freebsd.h"
-		xm_file="${xm_file} xm-freebsd.h"
-		target_cpu_default="MASK_GAS"
-		tmake_file="t-freebsd alpha/t-crtbe"
-		xmake_file=none
-		fixincludes=fixinc.wrap
-		gas=yes gnu_ld=yes
-		;;
-	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-ieee"
-		extra_parts="crtbegin.o crtend.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-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-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
-		    ;;
-		esac
-		case $machine in
-		  *-*-osf4.0[b-z] | *-*-osf4.[1-9]*)
-		    target_cpu_default=MASK_SUPPORT_ARCH
-		    ;;
-		esac
-		;;
- 	alpha*-*-vxworks*)
-		tm_file="${tm_file} dbx.h alpha/vxworks.h"
-		tmake_file="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-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-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-bare
-		;;
-	arm-*-vxworks*)
-		tm_file=arm/vxarm.h
-		tmake_file=arm/t-bare
-		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
-		xm_file="arm/xm-netbsd.h ${xm_file}"
-		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*-*-aout)
-		tm_file=arm/aout.h
-		tmake_file=arm/t-bare
-		;;
-        arm*-*-ecos-elf)
-		tm_file=arm/ecos-elf.h
-		tmake_file=arm/t-elf
-		;; 
-	arm*-*-elf)
-		tm_file=arm/unknown-elf.h
-		tmake_file=arm/t-arm-elf
-		;;
-        arm*-*-oabi)
-		tm_file=arm/unknown-elf-oabi.h
-		tmake_file=arm/t-arm-elf
-		;;
-	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
-		;;
-	dsp16xx-*)
-		;;
-	elxsi-elxsi-*)
-		use_collect2=yes
-		;;
-# This hasn't been upgraded to GCC 2.
-#	fx80-alliant-*)			# Alliant FX/80
-#		;;
-	h8300-*-*)
-		float_format=i32
-		;;
-	hppa*-*-openbsd*)
-		target_cpu_default="MASK_PA_11"
-		tmake_file=pa/t-openbsd
-		;;
-	hppa1.1-*-pro*)
-		tm_file="pa/pa-pro.h ${tm_file} 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/pa-osf.h"
-		use_collect2=yes
-		;;
-	hppa1.1-*-rtems*)
-		tm_file="pa/pa-pro.h ${tm_file} 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/pa-osf.h"
-		use_collect2=yes
-		;;
-	hppa1.1-*-bsd*)
-		target_cpu_default="MASK_PA_11"
-		use_collect2=yes
-		;;
-	hppa1.0-*-bsd*)
-		use_collect2=yes
-		;;
-	hppa1.0-*-hpux7*)
-		tm_file="pa/pa-oldas.h ${tm_file} pa/pa-hpux7.h"
-		xm_file=pa/xm-pahpux.h
-		xmake_file=pa/x-pa-hpux
-		if 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/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/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/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/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/pa-hpux.h pa/pa-hpux10.h"
-		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/pa-hpux.h pa/pa-hpux10.h"
-		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.1-*-hpux* | hppa2*-*-hpux*)
-		target_cpu_default="MASK_PA_11"
-		tm_file="${tm_file} pa/pa-hpux.h pa/pa-hpux9.h"
-		xm_file=pa/xm-pahpux.h
-		xmake_file=pa/x-pa-hpux
-		if 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/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/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/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*)
-		target_cpu_default="MASK_PA_11"
-		use_collect2=yes
-		;;
-	i370-*-mvs*)
-		;;
-	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-siglist.h 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-siglist.h 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-*-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-*-freebsdaout*)
-		tm_file=i386/freebsd-aout.h
-		# On FreeBSD, the headers are already ok, except for math.h.
-		fixincludes=fixinc.wrap
-		tmake_file=t-freebsd
-		;;
-	i[34567]86-*-freebsd* | i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsdelf*)
-		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd.h i386/perform.h"
-		# On FreeBSD, the headers are already ok, except for math.h.
-		fixincludes=fixinc.wrap
-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		tmake_file=t-freebsd
-		gas=yes
-		gnu_ld=yes
-		stabs=yes
-		;;
-	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
-		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
-		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-*-rtemself*)
-		cpu_type=i386
-		tm_file=i386/rtemself.h
-		tmake_file="i386/t-i386bare t-rtems"
-		;;
-	i[34567]86-*-rtems*)
-		cpu_type=i386
-		tm_file=i386/rtems.h
-		tmake_file="i386/t-i386bare t-rtems"
-		;;
-	i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
-		xm_file="xm-siglist.h 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
-		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 NO_SYS_SIGLIST"
-		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
-		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
-		truncate_target=yes
-		;;
-	i[34567]86-*-solaris2*)
-		xm_file="xm-siglist.h 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-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 = xyes; then
-			thread_file='solaris'
-		fi
-		;;
-       i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
-               xm_file="xm-alloca.h xm-siglist.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-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-siglist.h 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-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-siglist.h ${xm_file}"
-		xm_defines="USG POSIX"
-		tm_file=i386/udk.h
-		tmake_file="i386/t-crtpic i386/t-udk"
-		xmake_file=x-svr4
-		extra_parts="crtbegin.o crtend.o"
-		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
-		;;
-	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
-		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 NO_SYS_SIGLIST"
-		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-siglist.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
-		;;
-	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 NO_SYS_SIGLIST"
-		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}"
-		xm_defines=NO_SYS_SIGLIST
-		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
-		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 NO_SYS_SIGLIST"
-		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 NO_SYS_SIGLIST"
-		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-nextstep3*)
-		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 libgloss.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-*-rtems*)
-		tmake_file="m68k/t-m68kbare t-rtems"
-		tm_file=m68k/rtems.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"
-		;;
-	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
-		;;
-	mips-sgi-irix6*)		# SGI System V.4., IRIX 6
-		tm_file=mips/iris6.h
-		xm_file=mips/xm-iris6.h
-		xmake_file=mips/x-iris6
-		tmake_file=mips/t-iris6
-# 		if test x$enable_threads = xyes; then
-#			thread_file='irix'
-#		fi
-		;;
-	mips-wrs-vxworks)
-		tm_file="mips/elf.h libgloss.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
-		xm_file="xm-siglist.h ${xm_file}"
-               case $machine in
-                       mipsel-*)  tm_file="mips/elfl.h mips/linux.h" ;;
-                       *)         tm_file="mips/elf.h mips/linux.h" ;;
-               esac
-		extra_parts="crtbegin.o crtend.o"
-		gnu_ld=yes
-		gas=yes
-		;;
-	mips*el-*-openbsd*)	# mips little endian
-		target_cpu_default="MASK_GAS|MASK_ABICALLS"
-		tm_file=mips/openbsd.h
-		;;
-	mips*-*-openbsd*)		# mips big endian
-		target_cpu_default="MASK_GAS|MASK_ABICALLS"
-		tm_file=mips/openbsd-be.h
-		;;
-	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_file="xm-siglist.h ${xm_file}"
-		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_file="xm-siglist.h ${xm_file}"
-		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
-		xm_file="xm-siglist.h ${xm_file}"
-		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 libgloss.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 libgloss.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 libgloss.h"
-		tmake_file=mips/t-elf
-		;;
-	mips64orion-*-rtems*)
-		tm_file="mips/elforion.h mips/elf64.h mips/rtems64.h"
-		tmake_file="mips/t-ecoff 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-*-*)
-		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-*-*)
-		;;
-	ns32k-*-openbsd*)
-		# Nothing special
-		;;
-	pyramid-*-*)
-		cpu_type=pyr
-		xmake_file=pyr/x-pyr
-		use_collect2=yes
-		;;
-	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* | powerpc-*-elf*)
-		tm_file=rs6000/sysv4.h
-		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
-		xm_defines="USG POSIX"
-		extra_headers=ppc-asm.h
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
-		xmake_file=rs6000/x-sysv4
-		;;
-	powerpc-*-eabiaix*)
-		tm_file=rs6000/eabiaix.h
-		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		extra_headers=ppc-asm.h
-		;;
-	powerpc-*-eabisim*)
-		tm_file=rs6000/eabisim.h
-		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		extra_headers=ppc-asm.h
-		;;
-	powerpc-*-eabi*)
-		tm_file=rs6000/eabi.h
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
-		extra_headers=ppc-asm.h
-		;;
-	powerpc-*-rtems*)
-		tm_file=rs6000/rtems.h
-		if test x$gas = xyes
-		then
-		     tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
-		else
-		     tmake_file="rs6000/t-ppc t-rtems rs6000/t-ppccomm"
-		fi
-		extra_headers=ppc-asm.h
-		;;
-	powerpc-*-linux-gnulibc1)
-		tm_file=rs6000/linux.h
-		xm_file=rs6000/xm-sysv4.h
-		out_file=rs6000/rs6000.c
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
-		fi
-		xmake_file=x-linux
-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		extra_headers=ppc-asm.h
-		if test x$enable_threads = xyes; then
-			thread_file='posix'
-		fi
-		;;
-	powerpc-*-linux-gnu*)
-		tm_file=rs6000/linux.h
-		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
-		xm_defines="USG ${xm_defines}"
-		out_file=rs6000/rs6000.c
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos t-linux rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc t-linux rs6000/t-ppccomm"
-		fi
-		xmake_file=x-linux
-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		extra_headers=ppc-asm.h
-		if test x$enable_threads = xyes; then
-			thread_file='posix'
-		fi
-		;;
-        powerpc-wrs-vxworks*)
-                cpu_type=rs6000
-		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
-		xm_defines="USG POSIX"
-                tm_file=rs6000/vxppc.h
-                tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		extra_headers=ppc-asm.h
-		thread_file='vxworks'
-                ;;
-	powerpcle-*-sysv* | powerpcle-*-elf*)
-		tm_file=rs6000/sysv4le.h
-		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
-		xm_defines="USG POSIX"
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
-		xmake_file=rs6000/x-sysv4
-		extra_headers=ppc-asm.h
-		;;
-	powerpcle-*-eabisim*)
-		tm_file=rs6000/eabilesim.h
-		tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		extra_headers=ppc-asm.h
-		;;
-	powerpcle-*-eabi*)
-		tm_file=rs6000/eabile.h
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
-		extra_headers=ppc-asm.h
-		;;
-        powerpcle-*-winnt* )
-                tm_file=rs6000/win-nt.h
-                tmake_file=rs6000/t-winnt
-#               extra_objs=pe.o
- 		if test x$enable_threads = xyes; then
-			thread_file='win32'
-		fi
-		extra_headers=ppc-asm.h
-		;;
-	powerpcle-*-pe | powerpcle-*-cygwin*)
-		tm_file=rs6000/cygwin.h
-		xm_file="rs6000/xm-cygwin.h ${xm_file}"
-		tmake_file=rs6000/t-winnt
-		xmake_file=rs6000/x-cygwin
-#		extra_objs=pe.o
- 		if test x$enable_threads = xyes; then
-			thread_file='win32'
-		fi
-		exeext=.exe
-		extra_headers=ppc-asm.h
-		;;
-	powerpcle-*-solaris2*)
-		tm_file=rs6000/sol2.h
-		xm_file="xm-siglist.h rs6000/xm-sysv4.h"
-		xm_defines="USG POSIX"
-		if test x$gas = xyes
-		then
-			tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
-		else
-			tmake_file="rs6000/t-ppc rs6000/t-ppccomm"
-		fi
-		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
-			xmake_file=rs6000/x-aix41
-		fi
-		float_format=none
-		use_collect2=yes
-		;;
-	rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
-		tm_file=rs6000/aix43.h
-		if test x$host != x$target
-		then
-			tmake_file=rs6000/t-xaix43
-		else
-			tmake_file=rs6000/t-aix43
-		fi
-		xmake_file=rs6000/x-aix43
-		float_format=none
-		use_collect2=yes
-		;;
-	rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
-		tm_file=rs6000/aix43.h
-		if test x$host != x$target
-		then
-			tmake_file=rs6000/t-xaix43
-		else
-			tmake_file=rs6000/t-aix43
-		fi
-		xmake_file=rs6000/x-aix43
-		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
-		;;
-	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
-		;;
-	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-*-rtems*)
-		tmake_file="sparc/t-sparcbare t-rtems"
-		tm_file=sparc/rtems.h
-		;;
-	sparcv9-*-solaris2*)
-		tm_file=sparc/sol2-sld-64.h
-		xm_file="sparc/xm-sysv4-64.h sparc/xm-sol2.h"
-		xm_defines="USG POSIX"
-		tmake_file="sparc/t-sol2 sparc/t-sol2-64"
-		xmake_file=sparc/x-sysv4
-		extra_parts="crt1.o crti.o crtn.o gcrt1.o crtbegin.o crtend.o"
-		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="xm-siglist.h 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="xm-siglist.h 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-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="xm-siglist.h 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="xm-siglist.h 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
-		;;
-	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
-		;;
-	sparc64-*-freebsd*)
-		tmake_file=sparc/t-sp64
-		tm_file=sparc/sp64-elf.h
-		xm_file="sparc/xm-sp64.h sparc/xm-freebsd.h"
-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-		gas=yes
-		gnu_ld=yes
-		;;
-# 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-*-coff* | thumbel-*-coff*)
-		tm_file=arm/tcoff.h
-		out_file=arm/thumb.c
-		xm_file=arm/xm-thumb.h
-		md_file=arm/thumb.md
-		tmake_file=arm/t-thumb
-		;;
-	thumb-wrs-vxworks)
-		tm_file=arm/tcoff.h
-		out_file=arm/thumb.c
-		xm_file=arm/xm-thumb.h
-		md_file=arm/thumb.md
-		tmake_file=arm/t-thumb
-		thread_file='vxworks'
-		;;
-# This hasn't been upgraded to GCC 2.
-#	tron-*-*)
-#		cpu_type=gmicro
-#		use_collect2=yes
-#		;;
-	v850-*-*)
-		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"
-		;;
-	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
-
-	# 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*)
-				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
-			xarm23678 | xarm250 | xarm67010 \
-			| 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
-		;;
-
-	mips*-*-ecoff* | mips*-*-elf*)
-		if test x$gas = xyes
-		then
-			if test x$gnu_ld = xyes
-			then
-				target_cpu_default2=20
-			else
-				target_cpu_default2=16
-			fi
-		fi
-		;;
-	mips*-*-*)
-		if test x$gas = xyes
-		then
-			target_cpu_default2=16
-		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
-
-	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
-
-	# 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
+	. ${srcdir}/config.gcc
 done
 
 extra_objs="${host_extra_objs} ${extra_objs}"
@@ -5859,12 +4927,9 @@ 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
-then xm_file=$cpu_type/xm-$cpu_type.h; fi
-
 if test x$md_file = x
 then md_file=$cpu_type/$cpu_type.md; fi
 
@@ -5876,7 +4941,7 @@ then tmake_file=$cpu_type/t-$cpu_type
 fi
 
 if test x"$dwarf2" = xyes
-then tm_file="tm-dwarf2.h $tm_file"
+then tm_file="$tm_file tm-dwarf2.h"
 fi
 
 if test x$float_format = x
@@ -5888,14 +4953,6 @@ then float_h_file=Makefile.in
 else float_h_file=float-$float_format.h
 fi
 
-if test x$enable_haifa = x
-then
-  case $target in
-    alpha*-* | hppa*-* | powerpc*-* | rs6000-* | *sparc*-* | m32r*-*)
-      enable_haifa=yes;;
-  esac
-fi
-
 # Handle cpp installation.
 if test x$enable_cpp != xno
 then
@@ -5903,9 +4960,39 @@ then
 fi
 
 # Say what files are being used for the output code and MD file.
-echo "Using \`$srcdir/config/$out_file' to output insns."
+echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
 echo "Using \`$srcdir/config/$md_file' as machine description file."
 
+# If any of the xm_file variables contain nonexistent files, warn
+# about them and drop them.
+
+bx=
+for x in $build_xm_file; do
+  if    test -f $srcdir/config/$x
+  then      bx="$bx $x"
+  else      echo "configure: warning: $srcdir/config/$x does not exist." 1>&2
+  fi
+done
+build_xm_file="$bx"
+
+hx=
+for x in $host_xm_file; do
+  if    test -f $srcdir/config/$x
+  then      hx="$hx $x"
+  else      echo "configure: warning: $srcdir/config/$x does not exist." 1>&2
+  fi
+done
+host_xm_file="$hx"
+
+tx=
+for x in $xm_file; do
+  if    test -f $srcdir/config/$x
+  then      tx="$tx $x"
+  else      echo "configure: warning: $srcdir/config/$x does not exist." 1>&2
+  fi
+done
+xm_file="$tx"
+
 count=a
 for f in $tm_file; do
 	count=${count}x
@@ -5923,7 +5010,9 @@ count=a
 for f in $host_xm_file; do
 	count=${count}x
 done
-if test $count = ax; then
+if test $count = a; then
+	:
+elif test $count = ax; then
 	echo "Using \`$srcdir/config/$host_xm_file' as host machine macro file."
 else
 	echo "Using the following host machine macro files:"
@@ -5937,7 +5026,9 @@ if test "$host_xm_file" != "$build_xm_file"; then
 	for f in $build_xm_file; do
 		count=${count}x
 	done
-	if test $count = ax; then
+	if test $count = a; then
+		:
+	elif test $count = ax; then
 		echo "Using \`$srcdir/config/$build_xm_file' as build machine macro file."
 	else
 		echo "Using the following build machine macro files:"
@@ -5955,20 +5046,15 @@ if test x$thread_file = x; then
 	fi
 fi
 
-# Set up the header files.
-# $links is the list of header files to create.
-# $vars is the list of shell variables with file names to include.
 # 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"
-
 # 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_auto=auto-host.h
+	FORBUILD=..
 else
 	# We create a subdir, then run autoconf in the subdir.
 	# To prevent recursion we set host and build for the new
@@ -5979,70 +5065,29 @@ else
 	mkdir $tempdir
 	cd $tempdir
 	case ${srcdir} in
-	/*) realsrcdir=${srcdir};;
+	/* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
 	*) realsrcdir=../${srcdir};;
 	esac
-	CC=${CC_FOR_BUILD} ${realsrcdir}/configure \
+	saved_CFLAGS="${CFLAGS}"
+	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
+	${realsrcdir}/configure \
 		--target=$target --host=$build --build=$build
+	CFLAGS="${saved_CFLAGS}"
 
 	# We just finished tests for the build machine, so rename
 	# the file auto-build.h in the gcc directory.
 	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_auto=auto-build.h
+	FORBUILD=../$build
 fi
 
-xm_file="gansidecl.h ${xm_file}"
-tm_file="gansidecl.h ${tm_file}"
-
-vars="host_xm_file tm_file xm_file build_xm_file"
-links="config.h tm.h tconfig.h hconfig.h"
-defines="host_xm_defines null_defines xm_defines build_xm_defines"
 
-rm -f config.bak
-if test -f config.status; then mv -f config.status config.bak; fi
-
-# Make the links.
-while test -n "$vars"
-do
-	set $vars; var=$1; shift; vars=$*
-	set $links; link=$1; shift; links=$*
-	set $defines; define=$1; shift; defines=$*
-
-	rm -f $link
-
-	# Define TARGET_CPU_DEFAULT if the system wants one.
-	# This substitutes for lots of *.h files.
-	if test "$target_cpu_default" != "" -a $link = tm.h
-	then
-		echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link
-	fi
-
-	for file in `eval echo '$'$var`; do
-		case $file in
-		auto-config.h)
-			;;
-		*)
-			echo '#ifdef IN_GCC' >>$link
-			;;
-		esac
-		echo "#include \"$file\"" >>$link
-		case $file in
-		auto-config.h)
-			;;
-		*)
-			echo '#endif' >>$link
-			;;
-		esac
-	done
-
-	for def in `eval echo '$'$define`; do
-		echo "#ifndef $def" >>$link
-		echo "#define $def" >>$link
-		echo "#endif" >>$link
-	done
-done
+tm_file="${tm_file} defaults.h"
+host_xm_file="auto-host.h ansidecl.h ${host_xm_file} ${tm_file}"
+build_xm_file="${build_auto} ansidecl.h ${build_xm_file} ${tm_file}"
+xm_file="ansidecl.h ${xm_file} ${tm_file}"
 
 # Truncate the target if necessary
 if test x$host_truncate_target != x; then
@@ -6055,45 +5100,58 @@ if test "${with_gcc_version_trigger+set}" = set; then
 else
 	gcc_version_trigger=${srcdir}/version.c
 fi
-gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+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";
+static const char thread_model[] = "$thread_file";
+EOF
 
 # Internationalization
 PACKAGE=gcc
 VERSION="$gcc_version"
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
 
 
 
-ALL_LINGUAS="en_UK"
-
-# NLS support is still experimental, so disable it by default for now.
+# Enable NLS support by default
 # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
   :
 else
-  enable_nls=no
+  enable_nls=yes
 fi
 
 
+# if cross compiling, disable NLS support.
+# It's not worth the trouble, at least for now.
+
+if test "${build}" != "${host}" && test "x$enable_nls" = "xyes"; then
+  echo "configure: warning: Disabling NLS support for canadian cross compiler." 1>&2
+  enable_nls=no
+fi
+
 
-        echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
-echo "configure:6066: 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 "checking for library containing strerror""... $ac_c" 1>&6
+echo "configure:5146: checking for library containing strerror" >&5
+if eval "test \"`echo '$''{'ac_cv_search_strerror'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lcposix  $LIBS"
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_strerror="no"
 cat > conftest.$ac_ext <<EOF
-#line 6074 "configure"
+#line 5153 "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
@@ -6104,35 +5162,57 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5164: \"$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"
+  ac_cv_search_strerror="none required"
 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"
+test "$ac_cv_search_strerror" = "no" && for i in cposix; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5175 "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 strerror();
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lcposix"
+int main() {
+strerror()
+; return 0; }
+EOF
+if { (eval echo configure:5186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_cv_search_strerror="-l$i"
+break
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
 fi
 
+echo "$ac_t""$ac_cv_search_strerror" 1>&6
+if test "$ac_cv_search_strerror" != "no"; then
+  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
+  
+else :
+  
+fi
   
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:6108: checking for working const" >&5
+echo "configure:5209: 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 6113 "configure"
+#line 5214 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -6181,7 +5261,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:6162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -6201,53 +5281,13 @@ EOF
 
 fi
 
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:6183: 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 6190 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:6197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6223: checking for off_t" >&5
+echo "configure:5284: 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 6228 "configure"
+#line 5289 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6275,12 +5315,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:6256: checking for size_t" >&5
+echo "configure:5317: 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 6261 "configure"
+#line 5322 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6310,19 +5350,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:6291: checking for working alloca.h" >&5
+echo "configure:5352: 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 6296 "configure"
+#line 5357 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:6303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5364: \"$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
@@ -6343,12 +5383,12 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6324: checking for alloca" >&5
+echo "configure:5385: 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 6329 "configure"
+#line 5390 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -6376,7 +5416,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:6357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5418: \"$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
@@ -6408,12 +5448,12 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6389: checking whether alloca needs Cray hooks" >&5
+echo "configure:5450: 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 6394 "configure"
+#line 5455 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6438,12 +5478,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:6419: checking for $ac_func" >&5
+echo "configure:5480: 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 6424 "configure"
+#line 5485 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6466,7 +5506,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5508: \"$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
@@ -6493,7 +5533,7 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:6474: checking stack direction for C alloca" >&5
+echo "configure:5535: 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
@@ -6501,7 +5541,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 6482 "configure"
+#line 5543 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -6520,7 +5560,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:6501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5562: \"$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
@@ -6541,21 +5581,60 @@ EOF
 
 fi
 
-for ac_hdr in unistd.h
+
+    echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6
+echo "configure:5585: checking whether we are using the GNU C Library 2.1 or newer" >&5
+if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5590 "configure"
+#include "confdefs.h"
+
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "Lucky GNU user" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_gnu_library_2_1=yes
+else
+  rm -rf conftest*
+  ac_cv_gnu_library_2_1=no
+fi
+rm -f conftest*
+
+      
+    
+fi
+
+echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6
+    
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  
+
+                                 
+   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h 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:6526: checking for $ac_hdr" >&5
+echo "configure:5626: 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 6531 "configure"
+#line 5631 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5636: \"$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*
@@ -6581,15 +5660,17 @@ else
 fi
 done
 
-for ac_func in getpagesize
+   for ac_func in feof_unlocked fgets_unlocked getcwd getegid geteuid \
+getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
+strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6565: checking for $ac_func" >&5
+echo "configure:5667: 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 6570 "configure"
+#line 5672 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6612,7 +5693,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5695: \"$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
@@ -6636,355 +5717,186 @@ else
 fi
 done
 
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6618: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6626 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the filesystem buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propogated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
 
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
+   
+    
+  am_cv_lib_iconv_ldpath=
+  # Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then
+  withval="$with_libiconv_prefix"
+  
+    for dir in `echo "$withval" | tr : ' '`; do
+      if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
+      if test -d $dir/lib; then am_cv_lib_iconv_ldpath="-L$dir/lib"; fi
+    done
+   
+fi
 
-int
-main()
-{
-	char *data, *data2, *data3;
-	int i, pagesize;
-	int fd;
-
-	pagesize = getpagesize();
-
-	/*
-	 * First, make a file with some known garbage in it.
-	 */
-	data = malloc(pagesize);
-	if (!data)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		*(data + i) = rand();
-	umask(0);
-	fd = creat("conftestmmap", 0600);
-	if (fd < 0)
-		exit(1);
-	if (write(fd, data, pagesize) != pagesize)
-		exit(1);
-	close(fd);
-
-	/*
-	 * Next, try to mmap the file at a fixed address which
-	 * already has something else allocated at it.  If we can,
-	 * also make sure that we see the same garbage.
-	 */
-	fd = open("conftestmmap", O_RDWR);
-	if (fd < 0)
-		exit(1);
-	data2 = malloc(2 * pagesize);
-	if (!data2)
-		exit(1);
-	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data2 + i))
-			exit(1);
-
-	/*
-	 * Finally, make sure that changes to the mapped area
-	 * do not percolate back to the file as seen by read().
-	 * (This is a bug on some variants of i386 svr4.0.)
-	 */
-	for (i = 0; i < pagesize; ++i)
-		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
-	if (!data3)
-		exit(1);
-	if (read(fd, data3, pagesize) != pagesize)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data3 + i))
-			exit(1);
-	close(fd);
-	unlink("conftestmmap");
-	exit(0);
-}
 
+  echo $ac_n "checking for iconv""... $ac_c" 1>&6
+echo "configure:5736: checking for iconv" >&5
+if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    cat > conftest.$ac_ext <<EOF
+#line 5744 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);
+; return 0; }
 EOF
-if { (eval echo configure:6766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_mmap_fixed_mapped=yes
+if { (eval echo configure:5754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  am_cv_func_iconv=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-                              
-   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-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:6794: 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 6799 "configure"
+rm -f conftest*
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
+      cat > conftest.$ac_ext <<EOF
+#line 5766 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+#include <stdlib.h>
+#include <iconv.h>
+int main() {
+iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6804: \"$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
+if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  am_cv_lib_iconv=yes
+        am_cv_func_iconv=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*
+      LIBS="$am_save_LIBS"
+    fi
+  
 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
+
+echo "$ac_t""$am_cv_func_iconv" 1>&6
+  if test "$am_cv_func_iconv" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_ICONV 1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
 
-   for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-strdup __argz_count __argz_stringify __argz_next
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6834: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
+echo "configure:5797: checking for iconv declaration" >&5
+    if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 6839 "configure"
+  
+      cat > conftest.$ac_ext <<EOF
+#line 5803 "configure"
 #include "confdefs.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() {
-
-/* 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
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 #else
-$ac_func();
+size_t iconv();
 #endif
 
+int main() {
+
 ; return 0; }
 EOF
-if { (eval echo configure:6862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  am_cv_proto_iconv_arg1=""
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  am_cv_proto_iconv_arg1="const"
 fi
 rm -f conftest*
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
-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
+    am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    echo "$ac_t""${ac_t:-
+         }$am_cv_proto_iconv" 1>&6
+    cat >> confdefs.h <<EOF
+#define ICONV_CONST $am_cv_proto_iconv_arg1
 EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
 
+  fi
+  LIBICONV=
+  if test "$am_cv_lib_iconv" = yes; then
+    LIBICONV="$am_cv_lib_iconv_ldpath -liconv"
+  fi
+  
 
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     for ac_func in stpcpy
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6891: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   
+  echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6
+echo "configure:5851: checking for nl_langinfo and CODESET" >&5
+if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6896 "configure"
+#line 5856 "configure"
 #include "confdefs.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();
-
+#include <langinfo.h>
 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
-
+char* cs = nl_langinfo(CODESET);
 ; return 0; }
 EOF
-if { (eval echo configure:6919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5863: \"$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"
+  am_cv_langinfo_codeset=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  am_cv_langinfo_codeset=no
 fi
 rm -f conftest*
+    
 fi
 
-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
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     cat >> confdefs.h <<\EOF
-#define HAVE_STPCPY 1
+echo "$ac_t""$am_cv_langinfo_codeset" 1>&6
+  if test $am_cv_langinfo_codeset = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_LANGINFO_CODESET 1
 EOF
 
-   fi
+  fi
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:6953: checking for LC_MESSAGES" >&5
+echo "configure:5886: 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 6958 "configure"
+#line 5891 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5898: \"$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
@@ -7005,7 +5917,7 @@ EOF
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:6986: checking whether NLS is requested" >&5
+echo "configure:5919: 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"
@@ -7017,7 +5929,10 @@ fi
     echo "$ac_t""$USE_NLS" 1>&6
     
 
+    BUILD_INCLUDED_LIBINTL=no
     USE_INCLUDED_LIBINTL=no
+    INTLLIBS=
+    INTLDEPS=
 
         if test "$USE_NLS" = "yes"; then
       cat >> confdefs.h <<\EOF
@@ -7025,7 +5940,7 @@ fi
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:7006: checking whether included gettext is requested" >&5
+echo "configure:5942: 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"
@@ -7038,23 +5953,24 @@ fi
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-                        		nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
+                        	CATOBJEXT=NONE
+
+                
+        
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:7025: checking for libintl.h" >&5
+echo "configure:5962: 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 7030 "configure"
+#line 5967 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5972: \"$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*
@@ -7070,173 +5986,96 @@ rm -f conftest*
 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:7052: checking for gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_LIBINTL_H 1
+EOF
+
+           echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6
+echo "configure:5993: checking for GNU gettext in libc" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7057 "configure"
+#line 5998 "configure"
 #include "confdefs.h"
 #include <libintl.h>
+extern int _nl_msg_cat_cntr;
 int main() {
-return (int) gettext ("")
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:7064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  gt_cv_func_gettext_libc=yes
+  gt_cv_func_gnugettext1_libc=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  gt_cv_func_gettext_libc=no
+  gt_cv_func_gnugettext1_libc=no
 fi
 rm -f conftest*
 fi
 
-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:7080: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7088 "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 bindtextdomain();
-
-int main() {
-bindtextdomain()
-; return 0; }
-EOF
-if { (eval echo configure:7099: \"$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"
+echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6
 
-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:7115: 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:7120: 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
+	   if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
+	     echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6
+echo "configure:6023: checking for GNU gettext in libintl" >&5
+if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7128 "configure"
+  gt_save_LIBS="$LIBS"
+		LIBS="$LIBS -lintl $LIBICONV"
+		cat > conftest.$ac_ext <<EOF
+#line 6030 "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 gettext();
-
+#include <libintl.h>
+extern int _nl_msg_cat_cntr;
 int main() {
-gettext()
+bindtextdomain ("", "");
+return (int) gettext ("") + _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:7139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6039: \"$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"
+  gt_cv_func_gnugettext1_libintl=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  gt_cv_func_gnugettext1_libintl=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
-  gt_cv_func_gettext_libintl=yes
-else
-  echo "$ac_t""no" 1>&6
-gt_cv_func_gettext_libintl=no
-fi
-
-fi
-
-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+		LIBS="$gt_save_LIBS"
 fi
 
+echo "$ac_t""$gt_cv_func_gnugettext1_libintl" 1>&6
 	   fi
 
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      cat >> confdefs.h <<\EOF
+	   	   	   	   	   if test "$gt_cv_func_gnugettext1_libc" = "yes" \
+	      || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
+		   && test "$PACKAGE" != gettext; }; then
+	     cat >> confdefs.h <<\EOF
 #define HAVE_GETTEXT 1
 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:7178: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_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.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    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"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-	      if test "$MSGFMT" != "no"; then
-		for ac_func in dcgettext
+
+	     if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
+	       	       	       	       INTLLIBS="-lintl $LIBICONV"
+	     fi
+
+	     gt_save_LIBS="$LIBS"
+	     LIBS="$LIBS $INTLLIBS"
+	     for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7212: checking for $ac_func" >&5
+echo "configure:6072: 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 7217 "configure"
+#line 6077 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7259,7 +6098,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6100: \"$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
@@ -7283,251 +6122,46 @@ else
 fi
 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:7267: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_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.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  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_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+	     LIBS="$gt_save_LIBS"
 
-		# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
+	     	     # 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:7303: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
+echo "configure:6129: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$XGETTEXT" in
+  case "$MSGFMT" in
   /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
   ;;
   *)
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   for ac_dir in $PATH; do
     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"
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
 	break
       fi
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
   ;;
 esac
 fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		cat > conftest.$ac_ext <<EOF
-#line 7335 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr
-; return 0; }
-EOF
-if { (eval echo configure:7343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  CATOBJEXT=.gmo
-		   DATADIRNAME=share
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CATOBJEXT=.mo
-		   DATADIRNAME=lib
-fi
-rm -f conftest*
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:7366: 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"
-  nls_cv_use_catgets=$withval
-else
-  nls_cv_use_catgets=no
-fi
-
-	  echo "$ac_t""$nls_cv_use_catgets" 1>&6
-
-	  if test "$nls_cv_use_catgets" = "yes"; then
-	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:7379: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-li  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7387 "configure"
-#include "confdefs.h"
-
-int main() {
-main()
-; return 0; }
-EOF
-if { (eval echo configure:7394: \"$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
-    ac_tr_lib=HAVE_LIB`echo i | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-li $LIBS"
-
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  echo "$ac_t""$MSGFMT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:7422: 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 7427 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char catgets(); 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 catgets();
-
-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_catgets) || defined (__stub___catgets)
-choke me
-#else
-catgets();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:7450: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_catgets=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'catgets`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_CATGETS 1
-EOF
-
-	       INTLOBJS="\$(CATOBJS)"
-	       # 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:7472: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_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.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  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_path_GENCAT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GENCAT" && ac_cv_path_GENCAT="no"
-  ;;
-esac
-fi
-GENCAT="$ac_cv_path_GENCAT"
-if test -n "$GENCAT"; then
-  echo "$ac_t""$GENCAT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-	       if test "$GENCAT" != "no"; then
-		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
+	     # 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:7508: checking for $ac_word" >&5
+echo "configure:6163: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7549,7 +6183,7 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
@@ -7560,46 +6194,11 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-		 if test "$GMSGFMT" = "no"; then
-		   # 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:7545: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_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.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    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"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="no"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-		 fi
-		 # Extract the first word of "xgettext", so it can be a program name with args.
+	     	     # 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:7580: checking for $ac_word" >&5
+echo "configure:6200: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7612,7 +6211,7 @@ else
   for ac_dir in $PATH; do
     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
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
 	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
 	break
       fi
@@ -7624,28 +6223,20 @@ else
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
+if test "$XGETTEXT" != ":"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
-		 USE_INCLUDED_LIBINTL=yes
-		 CATOBJEXT=.cat
-		 INSTOBJEXT=.cat
-		 DATADIRNAME=lib
-		 INTLDEPS='$(top_builddir)/intl/libintl.a'
-		 INTLLIBS=$INTLDEPS
-		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-		 nls_cv_header_intl=intl/libintl.h
-		 nls_cv_header_libgt=intl/libgettext.h
-	       fi
+
+	     CATOBJEXT=.gmo
+	   fi
+	
 else
   echo "$ac_t""no" 1>&6
 fi
 
-	  fi
-        fi
 
         if test "$CATOBJEXT" = "NONE"; then
 	  	  	  nls_cv_use_gnu_gettext=yes
@@ -7657,7 +6248,7 @@ 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:7638: checking for $ac_word" >&5
+echo "configure:6250: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7670,19 +6261,19 @@ else
   for ac_dir in $PATH; do
     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
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
 	ac_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 "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
   ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
+if test "$MSGFMT" != ":"; then
   echo "$ac_t""$MSGFMT" 1>&6
 else
   echo "$ac_t""no" 1>&6
@@ -7691,7 +6282,7 @@ 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:7672: checking for $ac_word" >&5
+echo "configure:6284: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7727,7 +6318,7 @@ 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:7708: checking for $ac_word" >&5
+echo "configure:6320: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7740,7 +6331,7 @@ else
   for ac_dir in $PATH; do
     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
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
 	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
 	break
       fi
@@ -7752,26 +6343,32 @@ else
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
+if test "$XGETTEXT" != ":"; then
   echo "$ac_t""$XGETTEXT" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
 
         
+	BUILD_INCLUDED_LIBINTL=yes
 	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+	INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
+	INTLDEPS="\$(top_builddir)/intl/libintl.a"
+	LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
-            if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+                  if test "$GMSGFMT" != ":"; then
+			if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+	  : ;
+	else
+	  echo "$ac_t""found msgfmt program is not GNU msgfmt; ignore it" 1>&6
+	  GMSGFMT=":"
+	fi
+      fi
+
+                  if test "$XGETTEXT" != ":"; then
+			if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
 	  : ;
 	else
 	  echo "$ac_t""found xgettext program is not GNU xgettext; ignore it" 1>&6
@@ -7779,29 +6376,68 @@ fi
 	fi
       fi
 
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=intl/libintl.h
-      nls_cv_header_libgt=intl/libgettext.h
+            POSUB=po
     fi
     
-    
 
 
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
+            if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
     fi
 
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
+                                            for ac_prog in bison
+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:6392: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$INTLBISON"; then
+  ac_cv_prog_INTLBISON="$INTLBISON" # 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_INTLBISON="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+INTLBISON="$ac_cv_prog_INTLBISON"
+if test -n "$INTLBISON"; then
+  echo "$ac_t""$INTLBISON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$INTLBISON" && break
+done
 
+    if test -z "$INTLBISON"; then
+      ac_verc_fail=yes
+    else
+            echo $ac_n "checking version of bison""... $ac_c" 1>&6
+echo "configure:6425: checking version of bison" >&5
+      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+      case $ac_prog_version in
+        '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+        1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+      esac
+      echo "$ac_t""$ac_prog_version" 1>&6
+    fi
+    if test $ac_verc_fail = yes; then
+      INTLBISON=:
+    fi
+
+    
         
     
     
@@ -7810,119 +6446,186 @@ fi
     
     
     
+    if test $USE_INCLUDED_LIBINTL = yes; then
+      cat >> confdefs.h <<\EOF
+#define USE_INCLUDED_LIBINTL 1
+EOF
+
+    fi
+
+        nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+        DATADIRNAME=share
     
+
+        INSTOBJEXT=.mo
     
+
+        GENCAT=gencat
     
   
 
-   if test "x$CATOBJEXT" != "x"; 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:7801: checking for catalogs to be installed" >&5
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       echo "$ac_t""$LINGUAS" 1>&6
-     fi
-
-          if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
+         if test "x$CATOBJEXT" != x; then
+     echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
+echo "configure:6470: checking for catalogs to be installed" >&5
+     # Look for .po and .gmo files in the source directory.
+     CATALOGS=
+     XLINGUAS=
+     for cat in $srcdir/po/*$CATOBJEXT $srcdir/po/*.po; do
+	# If there aren't any .gmo files the shell will give us the
+	# literal string "../path/to/srcdir/po/*.gmo" which has to be
+	# weeded out.
+	case "$cat" in *\**)
+	    continue;;
+	esac
+	# The quadruple backslash is collapsed to a double backslash
+	# by the backticks, then collapsed again by the double quotes,
+	# leaving us with one backslash in the sed expression (right
+	# before the dot that mustn't act as a wildcard).  The dot to
+	# be escaped in the second expression is hiding inside CATOBJEXT.
+	cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!$CATOBJEXT!"`
+	lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\$CATOBJEXT!!"`
+	# The user is allowed to set LINGUAS to a list of languages to
+	# install catalogs for.  If it's empty that means "all of them."
+	if test "x$LINGUAS" = x; then
+	    CATALOGS="$CATALOGS $cat"
+	    XLINGUAS="$XLINGUAS $lang"
+	else
+	  case "$LINGUAS" in *$lang*)
+	    CATALOGS="$CATALOGS $cat"
+	    XLINGUAS="$XLINGUAS $lang"
+	    ;;
+	  esac
+	fi
+     done
+     LINGUAS="$XLINGUAS"
+     echo "$ac_t""$LINGUAS" 1>&6
    fi
 
-            if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
+            MKINSTALLDIRS=
+   if test -n "$ac_aux_dir"; then
+     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+   fi
+   if test -z "$MKINSTALLDIRS"; then
+     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
    fi
    
 
-            test -d intl || mkdir intl
-   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:7829: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+      INTL_LIBTOOL_SUFFIX_PREFIX=
+   
+  
+
+# Windows32 Registry support for specifying GCC installation paths.
+# Check whether --enable-win32-registry or --disable-win32-registry was given.
+if test "${enable_win32_registry+set}" = set; then
+  enableval="$enable_win32_registry"
+  :
+fi
+
+case $host_os in
+	win32 | pe | cygwin* | mingw32* | uwin*)
+echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6
+echo "configure:6528: 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
+EOF
+
+  echo "$ac_t""yes" 1>&6
+  
+echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6
+echo "configure:6537: checking for library containing RegOpenKeyExA" >&5
+if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 7834 "configure"
+  ac_func_search_save_LIBS="$LIBS"
+ac_cv_search_RegOpenKeyExA="no"
+cat > conftest.$ac_ext <<EOF
+#line 6544 "configure"
 #include "confdefs.h"
-#include <linux/version.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 RegOpenKeyExA();
+
+int main() {
+RegOpenKeyExA()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7839: \"$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
+if { (eval echo configure:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  ac_cv_search_RegOpenKeyExA="none required"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do
+LIBS="-l$i  $ac_func_search_save_LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6566 "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 RegOpenKeyExA();
+
+int main() {
+RegOpenKeyExA()
+; return 0; }
+EOF
+if { (eval echo configure:6577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  ac_cv_search_RegOpenKeyExA="-l$i"
+break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+done
+LIBS="$ac_func_search_save_LIBS"
+fi
+
+echo "$ac_t""$ac_cv_search_RegOpenKeyExA" 1>&6
+if test "$ac_cv_search_RegOpenKeyExA" != "no"; then
+  test "$ac_cv_search_RegOpenKeyExA" = "none required" || LIBS="$ac_cv_search_RegOpenKeyExA $LIBS"
+  
+else :
+  
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  msgformat=linux
 else
   echo "$ac_t""no" 1>&6
-msgformat=xopen
 fi
 
+# Check if user specified a different registry key.
+case "x${enable_win32_registry}" in
+x | xyes)
+  # default.
+  gcc_cv_win32_registry_key="$VERSION"
+  ;;
+xno)
+  # no registry lookup.
+  gcc_cv_win32_registry_key=''
+  ;;
+*)
+  # user-specified key.
+  gcc_cv_win32_registry_key="$enable_win32_registry"
+  ;;
+esac
 
-               sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
-   fi
-      sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-     $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
-
-            if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   
-   
-
-            MKINSTALLDIRS=
-   if test -n "$ac_aux_dir"; then
-     MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
-   fi
-   if test -z "$MKINSTALLDIRS"; then
-     MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
-   fi
-   
-
-      l=
-   
+if test "x$enable_win32_registry" != xno; then
+  echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
+echo "configure:6619: checking registry key on windows hosts" >&5
+  cat >> confdefs.h <<EOF
+#define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
+EOF
 
-         test -d po || mkdir po
-   if test "x$srcdir" != "x."; then
-     if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-       posrcprefix="$srcdir/"
-     else
-       posrcprefix="../$srcdir/"
-     fi
-   else
-     posrcprefix="../"
-   fi
-   rm -f po/POTFILES
-   sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	< $srcdir/po/POTFILES.in > po/POTFILES
-  
-XGETTEXT="AWK='$AWK' \$(SHELL) \$(top_srcdir)/exgettext $XGETTEXT"
+  echo "$ac_t""$gcc_cv_win32_registry_key" 1>&6
+fi
+;;
+esac
 
 # Get an absolute path to the GCC top-level source directory
 holddir=`pwd`
@@ -7965,6 +6668,7 @@ then
 	cc_set_by_configure="\$(CC)"
 	quoted_cc_set_by_configure="\$(CC)"
 	stage_prefix_set_by_configure="\$(STAGE_PREFIX)"
+	quoted_stage_prefix_set_by_configure="\$(STAGE_PREFIX)"
 else
 	rm -f symtest.tem
 	if cp -p $srcdir/gcc.c symtest.tem 2>/dev/null
@@ -7976,6 +6680,7 @@ else
 	cc_set_by_configure="\`case '\$(CC)' in stage*) echo '\$(CC)' | sed -e 's|stage|../stage|g';; *) echo '\$(CC)';; esac\`"
 	quoted_cc_set_by_configure="\\\`case '\\\$(CC)' in stage*) echo '\\\$(CC)' | sed -e 's|stage|../stage|g';; *) echo '\\\$(CC)';; esac\\\`"
 	stage_prefix_set_by_configure="\`case '\$(STAGE_PREFIX)' in stage*) echo '\$(STAGE_PREFIX)' | sed -e 's|stage|../stage|g';; *) echo '\$(STAGE_PREFIX)';; esac\`"
+	quoted_stage_prefix_set_by_configure="\\\`case '\\\$(STAGE_PREFIX)' in stage*) echo '\\\$(STAGE_PREFIX)' | sed -e 's|stage|../stage|g';; *) echo '\\\$(STAGE_PREFIX)';; esac\\\`"
 fi
 rm -f symtest.tem
 
@@ -7984,16 +6689,25 @@ out_object_file=`basename $out_file .c`.o
 tm_file_list=
 for f in $tm_file; do
   case $f in
-    gansidecl.h )
+    ansidecl.h )
+       tm_file_list="${tm_file_list} \$(srcdir)/../include/ansidecl.h" ;;
+    defaults.h )
        tm_file_list="${tm_file_list} $f" ;;
     *) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" ;;
   esac
 done
 
+tm_p_file_list=
+for f in $tm_p_file; do
+    tm_p_file_list="${tm_p_file_list} \$(srcdir)/config/$f"
+done
+
 host_xm_file_list=
 for f in $host_xm_file; do
   case $f in
-    auto-host.h | gansidecl.h | hwint.h )
+    ansidecl.h )
+       host_xm_file_list="${host_xm_file_list} \$(srcdir)/../include/ansidecl.h" ;;
+    auto-host.h | defaults.h )
        host_xm_file_list="${host_xm_file_list} $f" ;;
     *) host_xm_file_list="${host_xm_file_list} \$(srcdir)/config/$f" ;;
   esac
@@ -8002,30 +6716,68 @@ 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 )
+    ansidecl.h )
+       build_xm_file_list="${build_xm_file_list} \$(srcdir)/../include/ansidecl.h" ;;
+    auto-build.h | auto-host.h | defaults.h )
        build_xm_file_list="${build_xm_file_list} $f" ;;
     *) build_xm_file_list="${build_xm_file_list} \$(srcdir)/config/$f" ;;
   esac
 done
 
-# Define macro CROSS_COMPILE in compilation
-# if this is a cross-compiler.
-# Also use all.cross instead of all.internal
-# and add cross-make to Makefile.
-cross_overrides="/dev/null"
+# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
+# Also use all.cross instead of all.internal and adjust SYSTEM_HEADER_DIR.
+CROSS=						
+ALL=all.internal				
+SYSTEM_HEADER_DIR='$(NATIVE_SYSTEM_HEADER_DIR)'	
 if test x$host != x$target
 then
-	cross_defines="CROSS=-DCROSS_COMPILE"
-	cross_overrides="${topdir}/cross-make"
+	CROSS="-DCROSS_COMPILE"
+	ALL=all.cross
+	SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
+fi
+
+# If this is a cross-compiler that does not
+# have its own set of headers then define
+# inhibit_libc
+
+# If this is using newlib, then define inhibit_libc in LIBGCC2_CFLAGS.
+# This prevents libgcc2 from containing any code which requires libc
+# support.
+inhibit_libc=
+if test x$host != x$target && test x$with_headers = x; then
+       inhibit_libc=-Dinhibit_libc
+else
+       if test x$with_newlib = xyes; then
+               inhibit_libc=-Dinhibit_libc
+       fi
 fi
 
-# When building gcc with a cross-compiler, we need to fix a few things.
-# This must come after cross-make as we want all.build to override
-# all.cross.
-build_overrides="/dev/null"
+
+# When building gcc with a cross-compiler, we need to adjust things so
+# that the generator programs are still built with the native compiler.
+# Also, we cannot run fixincludes or fix-header.
+# Note that the terminology here is wrong; it should be BUILD_* throughout.
+# FIXME.
+
+# These are the normal (build=host) settings:
+HOST_PREFIX=			
+HOST_PREFIX_1=ignore-		
+HOST_CC='$(CC)'			
+HOST_CFLAGS='$(ALL_CFLAGS)'	
+
+STMP_FIXINC=stmp-fixinc		
+STMP_FIXPROTO=stmp-fixproto	
+
+# And these apply if build != host.
 if test x$build != x$host
 then
-	build_overrides="${topdir}/build-make"
+    HOST_PREFIX=build-
+    HOST_PREFIX_1=build-
+    HOST_CC='$(CC_FOR_BUILD)'
+    HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
+
+    STMP_FIXINC=
+    STMP_FIXPROTO=
 fi
 
 # Expand extra_headers to include complete path.
@@ -8034,10 +6786,10 @@ extra_headers_list=
 if test "x$extra_headers" = x
 then true
 else
-	# Prepend ${srcdir}/ginclude/ to every entry in extra_headers.
+	# Prepend ${srcdir}/config/${cpu_type}/ to every entry in extra_headers.
 	for file in $extra_headers;
 	do
-		extra_headers_list="${extra_headers_list} \$(srcdir)/ginclude/${file}"
+		extra_headers_list="${extra_headers_list} \$(srcdir)/config/${cpu_type}/${file}"
 	done
 fi
 
@@ -8046,29 +6798,10 @@ if test x$use_collect2 = xno; then
 fi
 
 # Add a definition of USE_COLLECT2 if system wants one.
-# Also tell toplev.c what to do.
-# This substitutes for lots of t-* files.
-if test x$use_collect2 = x
-then
-	will_use_collect2=
-	maybe_use_collect2=
-else
-	will_use_collect2="collect2"
-	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
+if test x$use_collect2 != x
 then
-	md_file_sub=$srcdir/config/$md_file
-else
-	md_file=md
+	host_xm_defines="${host_xm_defines} USE_COLLECT2"
+	xm_defines="${xm_defines} USE_COLLECT2"
 fi
 
 # If we have gas in the build tree, make a link to it.
@@ -8076,26 +6809,25 @@ if test -f ../gas/Makefile; then
 	rm -f as; $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null
 fi
 
-# If we have nm in the build tree, make a link to it.
+# If we have nm and objdump in the build tree, make a link to them.
 if test -f ../binutils/Makefile; then
 	rm -f nm; $symbolic_link ../binutils/nm-new$host_exeext nm$host_exeext 2>/dev/null
+	rm -f objdump; $symbolic_link ../binutils/objdump$host_exeext objdump$host_exeext 2>/dev/null
 fi
 
 # If we have ld in the build tree, make a link to it.
 if test -f ../ld/Makefile; then
-#	if test x$use_collect2 = x; then
-#		rm -f ld; $symbolic_link ../ld/ld-new$host_exeext ld$host_exeext 2>/dev/null
-#	else
-		rm -f collect-ld; $symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext 2>/dev/null
-#	fi
+	rm -f collect-ld; $symbolic_link ../ld/ld-new$host_exeext collect-ld$host_exeext 2>/dev/null
 fi
 
-# Figure out what assembler alignment features are present.
-echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:8073: 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:6824: 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
+gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
 if test -x "$DEFAULT_ASSEMBLER"; then
 	gcc_cv_as="$DEFAULT_ASSEMBLER"
 elif test -x "$AS"; then
@@ -8105,7 +6837,7 @@ elif test -x as$host_exeext; then
 	gcc_cv_as=./as$host_exeext
 elif test -f $gcc_cv_as_gas_srcdir/configure.in -a -f ../gas/Makefile; then
 	# Single tree build which includes gas.
-	for f in $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
+	for f in $gcc_cv_as_bfd_srcdir/configure $gcc_cv_as_gas_srcdir/configure $gcc_cv_as_gas_srcdir/configure.in $gcc_cv_as_gas_srcdir/Makefile.in
 	do
 		gcc_cv_gas_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
 		if test x$gcc_cv_gas_version != x; then
@@ -8114,27 +6846,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
@@ -8160,7 +6874,7 @@ elif test x$host = x$target; then
 	# If the loop below does not find an assembler, then use whatever
 	# one we can find in the users's path.
 	# user's path.
-	as=as$host_exeext
+	gcc_cv_as=as$host_exeext
 
 	test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \
 		   $test_prefix/lib/gcc-lib/$target \
@@ -8186,7 +6900,144 @@ 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 linker we will be using.
+echo $ac_n "checking what linker to use""... $ac_c" 1>&6
+echo "configure:6910: checking what linker to use" >&5
+gcc_cv_ld=
+gcc_cv_gld_major_version=
+gcc_cv_gld_minor_version=
+gcc_cv_ld_gld_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/ld
+gcc_cv_ld_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
+if test -x "$DEFAULT_LINKER"; then
+	gcc_cv_ld="$DEFAULT_LINKER"
+elif test -x "$LD"; then
+	gcc_cv_ld="$LD"
+elif test -x ld$host_exeext; then
+	# Build using linker in the current directory.
+	gcc_cv_ld=./ld$host_exeext
+elif test -f $gcc_cv_ld_gld_srcdir/configure.in -a -f ../ld/Makefile; then
+	# Single tree build which includes ld.
+	for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in
+	do
+		gcc_cv_gld_version=`grep '^VERSION=[0-9]*\.[0-9]*' $f`
+		if test x$gcc_cv_gld_version != x; then
+			break
+		fi
+	done
+	gcc_cv_gld_major_version=`expr "$gcc_cv_gld_version" : "VERSION=\([0-9]*\)"`
+	gcc_cv_gld_minor_version=`expr "$gcc_cv_gld_version" : "VERSION=[0-9]*\.\([0-9]*\)"`
+fi
+
+if test "x$gcc_cv_ld" = 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 linker and lose.  If we
+	# do not find a suitable linker binary, then try the user's
+	# path.
+	#
+	# Also note we have to check MD_EXEC_PREFIX before checking the
+	# user's path.  Unfortunately, there is no good way to get at the
+	# value of MD_EXEC_PREFIX here.  So we do a brute force search
+	# through all the known MD_EXEC_PREFIX values.  Ugh.  This needs
+	# to be fixed as part of the make/configure rewrite too.
+
+	if test "x$exec_prefix" = xNONE; then
+		if test "x$prefix" = xNONE; then
+			test_prefix=/usr/local
+		else
+			test_prefix=$prefix
+		fi
+	else
+		test_prefix=$exec_prefix
+	fi
+
+	# If the loop below does not find an linker, then use whatever
+	# one we can find in the users's path.
+	# user's path.
+	gcc_cv_ld=ld$host_exeext
+
+	test_dirs="$test_prefix/lib/gcc-lib/$target/$gcc_version \
+		   $test_prefix/lib/gcc-lib/$target \
+		   /usr/lib/gcc/$target/$gcc_version \
+		   /usr/lib/gcc/$target \
+		   $test_prefix/$target/bin/$target/$gcc_version \
+		   $test_prefix/$target/bin \
+		   /usr/libexec \
+		   /usr/ccs/gcc \
+		   /usr/ccs/bin \
+		   /udk/usr/ccs/bin \
+		   /bsd43/usr/lib/cmplrs/cc \
+		   /usr/cross64/usr/bin \
+		   /usr/lib/cmplrs/cc \
+		   /sysv/usr/lib/cmplrs/cc \
+		   /svr4/usr/lib/cmplrs/cc \
+		   /usr/bin"
+
+	for dir in $test_dirs; do
+		if test -f $dir/ld$host_exeext; then
+			gcc_cv_ld=$dir/ld$host_exeext
+			break;
+		fi
+	done
+fi
+if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then
+  echo "$ac_t"""newly built ld"" 1>&6
+else
+  echo "$ac_t""$gcc_cv_ld" 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:6996: 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 objdump we will be using.
+echo $ac_n "checking what objdump to use""... $ac_c" 1>&6
+echo "configure:7007: checking what objdump to use" >&5
+if test -x objdump$host_exeext; then
+	gcc_cv_objdump=./objdump$host_exeext
+elif test x$host = x$target; then
+	# Native build.
+	gcc_cv_objdump=objdump$host_exeext
+fi
+echo "$ac_t""$gcc_cv_objdump" 1>&6
+
+# Figure out what assembler alignment features are present.
+echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
+echo "configure:7018: 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
@@ -8213,19 +7064,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:8194: checking assembler subsection support" >&5
-gcc_cv_as_subsections=
-if test x$gcc_cv_as != x; then
+echo "configure:7066: 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
@@ -8240,50 +7089,691 @@ EOF
 					:
 				else
 					gcc_cv_as_subsections="working .subsection -1"
-					cat >> confdefs.h <<\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
+fi
+echo "$ac_t""$gcc_cv_as_subsections" 1>&6
+
+echo $ac_n "checking assembler weak support""... $ac_c" 1>&6
+echo "configure:7106: 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
+		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:7129: 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
+		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
+
+echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6
+echo "configure:7153: checking assembler leb128 support" >&5
+gcc_cv_as_leb128=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 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+    gcc_cv_as_leb128="yes"
+  fi
+elif test x$gcc_cv_as != x; then
+	# Check if we have .[us]leb128, and support symbol arithmetic with it.
+	cat > conftest.s <<EOF
+	.data
+	.uleb128 L2 - L1
+L1:
+	.uleb128 1280
+	.sleb128 -1010
+L2:
+EOF
+	if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+		gcc_cv_as_leb128="yes"
+
+		# GAS versions before 2.11 do not support uleb128,
+		# despite appearing to.
+		# ??? There exists an elf-specific test that will crash
+		# the assembler.  Perhaps it's better to figure out whether
+		# arbitrary sections are supported and try the test.
+		as_ver=`$gcc_cv_as --version 2>/dev/null | head -1`
+		if echo "$as_ver" | grep GNU > /dev/null; then
+			as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
+			as_major=`echo $as_ver | sed 's/\..*//'`
+			as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
+			if test $as_major -eq 2 -a $as_minor -lt 11; then
+				gcc_cv_as_leb128="no"
 			fi
 		fi
 	fi
 	rm -f conftest.s conftest.o conftest.nm1 conftest.nm2
 fi
-echo "$ac_t""$gcc_cv_as_subsections" 1>&6
+if test x"$gcc_cv_as_leb128" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_LEB128 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_as_leb128" 1>&6
+
+echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6
+echo "configure:7198: checking assembler eh_frame optimization" >&5
+gcc_cv_as_eh_frame=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 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+    gcc_cv_as_eh_frame="yes"
+  fi
+elif test x$gcc_cv_as != x; then
+	# Check if this is GAS.
+	as_ver=`$gcc_cv_as --version < /dev/null 2> /dev/null | head -1`
+	rm -f a.out 2> /dev/null
+	if echo "$as_ver" | grep GNU > /dev/null; then
+		# Versions up to and including 2.11.0 may mis-optimize
+		# .eh_frame data.  Try something.
+		cat > conftest.s <<EOF
+	.text
+.LFB1:
+	.4byte	0
+.L1:
+	.4byte	0
+.LFE1:
+	.section	.eh_frame,"aw",@progbits
+__FRAME_BEGIN__:
+	.4byte	.LECIE1-.LSCIE1
+.LSCIE1:
+	.4byte	0x0
+	.byte	0x1
+	.ascii "z\0"
+	.byte	0x1
+	.byte	0x78
+	.byte	0x1a
+	.byte	0x0
+	.byte	0x4
+	.4byte	1
+	.p2align 1
+.LECIE1:
+.LSFDE1:
+	.4byte	.LEFDE1-.LASFDE1
+.LASFDE1:
+	.4byte	.LASFDE1-__FRAME_BEGIN__
+	.4byte	.LFB1
+	.4byte	.LFE1-.LFB1
+	.byte	0x4
+	.4byte	.LFE1-.LFB1
+	.byte	0x4
+	.4byte	.L1-.LFB1
+.LEFDE1:
+EOF
+		cat > conftest.lit <<EOF
+ 0000 10000000 00000000 017a0001 781a0004  .........z..x...
+ 0010 01000000 12000000 18000000 00000000  ................
+ 0020 08000000 04080000 0044               .........D      
+EOF
+		cat > conftest.big <<EOF
+ 0000 00000010 00000000 017a0001 781a0004  .........z..x...
+ 0010 00000001 00000012 00000018 00000000  ................
+ 0020 00000008 04000000 0844               .........D      
+EOF
+		# If the assembler didn't choke, and we can objdump,
+		# and we got the correct data, then succeed.
+		if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \
+		   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+		      | tail -3 > conftest.got \
+		   && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+		        || cmp conftest.big conftest.got > /dev/null 2>&1; }
+		then
+			gcc_cv_as_eh_frame="yes"
+		else
+			gcc_cv_as_eh_frame="bad"
+			if $gcc_cv_as -o conftest.o --traditional-format /dev/null; then
+				cat >> confdefs.h <<\EOF
+#define USE_AS_TRADITIONAL_FORMAT 1
+EOF
+
+			fi
+		fi
+	fi
+	rm -f conftest.*
+fi
+echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6
+
+echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6
+echo "configure:7279: checking assembler section merging support" >&5
+gcc_cv_as_shf_merge=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 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then
+    gcc_cv_as_shf_merge=yes
+  fi
+elif test x$gcc_cv_as != x; then
+	# Check if we support SHF_MERGE sections
+	echo '.section .rodata.str, "aMS", @progbits, 1' > conftest.s
+	if $gcc_cv_as --fatal-warnings -o conftest.o conftest.s > /dev/null 2>&1; then
+		gcc_cv_as_shf_merge=yes
+	fi
+	rm -f conftest.s conftest.o
+fi
+if test x"$gcc_cv_as_shf_merge" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_GAS_SHF_MERGE 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
+
+case "$target" in
+  # All TARGET_ABI_OSF targets.
+  alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*)
+    echo $ac_n "checking assembler supports explicit relocations""... $ac_c" 1>&6
+echo "configure:7305: checking assembler supports explicit relocations" >&5
+if eval "test \"`echo '$''{'gcc_cv_as_explicit_relocs'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	gcc_cv_as_explicit_relocs=unknown
+	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 12 \
+	           -o "$gcc_cv_gas_major_version" -gt 2; then
+	      gcc_cv_as_explicit_relocs=yes
+	   fi
+	elif test x$gcc_cv_as != x; then
+	    cat > conftest.s << 'EOF'
+	.set nomacro
+	.text
+	extbl	$3, $2, $3	!lituse_bytoff!1
+	ldq	$2, a($29)	!literal!1
+	ldq	$4, b($29)	!literal!2
+	ldq_u	$3, 0($2)	!lituse_base!1
+	ldq	$27, f($29)	!literal!5
+	jsr	$26, ($27), f	!lituse_jsr!5
+	ldah	$29, 0($26)	!gpdisp!3
+	lda	$0, c($29)	!gprel
+	ldah	$1, d($29)	!gprelhigh
+	lda	$1, d($1)	!gprellow
+	lda	$29, 0($29)	!gpdisp!3
+EOF
+	    if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+		gcc_cv_as_explicit_relocs=yes
+	    else
+		gcc_cv_as_explicit_relocs=no
+	    fi
+	    rm -f conftest.s conftest.o
+	fi
+    
+fi
+
+echo "$ac_t""$gcc_cv_as_explicit_relocs" 1>&6
+    if test "x$gcc_cv_as_explicit_relocs" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_EXPLICIT_RELOCS 1
+EOF
+
+    fi
+    ;;
+  sparc*-*-*)
+    echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6
+echo "configure:7355: 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
+  
+	gcc_cv_as_register_pseudo_op=unknown
+	if test x$gcc_cv_as != x; then
+	    # Check if we have .register
+	    echo ".register %g2, #scratch" > conftest.s
+	    if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+		gcc_cv_as_register_pseudo_op=yes
+	    else
+		gcc_cv_as_register_pseudo_op=no
+	    fi
+	    rm -f conftest.s conftest.o
+	fi
+    
+fi
+
+echo "$ac_t""$gcc_cv_as_register_pseudo_op" 1>&6
+    if test "x$gcc_cv_as_register_pseudo_op" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_REGISTER_PSEUDO_OP 1
+EOF
+
+    fi
+
+    echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6
+echo "configure:7383: 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
+  
+	gcc_cv_as_relax_opt=unknown
+	if test x$gcc_cv_as != x; then
+	    # Check if gas supports -relax
+	    echo ".text" > conftest.s
+	    if $gcc_cv_as -relax -o conftest.o conftest.s > /dev/null 2>&1; then
+		gcc_cv_as_relax_opt=yes
+	    else
+		gcc_cv_as_relax_opt=no
+	    fi
+	    rm -f conftest.s conftest.o
+	fi
+    
+fi
+
+echo "$ac_t""$gcc_cv_as_relax_opt" 1>&6
+    if test "x$gcc_cv_as_relax_opt" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_RELAX_OPTION 1
+EOF
+
+    fi
+
+    echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6
+echo "configure:7411: checking assembler and linker support unaligned pc related relocs" >&5
+if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+	gcc_cv_as_sparc_ua_pcrel=unknown
+	if test x$gcc_cv_as != x -a x$gcc_cv_ld != x; then
+	    gcc_cv_as_sparc_ua_pcrel=no
+	    echo ".text; foo: nop; .data; .align 4; .byte 0; .uaword %r_disp32(foo)" > conftest.s
+	    if $gcc_cv_as -K PIC -o conftest.o conftest.s > /dev/null 2>&1; then
+		if $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1; then
+		    gcc_cv_as_sparc_ua_pcrel=yes
+		fi
+	    fi
+	    rm -f conftest.s conftest.o conftest
+	fi
+    
+fi
+
+echo "$ac_t""$gcc_cv_as_sparc_ua_pcrel" 1>&6
+    if test "x$gcc_cv_as_sparc_ua_pcrel" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_SPARC_UA_PCREL 1
+EOF
+
+    fi
+
+    case "$tm_file" in
+    *64*)
+	echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6
+echo "configure:7441: 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
+  
+		if test -n "$gcc_cv_as"; then
+		    echo ".xword foo" > conftest.s
+		    gcc_cv_as_flags64=no
+		    for flag in "-xarch=v9" "-64 -Av9"; do
+			if $gcc_cv_as $flag -o conftest.o conftest.s \
+			    > /dev/null 2>&1; then
+			    gcc_cv_as_flags64=$flag
+			    break
+			fi
+		    done
+		    rm -f conftest.s conftest.o
+		else
+		    if test "$gas" = yes; then
+			gcc_cv_as_flags64="-64 -Av9"
+		    else
+			gcc_cv_as_flags64="-xarch=v9"
+		    fi
+		fi
+	
+fi
+
+echo "$ac_t""$gcc_cv_as_flags64" 1>&6
+	if test "x$gcc_cv_as_flags64" = xno; then
+
+	    tmake_file=`echo " $tmake_file " | sed -e 's, sparc/t-sol2-64 , ,' -e 's,^ ,,' -e 's, $,,'`
+	    dep_tmake_file=`echo " $dep_tmake_file " | sed -e 's, [^ ]*/config/sparc/t-sol2-64 , ,' -e 's,^ ,,' -e 's, $,,'`
+
+	else
+	    cat >> confdefs.h <<EOF
+#define AS_SPARC64_FLAG "$gcc_cv_as_flags64"
+EOF
+
+	fi
+	;;
+    *) gcc_cv_as_flags64=${gcc_cv_as_flags64-no}
+	;;
+    esac
+
+    if test "x$gcc_cv_as_flags64" != xno; then
+	echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6
+echo "configure:7486: 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
+  
+	    gcc_cv_as_offsetable_lo10=unknown
+	    if test "x$gcc_cv_as" != x; then
+		# Check if assembler has offsetable %lo()
+		echo "or %g1, %lo(ab) + 12, %g1" > conftest.s
+		echo "or %g1, %lo(ab + 12), %g1" > conftest1.s
+		if $gcc_cv_as $gcc_cv_as_flags64 -o conftest.o conftest.s \
+			> /dev/null 2>&1 &&
+		   $gcc_cv_as $gcc_cv_as_flags64 -o conftest1.o conftest1.s \
+			> /dev/null 2>&1; then
+		    if cmp conftest.o conftest1.o > /dev/null 2>&1; then
+			gcc_cv_as_offsetable_lo10=no
+		    else
+			gcc_cv_as_offsetable_lo10=yes
+		    fi
+		else
+		    gcc_cv_as_offsetable_lo10=no
+		fi
+		rm -f conftest.s conftest.o conftest1.s conftest1.o
+	    fi
+	
+fi
 
-echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
-echo "configure:8234: checking assembler instructions" >&5
-gcc_cv_as_instructions=
-if test x$gcc_cv_as != x; then
+echo "$ac_t""$gcc_cv_as_offsetable_lo10" 1>&6
+	if test "x$gcc_cv_as_offsetable_lo10" = xyes; then
+	    cat >> confdefs.h <<\EOF
+#define HAVE_AS_OFFSETABLE_LO10 1
+EOF
+
+	fi
+    fi
+
+    ;;
+
+  i[34567]86-*-* | x86_64-*-*)
+    echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
+echo "configure:7526: checking assembler instructions" >&5
+    gcc_cv_as_instructions=
+    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
+
+    echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6
+echo "configure:7553: checking assembler GOTOFF in data directives" >&5
+    gcc_cv_as_gotoff_in_data=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 11 \
+	 -o "$gcc_cv_gas_major_version" -gt 2; then
+	gcc_cv_as_gotoff_in_data=yes
+      fi
+    elif test x$gcc_cv_as != x; then
+	cat > conftest.s <<EOF
+	.text
+.L0:
+	nop
+	.data
+	.long .L0@GOTOFF
+EOF
+	if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1; then
+	  gcc_cv_as_gotoff_in_data=yes
+	fi
+    fi
+    cat >> confdefs.h <<EOF
+#define HAVE_AS_GOTOFF_IN_DATA `if test $gcc_cv_as_gotoff_in_data = yes; then echo 1; else echo 0; fi`
+EOF
+
+    echo "$ac_t""$gcc_cv_as_gotoff_in_data" 1>&6
+    ;;
+esac
+
+echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6
+echo "configure:7583: 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*-*-* | m68*-*-* | x86_64*-*-*)
+    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 1 "conftest.s"' > conftest.s
+	echo '	.loc 1 3 0' >> conftest.s
+	echo "	$insn" >> conftest.s
+	# ??? This fails with non-gnu grep.
+	if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \
+	   && grep debug_line conftest.o > /dev/null 2>&1 ; then
+		# The .debug_line file table must be in the exact order that
+		# we specified the files, since these indices are also used
+		# by DW_AT_decl_file.  Approximate this test by testing if
+		# the assembler bitches if the same index is assigned twice.
+		echo '	.file 1 "foo.s"' > conftest.s
+		echo '	.file 1 "bar.s"' >> conftest.s
+		if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1
+		then
+		  gcc_cv_as_dwarf2_debug_line="no"
+		else
+		  gcc_cv_as_dwarf2_debug_line="yes"
+		fi
+	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
+
+echo $ac_n "checking assembler --gdwarf2 support""... $ac_c" 1>&6
+echo "configure:7639: checking assembler --gdwarf2 support" >&5
+gcc_cv_as_gdwarf2_flag=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 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_gdwarf2_debug_flag="yes"
+  fi
+elif test x$gcc_cv_as != x -a x"$insn" != x ; then
+	echo '' > conftest.s
+	# ??? This fails with non-gnu grep.
+	if $gcc_cv_as --gdwarf2 -o conftest.o conftest.s > /dev/null 2>&1
+	  then
+	  gcc_cv_as_gdwarf2_flag="yes"
+	fi
+	rm -f conftest.s conftest.o
+fi
+if test x"$gcc_cv_as_gdwarf2_flag" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_GDWARF2_DEBUG_FLAG 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_as_gdwarf2_flag" 1>&6
+
+echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6
+echo "configure:7668: checking assembler --gstabs support" >&5
+gcc_cv_as_gstabs_flag=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 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_gstabs_debug_flag="yes"
+  fi
+elif test x$gcc_cv_as != x -a x"$insn" != x ; then
+	echo '' > conftest.s
+	# ??? This fails with non-gnu grep.
+	if $gcc_cv_as --gstabs -o conftest.o conftest.s > /dev/null 2>&1 ; then
+	  gcc_cv_as_gstabs_flag="yes"
+	fi
+	rm -f conftest.s conftest.o
+fi
+if test x"$gcc_cv_as_gstabs_flag" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_AS_GSTABS_DEBUG_FLAG 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6
+
+echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6
+echo "configure:7696: checking linker PT_GNU_EH_FRAME support" >&5
+gcc_cv_ld_eh_frame_hdr=no
+if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then
+  if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then
+    gcc_cv_ld_eh_frame_hdr=yes
+  fi
+elif test x$gcc_cv_ld != x; then
+	# Check if linker supports --eh-frame-hdr option
+	if $gcc_cv_ld --help 2>/dev/null | grep eh-frame-hdr > /dev/null; then
+		gcc_cv_ld_eh_frame_hdr=yes
+	fi
+fi
+if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
+	cat >> confdefs.h <<\EOF
+#define HAVE_LD_EH_FRAME_HDR 1
+EOF
+
+fi
+echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6
+
+if test "$prefix" != "/usr" && test "$prefix" != "/usr/local" ; then
+  cat >> confdefs.h <<EOF
+#define PREFIX_INCLUDE_DIR "$prefix/include"
+EOF
+
 fi
-echo "$ac_t""$gcc_cv_as_instructions" 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
 # go away some day.
+# NB:  embedded tabs in this IF block -- do not untabify
 if test x"${enable_languages+set}" != xset; then
 	if test x"${LANGUAGES+set}" = xset; then
-		enable_languages="`echo ${LANGUAGES} | tr ' ' ','`"
+		enable_languages="${LANGUAGES}"
+		echo "configure: warning: setting LANGUAGES is deprecated, use --enable-languages instead" 1>&2
+
 	else
 		enable_languages=all
 	fi
+else
+	if test x"${enable_languages}" = x ||
+	   test x"${enable_languages}" = xyes;
+	then
+		{ echo "configure: error: --enable-languages needs at least one language argument" 1>&2; exit 1; }
+	fi
 fi
+enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
+
+# First scan to see if an enabled language requires some other language.
+# We assume that a given config-lang.in will list all the language
+# front ends it requires, even if some are required indirectly.
+for lang in ${srcdir}/*/config-lang.in ..
+do
+   case $lang in
+    ..)
+       ;;
+    # The odd quoting in the next line works around
+    # an apparent bug in bash 1.12 on linux.
+    ${srcdir}/[*]/config-lang.in)
+       ;;
+    *)
+       lang_alias=`sed -n -e 's,^language=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^language=\([^ 	]*\).*$,\1,p' $lang`
+       this_lang_requires=`sed -n -e 's,^lang_requires=['"'"'"'"]\(.*\)["'"'"'"'].*$,\1,p' -e 's,^lang_requires=\([^ 	]*\).*$,\1,p' $lang`
+       for other in $this_lang_requires
+       do
+	  case ,${enable_languages}, in
+	   *,$other,*)
+	      ;;
+	   *,all,*)
+	      ;;
+	   *,$lang_alias,*)
+	      enable_languages="$enable_languages,$other"
+	      ;;
+	  esac
+       done
+       ;;
+   esac
+done
+
 subdirs=
 for lang in ${srcdir}/*/config-lang.in ..
 do
@@ -8294,27 +7784,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
 			;;
@@ -8336,27 +7822,87 @@ if test $thread_file != single; then
 fi
 
 
+# Find out what GC implementation we want, or may, use.
+# Check whether --with-gc or --without-gc was given.
+if test "${with_gc+set}" = set; then
+  withval="$with_gc"
+  case "$withval" in
+  simple | page)
+    GGC=ggc-$withval
+    ;;
+  *)
+    { echo "configure: error: $withval is an invalid option to --with-gc" 1>&2; exit 1; }
+    ;;
+esac
+else
+  GGC=ggc-page
+fi
+
+
+echo "Using $GGC for garbage collection."
+
+# 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
+
+
+
+
+
+echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
+echo "configure:7859: 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"
+  maintainer_mode=$enableval
+else
+  maintainer_mode=no
+fi
+
+
+echo "$ac_t""$maintainer_mode" 1>&6
+
+if test "$maintainer_mode" = "yes"; then
+  MAINT=''
+else
+  MAINT='#'
+fi
+
+# With Setjmp/Longjmp based exception handling.
+# Check whether --enable-sjlj-exceptions or --disable-sjlj-exceptions was given.
+if test "${enable_sjlj_exceptions+set}" = set; then
+  enableval="$enable_sjlj_exceptions"
+  sjlj=`if test $enableval = yes; then echo 1; else echo 0; fi`
+cat >> confdefs.h <<EOF
+#define CONFIG_SJLJ_EXCEPTIONS $sjlj
+EOF
+
+fi
+
+
 # Make empty files to contain the specs and options for each language.
 # Then add #include lines to for a compiler that has specs and/or options.
 
 lang_specs_files=
 lang_options_files=
 lang_tree_files=
-rm -f specs.h options.h gencheck.h
-touch specs.h options.h gencheck.h
 for subdir in . $subdirs
 do
 	if test -f $srcdir/$subdir/lang-specs.h; then
-		echo "#include \"$subdir/lang-specs.h\"" >>specs.h
-		lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
+	    lang_specs_files="$lang_specs_files $srcdir/$subdir/lang-specs.h"
 	fi
 	if test -f $srcdir/$subdir/lang-options.h; then
-		echo "#include \"$subdir/lang-options.h\"" >>options.h
-		lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h"
+	    lang_options_files="$lang_options_files $srcdir/$subdir/lang-options.h"
 	fi
 	if test -f $srcdir/$subdir/$subdir-tree.def; then
-		echo "#include \"$subdir/$subdir-tree.def\"" >>gencheck.h
-		lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
+	    lang_tree_files="$lang_tree_files $srcdir/$subdir/$subdir-tree.def"
 	fi
 done
 
@@ -8366,12 +7912,9 @@ all_languages=
 all_boot_languages=
 all_compilers=
 all_stagestuff=
-all_diff_excludes=
-all_outputs='Makefile intl/Makefile po/Makefile.in fixinc/Makefile'
+all_outputs='Makefile intl/Makefile fixinc/Makefile gccbug mklibgcc'
 # List of language makefile fragments.
 all_lang_makefiles=
-all_headers=
-all_lib2funcs=
 
 # Add the language fragments.
 # Languages are added via two mechanisms.  Some information must be
@@ -8382,7 +7925,6 @@ all_lib2funcs=
 
 language_fragments="Make-lang"
 language_hooks="Make-hooks"
-oldstyle_subdirs=
 
 for s in .. $subdirs
 do
@@ -8392,17 +7934,17 @@ do
 		boot_language=
 		compilers=
 		stagestuff=
-		diff_excludes=
-		headers=
 		outputs=
-		lib2funcs=
 		. ${srcdir}/$s/config-lang.in
 		if test "x$language" = x
 		then
 			echo "${srcdir}/$s/config-lang.in doesn't set \$language." 1>&2
 			exit 1
 		fi
-		all_lang_makefiles="$all_lang_makefiles ${srcdir}/$s/Make-lang.in ${srcdir}/$s/Makefile.in"
+		all_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
@@ -8410,14 +7952,16 @@ do
 		fi
 		all_compilers="$all_compilers $compilers"
 		all_stagestuff="$all_stagestuff $stagestuff"
-		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
 
@@ -8427,9 +7971,9 @@ done
 rm -f Make-hooks
 touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap \
-	info dvi \
+	info dvi generated-manpages \
 	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
@@ -8444,23 +7988,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.
@@ -8468,42 +8010,12 @@ build_canonical=${build}
 host_canonical=${host}
 target_subdir=
 if test "${host}" != "${target}" ; then
-    target_subdir=${target}/
+    target_subdir=${target_alias}/
 fi
 
 
 
 	
-# If this is using newlib, then define inhibit_libc in
-# LIBGCC2_CFLAGS.  This will cause __eprintf to be left out of
-# libgcc.a, but that's OK because newib should have its own version of
-# assert.h.
-inhibit_libc=
-if test x$with_newlib = xyes; then
-	inhibit_libc=-Dinhibit_libc
-fi
-
-
-# Override SCHED_OBJ and SCHED_CFLAGS to enable the Haifa scheduler.
-sched_prefix=
-sched_cflags=
-if test x$enable_haifa = xyes; then
-    echo "Using the Haifa scheduler."
-    sched_prefix=haifa-
-    sched_cflags=-DHAIFA
-fi
-
-
-if test x$enable_haifa != x; then
-    # Explicitly remove files that need to be recompiled for the Haifa scheduler.
-    for x in genattrtab.o toplev.o *sched.o; do
-	if test -f $x; then
-	    echo "Removing $x"
-	    rm -f $x
-	fi
-    done
-fi
-
 # If $(exec_prefix) exists and is not the same as $(prefix), then compute an
 # absolute path for gcc_tooldir based on inserting the number of up-directory
 # movements required to get from $(exec_prefix) to $(prefix) into the basic
@@ -8518,7 +8030,7 @@ else
 #  -e 's|^\$(prefix)||'   matches and eliminates 'prefix' from 'exec_prefix'
 #  -e 's|/$||'            match a trailing forward slash and eliminates it
 #  -e 's|^[^/]|/|'        forces the string to start with a forward slash (*)
-#  -e 's|/[^/]*|../|g'    replaces each occurance of /<directory> with ../
+#  -e 's|/[^/]*|../|g'    replaces each occurrence of /<directory> with ../
 #
 # (*) Note this pattern overwrites the first character of the string
 # with a forward slash if one is not already present.  This is not a
@@ -8541,6 +8053,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`
 
@@ -8610,6 +8147,8 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma
 
 
 
+
+
 # Echo that links are built
 if test x$host = x$target
 then
@@ -8778,6 +8317,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
@@ -8794,118 +8335,139 @@ s%@build_cpu@%$build_cpu%g
 s%@build_vendor@%$build_vendor%g
 s%@build_os@%$build_os%g
 s%@CC@%$CC%g
-s%@stage1_warn_cflags@%$stage1_warn_cflags%g
+s%@NO_MINUS_C_MINUS_O@%$NO_MINUS_C_MINUS_O%g
+s%@OUTPUT_OPTION@%$OUTPUT_OPTION%g
+s%@strict1_warn@%$strict1_warn%g
+s%@CPP@%$CPP%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%@vfprintf@%$vfprintf%g
-s%@doprint@%$doprint%g
+s%@GNATBIND@%$GNATBIND%g
+s%@ADAC@%$ADAC%g
+s%@have_mktemp_command@%$have_mktemp_command%g
+s%@MAKEINFO@%$MAKEINFO%g
+s%@BUILD_INFO@%$BUILD_INFO%g
+s%@GENERATED_MANPAGES@%$GENERATED_MANPAGES%g
+s%@FLEX@%$FLEX%g
+s%@BISON@%$BISON%g
+s%@COLLECT2_LIBS@%$COLLECT2_LIBS%g
+s%@GNAT_LIBEXC@%$GNAT_LIBEXC%g
+s%@TARGET_GETGROUPS_T@%$TARGET_GETGROUPS_T%g
+s%@LIBICONV@%$LIBICONV%g
 s%@manext@%$manext%g
 s%@objext@%$objext%g
+s%@FORBUILD@%$FORBUILD%g
 s%@PACKAGE@%$PACKAGE%g
 s%@VERSION@%$VERSION%g
 s%@ALLOCA@%$ALLOCA%g
+s%@GLIBC21@%$GLIBC21%g
 s%@USE_NLS@%$USE_NLS%g
 s%@MSGFMT@%$MSGFMT%g
 s%@GMSGFMT@%$GMSGFMT%g
 s%@XGETTEXT@%$XGETTEXT%g
-s%@GENCAT@%$GENCAT%g
+s%@INTLBISON@%$INTLBISON%g
+s%@BUILD_INCLUDED_LIBINTL@%$BUILD_INCLUDED_LIBINTL%g
 s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
 s%@CATALOGS@%$CATALOGS%g
 s%@CATOBJEXT@%$CATOBJEXT%g
-s%@DATADIRNAME@%$DATADIRNAME%g
-s%@GMOFILES@%$GMOFILES%g
-s%@INSTOBJEXT@%$INSTOBJEXT%g
-s%@INTLDEPS@%$INTLDEPS%g
 s%@INTLLIBS@%$INTLLIBS%g
+s%@INTLDEPS@%$INTLDEPS%g
 s%@INTLOBJS@%$INTLOBJS%g
-s%@POFILES@%$POFILES%g
 s%@POSUB@%$POSUB%g
-s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
-s%@GT_NO@%$GT_NO%g
-s%@GT_YES@%$GT_YES%g
+s%@DATADIRNAME@%$DATADIRNAME%g
+s%@INSTOBJEXT@%$INSTOBJEXT%g
+s%@GENCAT@%$GENCAT%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@l@%$l%g
+s%@INTL_LIBTOOL_SUFFIX_PREFIX@%$INTL_LIBTOOL_SUFFIX_PREFIX%g
+s%@CROSS@%$CROSS%g
+s%@ALL@%$ALL%g
+s%@SYSTEM_HEADER_DIR@%$SYSTEM_HEADER_DIR%g
+s%@inhibit_libc@%$inhibit_libc%g
+s%@HOST_PREFIX@%$HOST_PREFIX%g
+s%@HOST_PREFIX_1@%$HOST_PREFIX_1%g
+s%@HOST_CC@%$HOST_CC%g
+s%@HOST_CFLAGS@%$HOST_CFLAGS%g
+s%@STMP_FIXINC@%$STMP_FIXINC%g
+s%@STMP_FIXPROTO@%$STMP_FIXPROTO%g
 s%@gthread_flags@%$gthread_flags%g
+s%@GGC@%$GGC%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%@inhibit_libc@%$inhibit_libc%g
-s%@sched_prefix@%$sched_prefix%g
-s%@sched_cflags@%$sched_cflags%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
 s%@all_compilers@%$all_compilers%g
-s%@all_diff_excludes@%$all_diff_excludes%g
-s%@all_headers@%$all_headers%g
 s%@all_lang_makefiles@%$all_lang_makefiles%g
 s%@all_languages@%$all_languages%g
-s%@all_lib2funcs@%$all_lib2funcs%g
 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%@build_xm_file@%$build_xm_file%g
+s%@build_xm_defines@%$build_xm_defines%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%@cpp_main@%$cpp_main%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%@fixinc_defs@%$fixinc_defs%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
 s%@host_xm_file_list@%$host_xm_file_list%g
+s%@host_xm_file@%$host_xm_file%g
+s%@host_xm_defines@%$host_xm_defines%g
 s%@install@%$install%g
-s%@JAVAGC@%$JAVAGC%g
 s%@lang_options_files@%$lang_options_files%g
 s%@lang_specs_files@%$lang_specs_files%g
 s%@lang_tree_files@%$lang_tree_files%g
 s%@local_prefix@%$local_prefix%g
-s%@maybe_use_collect2@%$maybe_use_collect2%g
 s%@md_file@%$md_file%g
 s%@objc_boehm_gc@%$objc_boehm_gc%g
 s%@out_file@%$out_file%g
 s%@out_object_file@%$out_object_file%g
 s%@stage_prefix_set_by_configure@%$stage_prefix_set_by_configure%g
+s%@quoted_stage_prefix_set_by_configure@%$quoted_stage_prefix_set_by_configure%g
 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%@tm_file@%$tm_file%g
+s%@tm_p_file_list@%$tm_p_file_list%g
+s%@tm_p_file@%$tm_p_file%g
+s%@xm_file@%$xm_file%g
+s%@xm_defines@%$xm_defines%g
+s%@c_target_objs@%$c_target_objs%g
+s%@cxx_target_objs@%$cxx_target_objs%g
+s%@target_cpu_default@%$target_cpu_default%g
 /@target_overrides@/r $target_overrides
 s%@target_overrides@%%g
 /@host_overrides@/r $host_overrides
 s%@host_overrides@%%g
-s%@cross_defines@%$cross_defines%g
-/@cross_overrides@/r $cross_overrides
-s%@cross_overrides@%%g
-/@build_overrides@/r $build_overrides
-s%@build_overrides@%%g
 /@language_fragments@/r $language_fragments
 s%@language_fragments@%%g
 /@language_hooks@/r $language_hooks
@@ -9113,93 +8675,43 @@ cat >> $CONFIG_STATUS <<\EOF
 fi; done
 
 EOF
-
 cat >> $CONFIG_STATUS <<EOF
-ac_sources="$nls_cv_header_libgt"
-ac_dests="$nls_cv_header_intl"
-EOF
 
-cat >> $CONFIG_STATUS <<\EOF
-srcdir=$ac_given_srcdir
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-
-  echo "linking $srcdir/$ac_source to $ac_dest"
-
-  if test ! -r $srcdir/$ac_source; then
-    { echo "configure: error: $srcdir/$ac_source: File not found" 1>&2; exit 1; }
-  fi
-  rm -f $ac_dest
-
-  # Make relative symlinks.
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dest_dir=`echo $ac_dest|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dest_dir" != "$ac_dest" && test "$ac_dest_dir" != .; then
-    # The dest file is in a subdirectory.
-    test ! -d "$ac_dest_dir" && mkdir "$ac_dest_dir"
-    ac_dest_dir_suffix="/`echo $ac_dest_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dest_dir_suffix.
-    ac_dots=`echo $ac_dest_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dest_dir_suffix= ac_dots=
-  fi
-
-  case "$srcdir" in
-  [/$]*) ac_rel_source="$srcdir/$ac_source" ;;
-  *) ac_rel_source="$ac_dots$srcdir/$ac_source" ;;
-  esac
-
-  # Make a symlink if possible; otherwise try a hard link.
-  if ln -s $ac_rel_source $ac_dest 2>/dev/null ||
-    ln $srcdir/$ac_source $ac_dest; then :
-  else
-    { echo "configure: error: can not link $ac_dest to $srcdir/$ac_source" 1>&2; exit 1; }
-  fi
-done
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-
-host='${host}'
-build='${build}'
-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}'
-dep_host_xmake_file='${dep_host_xmake_file}'
-host_xmake_file='${host_xmake_file}'
-dep_tmake_file='${dep_tmake_file}'
-tmake_file='${tmake_file}'
-thread_file='${thread_file}'
-gcc_version='${gcc_version}'
-gcc_version_trigger='${gcc_version_trigger}'
-local_prefix='${local_prefix}'
-build_install_headers_dir='${build_install_headers_dir}'
-build_exeext='${build_exeext}'
-host_exeext='${host_exeext}'
-out_file='${out_file}'
-gdb_needs_out_file_path='${gdb_needs_out_file_path}'
-SET_MAKE='${SET_MAKE}'
-target_list='${target_list}'
-target_overrides='${target_overrides}'
-host_overrides='${host_overrides}'
-cross_defines='${cross_defines}'
-cross_overrides='${cross_overrides}'
-build_overrides='${build_overrides}'
-cpp_install_dir='${cpp_install_dir}'
+subdirs='$subdirs'
+symbolic_link='$symbolic_link'
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-case "$CONFIG_FILES" in *po/Makefile.in*)
-        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
-      esac
+for ac_file in $CONFIG_FILES; do
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+        esac
+        # PO directories have a Makefile.in generated from Makefile.in.in.
+        case "$ac_file" in */Makefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+          case "$ac_given_srcdir" in
+            .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            /*) top_srcdir="$ac_given_srcdir" ;;
+            *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          fi
+          ;;
+        esac
+      done
 
-. $srcdir/configure.lang
 case x$CONFIG_HEADERS in
 xauto-host.h:config.in)
 echo > cstamp-h ;;
@@ -9211,7 +8723,7 @@ esac
 # This is virtually a duplicate of what happens in configure.lang; we do
 # an extra check to make sure this only happens if ln -s can be used.
 if test "$symbolic_link" = "ln -s"; then
- for d in .. ${subdirs} ; do
+ for d in .. ${subdirs} fixinc ; do
    if test $d != ..; then
 	STARTDIR=`pwd`
 	cd $d