Makefile.in (gnucompare*): Merge into ...

* Makefile.in (gnucompare*): Merge into ... (slowcompare*): ... here. (fastcompare*): New targets. * aclocal.m4 (gcc_AC_PROG_CMP_IGNORE_INITIAL): Add checks for other "fast" cmp programs. * configure: Regenerate. From-SVN: r71703

Makefile.in (gnucompare*): Merge into ...
* Makefile.in (gnucompare*): Merge into ... (slowcompare*): ... here. (fastcompare*): New targets. * aclocal.m4 (gcc_AC_PROG_CMP_IGNORE_INITIAL): Add checks for other "fast" cmp programs. * configure: Regenerate. From-SVN: r71703
269a7343 · Kaveh R. Ghazi · Kaveh Ghazi · d84a4ef1 · 269a7343 · 269a7343
Commit 269a7343 authored Sep 23, 2003 by Kaveh R. Ghazi Committed by Kaveh Ghazi Sep 23, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 280 additions and 259 deletions

gcc/ChangeLog
+9 -0

gcc/Makefile.in
+45 -44

gcc/aclocal.m4
+14 -4

gcc/configure
+212 -211

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
+2003-09-23  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+	* Makefile.in (gnucompare*): Merge into ...
+	(slowcompare*): ... here.
+	(fastcompare*): New targets.
+	* aclocal.m4 (gcc_AC_PROG_CMP_IGNORE_INITIAL): Add checks for
+	other "fast" cmp programs.
+	* configure: Regenerate.
 2003-09-23  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 	* targhooks.c: Include output.h.

--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3529,62 +3529,62 @@ restrap:
 	$(MAKE) unstrap
 	$(MAKE) $(REMAKEFLAGS) bootstrap
-# Compare the object files in the current directory with those in the
+# These targets compare the object files in the current directory with
-# stage2 directory.
+# those in a stage directory.  We need to skip the first N bytes of
-# ./ avoids bug in some versions of tail.
+# each object file.  The "slow" mechanism assumes nothing special
-slowcompare slowcompare3 slowcompare4 slowcompare-lean slowcompare3-lean slowcompare4-lean: force
+# about cmp and uses the tail command to skip.  ./ avoids a bug in
+# some versions of tail.  The "gnu" targets use gnu cmp (diffutils
+# v2.4 or later), to avoid running tail and the overhead of twice
+# copying each object file.  Likewise, the "fast" targets use the skip
+# parameter of cmp available on some systems to accomplish the same
+# thing.  An exit status of 1 is precisely the result we're looking
+# for (other values mean other problems).
+slowcompare slowcompare3 slowcompare4 slowcompare-lean slowcompare3-lean slowcompare4-lean \
+fastcompare fastcompare3 fastcompare4 fastcompare-lean fastcompare3-lean fastcompare4-lean \
+ gnucompare  gnucompare3  gnucompare4  gnucompare-lean  gnucompare3-lean  gnucompare4-lean: force
 	-rm -f .bad_compare
-	case "$@" in slowcompare | slowcompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^slowcompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	case "$@" in *compare | *compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^[a-z]*compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
 	for file in *$(objext); do \
-	  tail +16c ./$$file > tmp-foo1; \
+	  case "$@" in \
-	  tail +16c stage$$stage/$$file > tmp-foo2 \
+	    slowcompare* ) \
-	    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
-	done
-	case "$@" in slowcompare | slowcompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^slowcompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
-	for dir in tmp-foo $(SUBDIRS); do \
-	  if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \
-	    for file in $$dir/*$(objext); do \
 	      tail +16c ./$$file > tmp-foo1; \
 	      tail +16c stage$$stage/$$file > tmp-foo2 \
 	        && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
-	    done; \
+	      ;; \
-	  else true; fi; \
+	    fastcompare* ) \
-	done
+	      cmp $$file stage$$stage/$$file 16 16 > /dev/null 2>&1; \
-	-rm -f tmp-foo*
+	      test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
-	case "$@" in slowcompare | slowcompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^slowcompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	      ;; \
-	if [ -f .bad_compare ]; then \
+	    gnucompare* ) \
-	  echo "Bootstrap comparison failure!"; \
+	      cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1; \
-	  cat .bad_compare; \
+	      test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
-	  exit 1; \
+	      ;; \
-	else \
+	  esac ; \
-	  case "$@" in \
-	    *-lean ) rm -rf stage$$stage ;; \
-	    *) ;; \
-	  esac; true; \
-	fi
-# Compare the object files in the current directory with those in the
-# stage2 directory.  Use gnu cmp (diffutils v2.4 or later) to avoid
-# running tail and the overhead of twice copying each object file.
-# An exit status of 1 is precisely the result we're looking for (other
-# values mean other problems).
-gnucompare gnucompare3 gnucompare4 gnucompare-lean gnucompare3-lean gnucompare4-lean: force
-	-rm -f .bad_compare
-	case "$@" in gnucompare | gnucompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^gnucompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
-	for file in *$(objext); do \
-	  cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1; \
-	  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
 	done
-	case "$@" in gnucompare | gnucompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^gnucompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	case "$@" in *compare | *compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^[a-z]*compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
 	for dir in tmp-foo $(SUBDIRS); do \
 	  if [ "`echo $$dir/*$(objext)`" != "$$dir/*$(objext)" ] ; then \
 	    for file in $$dir/*$(objext); do \
-	      cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1; \
+	      case "$@" in \
-	      test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+		slowcompare* ) \
+		  tail +16c ./$$file > tmp-foo1; \
+		  tail +16c stage$$stage/$$file > tmp-foo2 \
+		    && (cmp tmp-foo1 tmp-foo2 > /dev/null 2>&1 || echo $$file differs >> .bad_compare) || true; \
+		  ;; \
+		fastcompare* ) \
+		  cmp $$file stage$$stage/$$file 16 16 > /dev/null 2>&1; \
+		  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+		  ;; \
+		gnucompare* ) \
+		  cmp --ignore-initial=16 $$file stage$$stage/$$file > /dev/null 2>&1; \
+		  test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
+		  ;; \
+	      esac ; \
 	    done; \
 	  else true; fi; \
 	done
-	case "$@" in gnucompare | gnucompare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^gnucompare\([0-9][0-9]*\).*,\1,'` ;; esac; \
+	-rm -f tmp-foo*
+	case "$@" in *compare | *compare-lean ) stage=2 ;; * ) stage=`echo $@ | sed -e 's,^[a-z]*compare\([0-9][0-9]*\).*,\1,'` ;; esac; \
 	if [ -f .bad_compare ]; then \
 	  echo "Bootstrap comparison failure!"; \
 	  cat .bad_compare; \
@@ -3592,6 +3592,7 @@ gnucompare gnucompare3 gnucompare4 gnucompare-lean gnucompare3-lean gnucompare4-
 	else \
 	  case "$@" in \
 	    *-lean ) rm -rf stage$$stage ;; \
+	    *) ;; \
 	  esac; true; \
 	fi

--- a/gcc/aclocal.m4
+++ b/gcc/aclocal.m4
@@ -104,19 +104,29 @@ fi
 dnl 'make compare' can be significantly faster, if cmp itself can
 dnl skip bytes instead of using tail.  The test being performed is
 dnl "if cmp --ignore-initial=2 t1 t2 && ! cmp --ignore-initial=1 t1 t2"
-dnl but we need to sink errors and handle broken shells.
+dnl but we need to sink errors and handle broken shells.  We also test
+dnl for the parameter format "cmp file1 file2 skip1 skip2" which is
+dnl accepted by cmp on some systems.
 AC_DEFUN(gcc_AC_PROG_CMP_IGNORE_INITIAL,
 [AC_CACHE_CHECK([for cmp's capabilities], gcc_cv_prog_cmp_skip,
 [ echo abfoo >t1
  echo cdfoo >t2
+  gcc_cv_prog_cmp_skip=slowcompare
  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-      gcc_cv_prog_cmp_skip=slowcompare
+      :
    else
      gcc_cv_prog_cmp_skip=gnucompare
    fi
-  else
+  fi
-    gcc_cv_prog_cmp_skip=slowcompare
+  if test $gcc_cv_prog_cmp_skip = slowcompare ; then
+    if cmp t1 t2 2 2 > /dev/null 2>&1; then
+      if cmp t1 t2 1 1 > /dev/null 2>&1; then
+        :
+      else
+        gcc_cv_prog_cmp_skip=fastcompare
+      fi
+    fi
  fi
  rm t1 t2
 ])

--- a/gcc/configure
+++ b/gcc/configure
@@ -2572,14 +2572,22 @@ if eval "test \"`echo '$''{'gcc_cv_prog_cmp_skip'+set}'`\" = set"; then
 else
   echo abfoo >t1
  echo cdfoo >t2
+  gcc_cv_prog_cmp_skip=slowcompare
  if cmp --ignore-initial=2 t1 t2 > /dev/null 2>&1; then
    if cmp --ignore-initial=1 t1 t2 > /dev/null 2>&1; then
-      gcc_cv_prog_cmp_skip=slowcompare
+      :
    else
      gcc_cv_prog_cmp_skip=gnucompare
    fi
-  else
+  fi
-    gcc_cv_prog_cmp_skip=slowcompare
+  if test $gcc_cv_prog_cmp_skip = slowcompare ; then
+    if cmp t1 t2 2 2 > /dev/null 2>&1; then
+      if cmp t1 t2 1 1 > /dev/null 2>&1; then
+        :
+      else
+        gcc_cv_prog_cmp_skip=fastcompare
+      fi
+    fi
  fi
  rm t1 t2
@@ -2594,7 +2602,7 @@ make_compare_target=$gcc_cv_prog_cmp_skip
 # 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:2598: checking for $ac_word" >&5
+echo "configure:2606: 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
@@ -2633,7 +2641,7 @@ else
  # Extract the first word of "makeinfo", so it can be a program name with args.
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2637: checking for $ac_word" >&5
+echo "configure:2645: 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
@@ -2662,13 +2670,13 @@ 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:2666: checking for modern makeinfo" >&5
+echo "configure:2674: 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:2672: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:2680: version of makeinfo is $ac_prog_version" >&5
  case $ac_prog_version in
    '')     gcc_cv_prog_makeinfo_modern=no;;
    4.[2-9]*)
@@ -2696,7 +2704,7 @@ fi
 # Is pod2man recent enough to regenerate manpages?
 echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6
-echo "configure:2700: checking for recent Pod::Man" >&5
+echo "configure:2708: 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		
@@ -2712,7 +2720,7 @@ 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:2716: checking for $ac_word" >&5
+echo "configure:2724: 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
@@ -2749,7 +2757,7 @@ 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:2753: checking for $ac_word" >&5
+echo "configure:2761: 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
@@ -2783,12 +2791,12 @@ fi
 # --------------------
 echo $ac_n "checking for GNU C library""... $ac_c" 1>&6
-echo "configure:2787: checking for GNU C library" >&5
+echo "configure:2795: 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 2792 "configure"
+#line 2800 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2798,7 +2806,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:2802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_glibc=yes
 else
@@ -2819,12 +2827,12 @@ EOF
 fi
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2823: checking for ANSI C header files" >&5
+echo "configure:2831: 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 2828 "configure"
+#line 2836 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -2832,7 +2840,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2844: \"$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*
@@ -2849,7 +2857,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 2853 "configure"
+#line 2861 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -2867,7 +2875,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 2871 "configure"
+#line 2879 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -2888,7 +2896,7 @@ if test "$cross_compiling" = yes; then
  :
 else
  cat > conftest.$ac_ext <<EOF
-#line 2892 "configure"
+#line 2900 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -2899,7 +2907,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 EOF
-if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  :
 else
@@ -2923,12 +2931,12 @@ EOF
 fi
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:2927: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:2935: 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 2932 "configure"
+#line 2940 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -2937,7 +2945,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:2941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_time=yes
 else
@@ -2958,19 +2966,19 @@ EOF
 fi
 echo $ac_n "checking for working stdbool.h""... $ac_c" 1>&6
-echo "configure:2962: checking for working stdbool.h" >&5
+echo "configure:2970: 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 2967 "configure"
+#line 2975 "configure"
 #include "confdefs.h"
 #include <stdbool.h>
 int main() {
 bool foo = false;
 ; return 0; }
 EOF
-if { (eval echo configure:2974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_stdbool_h=yes
 else
@@ -2991,12 +2999,12 @@ EOF
 fi
 echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6
-echo "configure:2995: checking whether string.h and strings.h may both be included" >&5
+echo "configure:3003: 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 3000 "configure"
+#line 3008 "configure"
 #include "confdefs.h"
 #include <string.h>
 #include <strings.h>
@@ -3004,7 +3012,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:3008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_header_string=yes
 else
@@ -3025,12 +3033,12 @@ EOF
 fi
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3029: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3037: 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 3034 "configure"
+#line 3042 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3046,7 +3054,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_header_sys_wait_h=yes
 else
@@ -3073,17 +3081,17 @@ for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h \
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3077: checking for $ac_hdr" >&5
+echo "configure:3085: 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 3082 "configure"
+#line 3090 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3095: \"$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*
@@ -3113,17 +3121,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:3117: checking for thread.h" >&5
+echo "configure:3125: 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 3122 "configure"
+#line 3130 "configure"
 #include "confdefs.h"
 #include <thread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3135: \"$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*
@@ -3147,17 +3155,17 @@ fi
 ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:3151: checking for pthread.h" >&5
+echo "configure:3159: 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 3156 "configure"
+#line 3164 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3169: \"$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*
@@ -3182,12 +3190,12 @@ 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:3186: checking for CHAR_BIT" >&5
+echo "configure:3194: 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 3191 "configure"
+#line 3199 "configure"
 #include "confdefs.h"
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -3212,7 +3220,7 @@ 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:3216: checking number of bits in a byte" >&5
+echo "configure:3224: 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
@@ -3220,7 +3228,7 @@ else
 gcc_cv_c_nbby=
 while test $i -lt 65; do
   cat > conftest.$ac_ext <<EOF
-#line 3224 "configure"
+#line 3232 "configure"
 #include "confdefs.h"
 int main() {
@@ -3230,7 +3238,7 @@ switch(0) {
  ; }
 ; return 0; }
 EOF
-if { (eval echo configure:3234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_c_nbby=$i; break
 else
@@ -3255,14 +3263,14 @@ EOF
 fi
 fi
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3259: checking whether byte ordering is bigendian" >&5
+echo "configure:3267: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 3266 "configure"
+#line 3274 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3273,11 +3281,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 3281 "configure"
+#line 3289 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3288,7 +3296,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:3292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_c_bigendian=yes
 else
@@ -3308,7 +3316,7 @@ if test "$cross_compiling" = yes; then
   echo $ac_n "cross-compiling... " 2>&6 
 else
  cat > conftest.$ac_ext <<EOF
-#line 3312 "configure"
+#line 3320 "configure"
 #include "confdefs.h"
 main () {
  /* Are we little or big endian?  From Harbison&Steele.  */
@@ -3321,7 +3329,7 @@ main () {
  exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:3325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  ac_cv_c_bigendian=no
 else
@@ -3339,7 +3347,7 @@ fi
 echo "$ac_t""$ac_cv_c_bigendian" 1>&6
 if test $ac_cv_c_bigendian = unknown; then
 echo $ac_n "checking to probe for byte ordering""... $ac_c" 1>&6
-echo "configure:3343: checking to probe for byte ordering" >&5
+echo "configure:3351: checking to probe for byte ordering" >&5
 cat >conftest.c <<EOF
 short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
@@ -3419,7 +3427,7 @@ esac
 # 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:3423: checking for collect2 libraries" >&5
+echo "configure:3431: 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
@@ -3430,7 +3438,7 @@ for libs in '' -lld -lmld \
 do
 	LIBS="$libs"
 	cat > conftest.$ac_ext <<EOF
-#line 3434 "configure"
+#line 3442 "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
@@ -3441,7 +3449,7 @@ int main() {
 ldopen()
 ; return 0; }
 EOF
-if { (eval echo configure:3445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3453: \"$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
@@ -3467,14 +3475,14 @@ save_LIBS="$LIBS"
 LIBS=
 echo $ac_n "checking for library containing exc_resume""... $ac_c" 1>&6
-echo "configure:3471: checking for library containing exc_resume" >&5
+echo "configure:3479: 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 3478 "configure"
+#line 3486 "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
@@ -3485,7 +3493,7 @@ int main() {
 exc_resume()
 ; return 0; }
 EOF
-if { (eval echo configure:3489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3497: \"$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
@@ -3496,7 +3504,7 @@ 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 3500 "configure"
+#line 3508 "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
@@ -3507,7 +3515,7 @@ int main() {
 exc_resume()
 ; return 0; }
 EOF
-if { (eval echo configure:3511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_exc_resume="-l$i"
 break
@@ -3537,14 +3545,14 @@ save_LIBS="$LIBS"
 LIBS=
 echo $ac_n "checking for library containing ldexp""... $ac_c" 1>&6
-echo "configure:3541: checking for library containing ldexp" >&5
+echo "configure:3549: checking for library containing ldexp" >&5
 if eval "test \"`echo '$''{'ac_cv_search_ldexp'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_ldexp="no"
 cat > conftest.$ac_ext <<EOF
-#line 3548 "configure"
+#line 3556 "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
@@ -3555,7 +3563,7 @@ int main() {
 ldexp()
 ; return 0; }
 EOF
-if { (eval echo configure:3559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_ldexp="none required"
 else
@@ -3566,7 +3574,7 @@ rm -f conftest*
 test "$ac_cv_search_ldexp" = "no" && for i in m; do
 LIBS="-l$i  $ac_func_search_save_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3570 "configure"
+#line 3578 "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
@@ -3577,7 +3585,7 @@ int main() {
 ldexp()
 ; return 0; }
 EOF
-if { (eval echo configure:3581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_ldexp="-l$i"
 break
@@ -3604,12 +3612,12 @@ LIBS="$save_LIBS"
 # 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:3608: checking for inttypes.h" >&5
+echo "configure:3616: 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 3613 "configure"
+#line 3621 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <inttypes.h>
@@ -3617,7 +3625,7 @@ int main() {
 intmax_t i = -1;
 ; return 0; }
 EOF
-if { (eval echo configure:3621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3629: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_header_inttypes_h=yes
 else
@@ -3645,12 +3653,12 @@ for ac_func in times clock dup2 kill getrlimit setrlimit atoll atoq \
        setlocale
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3649: checking for $ac_func" >&5
+echo "configure:3657: 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 3654 "configure"
+#line 3662 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char $ac_func(); below.  */
@@ -3673,7 +3681,7 @@ $ac_func();
 ; return 0; }
 EOF
-if { (eval echo configure:3677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3685: \"$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
@@ -3700,7 +3708,7 @@ done
 if test x$ac_cv_func_mbstowcs = xyes; then
  echo $ac_n "checking whether mbstowcs works""... $ac_c" 1>&6
-echo "configure:3704: checking whether mbstowcs works" >&5
+echo "configure:3712: checking whether mbstowcs works" >&5
 if eval "test \"`echo '$''{'gcc_cv_func_mbstowcs_works'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3708,7 +3716,7 @@ else
  gcc_cv_func_mbstowcs_works=yes
 else
  cat > conftest.$ac_ext <<EOF
-#line 3712 "configure"
+#line 3720 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int main()
@@ -3717,7 +3725,7 @@ int main()
  return 0;
 }
 EOF
-if { (eval echo configure:3721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  gcc_cv_func_mbstowcs_works=yes
 else
@@ -3741,12 +3749,12 @@ EOF
 fi
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:3745: checking for ssize_t" >&5
+echo "configure:3753: 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 3750 "configure"
+#line 3758 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3777,12 +3785,12 @@ fi
 # Try to determine the array type of the second argument of getgroups
 # for the target system (int or gid_t).
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3781: checking for uid_t in sys/types.h" >&5
+echo "configure:3789: 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 3786 "configure"
+#line 3794 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3811,7 +3819,7 @@ EOF
 fi
 echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:3815: checking type of array argument to getgroups" >&5
+echo "configure:3823: 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
@@ -3819,7 +3827,7 @@ else
  ac_cv_type_getgroups=cross
 else
  cat > conftest.$ac_ext <<EOF
-#line 3823 "configure"
+#line 3831 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
@@ -3844,7 +3852,7 @@ main()
 }
 EOF
-if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3856: \"$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
@@ -3858,7 +3866,7 @@ fi
 if test $ac_cv_type_getgroups = cross; then
        cat > conftest.$ac_ext <<EOF
-#line 3862 "configure"
+#line 3870 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -3899,7 +3907,7 @@ fi
 echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
-echo "configure:3903: checking whether the printf functions support %p" >&5
+echo "configure:3911: 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
@@ -3907,7 +3915,7 @@ else
  gcc_cv_func_printf_ptr=no
 else
  cat > conftest.$ac_ext <<EOF
-#line 3911 "configure"
+#line 3919 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -3920,7 +3928,7 @@ int main()
  return (p != q);
 }
 EOF
-if { (eval echo configure:3924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3932: \"$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
@@ -3950,7 +3958,7 @@ if test $ac_cv_header_sys_mman_h != yes \
   gcc_cv_func_mmap_anon=no
 else
   echo $ac_n "checking whether read-only mmap of a plain file works""... $ac_c" 1>&6
-echo "configure:3954: checking whether read-only mmap of a plain file works" >&5
+echo "configure:3962: checking whether read-only mmap of a plain file works" >&5
 if eval "test \"`echo '$''{'gcc_cv_func_mmap_file'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3969,7 +3977,7 @@ fi
 echo "$ac_t""$gcc_cv_func_mmap_file" 1>&6
   echo $ac_n "checking whether mmap from /dev/zero works""... $ac_c" 1>&6
-echo "configure:3973: checking whether mmap from /dev/zero works" >&5
+echo "configure:3981: checking whether mmap from /dev/zero works" >&5
 if eval "test \"`echo '$''{'gcc_cv_func_mmap_dev_zero'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3995,12 +4003,12 @@ echo "$ac_t""$gcc_cv_func_mmap_dev_zero" 1>&6
   # Unlike /dev/zero, the MAP_ANON(YMOUS) defines can be probed for.
   echo $ac_n "checking for MAP_ANON(YMOUS)""... $ac_c" 1>&6
-echo "configure:3999: checking for MAP_ANON(YMOUS)" >&5
+echo "configure:4007: checking for MAP_ANON(YMOUS)" >&5
 if eval "test \"`echo '$''{'gcc_cv_decl_map_anon'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4004 "configure"
+#line 4012 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -4014,7 +4022,7 @@ int main() {
 int n = MAP_ANONYMOUS;
 ; return 0; }
 EOF
-if { (eval echo configure:4018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_decl_map_anon=yes
 else
@@ -4032,7 +4040,7 @@ echo "$ac_t""$gcc_cv_decl_map_anon" 1>&6
     gcc_cv_func_mmap_anon=no
   else
     echo $ac_n "checking whether mmap with MAP_ANON(YMOUS) works""... $ac_c" 1>&6
-echo "configure:4036: checking whether mmap with MAP_ANON(YMOUS) works" >&5
+echo "configure:4044: checking whether mmap with MAP_ANON(YMOUS) works" >&5
 if eval "test \"`echo '$''{'gcc_cv_func_mmap_anon'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4087,12 +4095,12 @@ case "${host}" in
  ;;
 esac
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4091: checking for pid_t" >&5
+echo "configure:4099: 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 4096 "configure"
+#line 4104 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4121,17 +4129,17 @@ fi
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:4125: checking for vfork.h" >&5
+echo "configure:4133: 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 4130 "configure"
+#line 4138 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4143: \"$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*
@@ -4156,18 +4164,18 @@ else
 fi
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:4160: checking for working vfork" >&5
+echo "configure:4168: 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:4166: checking for vfork" >&5
+echo "configure:4174: 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 4171 "configure"
+#line 4179 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
    which can conflict with char vfork(); below.  */
@@ -4190,7 +4198,7 @@ vfork();
 ; return 0; }
 EOF
-if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4202: \"$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
@@ -4212,7 +4220,7 @@ fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 else
  cat > conftest.$ac_ext <<EOF
-#line 4216 "configure"
+#line 4224 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -4307,7 +4315,7 @@ main() {
  }
 }
 EOF
-if { (eval echo configure:4311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4319: \"$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
@@ -4346,7 +4354,7 @@ fi
  echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:4350: checking for iconv" >&5
+echo "configure:4358: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4354,7 +4362,7 @@ else
    am_cv_func_iconv="no, consider installing GNU libiconv"
    am_cv_lib_iconv=no
    cat > conftest.$ac_ext <<EOF
-#line 4358 "configure"
+#line 4366 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -4364,7 +4372,7 @@ iconv_t cd = iconv_open("","");
       iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:4368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  am_cv_func_iconv=yes
 else
@@ -4376,7 +4384,7 @@ rm -f conftest*
      am_save_LIBS="$LIBS"
      LIBS="$LIBS $am_cv_libiconv_ldpath -liconv"
      cat > conftest.$ac_ext <<EOF
-#line 4380 "configure"
+#line 4388 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -4386,7 +4394,7 @@ iconv_t cd = iconv_open("","");
         iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:4390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  am_cv_lib_iconv=yes
        am_cv_func_iconv=yes
@@ -4407,13 +4415,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
    echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:4411: checking for iconv declaration" >&5
+echo "configure:4419: 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 4417 "configure"
+#line 4425 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -4432,7 +4440,7 @@ int main() {
 ; return 0; }
 EOF
-if { (eval echo configure:4436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  am_cv_proto_iconv_arg1=""
 else
@@ -4465,19 +4473,19 @@ LIBICONV_DEP=
  echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:4469: checking for LC_MESSAGES" >&5
+echo "configure:4477: 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 4474 "configure"
+#line 4482 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:4481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4489: \"$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
@@ -4508,12 +4516,12 @@ for ac_func in getenv atol sbrk abort atof getcwd getwd \
 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:4512: checking whether $ac_func is declared" >&5
+echo "configure:4520: 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 4517 "configure"
+#line 4525 "configure"
 #include "confdefs.h"
 #undef $ac_tr_decl
 #define $ac_tr_decl 1
@@ -4527,7 +4535,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  eval "gcc_cv_have_decl_$ac_func=yes"
 else
@@ -4629,12 +4637,12 @@ for ac_func in getrlimit setrlimit getrusage
 do
  ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
 echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6
-echo "configure:4633: checking whether $ac_func is declared" >&5
+echo "configure:4641: 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 4638 "configure"
+#line 4646 "configure"
 #include "confdefs.h"
 #undef $ac_tr_decl
 #define $ac_tr_decl 1
@@ -4652,7 +4660,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  eval "gcc_cv_have_decl_$ac_func=yes"
 else
@@ -4691,7 +4699,7 @@ fi
 cat > conftest.$ac_ext <<EOF
-#line 4695 "configure"
+#line 4703 "configure"
 #include "confdefs.h"
 #include "ansidecl.h"
@@ -4704,7 +4712,7 @@ int main() {
 rlim_t l = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  :
 else
  echo "configure: failed program was:" >&5
@@ -4721,12 +4729,12 @@ for ac_func in ldgetname
 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:4725: checking whether $ac_func is declared" >&5
+echo "configure:4733: 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 4730 "configure"
+#line 4738 "configure"
 #include "confdefs.h"
 #undef $ac_tr_decl
 #define $ac_tr_decl 1
@@ -4744,7 +4752,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  eval "gcc_cv_have_decl_$ac_func=yes"
 else
@@ -4780,12 +4788,12 @@ 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:4784: checking whether $ac_func is declared" >&5
+echo "configure:4792: 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 4789 "configure"
+#line 4797 "configure"
 #include "confdefs.h"
 #undef $ac_tr_decl
 #define $ac_tr_decl 1
@@ -4803,7 +4811,7 @@ char *(*pfn) = (char *(*)) $ac_func ;
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  eval "gcc_cv_have_decl_$ac_func=yes"
 else
@@ -4837,13 +4845,13 @@ fi
 # More time-related stuff.
 echo $ac_n "checking for struct tms""... $ac_c" 1>&6
-echo "configure:4841: checking for struct tms" >&5
+echo "configure:4849: 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 4847 "configure"
+#line 4855 "configure"
 #include "confdefs.h"
 #include "ansidecl.h"
@@ -4856,7 +4864,7 @@ int main() {
 struct tms tms;
 ; return 0; }
 EOF
-if { (eval echo configure:4860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_struct_tms=yes
 else
@@ -4879,13 +4887,13 @@ 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:4883: checking for clock_t" >&5
+echo "configure:4891: 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 4889 "configure"
+#line 4897 "configure"
 #include "confdefs.h"
 #include "ansidecl.h"
@@ -4895,7 +4903,7 @@ int main() {
 clock_t x;
 ; return 0; }
 EOF
-if { (eval echo configure:4899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4907: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_type_clock_t=yes
 else
@@ -4916,12 +4924,12 @@ EOF
 fi
 echo $ac_n "checking for uchar""... $ac_c" 1>&6
-echo "configure:4920: checking for uchar" >&5
+echo "configure:4928: checking for uchar" >&5
 if eval "test \"`echo '$''{'gcc_cv_type_uchar'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  cat > conftest.$ac_ext <<EOF
-#line 4925 "configure"
+#line 4933 "configure"
 #include "confdefs.h"
 #include "ansidecl.h"
@@ -4932,7 +4940,7 @@ if ((uchar *)0) return 0;
 if (sizeof(uchar)) return 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  ac_cv_type_uchar=yes
 else
@@ -4962,7 +4970,7 @@ if test "${enable_initfini_array+set}" = set; then
 else
 echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6
-echo "configure:4966: checking for .preinit_array/.init_array/.fini_array support" >&5
+echo "configure:4974: checking for .preinit_array/.init_array/.fini_array support" >&5
 if eval "test \"`echo '$''{'gcc_cv_initfini_array'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4970,7 +4978,7 @@ else
  gcc_cv_initfini_array=no
 else
  cat > conftest.$ac_ext <<EOF
-#line 4974 "configure"
+#line 4982 "configure"
 #include "confdefs.h"
 static int x = -1;
@@ -4978,7 +4986,7 @@ int main (void) { return x; }
 int foo (void) { x = 0; }
 int (*fp) (void) __attribute__ ((section (".init_array"))) = foo;
 EOF
-if { (eval echo configure:4982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  gcc_cv_initfini_array=yes
 else
@@ -5006,12 +5014,12 @@ fi
 # mkdir takes a single argument on some systems. 
 echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6
-echo "configure:5010: checking if mkdir takes one argument" >&5
+echo "configure:5018: 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 5015 "configure"
+#line 5023 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
@@ -5028,7 +5036,7 @@ int main() {
 mkdir ("foo", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:5032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  gcc_cv_mkdir_takes_one_arg=no
 else
@@ -5068,7 +5076,7 @@ fi
 echo $ac_n "checking for main in -lunwind""... $ac_c" 1>&6
-echo "configure:5072: checking for main in -lunwind" >&5
+echo "configure:5080: checking for main in -lunwind" >&5
 ac_lib_var=`echo unwind'_'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
@@ -5076,14 +5084,14 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lunwind  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5080 "configure"
+#line 5088 "configure"
 #include "confdefs.h"
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5095: \"$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
@@ -5133,7 +5141,9 @@ fi
 target_gtfiles=
 # Collect target-machine-specific information.
-. ${srcdir}/config.gcc
+for machine in $target ; do
+	. ${srcdir}/config.gcc
+done
 extra_objs="${host_extra_objs} ${extra_objs}"
@@ -5380,7 +5390,7 @@ if test -f ../intl/config.intl; then
  . ../intl/config.intl
 fi
 echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:5384: checking whether NLS is requested" >&5
+echo "configure:5394: checking whether NLS is requested" >&5
 if test x"$USE_NLS" != xyes; then
  echo "$ac_t""no" 1>&6
 else
@@ -5391,7 +5401,7 @@ EOF
  echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:5395: checking for catalogs to be installed" >&5
+echo "configure:5405: checking for catalogs to be installed" >&5
  # Look for .po and .gmo files in the source directory.
  CATALOGS=  
  XLINGUAS=
@@ -5441,7 +5451,7 @@ 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:5445: checking whether windows registry support is requested" >&5
+echo "configure:5455: 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
@@ -5450,14 +5460,14 @@ EOF
  echo "$ac_t""yes" 1>&6
 echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6
-echo "configure:5454: checking for library containing RegOpenKeyExA" >&5
+echo "configure:5464: 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
  ac_func_search_save_LIBS="$LIBS"
 ac_cv_search_RegOpenKeyExA="no"
 cat > conftest.$ac_ext <<EOF
-#line 5461 "configure"
+#line 5471 "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
@@ -5468,7 +5478,7 @@ int main() {
 RegOpenKeyExA()
 ; return 0; }
 EOF
-if { (eval echo configure:5472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_RegOpenKeyExA="none required"
 else
@@ -5479,7 +5489,7 @@ 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 5483 "configure"
+#line 5493 "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
@@ -5490,7 +5500,7 @@ int main() {
 RegOpenKeyExA()
 ; return 0; }
 EOF
-if { (eval echo configure:5494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  ac_cv_search_RegOpenKeyExA="-l$i"
 break
@@ -5532,7 +5542,7 @@ esac
 if test "x$enable_win32_registry" != xno; then
  echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6
-echo "configure:5536: checking registry key on windows hosts" >&5
+echo "configure:5546: checking registry key on windows hosts" >&5
  cat >> confdefs.h <<EOF
 #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key"
 EOF
@@ -5745,17 +5755,7 @@ CC_FOR_BUILD='$(CC)'
 BUILD_CFLAGS='$(ALL_CFLAGS)'	
 STMP_FIXINC=stmp-fixinc		
+STMP_FIXPROTO=stmp-fixproto	
-# Possibly disable fixproto, on a per-target basis.
-case ${use_fixproto} in
-  no)
-    STMP_FIXPROTO=
-    ;;
-  yes)
-    STMP_FIXPROTO=stmp-fixproto
-    ;;
-esac
 # And these apply if build != host, or we are generating coverage data
 if test x$build != x$host || test "x$coverage_flags" != x
@@ -6482,11 +6482,12 @@ fi
 fi
 echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
+if test $gcc_cv_as_shf_merge = yes; then
-cat >> confdefs.h <<EOF
+  cat >> confdefs.h <<\EOF
-#define HAVE_GAS_SHF_MERGE `if test $gcc_cv_as_shf_merge = yes; then echo 1; else echo 0; fi`
+#define HAVE_GAS_SHF_MERGE 1
 EOF
+fi
 # Thread-local storage - the check is heavily parametrized.
 conftest_s=
@@ -6695,7 +6696,7 @@ if test -z "$tls_first_major"; then
  : # If we don't have a check, assume no support.
 else
  echo $ac_n "checking assembler for thread-local storage support""... $ac_c" 1>&6
-echo "configure:6699: checking assembler for thread-local storage support" >&5
+echo "configure:6700: checking assembler for thread-local storage support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_tls'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6706,7 +6707,7 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo "$conftest_s" > conftest.s
-    if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_tls=yes
    else
@@ -6732,7 +6733,7 @@ case "$target" in
  # All TARGET_ABI_OSF targets.
  alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*)
    echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6
-echo "configure:6736: checking assembler for explicit relocation support" >&5
+echo "configure:6737: checking assembler for explicit relocation support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_alpha_explicit_relocs'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6755,7 +6756,7 @@ fi
 	ldah	$1, d($29)	!gprelhigh
 	lda	$1, d($1)	!gprellow
 	lda	$29, 0($29)	!gpdisp!3' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6759: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_alpha_explicit_relocs=yes
    else
@@ -6777,14 +6778,14 @@ fi
  sparc*-*-*)
    echo $ac_n "checking assembler for .register""... $ac_c" 1>&6
-echo "configure:6781: checking assembler for .register" >&5
+echo "configure:6782: checking assembler for .register" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_sparc_register_op'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  gcc_cv_as_sparc_register_op=no
  if test x$gcc_cv_as != x; then
    echo '.register %g2, #scratch' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_sparc_register_op=yes
    else
@@ -6804,14 +6805,14 @@ EOF
 fi
    echo $ac_n "checking assembler for -relax option""... $ac_c" 1>&6
-echo "configure:6808: checking assembler for -relax option" >&5
+echo "configure:6809: checking assembler for -relax option" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_sparc_relax'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  gcc_cv_as_sparc_relax=no
  if test x$gcc_cv_as != x; then
    echo '.text' > conftest.s
-    if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6816: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_sparc_relax=yes
    else
@@ -6831,7 +6832,7 @@ EOF
 fi
    echo $ac_n "checking assembler for unaligned pcrel relocs""... $ac_c" 1>&6
-echo "configure:6835: checking assembler for unaligned pcrel relocs" >&5
+echo "configure:6836: checking assembler for unaligned pcrel relocs" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6844,7 +6845,7 @@ foo:
 .align 4
 .byte 0
 .uaword %r_disp32(foo)' > conftest.s
-    if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	if test x$gcc_cv_ld != x \
       && $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1; then
@@ -6867,7 +6868,7 @@ EOF
      echo $ac_n "checking assembler for unaligned pcrel relocs against hidden symbols""... $ac_c" 1>&6
-echo "configure:6871: checking assembler for unaligned pcrel relocs against hidden symbols" >&5
+echo "configure:6872: checking assembler for unaligned pcrel relocs against hidden symbols" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6882,7 +6883,7 @@ else
 .hidden foo
 foo:
 .skip 4' > conftest.s
-    if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \
 	 && $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1 \
@@ -6915,7 +6916,7 @@ fi
 fi # unaligned pcrel relocs
    echo $ac_n "checking assembler for offsetable %lo()""... $ac_c" 1>&6
-echo "configure:6919: checking assembler for offsetable %lo()" >&5
+echo "configure:6920: checking assembler for offsetable %lo()" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_sparc_offsetable_lo10'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6924,7 +6925,7 @@ else
    echo '.text
 	or %g1, %lo(ab) + 12, %g1
 	or %g1, %lo(ab + 12), %g1' > conftest.s
-    if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	if test x$gcc_cv_objdump != x \
       && %gcc_cv_objdump -s -j .text conftest.o 2> /dev/null \
@@ -6950,7 +6951,7 @@ fi
  i[34567]86-*-* | x86_64-*-*)
    echo $ac_n "checking assembler for filds and fists mnemonics""... $ac_c" 1>&6
-echo "configure:6954: checking assembler for filds and fists mnemonics" >&5
+echo "configure:6955: checking assembler for filds and fists mnemonics" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_ix86_filds_fists'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6961,7 +6962,7 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo 'filds mem; fists mem' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_ix86_filds_fists=yes
    else
@@ -6981,14 +6982,14 @@ EOF
 fi
    echo $ac_n "checking assembler for cmov syntax""... $ac_c" 1>&6
-echo "configure:6985: checking assembler for cmov syntax" >&5
+echo "configure:6986: checking assembler for cmov syntax" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_ix86_cmov_sun_syntax'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
  gcc_cv_as_ix86_cmov_sun_syntax=no
  if test x$gcc_cv_as != x; then
    echo 'cmovl.l %edx, %eax' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:6993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_ix86_cmov_sun_syntax=yes
    else
@@ -7010,7 +7011,7 @@ fi
    # This one is used unconditionally by i386.[ch]; it is to be defined
    # to 1 if the feature is present, 0 otherwise.
    echo $ac_n "checking assembler for GOTOFF in data""... $ac_c" 1>&6
-echo "configure:7014: checking assembler for GOTOFF in data" >&5
+echo "configure:7015: checking assembler for GOTOFF in data" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_ix86_gotoff_in_data'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7025,7 +7026,7 @@ fi
 	nop
 	.data
 	.long .L0@GOTOFF' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_ix86_gotoff_in_data=yes
    else
@@ -7046,7 +7047,7 @@ EOF
  ia64*-*-*)
    echo $ac_n "checking assembler for ltoffx and ldxmov relocs""... $ac_c" 1>&6
-echo "configure:7050: checking assembler for ltoffx and ldxmov relocs" >&5
+echo "configure:7051: checking assembler for ltoffx and ldxmov relocs" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_ia64_ltoffx_ldxmov_relocs'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7060,7 +7061,7 @@ fi
 	addl r15 = @ltoffx(x#), gp
 	;;
 	ld8.mov r16 = [r15], x#' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7065: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_ia64_ltoffx_ldxmov_relocs=yes
    else
@@ -7090,7 +7091,7 @@ fi
 	mfcr 3,128"
    echo $ac_n "checking assembler for mfcr field support""... $ac_c" 1>&6
-echo "configure:7094: checking assembler for mfcr field support" >&5
+echo "configure:7095: checking assembler for mfcr field support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_powerpc_mfcrf'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7101,7 +7102,7 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo "$conftest_s" > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_powerpc_mfcrf=yes
    else
@@ -7123,7 +7124,7 @@ fi
  mips*-*-*)
    echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6
-echo "configure:7127: checking assembler for explicit relocation support" >&5
+echo "configure:7128: checking assembler for explicit relocation support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_mips_explicit_relocs'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7134,7 +7135,7 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo '	lw $4,%gp_rel(foo)($4)' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_mips_explicit_relocs=yes
    else
@@ -7180,7 +7181,7 @@ if test x"$insn" != x; then
 	.loc 1 3 0
 	$insn"
 echo $ac_n "checking assembler for dwarf2 debug_line support""... $ac_c" 1>&6
-echo "configure:7184: checking assembler for dwarf2 debug_line support" >&5
+echo "configure:7185: checking assembler for dwarf2 debug_line support" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_debug_line'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7192,7 +7193,7 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo "$conftest_s" > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7196: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	# ??? This fails with non-gnu grep.  Maybe use objdump?
   if grep debug_line conftest.o > /dev/null 2>&1; then
@@ -7214,7 +7215,7 @@ echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6
 # by DW_AT_decl_file.  Approximate this test by testing if
 # the assembler bitches if the same index is assigned twice.
 echo $ac_n "checking assembler for buggy dwarf2 .file directive""... $ac_c" 1>&6
-echo "configure:7218: checking assembler for buggy dwarf2 .file directive" >&5
+echo "configure:7219: checking assembler for buggy dwarf2 .file directive" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_file_buggy'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7222,7 +7223,7 @@ else
  if test x$gcc_cv_as != x; then
    echo '	.file 1 "foo.s"
 	.file 1 "bar.s"' > conftest.s
-    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as  -o conftest.o conftest.s >&5'; { (eval echo configure:7227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_dwarf2_file_buggy=yes
    else
@@ -7245,7 +7246,7 @@ EOF
 fi
 echo $ac_n "checking assembler for --gdwarf2 option""... $ac_c" 1>&6
-echo "configure:7249: checking assembler for --gdwarf2 option" >&5
+echo "configure:7250: checking assembler for --gdwarf2 option" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_gdwarf2_flag'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7257,7 +7258,7 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo "$insn" > conftest.s
-    if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7261: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	gcc_cv_as_gdwarf2_flag=yes
    else
@@ -7277,7 +7278,7 @@ EOF
 fi
 echo $ac_n "checking assembler for --gstabs option""... $ac_c" 1>&6
-echo "configure:7281: checking assembler for --gstabs option" >&5
+echo "configure:7282: checking assembler for --gstabs option" >&5
 if eval "test \"`echo '$''{'gcc_cv_as_gstabs_flag'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7289,12 +7290,12 @@ else
 fi
  elif test x$gcc_cv_as != x; then
    echo "$insn" > conftest.s
-    if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+    if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
    then
 	# The native Solaris 9/Intel assembler doesn't understand --gstabs
   # and warns about it, but still exits successfully.  So check for
   # this.
-   if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+   if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
   then :
   else gcc_cv_as_gstabs_flag=yes
   fi
@@ -7316,7 +7317,7 @@ fi
 fi
 echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6
-echo "configure:7320: checking linker read-only and read-write section mixing" >&5
+echo "configure:7321: checking linker read-only and read-write section mixing" >&5
 gcc_cv_ld_ro_rw_mix=unknown
 if test $in_tree_ld = yes ; then
  if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 10 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7355,7 +7356,7 @@ fi
 echo "$ac_t""$gcc_cv_ld_ro_rw_mix" 1>&6
 echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6
-echo "configure:7359: checking linker PT_GNU_EH_FRAME support" >&5
+echo "configure:7360: checking linker PT_GNU_EH_FRAME support" >&5
 gcc_cv_ld_eh_frame_hdr=no
 if test $in_tree_ld = yes ; 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 \
@@ -7377,7 +7378,7 @@ fi
 echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6
 echo $ac_n "checking linker position independent executable support""... $ac_c" 1>&6
-echo "configure:7381: checking linker position independent executable support" >&5
+echo "configure:7382: checking linker position independent executable support" >&5
 gcc_cv_ld_pie=no
 if test $in_tree_ld = yes ; then
  if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 15 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7402,7 +7403,7 @@ echo "$ac_t""$gcc_cv_ld_pie" 1>&6
 case "$target" in
  mips*-*-*)
    echo $ac_n "checking whether libgloss uses STARTUP directives consistently""... $ac_c" 1>&6
-echo "configure:7406: checking whether libgloss uses STARTUP directives consistently" >&5
+echo "configure:7407: checking whether libgloss uses STARTUP directives consistently" >&5
    gcc_cv_mips_libgloss_startup=no
    gcc_cv_libgloss_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/libgloss
    if test "x$exec_prefix" = xNONE; then
@@ -7604,7 +7605,7 @@ fi
 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7608: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:7609: 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"