Make this pkg work on NetBSD/sparc.

Patches contributes by Michael Rauch <mrauch@fs.tum.de> in PR 12299

6 files changed, 254 insertions, 1084 deletions

diff --git a/lang/gcc/patches/patch-ad b/lang/gcc/patches/patch-ad
index 423a71ba2b3..8e188368554 100644
--- a/lang/gcc/patches/patch-ad
+++ b/lang/gcc/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2000/09/15 23:58:48 tron Exp $
+$NetBSD: patch-ad,v 1.2 2001/02/28 23:28:09 hubertf Exp $
 
 --- ../gcc-2.95.2/gcc/config/sparc/netbsd-elf-common.h.orig	Sat Sep 16 00:17:42 2000
 +++ ../gcc-2.95.2/gcc/config/sparc/netbsd-elf-common.h	Sat Sep 16 00:17:42 2000
-@@ -0,0 +1,73 @@
+@@ -0,0 +1,69 @@
 +/* NetBSD/sparc ELF common 32/64 bit configuration */
 +
 +#define OBJECT_FORMAT_ELF
@@ -69,10 +69,6 @@ $NetBSD: patch-ad,v 1.1 2000/09/15 23:58:48 tron Exp $
 +
 +#undef STDC_0_IN_SYSTEM_HEADERS
 +
-+/** We don't have the C++ support for this (yet). */
-+#undef DWARF2_UNWIND_INFO
-+#define DWARF2_UNWIND_INFO 0
-+
 +/* XXX Redefine this; <sparc/sparc.h> mucks with it. */
 +#undef TARGET_VERSION
 +#define TARGET_VERSION fprintf (stderr, " (%s)", TARGET_NAME);
diff --git a/lang/gcc/patches/patch-al b/lang/gcc/patches/patch-al
index b462186bb97..b698315298b 100644
--- a/lang/gcc/patches/patch-al
+++ b/lang/gcc/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.1 2000/09/15 23:58:48 tron Exp $
+$NetBSD: patch-al,v 1.2 2001/02/28 23:28:09 hubertf Exp $
 
 --- ../gcc-2.95.2/gcc/config/netbsd.h.orig	Wed Dec 16 21:59:58 1998
 +++ ../gcc-2.95.2/gcc/config/netbsd.h	Sat Sep 16 00:17:42 2000
@@ -47,7 +47,7 @@ $NetBSD: patch-al,v 1.1 2000/09/15 23:58:48 tron Exp $
  /* Write the extra assembler code needed to declare a function properly.
     Some svr4 assemblers need to also have something extra said about the
     function's return value.  We allow for that here.  */
-@@ -207,3 +224,54 @@
+@@ -207,3 +224,56 @@
  	putc ('\n', FILE);						\
        }									\
    } while (0)
@@ -59,10 +59,12 @@ $NetBSD: patch-al,v 1.1 2000/09/15 23:58:48 tron Exp $
 +#ifdef NETBSD_ELF
 +
 +/* Start with generic ELF definitions. */
++#if !defined(__sparc__)
 +#include "elfos.h"
 +
 +#undef DWARF_DEBUGGING_INFO	/* XXX */
 +#undef DWARF2_DEBUGGING_INFO	/* XXX */
++#endif
 +
 +/* Provide a STARTFILE_SPEC appropriate for NetBSD ELF targets.  Here we
 +   provide support for the special GCC option -static.  On ELF targets,
diff --git a/lang/gcc/patches/patch-aq b/lang/gcc/patches/patch-aq
index da686c11d36..597a15c20ec 100644
--- a/lang/gcc/patches/patch-aq
+++ b/lang/gcc/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.1 2000/09/15 23:58:49 tron Exp $
+$NetBSD: patch-aq,v 1.2 2001/02/28 23:28:09 hubertf Exp $
 
 --- ../gcc-2.95.2/gcc/configure.in.orig	Wed Oct 13 09:58:02 1999
 +++ ../gcc-2.95.2/gcc/configure.in	Sat Sep 16 01:07:10 2000
@@ -28,10 +28,10 @@ $NetBSD: patch-aq,v 1.1 2000/09/15 23:58:49 tron Exp $
  		tm_file="sparc/aout.h libgloss.h"
  		;;
 +	sparc-*-netbsd*elf*)
-+		tm_file=sparc/netbsdelf.h
++		tm_file=sparc/netbsd-elf.h
 +		xm_file=sparc/xm-netbsd.h
-+		tmake_file=t-netbsd
-+		use_collect2=yes
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
++		tmake_file="t-netbsd sparc/t-netbsd"
 +		;;
  	sparc-*-netbsd*)
  		tm_file=sparc/netbsd.h
diff --git a/lang/gcc/patches/patch-ar b/lang/gcc/patches/patch-ar
index c3730d97396..58459fd2b6e 100644
--- a/lang/gcc/patches/patch-ar
+++ b/lang/gcc/patches/patch-ar
@@ -1,214 +1,8 @@
-$NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
+$NetBSD: patch-ar,v 1.2 2001/02/28 23:28:09 hubertf Exp $
 
---- ../gcc-2.95.2/gcc/configure.orig	Wed Oct 13 09:58:02 1999
-+++ ../gcc-2.95.2/gcc/configure	Sat Sep 16 01:07:10 2000
-@@ -86,6 +86,7 @@
- program_transform_name=s,x,x,
- silent=
- site=
-+sitefile=
- srcdir=
- target=NONE
- verbose=
-@@ -200,6 +201,7 @@
-   --help                  print this message
-   --no-create             do not create output files
-   --quiet, --silent       do not print \`checking...' messages
-+  --site-file=FILE        use FILE as the site file
-   --version               print the version of autoconf that created configure
- Directory and file names:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
-@@ -370,6 +372,11 @@
-   -site=* | --site=* | --sit=*)
-     site="$ac_optarg" ;;
- 
-+  -site-file | --site-file | --site-fil | --site-fi | --site-f)
-+    ac_prev=sitefile ;;
-+  -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
-+    sitefile="$ac_optarg" ;;
-+
-   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-     ac_prev=srcdir ;;
-   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-@@ -535,12 +542,16 @@
- srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
- 
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+if test -z "$sitefile"; then
-+  if test -z "$CONFIG_SITE"; then
-+    if test "x$prefix" != xNONE; then
-+      CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-+    else
-+      CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-+    fi
-   fi
-+else
-+  CONFIG_SITE="$sitefile"
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
-@@ -595,7 +606,7 @@
- # - 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:599: checking LIBRARY_PATH variable" >&5
-+echo "configure:610: checking LIBRARY_PATH variable" >&5
- case ${LIBRARY_PATH} in
-   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
-     library_path_setting="contains current directory"
-@@ -620,7 +631,7 @@
- # - 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:624: checking GCC_EXEC_PREFIX variable" >&5
-+echo "configure:635: checking GCC_EXEC_PREFIX variable" >&5
- case ${GCC_EXEC_PREFIX} in
-   [:\;]* | *[:\;] | *[:\;][:\;]* |  *[:\;]. | .[:\;]*| . | *[:\;].[:\;]* )
-     gcc_exec_prefix_setting="contains current directory"
-@@ -961,7 +972,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:965: checking host system type" >&5
-+echo "configure:976: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -982,7 +993,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:986: checking target system type" >&5
-+echo "configure:997: checking target system type" >&5
- 
- target_alias=$target
- case "$target_alias" in
-@@ -1000,7 +1011,7 @@
- echo "$ac_t""$target" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:1004: checking build system type" >&5
-+echo "configure:1015: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -1027,7 +1038,7 @@
- # 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:1031: checking for $ac_word" >&5
-+echo "configure:1042: 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
-@@ -1057,7 +1068,7 @@
-   # 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:1061: checking for $ac_word" >&5
-+echo "configure:1072: 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
-@@ -1108,7 +1119,7 @@
-       # 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:1112: checking for $ac_word" >&5
-+echo "configure:1123: 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
-@@ -1140,7 +1151,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1144: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1155: 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.
-@@ -1151,12 +1162,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 1155 "configure"
-+#line 1166 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:1160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1171: \"$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
-@@ -1182,12 +1193,12 @@
-   { 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:1186: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1197: 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:1191: checking whether we are using GNU C" >&5
-+echo "configure:1202: 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
-@@ -1196,7 +1207,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1200: \"$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:1211: \"$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
-@@ -1215,7 +1226,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1219: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1230: 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
-@@ -1258,7 +1269,7 @@
- 
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:1262: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:1273: 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
-@@ -1286,7 +1297,7 @@
- 
- 
- echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6
--echo "configure:1290: checking whether a default assembler was specified" >&5
-+echo "configure:1301: 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
-@@ -1298,7 +1309,7 @@
- fi
- 
- echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6
--echo "configure:1302: checking whether a default linker was specified" >&5
-+echo "configure:1313: 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
-@@ -1310,12 +1321,12 @@
+--- ../gcc-2.95.2/gcc/configure.orig	Tue Feb 27 14:32:38 2001
++++ ../gcc-2.95.2/gcc/configure
+@@ -1310,7 +1310,7 @@
  fi
  
  # Find some useful tools
@@ -217,706 +11,7 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  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:1319: checking for $ac_word" >&5
-+echo "configure:1330: 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,7 +1358,7 @@
- # 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:1351: checking for $ac_word" >&5
-+echo "configure:1362: 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
-@@ -1381,7 +1392,7 @@
-   *) ac_lib=l ;;
-   esac
-   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
--echo "configure:1385: checking for yywrap in -l$ac_lib" >&5
-+echo "configure:1396: 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
-@@ -1389,7 +1400,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-l$ac_lib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1393 "configure"
-+#line 1404 "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
-@@ -1400,7 +1411,7 @@
- yywrap()
- ; return 0; }
- EOF
--if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1415: \"$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
-@@ -1423,7 +1434,7 @@
- fi
- 
- echo $ac_n "checking whether ln works""... $ac_c" 1>&6
--echo "configure:1427: checking whether ln works" >&5
-+echo "configure:1438: 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
-@@ -1455,7 +1466,7 @@
- fi
- 
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:1459: checking whether ln -s works" >&5
-+echo "configure:1470: 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
-@@ -1487,19 +1498,19 @@
- fi
- 
- echo $ac_n "checking for volatile""... $ac_c" 1>&6
--echo "configure:1491: checking for volatile" >&5
-+echo "configure:1502: 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 1496 "configure"
-+#line 1507 "configure"
- #include "confdefs.h"
- 
- int main() {
- volatile int foo;
- ; return 0; }
- EOF
--if { (eval echo configure:1503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gcc_cv_c_volatile=yes
- else
-@@ -1522,7 +1533,7 @@
- # 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:1526: checking for $ac_word" >&5
-+echo "configure:1537: 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
-@@ -1554,7 +1565,7 @@
- # 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:1558: checking for $ac_word" >&5
-+echo "configure:1569: 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
-@@ -1595,7 +1606,7 @@
- # 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:1599: checking for a BSD compatible install" >&5
-+echo "configure:1610: 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
-@@ -1646,7 +1657,7 @@
- 
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1650: checking how to run the C preprocessor" >&5
-+echo "configure:1661: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -1661,13 +1672,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 1665 "configure"
-+#line 1676 "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:1671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1682: \"$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
-   :
-@@ -1678,13 +1689,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 1682 "configure"
-+#line 1693 "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:1688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1699: \"$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
-   :
-@@ -1695,13 +1706,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 1699 "configure"
-+#line 1710 "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:1705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1716: \"$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
-   :
-@@ -1726,12 +1737,12 @@
- echo "$ac_t""$CPP" 1>&6
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:1730: checking for ANSI C header files" >&5
-+echo "configure:1741: 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 1735 "configure"
-+#line 1746 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -1739,7 +1750,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1754: \"$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*
-@@ -1756,7 +1767,7 @@
- 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 1760 "configure"
-+#line 1771 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -1774,7 +1785,7 @@
- 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 1778 "configure"
-+#line 1789 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -1795,7 +1806,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1799 "configure"
-+#line 1810 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -1806,7 +1817,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:1810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:1821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -1830,12 +1841,12 @@
- fi
- 
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:1834: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:1845: 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 1839 "configure"
-+#line 1850 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -1844,7 +1855,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:1848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_time=yes
- else
-@@ -1865,12 +1876,12 @@
- fi
- 
- echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6
--echo "configure:1869: checking whether string.h and strings.h may both be included" >&5
-+echo "configure:1880: 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 1874 "configure"
-+#line 1885 "configure"
- #include "confdefs.h"
- #include <string.h>
- #include <strings.h>
-@@ -1878,7 +1889,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:1882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gcc_cv_header_string=yes
- else
-@@ -1899,12 +1910,12 @@
- fi
- 
- echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
--echo "configure:1903: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+echo "configure:1914: 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 1908 "configure"
-+#line 1919 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/wait.h>
-@@ -1920,7 +1931,7 @@
- s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
- ; return 0; }
- EOF
--if { (eval echo configure:1924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_sys_wait_h=yes
- else
-@@ -1944,17 +1955,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:1948: checking for $ac_hdr" >&5
-+echo "configure:1959: 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 1953 "configure"
-+#line 1964 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1969: \"$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*
-@@ -1984,17 +1995,17 @@
- # 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:1988: checking for thread.h" >&5
-+echo "configure:1999: 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 1993 "configure"
-+#line 2004 "configure"
- #include "confdefs.h"
- #include <thread.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2009: \"$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*
-@@ -2018,17 +2029,17 @@
- 
- ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
--echo "configure:2022: checking for pthread.h" >&5
-+echo "configure:2033: 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 2027 "configure"
-+#line 2038 "configure"
- #include "confdefs.h"
- #include <pthread.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2043: \"$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*
-@@ -2055,7 +2066,7 @@
- # 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:2059: checking for $ac_word" >&5
-+echo "configure:2070: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gnat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2086,12 +2097,12 @@
- # 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:2090: checking whether cpp understands the stringify operator" >&5
-+echo "configure:2101: checking whether cpp understands the stringify operator" >&5
- if eval "test \"`echo '$''{'gcc_cv_c_have_stringify'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2095 "configure"
-+#line 2106 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -2099,7 +2110,7 @@
- char *test = S(foo);
- ; return 0; }
- EOF
--if { (eval echo configure:2103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gcc_cv_c_have_stringify=yes
- else
-@@ -2122,12 +2133,12 @@
- # 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:2126: checking for inttypes.h" >&5
-+echo "configure:2137: 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 2131 "configure"
-+#line 2142 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <inttypes.h>
-@@ -2135,7 +2146,7 @@
- intmax_t i = -1;
- ; return 0; }
- EOF
--if { (eval echo configure:2139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gcc_cv_header_inttypes_h=yes
- else
-@@ -2161,12 +2172,12 @@
- 	fputs_unlocked
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:2165: checking for $ac_func" >&5
-+echo "configure:2176: 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 2170 "configure"
-+#line 2181 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -2189,7 +2200,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2204: \"$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
-@@ -2218,12 +2229,12 @@
- #AC_CHECK_TYPE(wchar_t, unsigned int)
- 
- echo $ac_n "checking for vprintf""... $ac_c" 1>&6
--echo "configure:2222: checking for vprintf" >&5
-+echo "configure:2233: checking for vprintf" >&5
- if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2227 "configure"
-+#line 2238 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char vprintf(); below.  */
-@@ -2246,7 +2257,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_vprintf=yes"
- else
-@@ -2270,12 +2281,12 @@
- 
- if test "$ac_cv_func_vprintf" != yes; then
- echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
--echo "configure:2274: checking for _doprnt" >&5
-+echo "configure:2285: checking for _doprnt" >&5
- if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2279 "configure"
-+#line 2290 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char _doprnt(); below.  */
-@@ -2298,7 +2309,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func__doprnt=yes"
- else
-@@ -2334,7 +2345,7 @@
- 
- 
- echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6
--echo "configure:2338: checking whether the printf functions support %p" >&5
-+echo "configure:2349: 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
-@@ -2342,7 +2353,7 @@
-   gcc_cv_func_printf_ptr=no
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2346 "configure"
-+#line 2357 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- 
-@@ -2355,7 +2366,7 @@
-   exit (p != q);
- }
- EOF
--if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2370: \"$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,12 +2399,12 @@
-   ;;
- esac
- echo $ac_n "checking for pid_t""... $ac_c" 1>&6
--echo "configure:2392: checking for pid_t" >&5
-+echo "configure:2403: 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 2408 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #if STDC_HEADERS
-@@ -2422,17 +2433,17 @@
- 
- 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:2437: 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 2442 "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:2447: \"$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*
-@@ -2457,18 +2468,18 @@
- fi
- 
- echo $ac_n "checking for working vfork""... $ac_c" 1>&6
--echo "configure:2461: checking for working vfork" >&5
-+echo "configure:2472: 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:2478: 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 2483 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char vfork(); below.  */
-@@ -2491,7 +2502,7 @@
- 
- ; 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:2506: \"$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
-@@ -2513,7 +2524,7 @@
- ac_cv_func_vfork_works=$ac_cv_func_vfork
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2517 "configure"
-+#line 2528 "configure"
- #include "confdefs.h"
- /* Thanks to Paul Eggert for this test.  */
- #include <stdio.h>
-@@ -2608,7 +2619,7 @@
-   }
- }
- 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:2623: \"$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
-@@ -2636,12 +2647,12 @@
- 	strsignal putc_unlocked fputs_unlocked strstr
- 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
-+echo "configure:2651: checking whether $ac_func must be declared" >&5
- if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2645 "configure"
-+#line 2656 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -2674,7 +2685,7 @@
- char *(*pfn) = (char *(*)) $ac_func
- ; return 0; }
- EOF
--if { (eval echo configure:2678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "gcc_cv_decl_needed_$ac_func=no"
- else
-@@ -2703,12 +2714,12 @@
- for ac_func in getrlimit setrlimit
- 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
-+echo "configure:2718: checking whether $ac_func must be declared" >&5
- if eval "test \"`echo '$''{'gcc_cv_decl_needed_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2712 "configure"
-+#line 2723 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -2745,7 +2756,7 @@
- char *(*pfn) = (char *(*)) $ac_func
- ; return 0; }
- EOF
--if { (eval echo configure:2749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   eval "gcc_cv_decl_needed_$ac_func=no"
- else
-@@ -2772,12 +2783,12 @@
- 
- 
- 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
-+echo "configure:2787: checking for sys_siglist declaration in signal.h or unistd.h" >&5
- if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2781 "configure"
-+#line 2792 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -2789,7 +2800,7 @@
- char *msg = *(sys_siglist + 1);
- ; return 0; }
- EOF
--if { (eval echo configure:2793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_decl_sys_siglist=yes
- else
-@@ -2812,12 +2823,12 @@
- 
- # 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:2827: 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 2832 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -2834,7 +2845,7 @@
- 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:2849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   gcc_cv_mkdir_takes_one_arg=no
- else
-@@ -3552,8 +3563,17 @@
+@@ -3552,8 +3552,17 @@
  		tm_file=i386/freebsd.h
  		tmake_file=t-freebsd
  		;;
@@ -934,20 +29,20 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  		tmake_file=t-netbsd
         use_collect2=yes
  		;;
-@@ -5326,6 +5346,12 @@
+@@ -5326,6 +5335,12 @@
  		tmake_file=sparc/t-sparcbare
  		tm_file="sparc/aout.h libgloss.h"
  		;;
 +	sparc-*-netbsd*elf*)
-+		tm_file=sparc/netbsdelf.h
++		tm_file=sparc/netbsd-elf.h
 +		xm_file=sparc/xm-netbsd.h
-+		tmake_file=t-netbsd
-+		use_collect2=yes
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
++		tmake_file="t-netbsd sparc/t-netbsd"
 +		;;
  	sparc-*-netbsd*)
  		tm_file=sparc/netbsd.h
  		tmake_file=t-netbsd
-@@ -5415,7 +5441,7 @@
+@@ -5415,7 +5430,7 @@
                  xmake_file=sparc/x-sysv4
                  extra_parts="crt1.o crti.o crtn.o gmon.o crtbegin.o crtend.o"
                  case $machine in
@@ -956,7 +51,7 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
                          float_format=i128
                  ;;
                  *)
-@@ -5519,6 +5545,12 @@
+@@ -5519,6 +5534,12 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		gnu_ld=yes
  		;;
@@ -969,7 +64,7 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  # This hasn't been upgraded to GCC 2.
  #	tahoe-harris-*)			# Harris tahoe, using COFF.
  #		tm_file=tahoe/harris.h
-@@ -5860,6 +5892,12 @@
+@@ -5860,6 +5881,12 @@
    esac
  fi
  
@@ -982,63 +77,63 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  # Handle cpp installation.
  if test x$enable_cpp != xno
  then
-@@ -6049,7 +6087,7 @@
+@@ -6049,7 +6076,7 @@
  
  
          echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6
 -echo "configure:6044: checking for strerror in -lcposix" >&5
-+echo "configure:6091: checking for strerror in -lcposix" >&5
++echo "configure:6080: checking for strerror in -lcposix" >&5
  ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6057,7 +6095,7 @@
+@@ -6057,7 +6084,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lcposix  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 6052 "configure"
-+#line 6099 "configure"
++#line 6088 "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
-@@ -6068,7 +6106,7 @@
+@@ -6068,7 +6095,7 @@
  strerror()
  ; return 0; }
  EOF
 -if { (eval echo configure:6063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6099: \"$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
-@@ -6091,12 +6129,12 @@
+@@ -6091,12 +6118,12 @@
    
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
 -echo "configure:6086: checking for working const" >&5
-+echo "configure:6133: checking for working const" >&5
++echo "configure:6122: 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 6091 "configure"
-+#line 6138 "configure"
++#line 6127 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -6145,7 +6183,7 @@
+@@ -6145,7 +6172,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:6140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-@@ -6166,21 +6204,21 @@
+@@ -6166,21 +6193,21 @@
  fi
  
  echo $ac_n "checking for inline""... $ac_c" 1>&6
 -echo "configure:6161: checking for inline" >&5
-+echo "configure:6208: checking for inline" >&5
++echo "configure:6197: checking for inline" >&5
  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -1046,7 +141,7 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  for ac_kw in inline __inline__ __inline; do
    cat > conftest.$ac_ext <<EOF
 -#line 6168 "configure"
-+#line 6215 "configure"
++#line 6204 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -1054,52 +149,52 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:6175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:6211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -6206,12 +6244,12 @@
+@@ -6206,12 +6233,12 @@
  esac
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
 -echo "configure:6201: checking for off_t" >&5
-+echo "configure:6248: checking for off_t" >&5
++echo "configure:6237: 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 6206 "configure"
-+#line 6253 "configure"
++#line 6242 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -6239,12 +6277,12 @@
+@@ -6239,12 +6266,12 @@
  fi
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:6234: checking for size_t" >&5
-+echo "configure:6281: checking for size_t" >&5
++echo "configure:6270: 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 6239 "configure"
-+#line 6286 "configure"
++#line 6275 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -6274,19 +6312,19 @@
+@@ -6274,19 +6301,19 @@
  # 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:6269: checking for working alloca.h" >&5
-+echo "configure:6316: checking for working alloca.h" >&5
++echo "configure:6305: 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 6274 "configure"
-+#line 6321 "configure"
++#line 6310 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -1107,253 +202,253 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:6281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6317: \"$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
-@@ -6307,12 +6345,12 @@
+@@ -6307,12 +6334,12 @@
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:6302: checking for alloca" >&5
-+echo "configure:6349: checking for alloca" >&5
++echo "configure:6338: 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 6307 "configure"
-+#line 6354 "configure"
++#line 6343 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -6340,7 +6378,7 @@
+@@ -6340,7 +6367,7 @@
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
 -if { (eval echo configure:6335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6371: \"$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
-@@ -6372,12 +6410,12 @@
+@@ -6372,12 +6399,12 @@
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
 -echo "configure:6367: checking whether alloca needs Cray hooks" >&5
-+echo "configure:6414: checking whether alloca needs Cray hooks" >&5
++echo "configure:6403: 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 6372 "configure"
-+#line 6419 "configure"
++#line 6408 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -6402,12 +6440,12 @@
+@@ -6402,12 +6429,12 @@
  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:6397: checking for $ac_func" >&5
-+echo "configure:6444: checking for $ac_func" >&5
++echo "configure:6433: 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 6402 "configure"
-+#line 6449 "configure"
++#line 6438 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -6430,7 +6468,7 @@
+@@ -6430,7 +6457,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:6425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6461: \"$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
-@@ -6457,7 +6495,7 @@
+@@ -6457,7 +6484,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 -echo "configure:6452: checking stack direction for C alloca" >&5
-+echo "configure:6499: checking stack direction for C alloca" >&5
++echo "configure:6488: 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
-@@ -6465,7 +6503,7 @@
+@@ -6465,7 +6492,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 6460 "configure"
-+#line 6507 "configure"
++#line 6496 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -6484,7 +6522,7 @@
+@@ -6484,7 +6511,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
 -if { (eval echo configure:6479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6515: \"$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
-@@ -6509,17 +6547,17 @@
+@@ -6509,17 +6536,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:6504: checking for $ac_hdr" >&5
-+echo "configure:6551: checking for $ac_hdr" >&5
++echo "configure:6540: 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 6509 "configure"
-+#line 6556 "configure"
++#line 6545 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:6514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6550: \"$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*
-@@ -6548,12 +6586,12 @@
+@@ -6548,12 +6575,12 @@
  for ac_func in getpagesize
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:6543: checking for $ac_func" >&5
-+echo "configure:6590: checking for $ac_func" >&5
++echo "configure:6579: 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 6548 "configure"
-+#line 6595 "configure"
++#line 6584 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -6576,7 +6614,7 @@
+@@ -6576,7 +6603,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:6571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6607: \"$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
-@@ -6601,7 +6639,7 @@
+@@ -6601,7 +6628,7 @@
  done
  
  echo $ac_n "checking for working mmap""... $ac_c" 1>&6
 -echo "configure:6596: checking for working mmap" >&5
-+echo "configure:6643: checking for working mmap" >&5
++echo "configure:6632: 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
-@@ -6609,7 +6647,7 @@
+@@ -6609,7 +6636,7 @@
    ac_cv_func_mmap_fixed_mapped=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 6604 "configure"
-+#line 6651 "configure"
++#line 6640 "configure"
  #include "confdefs.h"
  
  /* Thanks to Mike Haertel and Jim Avera for this test.
-@@ -6749,7 +6787,7 @@
+@@ -6749,7 +6776,7 @@
  }
  
  EOF
 -if { (eval echo configure:6744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:6780: \"$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
  else
-@@ -6777,17 +6815,17 @@
+@@ -6777,17 +6804,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:6772: checking for $ac_hdr" >&5
-+echo "configure:6819: checking for $ac_hdr" >&5
++echo "configure:6808: 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 6777 "configure"
-+#line 6824 "configure"
++#line 6813 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:6782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6818: \"$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*
-@@ -6817,12 +6855,12 @@
+@@ -6817,12 +6844,12 @@
  strdup __argz_count __argz_stringify __argz_next
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:6812: checking for $ac_func" >&5
-+echo "configure:6859: checking for $ac_func" >&5
++echo "configure:6848: 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 6817 "configure"
-+#line 6864 "configure"
++#line 6853 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -6845,7 +6883,7 @@
+@@ -6845,7 +6872,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:6840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6876: \"$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
-@@ -6874,12 +6912,12 @@
+@@ -6874,12 +6901,12 @@
       for ac_func in stpcpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:6869: checking for $ac_func" >&5
-+echo "configure:6916: checking for $ac_func" >&5
++echo "configure:6905: 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 6874 "configure"
-+#line 6921 "configure"
++#line 6910 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -6902,7 +6940,7 @@
+@@ -6902,7 +6929,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:6897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6933: \"$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
-@@ -6936,19 +6974,19 @@
+@@ -6936,19 +6963,19 @@
  
     if test $ac_cv_header_locale_h = yes; then
      echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
 -echo "configure:6931: checking for LC_MESSAGES" >&5
-+echo "configure:6978: checking for LC_MESSAGES" >&5
++echo "configure:6967: 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 6936 "configure"
-+#line 6983 "configure"
++#line 6972 "configure"
  #include "confdefs.h"
  #include <locale.h>
  int main() {
@@ -1361,61 +456,61 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6979: \"$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
-@@ -6969,7 +7007,7 @@
+@@ -6969,7 +6996,7 @@
      fi
    fi
     echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
 -echo "configure:6964: checking whether NLS is requested" >&5
-+echo "configure:7011: checking whether NLS is requested" >&5
++echo "configure:7000: 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"
-@@ -6989,7 +7027,7 @@
+@@ -6989,7 +7016,7 @@
  EOF
  
        echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
 -echo "configure:6984: checking whether included gettext is requested" >&5
-+echo "configure:7031: checking whether included gettext is requested" >&5
++echo "configure:7020: 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"
-@@ -7008,17 +7046,17 @@
+@@ -7008,17 +7035,17 @@
  
  	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
 -echo "configure:7003: checking for libintl.h" >&5
-+echo "configure:7050: checking for libintl.h" >&5
++echo "configure:7039: 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 7008 "configure"
-+#line 7055 "configure"
++#line 7044 "configure"
  #include "confdefs.h"
  #include <libintl.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:7013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7049: \"$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*
-@@ -7035,19 +7073,19 @@
+@@ -7035,19 +7062,19 @@
  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:7030: checking for gettext in libc" >&5
-+echo "configure:7077: checking for gettext in libc" >&5
++echo "configure:7066: checking for gettext in libc" >&5
  if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 7035 "configure"
-+#line 7082 "configure"
++#line 7071 "configure"
  #include "confdefs.h"
  #include <libintl.h>
  int main() {
@@ -1423,163 +518,163 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:7042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    gt_cv_func_gettext_libc=yes
  else
-@@ -7063,7 +7101,7 @@
+@@ -7063,7 +7090,7 @@
  
  	   if test "$gt_cv_func_gettext_libc" != "yes"; then
  	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
 -echo "configure:7058: checking for bindtextdomain in -lintl" >&5
-+echo "configure:7105: checking for bindtextdomain in -lintl" >&5
++echo "configure:7094: 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
-@@ -7071,7 +7109,7 @@
+@@ -7071,7 +7098,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 7066 "configure"
-+#line 7113 "configure"
++#line 7102 "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
-@@ -7082,7 +7120,7 @@
+@@ -7082,7 +7109,7 @@
  bindtextdomain()
  ; return 0; }
  EOF
 -if { (eval echo configure:7077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7113: \"$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
-@@ -7098,12 +7136,12 @@
+@@ -7098,12 +7125,12 @@
  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:7093: checking for gettext in libintl" >&5
-+echo "configure:7140: checking for gettext in libintl" >&5
++echo "configure:7129: 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:7098: checking for gettext in -lintl" >&5
-+echo "configure:7145: checking for gettext in -lintl" >&5
++echo "configure:7134: checking for gettext in -lintl" >&5
  ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -7111,7 +7149,7 @@
+@@ -7111,7 +7138,7 @@
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 7106 "configure"
-+#line 7153 "configure"
++#line 7142 "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
-@@ -7122,7 +7160,7 @@
+@@ -7122,7 +7149,7 @@
  gettext()
  ; return 0; }
  EOF
 -if { (eval echo configure:7117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7153: \"$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
-@@ -7161,7 +7199,7 @@
+@@ -7161,7 +7188,7 @@
  	      # 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:7156: checking for $ac_word" >&5
-+echo "configure:7203: checking for $ac_word" >&5
++echo "configure:7192: 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
-@@ -7195,12 +7233,12 @@
+@@ -7195,12 +7222,12 @@
  		for ac_func in dcgettext
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:7190: checking for $ac_func" >&5
-+echo "configure:7237: checking for $ac_func" >&5
++echo "configure:7226: 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 7195 "configure"
-+#line 7242 "configure"
++#line 7231 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -7223,7 +7261,7 @@
+@@ -7223,7 +7250,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:7218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7254: \"$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
-@@ -7250,7 +7288,7 @@
+@@ -7250,7 +7277,7 @@
  		# 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:7245: checking for $ac_word" >&5
-+echo "configure:7292: checking for $ac_word" >&5
++echo "configure:7281: 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
-@@ -7286,7 +7324,7 @@
+@@ -7286,7 +7313,7 @@
  		# 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:7281: checking for $ac_word" >&5
-+echo "configure:7328: checking for $ac_word" >&5
++echo "configure:7317: 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
-@@ -7318,7 +7356,7 @@
+@@ -7318,7 +7345,7 @@
  fi
  
  		cat > conftest.$ac_ext <<EOF
 -#line 7313 "configure"
-+#line 7360 "configure"
++#line 7349 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -7326,7 +7364,7 @@
+@@ -7326,7 +7353,7 @@
  			       return _nl_msg_cat_cntr
  ; return 0; }
  EOF
 -if { (eval echo configure:7321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    CATOBJEXT=.gmo
  		   DATADIRNAME=share
-@@ -7349,7 +7387,7 @@
+@@ -7349,7 +7376,7 @@
  
          if test "$CATOBJEXT" = "NONE"; then
  	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
 -echo "configure:7344: checking whether catgets can be used" >&5
-+echo "configure:7391: checking whether catgets can be used" >&5
++echo "configure:7380: 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"
-@@ -7362,7 +7400,7 @@
+@@ -7362,7 +7389,7 @@
  
  	  if test "$nls_cv_use_catgets" = "yes"; then
  	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
 -echo "configure:7357: checking for main in -li" >&5
-+echo "configure:7404: checking for main in -li" >&5
++echo "configure:7393: 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
-@@ -7370,14 +7408,14 @@
+@@ -7370,14 +7397,14 @@
    ac_save_LIBS="$LIBS"
  LIBS="-li  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 7365 "configure"
-+#line 7412 "configure"
++#line 7401 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -1587,151 +682,151 @@ $NetBSD: patch-ar,v 1.1 2000/09/15 23:58:49 tron Exp $
  ; return 0; }
  EOF
 -if { (eval echo configure:7372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7408: \"$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
-@@ -7405,12 +7443,12 @@
+@@ -7405,12 +7432,12 @@
  fi
  
  	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
 -echo "configure:7400: checking for catgets" >&5
-+echo "configure:7447: checking for catgets" >&5
++echo "configure:7436: 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 7405 "configure"
-+#line 7452 "configure"
++#line 7441 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char catgets(); below.  */
-@@ -7433,7 +7471,7 @@
+@@ -7433,7 +7460,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:7428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7464: \"$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
-@@ -7455,7 +7493,7 @@
+@@ -7455,7 +7482,7 @@
  	       # 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:7450: checking for $ac_word" >&5
-+echo "configure:7497: checking for $ac_word" >&5
++echo "configure:7486: 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
-@@ -7491,7 +7529,7 @@
+@@ -7491,7 +7518,7 @@
  		 # 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:7486: checking for $ac_word" >&5
-+echo "configure:7533: checking for $ac_word" >&5
++echo "configure:7522: 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
-@@ -7528,7 +7566,7 @@
+@@ -7528,7 +7555,7 @@
  		   # 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:7523: checking for $ac_word" >&5
-+echo "configure:7570: checking for $ac_word" >&5
++echo "configure:7559: 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
-@@ -7563,7 +7601,7 @@
+@@ -7563,7 +7590,7 @@
  		 # 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:7558: checking for $ac_word" >&5
-+echo "configure:7605: checking for $ac_word" >&5
++echo "configure:7594: 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
-@@ -7621,7 +7659,7 @@
+@@ -7621,7 +7648,7 @@
          # 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:7616: checking for $ac_word" >&5
-+echo "configure:7663: checking for $ac_word" >&5
++echo "configure:7652: 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
-@@ -7655,7 +7693,7 @@
+@@ -7655,7 +7682,7 @@
          # 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:7650: checking for $ac_word" >&5
-+echo "configure:7697: checking for $ac_word" >&5
++echo "configure:7686: 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
-@@ -7691,7 +7729,7 @@
+@@ -7691,7 +7718,7 @@
          # 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:7686: checking for $ac_word" >&5
-+echo "configure:7733: checking for $ac_word" >&5
++echo "configure:7722: 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
-@@ -7784,7 +7822,7 @@
+@@ -7784,7 +7811,7 @@
         LINGUAS=
       else
         echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
 -echo "configure:7779: checking for catalogs to be installed" >&5
-+echo "configure:7826: checking for catalogs to be installed" >&5
++echo "configure:7815: checking for catalogs to be installed" >&5
         NEW_LINGUAS=
         for lang in ${LINGUAS=$ALL_LINGUAS}; do
           case "$ALL_LINGUAS" in
-@@ -7812,17 +7850,17 @@
+@@ -7812,17 +7839,17 @@
     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:7807: checking for linux/version.h" >&5
-+echo "configure:7854: checking for linux/version.h" >&5
++echo "configure:7843: checking for linux/version.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 7812 "configure"
-+#line 7859 "configure"
++#line 7848 "configure"
  #include "confdefs.h"
  #include <linux/version.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:7817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:7853: \"$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*
-@@ -8056,7 +8094,7 @@
+@@ -8056,7 +8083,7 @@
  
  # Figure out what assembler alignment features are present.
  echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
 -echo "configure:8051: checking assembler alignment features" >&5
-+echo "configure:8098: checking assembler alignment features" >&5
++echo "configure:8087: checking assembler alignment features" >&5
  gcc_cv_as=
  gcc_cv_as_alignment_features=
  gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
-@@ -8177,7 +8215,7 @@
+@@ -8177,7 +8204,7 @@
  echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6
  
  echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6
 -echo "configure:8172: checking assembler subsection support" >&5
-+echo "configure:8219: checking assembler subsection support" >&5
++echo "configure:8208: checking assembler subsection support" >&5
  gcc_cv_as_subsections=
  if test x$gcc_cv_as != x; then
  	# Check if we have .subsection
-@@ -8217,7 +8255,7 @@
+@@ -8217,7 +8244,7 @@
  echo "$ac_t""$gcc_cv_as_subsections" 1>&6
  
  echo $ac_n "checking assembler instructions""... $ac_c" 1>&6
 -echo "configure:8212: checking assembler instructions" >&5
-+echo "configure:8259: checking assembler instructions" >&5
++echo "configure:8248: checking assembler instructions" >&5
  gcc_cv_as_instructions=
  if test x$gcc_cv_as != x; then
  	set "filds fists" "filds mem; fists mem"
diff --git a/lang/gcc/patches/patch-au b/lang/gcc/patches/patch-au
new file mode 100644
index 00000000000..a7fd62b3c62
--- /dev/null
+++ b/lang/gcc/patches/patch-au
@@ -0,0 +1,63 @@
+$NetBSD: patch-au,v 1.1 2001/02/28 23:28:09 hubertf Exp $
+
+--- ../gcc-2.95.2/gcc/crtstuff.c.orig	Tue Feb 27 14:34:52 2001
++++ ../gcc-2.95.2/gcc/crtstuff.c
+@@ -181,16 +181,16 @@
+ 
+ /* Stick a call to __do_global_dtors_aux into the .fini section.  */
+ 
+-static void __attribute__ ((__unused__))
+-fini_dummy (void)
++asm (FINI_SECTION_ASM_OP);
++void __attribute__ ((__unused__))
++_fini (void)
+ {
+-  asm (FINI_SECTION_ASM_OP);
+   __do_global_dtors_aux ();
+ #ifdef FORCE_FINI_SECTION_ALIGN
+   FORCE_FINI_SECTION_ALIGN;
+ #endif
+-  asm (TEXT_SECTION_ASM_OP);
+ }
++asm (TEXT_SECTION_ASM_OP);
+ 
+ #ifdef EH_FRAME_SECTION_ASM_OP
+ /* Stick a call to __register_frame_info into the .init section.  For some
+@@ -205,6 +205,21 @@
+     __register_frame_info (__EH_FRAME_BEGIN__, &object);
+ }
+ 
++static void 
++__nop (void) 
++{ 
++  //asm("unimp 0x42");    // We must not call this function ever. If we happen to
++			// do it accidently, use the emergency exit. 
++}
++
++asm (INIT_SECTION_ASM_OP);
++void __attribute__ ((__unused__))
++_init (void)
++{
++  asm (TEXT_SECTION_ASM_OP); 
++  __nop(); 
++}
++
+ static void __attribute__ ((__unused__))
+ init_dummy (void)
+ {
+@@ -378,7 +393,6 @@
+ #ifdef FORCE_INIT_SECTION_ALIGN
+   FORCE_INIT_SECTION_ALIGN;
+ #endif
+-  asm (TEXT_SECTION_ASM_OP);
+ 
+ /* This is a kludge. The i386 GNU/Linux dynamic linker needs ___brk_addr,
+    __environ and atexit (). We have to make sure they are in the .dynsym
+@@ -395,6 +409,7 @@
+   }
+ #endif
+ }
++asm (TEXT_SECTION_ASM_OP);
+ 
+ #else  /* OBJECT_FORMAT_ELF */
+ 
diff --git a/lang/gcc/patches/patch-av b/lang/gcc/patches/patch-av
new file mode 100644
index 00000000000..f7245e4bb9d
--- /dev/null
+++ b/lang/gcc/patches/patch-av
@@ -0,0 +1,14 @@
+$NetBSD: patch-av,v 1.1 2001/02/28 23:28:09 hubertf Exp $
+
+--- ../gcc-2.95.2/gcc/config/sparc/t-netbsd.orig	Tue Feb 27 14:37:27 2001
++++ ../gcc-2.95.2/gcc/config/sparc/t-netbsd
+@@ -0,0 +1,9 @@
++# We have to include libgcc.a also in shared libraries, so 
++# let's compile the code position independent
++
++TARGET_LIBGCC2_CFLAGS = -fPIC
++
++# Same for crtbeginS.o and crtendS.o . All code that goes into a shared
++# library has to be PIC
++
++CRTSTUFF_T_CFLAGS_S = -fPIC