diff --git a/gnu/lib/libobjc4/arch/powerpc/defs.mk b/gnu/lib/libobjc4/arch/powerpc/defs.mk
index ff581f1297d6..1b21855fc46c 100644
--- a/gnu/lib/libobjc4/arch/powerpc/defs.mk
+++ b/gnu/lib/libobjc4/arch/powerpc/defs.mk
@@ -2,7 +2,7 @@
 # Generated from: 	NetBSD: mknative-gcc,v 1.22 2006/06/25 03:06:15 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp 
 #
-G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.opt ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.opt
+G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.opt ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.opt ${GNUHOSTDIST}/gcc/config/rs6000/linux64.opt
 G_ALL_CFLAGS=-I. -I${GNUHOSTDIST}/libobjc   -O2   -W -Wall -Wwrite-strings -Wstrict-prototypes -DIN_GCC -DIN_TARGET_LIBS -fno-strict-aliasing -fexceptions
 G_INCLUDES=-I${GNUHOSTDIST}/libobjc/objc  -I${GNUHOSTDIST}/libobjc/../gcc -I${GNUHOSTDIST}/libobjc/../gcc/config -I../.././gcc -I${GNUHOSTDIST}/libobjc/../include
 G_OBJS=archive.lo class.lo encoding.lo gc.lo hash.lo init.lo linking.lo misc.lo nil_method.lo NXConstStr.lo Object.lo objects.lo Protocol.lo sarray.lo selector.lo sendmsg.lo thr.lo thr-objc.lo exception.lo hash_compat.lo
diff --git a/gnu/lib/libstdc++-v3_4/arch/powerpc/c++config.h b/gnu/lib/libstdc++-v3_4/arch/powerpc/c++config.h
index aefab794520e..9806401316b1 100644
--- a/gnu/lib/libstdc++-v3_4/arch/powerpc/c++config.h
+++ b/gnu/lib/libstdc++-v3_4/arch/powerpc/c++config.h
@@ -107,7 +107,7 @@ namespace std
 #define __N(msgid)     (msgid)
 
 // End of prewritten config; the discovered settings follow.
-#define __GLIBCXX__ 20060628
+#define __GLIBCXX__ 20061021
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/gnu/lib/libstdc++-v3_4/arch/powerpc/cxxabi_tweaks.h b/gnu/lib/libstdc++-v3_4/arch/powerpc/cxxabi_tweaks.h
index 6b7ab7972ca0..6587a6dea68c 100644
--- a/gnu/lib/libstdc++-v3_4/arch/powerpc/cxxabi_tweaks.h
+++ b/gnu/lib/libstdc++-v3_4/arch/powerpc/cxxabi_tweaks.h
@@ -4,7 +4,7 @@
 
 // Control various target specific ABI tweaks.  Generic version.
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -37,6 +37,8 @@
 #ifdef __cplusplus
 namespace __cxxabiv1
 {
+  extern "C" 
+  {
 #endif
 
   // The generic ABI uses the first byte of a 64-bit guard variable.
@@ -51,7 +53,8 @@ namespace __cxxabiv1
   typedef void __cxa_cdtor_return_type;
 
 #ifdef __cplusplus
+  }
 } // namespace __cxxabiv1
 #endif
 
-#endif // __cxxabiv1
+#endif 
diff --git a/gnu/lib/libstdc++-v3_4/arch/sparc64/c++config.h b/gnu/lib/libstdc++-v3_4/arch/sparc64/c++config.h
index 7e9b5095ed41..f7f312ee5688 100644
--- a/gnu/lib/libstdc++-v3_4/arch/sparc64/c++config.h
+++ b/gnu/lib/libstdc++-v3_4/arch/sparc64/c++config.h
@@ -107,7 +107,7 @@ namespace std
 #define __N(msgid)     (msgid)
 
 // End of prewritten config; the discovered settings follow.
-#define __GLIBCXX__ 20060628
+#define __GLIBCXX__ 20061021
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
diff --git a/gnu/lib/libstdc++-v3_4/arch/sparc64/cxxabi_tweaks.h b/gnu/lib/libstdc++-v3_4/arch/sparc64/cxxabi_tweaks.h
index 6b7ab7972ca0..6587a6dea68c 100644
--- a/gnu/lib/libstdc++-v3_4/arch/sparc64/cxxabi_tweaks.h
+++ b/gnu/lib/libstdc++-v3_4/arch/sparc64/cxxabi_tweaks.h
@@ -4,7 +4,7 @@
 
 // Control various target specific ABI tweaks.  Generic version.
 
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -37,6 +37,8 @@
 #ifdef __cplusplus
 namespace __cxxabiv1
 {
+  extern "C" 
+  {
 #endif
 
   // The generic ABI uses the first byte of a 64-bit guard variable.
@@ -51,7 +53,8 @@ namespace __cxxabiv1
   typedef void __cxa_cdtor_return_type;
 
 #ifdef __cplusplus
+  }
 } // namespace __cxxabiv1
 #endif
 
-#endif // __cxxabiv1
+#endif 
diff --git a/gnu/usr.bin/gcc4/arch/powerpc/configargs.h b/gnu/usr.bin/gcc4/arch/powerpc/configargs.h
index 280254e05748..cde0b1efdf58 100644
--- a/gnu/usr.bin/gcc4/arch/powerpc/configargs.h
+++ b/gnu/usr.bin/gcc4/arch/powerpc/configargs.h
@@ -3,7 +3,7 @@
 /* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp  */
 
 /* Generated automatically. */
-static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=i386-unknown-netbsdelf3.99.17 --host=powerpc--netbsd --target=powerpc--netbsd";
+static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=i386-unknown-netbsdelf4.99.3 --host=powerpc--netbsd --target=powerpc--netbsd";
 static const char thread_model[] = "posix";
 
 static const struct {
diff --git a/gnu/usr.bin/gcc4/arch/powerpc/defs.mk b/gnu/usr.bin/gcc4/arch/powerpc/defs.mk
index 912a633e55ac..65d04b0ed829 100644
--- a/gnu/usr.bin/gcc4/arch/powerpc/defs.mk
+++ b/gnu/usr.bin/gcc4/arch/powerpc/defs.mk
@@ -29,7 +29,7 @@ G_GCC_H=gcc.h version.h
 G_GTFILES_SRCDIR=${GNUHOSTDIST}/gcc
 G_GTFILES_FILES_FILES=${GNUHOSTDIST}/gcc/cp/rtti.c  ${GNUHOSTDIST}/gcc/cp/mangle.c  ${GNUHOSTDIST}/gcc/cp/name-lookup.h  ${GNUHOSTDIST}/gcc/cp/name-lookup.c  ${GNUHOSTDIST}/gcc/cp/cp-tree.h  ${GNUHOSTDIST}/gcc/cp/decl.h  ${GNUHOSTDIST}/gcc/cp/call.c  ${GNUHOSTDIST}/gcc/cp/decl.c  ${GNUHOSTDIST}/gcc/cp/decl2.c  ${GNUHOSTDIST}/gcc/cp/pt.c  ${GNUHOSTDIST}/gcc/cp/repo.c  ${GNUHOSTDIST}/gcc/cp/semantics.c  ${GNUHOSTDIST}/gcc/cp/tree.c  ${GNUHOSTDIST}/gcc/cp/parser.c  ${GNUHOSTDIST}/gcc/cp/method.c  ${GNUHOSTDIST}/gcc/cp/typeck2.c  ${GNUHOSTDIST}/gcc/c-common.c  ${GNUHOSTDIST}/gcc/c-common.h  ${GNUHOSTDIST}/gcc/c-lex.c  ${GNUHOSTDIST}/gcc/c-pragma.c  ${GNUHOSTDIST}/gcc/cp/class.c  ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c  ${GNUHOSTDIST}/gcc/objc/objc-act.h  ${GNUHOSTDIST}/gcc/c-parser.c  ${GNUHOSTDIST}/gcc/c-tree.h  ${GNUHOSTDIST}/gcc/c-decl.c  ${GNUHOSTDIST}/gcc/c-objc-common.c  ${GNUHOSTDIST}/gcc/c-common.c  ${GNUHOSTDIST}/gcc/c-common.h  ${GNUHOSTDIST}/gcc/c-pragma.c  ${GNUHOSTDIST}/gcc/objc/objc-act.c  ${GNUHOSTDIST}/gcc/c-lang.c  ${GNUHOSTDIST}/gcc/c-tree.h  ${GNUHOSTDIST}/gcc/c-decl.c  ${GNUHOSTDIST}/gcc/c-common.c  ${GNUHOSTDIST}/gcc/c-common.h  ${GNUHOSTDIST}/gcc/c-pragma.c  ${GNUHOSTDIST}/gcc/c-objc-common.c  ${GNUHOSTDIST}/gcc/c-parser.c 
 G_GTFILES_FILES_LANGS=cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  objc  objc  objc  objc  objc  objc  objc  objc  objc  c  c  c  c  c  c  c  c 
-G_GTFILES=${GNUHOSTDIST}/gcc/input.h ${GNUHOSTDIST}/gcc/coretypes.h ${GNUHOSTDIST}/gcc/../libcpp/include/line-map.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpplib.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpp-id-data.h auto-host.h ${GNUHOSTDIST}/gcc/../include/ansidecl.h options.h ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/freebsd-spec.h ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.h ${GNUHOSTDIST}/gcc/config/rs6000/netbsd.h ${GNUHOSTDIST}/gcc/defaults.h ${GNUHOSTDIST}/gcc/../include/hashtab.h ${GNUHOSTDIST}/gcc/../include/splay-tree.h ${GNUHOSTDIST}/gcc/bitmap.h ${GNUHOSTDIST}/gcc/coverage.c ${GNUHOSTDIST}/gcc/function.h ${GNUHOSTDIST}/gcc/rtl.h ${GNUHOSTDIST}/gcc/optabs.h ${GNUHOSTDIST}/gcc/tree.h ${GNUHOSTDIST}/gcc/libfuncs.h ${GNUHOSTDIST}/gcc/../libcpp/include/symtab.h ${GNUHOSTDIST}/gcc/real.h ${GNUHOSTDIST}/gcc/varray.h ${GNUHOSTDIST}/gcc/insn-addr.h ${GNUHOSTDIST}/gcc/hwint.h ${GNUHOSTDIST}/gcc/ipa-reference.h ${GNUHOSTDIST}/gcc/cselib.h ${GNUHOSTDIST}/gcc/basic-block.h  ${GNUHOSTDIST}/gcc/cgraph.h ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/reload.h ${GNUHOSTDIST}/gcc/alias.c ${GNUHOSTDIST}/gcc/bitmap.c ${GNUHOSTDIST}/gcc/cselib.c ${GNUHOSTDIST}/gcc/cgraph.c ${GNUHOSTDIST}/gcc/ipa-prop.c ${GNUHOSTDIST}/gcc/ipa-cp.c ${GNUHOSTDIST}/gcc/dbxout.c ${GNUHOSTDIST}/gcc/dwarf2out.c ${GNUHOSTDIST}/gcc/dwarf2asm.c ${GNUHOSTDIST}/gcc/dojump.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/emit-rtl.c ${GNUHOSTDIST}/gcc/except.c ${GNUHOSTDIST}/gcc/explow.c ${GNUHOSTDIST}/gcc/expr.c ${GNUHOSTDIST}/gcc/function.c ${GNUHOSTDIST}/gcc/except.h ${GNUHOSTDIST}/gcc/gcse.c ${GNUHOSTDIST}/gcc/integrate.c ${GNUHOSTDIST}/gcc/lists.c ${GNUHOSTDIST}/gcc/optabs.c ${GNUHOSTDIST}/gcc/profile.c ${GNUHOSTDIST}/gcc/regclass.c ${GNUHOSTDIST}/gcc/reg-stack.c ${GNUHOSTDIST}/gcc/cfglayout.c ${GNUHOSTDIST}/gcc/sdbout.c ${GNUHOSTDIST}/gcc/stor-layout.c ${GNUHOSTDIST}/gcc/stringpool.c ${GNUHOSTDIST}/gcc/tree.c ${GNUHOSTDIST}/gcc/varasm.c ${GNUHOSTDIST}/gcc/tree-mudflap.c ${GNUHOSTDIST}/gcc/tree-flow.h ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/tree-ssanames.c ${GNUHOSTDIST}/gcc/tree-eh.c ${GNUHOSTDIST}/gcc/tree-ssa-address.c ${GNUHOSTDIST}/gcc/tree-phinodes.c ${GNUHOSTDIST}/gcc/tree-cfg.c ${GNUHOSTDIST}/gcc/tree-dfa.c ${GNUHOSTDIST}/gcc/tree-ssa-propagate.c ${GNUHOSTDIST}/gcc/tree-iterator.c ${GNUHOSTDIST}/gcc/gimplify.c ${GNUHOSTDIST}/gcc/tree-chrec.h ${GNUHOSTDIST}/gcc/tree-vect-generic.c ${GNUHOSTDIST}/gcc/tree-ssa-operands.h ${GNUHOSTDIST}/gcc/tree-ssa-operands.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/tree-nested.c ${GNUHOSTDIST}/gcc/ipa-reference.c ${GNUHOSTDIST}/gcc/tree-ssa-structalias.h ${GNUHOSTDIST}/gcc/tree-ssa-structalias.c ${GNUHOSTDIST}/gcc/targhooks.c ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.c ${GNUHOSTDIST}/gcc/cp/rtti.c ${GNUHOSTDIST}/gcc/cp/mangle.c ${GNUHOSTDIST}/gcc/cp/name-lookup.h ${GNUHOSTDIST}/gcc/cp/name-lookup.c ${GNUHOSTDIST}/gcc/cp/cp-tree.h ${GNUHOSTDIST}/gcc/cp/decl.h ${GNUHOSTDIST}/gcc/cp/call.c ${GNUHOSTDIST}/gcc/cp/decl.c ${GNUHOSTDIST}/gcc/cp/decl2.c ${GNUHOSTDIST}/gcc/cp/pt.c ${GNUHOSTDIST}/gcc/cp/repo.c ${GNUHOSTDIST}/gcc/cp/semantics.c ${GNUHOSTDIST}/gcc/cp/tree.c ${GNUHOSTDIST}/gcc/cp/parser.c ${GNUHOSTDIST}/gcc/cp/method.c ${GNUHOSTDIST}/gcc/cp/typeck2.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-lex.c ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/cp/class.c ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c ${GNUHOSTDIST}/gcc/objc/objc-act.h ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/objc/objc-act.c ${GNUHOSTDIST}/gcc/c-lang.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-parser.c
+G_GTFILES=${GNUHOSTDIST}/gcc/input.h ${GNUHOSTDIST}/gcc/coretypes.h ${GNUHOSTDIST}/gcc/../libcpp/include/line-map.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpplib.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpp-id-data.h auto-host.h ${GNUHOSTDIST}/gcc/../include/ansidecl.h options.h ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/freebsd-spec.h ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.h ${GNUHOSTDIST}/gcc/config/rs6000/netbsd.h ${GNUHOSTDIST}/gcc/defaults.h ${GNUHOSTDIST}/gcc/../include/hashtab.h ${GNUHOSTDIST}/gcc/../include/splay-tree.h ${GNUHOSTDIST}/gcc/bitmap.h ${GNUHOSTDIST}/gcc/coverage.c ${GNUHOSTDIST}/gcc/function.h ${GNUHOSTDIST}/gcc/rtl.h ${GNUHOSTDIST}/gcc/optabs.h ${GNUHOSTDIST}/gcc/tree.h ${GNUHOSTDIST}/gcc/libfuncs.h ${GNUHOSTDIST}/gcc/../libcpp/include/symtab.h ${GNUHOSTDIST}/gcc/real.h ${GNUHOSTDIST}/gcc/varray.h ${GNUHOSTDIST}/gcc/insn-addr.h ${GNUHOSTDIST}/gcc/hwint.h ${GNUHOSTDIST}/gcc/ipa-reference.h ${GNUHOSTDIST}/gcc/cselib.h ${GNUHOSTDIST}/gcc/basic-block.h  ${GNUHOSTDIST}/gcc/cgraph.h ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/reload.h ${GNUHOSTDIST}/gcc/alias.c ${GNUHOSTDIST}/gcc/bitmap.c ${GNUHOSTDIST}/gcc/cselib.c ${GNUHOSTDIST}/gcc/cgraph.c ${GNUHOSTDIST}/gcc/ipa-prop.c ${GNUHOSTDIST}/gcc/ipa-cp.c ${GNUHOSTDIST}/gcc/cgraphunit.c ${GNUHOSTDIST}/gcc/dbxout.c ${GNUHOSTDIST}/gcc/dwarf2out.c ${GNUHOSTDIST}/gcc/dwarf2asm.c ${GNUHOSTDIST}/gcc/dojump.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/emit-rtl.c ${GNUHOSTDIST}/gcc/except.c ${GNUHOSTDIST}/gcc/explow.c ${GNUHOSTDIST}/gcc/expr.c ${GNUHOSTDIST}/gcc/function.c ${GNUHOSTDIST}/gcc/except.h ${GNUHOSTDIST}/gcc/gcse.c ${GNUHOSTDIST}/gcc/integrate.c ${GNUHOSTDIST}/gcc/lists.c ${GNUHOSTDIST}/gcc/optabs.c ${GNUHOSTDIST}/gcc/profile.c ${GNUHOSTDIST}/gcc/regclass.c ${GNUHOSTDIST}/gcc/reg-stack.c ${GNUHOSTDIST}/gcc/cfglayout.c ${GNUHOSTDIST}/gcc/sdbout.c ${GNUHOSTDIST}/gcc/stor-layout.c ${GNUHOSTDIST}/gcc/stringpool.c ${GNUHOSTDIST}/gcc/tree.c ${GNUHOSTDIST}/gcc/varasm.c ${GNUHOSTDIST}/gcc/tree-mudflap.c ${GNUHOSTDIST}/gcc/tree-flow.h ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/tree-ssanames.c ${GNUHOSTDIST}/gcc/tree-eh.c ${GNUHOSTDIST}/gcc/tree-ssa-address.c ${GNUHOSTDIST}/gcc/tree-phinodes.c ${GNUHOSTDIST}/gcc/tree-cfg.c ${GNUHOSTDIST}/gcc/tree-dfa.c ${GNUHOSTDIST}/gcc/tree-ssa-propagate.c ${GNUHOSTDIST}/gcc/tree-iterator.c ${GNUHOSTDIST}/gcc/gimplify.c ${GNUHOSTDIST}/gcc/tree-chrec.h ${GNUHOSTDIST}/gcc/tree-vect-generic.c ${GNUHOSTDIST}/gcc/tree-ssa-operands.h ${GNUHOSTDIST}/gcc/tree-ssa-operands.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/tree-nested.c ${GNUHOSTDIST}/gcc/ipa-reference.c ${GNUHOSTDIST}/gcc/tree-ssa-structalias.h ${GNUHOSTDIST}/gcc/tree-ssa-structalias.c ${GNUHOSTDIST}/gcc/targhooks.c ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.c ${GNUHOSTDIST}/gcc/cp/rtti.c ${GNUHOSTDIST}/gcc/cp/mangle.c ${GNUHOSTDIST}/gcc/cp/name-lookup.h ${GNUHOSTDIST}/gcc/cp/name-lookup.c ${GNUHOSTDIST}/gcc/cp/cp-tree.h ${GNUHOSTDIST}/gcc/cp/decl.h ${GNUHOSTDIST}/gcc/cp/call.c ${GNUHOSTDIST}/gcc/cp/decl.c ${GNUHOSTDIST}/gcc/cp/decl2.c ${GNUHOSTDIST}/gcc/cp/pt.c ${GNUHOSTDIST}/gcc/cp/repo.c ${GNUHOSTDIST}/gcc/cp/semantics.c ${GNUHOSTDIST}/gcc/cp/tree.c ${GNUHOSTDIST}/gcc/cp/parser.c ${GNUHOSTDIST}/gcc/cp/method.c ${GNUHOSTDIST}/gcc/cp/typeck2.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-lex.c ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/cp/class.c ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c ${GNUHOSTDIST}/gcc/objc/objc-act.h ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/objc/objc-act.c ${GNUHOSTDIST}/gcc/c-lang.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-parser.c
 G_GTFILES_LANG_DIR_NAMES=cp objc
 G_tm_defines=NETBSD_ENABLE_PTHREADS
 G_host_xm_file=
@@ -37,7 +37,7 @@ G_host_xm_defines=
 G_tm_p_file=
 G_target_cpu_default=
 G_TM_H=tm.h      options.h ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/freebsd-spec.h ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.h ${GNUHOSTDIST}/gcc/config/rs6000/netbsd.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h
-G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.opt ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.opt
+G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.opt ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.opt ${GNUHOSTDIST}/gcc/config/rs6000/linux64.opt
 G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/rs6000/rs6000.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/freebsd-spec.h ${GNUHOSTDIST}/gcc/config/rs6000/sysv4.h ${GNUHOSTDIST}/gcc/config/rs6000/netbsd.h ${GNUHOSTDIST}/gcc/defaults.h
 G_build_xm_include_list=auto-build.h ansidecl.h
 G_lang_specs_files=${GNUHOSTDIST}/gcc/cp/lang-specs.h ${GNUHOSTDIST}/gcc/objc/lang-specs.h
diff --git a/gnu/usr.bin/gcc4/arch/sparc64/configargs.h b/gnu/usr.bin/gcc4/arch/sparc64/configargs.h
index c75761530c7f..27d28e787102 100644
--- a/gnu/usr.bin/gcc4/arch/sparc64/configargs.h
+++ b/gnu/usr.bin/gcc4/arch/sparc64/configargs.h
@@ -3,7 +3,7 @@
 /* Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp  */
 
 /* Generated automatically. */
-static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=i386-unknown-netbsdelf3.99.17 --host=sparc64--netbsd --target=sparc64--netbsd";
+static const char configuration_arguments[] = "/usr/src/tools/gcc/../../gnu/dist/gcc4/configure --enable-long-long --disable-multilib --enable-threads --disable-symvers --build=i386-unknown-netbsdelf4.99.3 --host=sparc64--netbsd --target=sparc64--netbsd";
 static const char thread_model[] = "posix";
 
 static const struct {
diff --git a/gnu/usr.bin/gcc4/arch/sparc64/defs.mk b/gnu/usr.bin/gcc4/arch/sparc64/defs.mk
index f9d3fb960911..3c876f50b342 100644
--- a/gnu/usr.bin/gcc4/arch/sparc64/defs.mk
+++ b/gnu/usr.bin/gcc4/arch/sparc64/defs.mk
@@ -29,7 +29,7 @@ G_GCC_H=gcc.h version.h
 G_GTFILES_SRCDIR=${GNUHOSTDIST}/gcc
 G_GTFILES_FILES_FILES=${GNUHOSTDIST}/gcc/cp/rtti.c  ${GNUHOSTDIST}/gcc/cp/mangle.c  ${GNUHOSTDIST}/gcc/cp/name-lookup.h  ${GNUHOSTDIST}/gcc/cp/name-lookup.c  ${GNUHOSTDIST}/gcc/cp/cp-tree.h  ${GNUHOSTDIST}/gcc/cp/decl.h  ${GNUHOSTDIST}/gcc/cp/call.c  ${GNUHOSTDIST}/gcc/cp/decl.c  ${GNUHOSTDIST}/gcc/cp/decl2.c  ${GNUHOSTDIST}/gcc/cp/pt.c  ${GNUHOSTDIST}/gcc/cp/repo.c  ${GNUHOSTDIST}/gcc/cp/semantics.c  ${GNUHOSTDIST}/gcc/cp/tree.c  ${GNUHOSTDIST}/gcc/cp/parser.c  ${GNUHOSTDIST}/gcc/cp/method.c  ${GNUHOSTDIST}/gcc/cp/typeck2.c  ${GNUHOSTDIST}/gcc/c-common.c  ${GNUHOSTDIST}/gcc/c-common.h  ${GNUHOSTDIST}/gcc/c-lex.c  ${GNUHOSTDIST}/gcc/c-pragma.c  ${GNUHOSTDIST}/gcc/cp/class.c  ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c  ${GNUHOSTDIST}/gcc/objc/objc-act.h  ${GNUHOSTDIST}/gcc/c-parser.c  ${GNUHOSTDIST}/gcc/c-tree.h  ${GNUHOSTDIST}/gcc/c-decl.c  ${GNUHOSTDIST}/gcc/c-objc-common.c  ${GNUHOSTDIST}/gcc/c-common.c  ${GNUHOSTDIST}/gcc/c-common.h  ${GNUHOSTDIST}/gcc/c-pragma.c  ${GNUHOSTDIST}/gcc/objc/objc-act.c  ${GNUHOSTDIST}/gcc/c-lang.c  ${GNUHOSTDIST}/gcc/c-tree.h  ${GNUHOSTDIST}/gcc/c-decl.c  ${GNUHOSTDIST}/gcc/c-common.c  ${GNUHOSTDIST}/gcc/c-common.h  ${GNUHOSTDIST}/gcc/c-pragma.c  ${GNUHOSTDIST}/gcc/c-objc-common.c  ${GNUHOSTDIST}/gcc/c-parser.c 
 G_GTFILES_FILES_LANGS=cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  cp  objc  objc  objc  objc  objc  objc  objc  objc  objc  c  c  c  c  c  c  c  c 
-G_GTFILES=${GNUHOSTDIST}/gcc/input.h ${GNUHOSTDIST}/gcc/coretypes.h ${GNUHOSTDIST}/gcc/../libcpp/include/line-map.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpplib.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpp-id-data.h auto-host.h ${GNUHOSTDIST}/gcc/../include/ansidecl.h options.h ${GNUHOSTDIST}/gcc/config/sparc/biarch64.h ${GNUHOSTDIST}/gcc/config/sparc/sparc.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/svr4.h ${GNUHOSTDIST}/gcc/config/sparc/sysv4.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/sparc/netbsd-elf.h ${GNUHOSTDIST}/gcc/defaults.h ${GNUHOSTDIST}/gcc/../include/hashtab.h ${GNUHOSTDIST}/gcc/../include/splay-tree.h ${GNUHOSTDIST}/gcc/bitmap.h ${GNUHOSTDIST}/gcc/coverage.c ${GNUHOSTDIST}/gcc/function.h ${GNUHOSTDIST}/gcc/rtl.h ${GNUHOSTDIST}/gcc/optabs.h ${GNUHOSTDIST}/gcc/tree.h ${GNUHOSTDIST}/gcc/libfuncs.h ${GNUHOSTDIST}/gcc/../libcpp/include/symtab.h ${GNUHOSTDIST}/gcc/real.h ${GNUHOSTDIST}/gcc/varray.h ${GNUHOSTDIST}/gcc/insn-addr.h ${GNUHOSTDIST}/gcc/hwint.h ${GNUHOSTDIST}/gcc/ipa-reference.h ${GNUHOSTDIST}/gcc/cselib.h ${GNUHOSTDIST}/gcc/basic-block.h  ${GNUHOSTDIST}/gcc/cgraph.h ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/reload.h ${GNUHOSTDIST}/gcc/alias.c ${GNUHOSTDIST}/gcc/bitmap.c ${GNUHOSTDIST}/gcc/cselib.c ${GNUHOSTDIST}/gcc/cgraph.c ${GNUHOSTDIST}/gcc/ipa-prop.c ${GNUHOSTDIST}/gcc/ipa-cp.c ${GNUHOSTDIST}/gcc/dbxout.c ${GNUHOSTDIST}/gcc/dwarf2out.c ${GNUHOSTDIST}/gcc/dwarf2asm.c ${GNUHOSTDIST}/gcc/dojump.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/emit-rtl.c ${GNUHOSTDIST}/gcc/except.c ${GNUHOSTDIST}/gcc/explow.c ${GNUHOSTDIST}/gcc/expr.c ${GNUHOSTDIST}/gcc/function.c ${GNUHOSTDIST}/gcc/except.h ${GNUHOSTDIST}/gcc/gcse.c ${GNUHOSTDIST}/gcc/integrate.c ${GNUHOSTDIST}/gcc/lists.c ${GNUHOSTDIST}/gcc/optabs.c ${GNUHOSTDIST}/gcc/profile.c ${GNUHOSTDIST}/gcc/regclass.c ${GNUHOSTDIST}/gcc/reg-stack.c ${GNUHOSTDIST}/gcc/cfglayout.c ${GNUHOSTDIST}/gcc/sdbout.c ${GNUHOSTDIST}/gcc/stor-layout.c ${GNUHOSTDIST}/gcc/stringpool.c ${GNUHOSTDIST}/gcc/tree.c ${GNUHOSTDIST}/gcc/varasm.c ${GNUHOSTDIST}/gcc/tree-mudflap.c ${GNUHOSTDIST}/gcc/tree-flow.h ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/tree-ssanames.c ${GNUHOSTDIST}/gcc/tree-eh.c ${GNUHOSTDIST}/gcc/tree-ssa-address.c ${GNUHOSTDIST}/gcc/tree-phinodes.c ${GNUHOSTDIST}/gcc/tree-cfg.c ${GNUHOSTDIST}/gcc/tree-dfa.c ${GNUHOSTDIST}/gcc/tree-ssa-propagate.c ${GNUHOSTDIST}/gcc/tree-iterator.c ${GNUHOSTDIST}/gcc/gimplify.c ${GNUHOSTDIST}/gcc/tree-chrec.h ${GNUHOSTDIST}/gcc/tree-vect-generic.c ${GNUHOSTDIST}/gcc/tree-ssa-operands.h ${GNUHOSTDIST}/gcc/tree-ssa-operands.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/tree-nested.c ${GNUHOSTDIST}/gcc/ipa-reference.c ${GNUHOSTDIST}/gcc/tree-ssa-structalias.h ${GNUHOSTDIST}/gcc/tree-ssa-structalias.c ${GNUHOSTDIST}/gcc/targhooks.c ${GNUHOSTDIST}/gcc/config/sparc/sparc.c ${GNUHOSTDIST}/gcc/cp/rtti.c ${GNUHOSTDIST}/gcc/cp/mangle.c ${GNUHOSTDIST}/gcc/cp/name-lookup.h ${GNUHOSTDIST}/gcc/cp/name-lookup.c ${GNUHOSTDIST}/gcc/cp/cp-tree.h ${GNUHOSTDIST}/gcc/cp/decl.h ${GNUHOSTDIST}/gcc/cp/call.c ${GNUHOSTDIST}/gcc/cp/decl.c ${GNUHOSTDIST}/gcc/cp/decl2.c ${GNUHOSTDIST}/gcc/cp/pt.c ${GNUHOSTDIST}/gcc/cp/repo.c ${GNUHOSTDIST}/gcc/cp/semantics.c ${GNUHOSTDIST}/gcc/cp/tree.c ${GNUHOSTDIST}/gcc/cp/parser.c ${GNUHOSTDIST}/gcc/cp/method.c ${GNUHOSTDIST}/gcc/cp/typeck2.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-lex.c ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/cp/class.c ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c ${GNUHOSTDIST}/gcc/objc/objc-act.h ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/objc/objc-act.c ${GNUHOSTDIST}/gcc/c-lang.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-parser.c
+G_GTFILES=${GNUHOSTDIST}/gcc/input.h ${GNUHOSTDIST}/gcc/coretypes.h ${GNUHOSTDIST}/gcc/../libcpp/include/line-map.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpplib.h ${GNUHOSTDIST}/gcc/../libcpp/include/cpp-id-data.h auto-host.h ${GNUHOSTDIST}/gcc/../include/ansidecl.h options.h ${GNUHOSTDIST}/gcc/config/sparc/biarch64.h ${GNUHOSTDIST}/gcc/config/sparc/sparc.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/svr4.h ${GNUHOSTDIST}/gcc/config/sparc/sysv4.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/sparc/netbsd-elf.h ${GNUHOSTDIST}/gcc/defaults.h ${GNUHOSTDIST}/gcc/../include/hashtab.h ${GNUHOSTDIST}/gcc/../include/splay-tree.h ${GNUHOSTDIST}/gcc/bitmap.h ${GNUHOSTDIST}/gcc/coverage.c ${GNUHOSTDIST}/gcc/function.h ${GNUHOSTDIST}/gcc/rtl.h ${GNUHOSTDIST}/gcc/optabs.h ${GNUHOSTDIST}/gcc/tree.h ${GNUHOSTDIST}/gcc/libfuncs.h ${GNUHOSTDIST}/gcc/../libcpp/include/symtab.h ${GNUHOSTDIST}/gcc/real.h ${GNUHOSTDIST}/gcc/varray.h ${GNUHOSTDIST}/gcc/insn-addr.h ${GNUHOSTDIST}/gcc/hwint.h ${GNUHOSTDIST}/gcc/ipa-reference.h ${GNUHOSTDIST}/gcc/cselib.h ${GNUHOSTDIST}/gcc/basic-block.h  ${GNUHOSTDIST}/gcc/cgraph.h ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/reload.h ${GNUHOSTDIST}/gcc/alias.c ${GNUHOSTDIST}/gcc/bitmap.c ${GNUHOSTDIST}/gcc/cselib.c ${GNUHOSTDIST}/gcc/cgraph.c ${GNUHOSTDIST}/gcc/ipa-prop.c ${GNUHOSTDIST}/gcc/ipa-cp.c ${GNUHOSTDIST}/gcc/cgraphunit.c ${GNUHOSTDIST}/gcc/dbxout.c ${GNUHOSTDIST}/gcc/dwarf2out.c ${GNUHOSTDIST}/gcc/dwarf2asm.c ${GNUHOSTDIST}/gcc/dojump.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/emit-rtl.c ${GNUHOSTDIST}/gcc/except.c ${GNUHOSTDIST}/gcc/explow.c ${GNUHOSTDIST}/gcc/expr.c ${GNUHOSTDIST}/gcc/function.c ${GNUHOSTDIST}/gcc/except.h ${GNUHOSTDIST}/gcc/gcse.c ${GNUHOSTDIST}/gcc/integrate.c ${GNUHOSTDIST}/gcc/lists.c ${GNUHOSTDIST}/gcc/optabs.c ${GNUHOSTDIST}/gcc/profile.c ${GNUHOSTDIST}/gcc/regclass.c ${GNUHOSTDIST}/gcc/reg-stack.c ${GNUHOSTDIST}/gcc/cfglayout.c ${GNUHOSTDIST}/gcc/sdbout.c ${GNUHOSTDIST}/gcc/stor-layout.c ${GNUHOSTDIST}/gcc/stringpool.c ${GNUHOSTDIST}/gcc/tree.c ${GNUHOSTDIST}/gcc/varasm.c ${GNUHOSTDIST}/gcc/tree-mudflap.c ${GNUHOSTDIST}/gcc/tree-flow.h ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/tree-ssanames.c ${GNUHOSTDIST}/gcc/tree-eh.c ${GNUHOSTDIST}/gcc/tree-ssa-address.c ${GNUHOSTDIST}/gcc/tree-phinodes.c ${GNUHOSTDIST}/gcc/tree-cfg.c ${GNUHOSTDIST}/gcc/tree-dfa.c ${GNUHOSTDIST}/gcc/tree-ssa-propagate.c ${GNUHOSTDIST}/gcc/tree-iterator.c ${GNUHOSTDIST}/gcc/gimplify.c ${GNUHOSTDIST}/gcc/tree-chrec.h ${GNUHOSTDIST}/gcc/tree-vect-generic.c ${GNUHOSTDIST}/gcc/tree-ssa-operands.h ${GNUHOSTDIST}/gcc/tree-ssa-operands.c ${GNUHOSTDIST}/gcc/tree-profile.c ${GNUHOSTDIST}/gcc/tree-nested.c ${GNUHOSTDIST}/gcc/ipa-reference.c ${GNUHOSTDIST}/gcc/tree-ssa-structalias.h ${GNUHOSTDIST}/gcc/tree-ssa-structalias.c ${GNUHOSTDIST}/gcc/targhooks.c ${GNUHOSTDIST}/gcc/config/sparc/sparc.c ${GNUHOSTDIST}/gcc/cp/rtti.c ${GNUHOSTDIST}/gcc/cp/mangle.c ${GNUHOSTDIST}/gcc/cp/name-lookup.h ${GNUHOSTDIST}/gcc/cp/name-lookup.c ${GNUHOSTDIST}/gcc/cp/cp-tree.h ${GNUHOSTDIST}/gcc/cp/decl.h ${GNUHOSTDIST}/gcc/cp/call.c ${GNUHOSTDIST}/gcc/cp/decl.c ${GNUHOSTDIST}/gcc/cp/decl2.c ${GNUHOSTDIST}/gcc/cp/pt.c ${GNUHOSTDIST}/gcc/cp/repo.c ${GNUHOSTDIST}/gcc/cp/semantics.c ${GNUHOSTDIST}/gcc/cp/tree.c ${GNUHOSTDIST}/gcc/cp/parser.c ${GNUHOSTDIST}/gcc/cp/method.c ${GNUHOSTDIST}/gcc/cp/typeck2.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-lex.c ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/cp/class.c ${GNUHOSTDIST}/gcc/cp/cp-objcp-common.c ${GNUHOSTDIST}/gcc/objc/objc-act.h ${GNUHOSTDIST}/gcc/c-parser.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/objc/objc-act.c ${GNUHOSTDIST}/gcc/c-lang.c ${GNUHOSTDIST}/gcc/c-tree.h ${GNUHOSTDIST}/gcc/c-decl.c ${GNUHOSTDIST}/gcc/c-common.c ${GNUHOSTDIST}/gcc/c-common.h ${GNUHOSTDIST}/gcc/c-pragma.c ${GNUHOSTDIST}/gcc/c-objc-common.c ${GNUHOSTDIST}/gcc/c-parser.c
 G_GTFILES_LANG_DIR_NAMES=cp objc
 G_tm_defines=NETBSD_ENABLE_PTHREADS
 G_host_xm_file=
diff --git a/gnu/usr.bin/gcc4/libiberty/arch/powerpc/config.h b/gnu/usr.bin/gcc4/libiberty/arch/powerpc/config.h
index ed47f255b87b..59fa15eb8e68 100644
--- a/gnu/usr.bin/gcc4/libiberty/arch/powerpc/config.h
+++ b/gnu/usr.bin/gcc4/libiberty/arch/powerpc/config.h
@@ -238,7 +238,7 @@
 #define HAVE_STRNCASECMP 1
 
 /* Define to 1 if you have the `strndup' function. */
-/* #undef HAVE_STRNDUP */
+#define HAVE_STRNDUP 1
 
 /* Define to 1 if you have the `strrchr' function. */
 #define HAVE_STRRCHR 1
diff --git a/gnu/usr.bin/gcc4/libiberty/arch/sparc64/config.h b/gnu/usr.bin/gcc4/libiberty/arch/sparc64/config.h
index ed47f255b87b..59fa15eb8e68 100644
--- a/gnu/usr.bin/gcc4/libiberty/arch/sparc64/config.h
+++ b/gnu/usr.bin/gcc4/libiberty/arch/sparc64/config.h
@@ -238,7 +238,7 @@
 #define HAVE_STRNCASECMP 1
 
 /* Define to 1 if you have the `strndup' function. */
-/* #undef HAVE_STRNDUP */
+#define HAVE_STRNDUP 1
 
 /* Define to 1 if you have the `strrchr' function. */
 #define HAVE_STRRCHR 1
diff --git a/gnu/usr.bin/gcc4/libiberty/defs.mk b/gnu/usr.bin/gcc4/libiberty/defs.mk
index 0bf6ce8ed300..87c5e8700bcf 100644
--- a/gnu/usr.bin/gcc4/libiberty/defs.mk
+++ b/gnu/usr.bin/gcc4/libiberty/defs.mk
@@ -1,8 +1,8 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: 	NetBSD: mknative-gcc,v 1.18 2006/05/23 10:55:55 mrg Exp 
-# Generated from: NetBSD: mknative.common,v 1.7 2006/05/17 03:27:19 mrg Exp 
+# Generated from: 	NetBSD: mknative-gcc,v 1.22 2006/06/25 03:06:15 mrg Exp 
+# Generated from: NetBSD: mknative.common,v 1.8 2006/05/26 19:17:21 mrg Exp 
 #
 G_ALLOCA=
 G_EXTRA_OFILES=
-G_LIBOBJS=mempcpy.o mkstemps.o stpcpy.o stpncpy.o strndup.o strverscmp.o strncmp.o
+G_LIBOBJS=mempcpy.o mkstemps.o stpcpy.o stpncpy.o strverscmp.o strncmp.o
 G_REQUIRED_OFILES=regex.o cplus-dem.o cp-demangle.o md5.o alloca.o argv.o choose-temp.o concat.o cp-demint.o dyn-string.o fdmatch.o fibheap.o floatformat.o fnmatch.o fopen_unlocked.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o hex.o lbasename.o lrealpath.o make-relative-prefix.o make-temp-file.o objalloc.o obstack.o partition.o pexecute.o physmem.o pex-common.o pex-one.o pex-unix.o safe-ctype.o sort.o spaces.o splay-tree.o strerror.o strsignal.o ternary.o unlink-if-ordinary.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o xstrerror.o xstrndup.o