new gcc snapshot, this one compiles again on i386 !

NOTE: this needs current -src, in particular current includes for libgfortran to build correctly (semantics change in __extern inline that lead to duplicate isalnum symbols otherwise).
2007-03-17 21:58:45 +00:00 · 2007-03-17 21:58:45 +00:00 · ceaa955aca
commit ceaa955aca
parent fffc411fc5
39 changed files with 375 additions and 247 deletions
--- a/lang/gcc/4.2/Makefile
+++ b/lang/gcc/4.2/Makefile
@ -1,21 +1,21 @@
-# $OpenBSD: Makefile,v 1.8 2007/02/14 16:55:28 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2007/03/17 21:58:45 espie Exp $

 ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN='adjust for types changes'

-V=4.2.0
-DATE=20061024
-FULL_VERSION=4.2-${DATE}
-FULL_PKGVERSION=4.2.${DATE}
+V=4.3.0
+DATE=20070309
+FULL_VERSION=4.3-${DATE}
+FULL_PKGVERSION=4.3.${DATE}

-PKGNAME-main=  gcc-${FULL_PKGVERSION}p0
-PKGNAME-c++ =  g++-${FULL_PKGVERSION}p0
+PKGNAME-main=  gcc-${FULL_PKGVERSION}
+PKGNAME-c++ =  g++-${FULL_PKGVERSION}
 PKGNAME-estdc= libstdc++-${FULL_PKGVERSION}
 PKGNAME-g77=   g77-${FULL_PKGVERSION}
-PKGNAME-f95=   g95-${FULL_PKGVERSION}p0
+PKGNAME-f95=   g95-${FULL_PKGVERSION}
 PKGNAME-java=  gcj-${FULL_PKGVERSION}
-PKGNAME-objc=  gobjc-${FULL_PKGVERSION}p0
-PKGNAME-ada=   gnat-${FULL_PKGVERSION}p0
+PKGNAME-objc=  gobjc-${FULL_PKGVERSION}
+PKGNAME-ada=   gnat-${FULL_PKGVERSION}
 SHARED_LIBS=	estdc++		7.0 \
 		gfortran	2.0 \
 		-org-w3c-dom	1.0 \
@ -65,6 +65,7 @@ MASTER_SITES0=	ftp://quatramaran.ens.fr/pub/espie/

 CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/gcc
+CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}

 LANGS=c
 .if ${FLAVOR:L:Mc++}
@ -74,7 +75,6 @@ MULTI_PACKAGES+=-c++ -estdc
 .if ${FLAVOR:L:Mfortran}
 LANGS:=${LANGS},fortran
 MULTI_PACKAGES+=-f95
-CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 .if ${FLAVOR:L:Mobjc}
 LANGS:=${LANGS},objc
@ -161,7 +161,13 @@ USE_GMAKE= yes
 # use bootstrap-lean if you're pressed for space
 ALL_TARGET=bootstrap

-MAKE_FLAGS=libstdc___la_LDFLAGS='-version-info 31:0:0 -lm'
+BASIC_MAKE_FLAGS=libstdc___la_LDFLAGS='-version-info 31:0:0 -lm'
+MAKE_FLAGS=${BASIC_MAKE_FLAGS} \
+	INSTALL='/usr/bin/install -c' \
+	INSTALL_PROGRAM='/usr/bin/install -c -m 555' \
+	INSTALL_DATA='/usr/bin/install -c -m 444' \
+
+FAKE_FLAGS=DESTDIR=${WRKINST} ${BASIC_MAKE_FLAGS}


 .if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "sparc"  || ${MACHINE_ARCH} == "amd64"
@ -187,12 +193,14 @@ WANTLIB=		c
 RUN_DEPENDS-main=

 RUN_DEPENDS-c++ =	${RUN_DEPENDS} ::${PKGPATH},-estdc
+LIB_DEPENDS-estdc=
 WANTLIB-estdc=		c m

-LIB_DEPENDS-f95=	gmp:gmp->=4.2:devel/gmp \
+LIB_DEPENDS+=		gmp:gmp->=4.2:devel/gmp \
 			mpfr::devel/mpfr

-LIB_DEPENDS-java=	gc::devel/boehm-gc
+LIB_DEPENDS-java=	${LIB_DEPENDS} \
+			gc::devel/boehm-gc

 .include <bsd.port.mk>

--- a/lang/gcc/4.2/distinfo
+++ b/lang/gcc/4.2/distinfo
@ -1,8 +1,10 @@
 MD5 (gcc/adastrap-i386-3.3.6-4.tgz) = 216977774d85b97542cfaa8b0e79b909
-MD5 (gcc/gcc-4.2-20061024.tar.bz2) = 24b8fbdef7e9d8701a41379b5d8a69d7
+MD5 (gcc/gcc-4.3-20070309.tar.bz2) = 3b8c190c9701c29c987ade6e8a79d8b6
 RMD160 (gcc/adastrap-i386-3.3.6-4.tgz) = ac93ba044f2b9d7f68ab09b4746c4cba28521d7b
-RMD160 (gcc/gcc-4.2-20061024.tar.bz2) = 1b41a1a03af89969f2c9809bb486c0e8fa5fd7da
+RMD160 (gcc/gcc-4.3-20070309.tar.bz2) = a40c828a938459525480b81b204beca0757e6cf2
 SHA1 (gcc/adastrap-i386-3.3.6-4.tgz) = 0a79e84f47a5a6a57197e76c31eae933622d395c
-SHA1 (gcc/gcc-4.2-20061024.tar.bz2) = d0dbfeb2a0be7b6984319214027fd1da0a7e9af0
+SHA1 (gcc/gcc-4.3-20070309.tar.bz2) = b5c5cc62e16c3059c523eb6e7ef1bbed405c2bee
+SHA256 (gcc/adastrap-i386-3.3.6-4.tgz) = bddcee971367955f1816cd1b5f1a68a2b3c3e574c76b26862d26979878029b6a
+SHA256 (gcc/gcc-4.3-20070309.tar.bz2) = a8fde09bb163d91bfde299ebdc94c3848e3d2b6bb9b4355bc069984d521263b3
 SIZE (gcc/adastrap-i386-3.3.6-4.tgz) = 16776383
-SIZE (gcc/gcc-4.2-20061024.tar.bz2) = 40654041
+SIZE (gcc/gcc-4.3-20070309.tar.bz2) = 49554574
--- a/lang/gcc/4.2/patches/patch-gcc_ada_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-gcc_ada_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-gcc_ada_Makefile_in,v 1.2 2006/11/25 16:26:46 espie Exp $
--- gcc/ada/Makefile.in.orig	Tue Oct 17 06:24:13 2006
-+++ gcc/ada/Makefile.in	Mon Oct 30 12:43:35 2006
-@@ -117,12 +117,12 @@ TEXI2DVI = texi2dvi
+$OpenBSD: patch-gcc_ada_Makefile_in,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/ada/Makefile.in.orig	Tue Jan 23 17:37:09 2007
+++ gcc/ada/Makefile.in	Mon Feb 19 14:08:46 2007
+@@ -116,12 +116,12 @@ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
- GNATBIND = $(STAGE_PREFIX)gnatbind
 GNATBIND_FLAGS = -static -x
 -ADA_CFLAGS =
 +ADA_CFLAGS = -O1
--- a/lang/gcc/4.2/patches/patch-gcc_ada_adaint_c
+++ b/lang/gcc/4.2/patches/patch-gcc_ada_adaint_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_ada_adaint_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/ada/adaint.c.orig	Wed Feb 15 10:30:39 2006
-+++ gcc/ada/adaint.c	Sun Jul 23 11:24:01 2006
-@@ -794,7 +794,7 @@ __gnat_open_new_temp (char *path, int fm
+$OpenBSD: patch-gcc_ada_adaint_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/ada/adaint.c.orig	Wed Dec 13 10:28:16 2006
+++ gcc/ada/adaint.c	Mon Feb 19 14:08:46 2007
+@@ -826,7 +826,7 @@ __gnat_open_new_temp (char *path, int fm
 
   strcpy (path, "GNAT-XXXXXX");
 
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_ada_adaint_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
   return mkstemp (path);
 #elif defined (__Lynx__)
   mktemp (path);
-@@ -884,7 +884,7 @@ __gnat_tmp_name (char *tmp_filename)
+@@ -916,7 +916,7 @@ __gnat_tmp_name (char *tmp_filename)
     free (pname);
   }
 
--- a/lang/gcc/4.2/patches/patch-gcc_ada_gnatlink_adb
+++ b/lang/gcc/4.2/patches/patch-gcc_ada_gnatlink_adb
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_ada_gnatlink_adb,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/ada/gnatlink.adb.orig	Wed Feb 15 10:35:23 2006
-+++ gcc/ada/gnatlink.adb	Sun Jul 23 11:24:01 2006
-@@ -131,7 +131,7 @@ procedure Gnatlink is
+$OpenBSD: patch-gcc_ada_gnatlink_adb,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/ada/gnatlink.adb.orig	Tue Oct 31 18:59:58 2006
+++ gcc/ada/gnatlink.adb	Mon Feb 19 14:08:47 2007
+@@ -136,7 +136,7 @@ procedure Gnatlink is
    --  This table collects the arguments to be passed to compile the binder
    --  generated file.
 
--- a/lang/gcc/4.2/patches/patch-gcc_ada_mlib-utl_adb
+++ b/lang/gcc/4.2/patches/patch-gcc_ada_mlib-utl_adb
@ -1,9 +1,9 @@
-$OpenBSD: patch-gcc_ada_mlib-utl_adb,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/ada/mlib-utl.adb.orig	Tue Jun  6 14:37:36 2006
-+++ gcc/ada/mlib-utl.adb	Sat Jul 22 18:05:51 2006
-@@ -38,7 +38,7 @@ package body MLib.Utl is
+$OpenBSD: patch-gcc_ada_mlib-utl_adb,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/ada/mlib-utl.adb.orig	Tue Oct 31 19:02:17 2006
+++ gcc/ada/mlib-utl.adb	Mon Feb 19 14:08:47 2007
+@@ -36,7 +36,7 @@ with GNAT;     use GNAT;
 
-    Initialized : Boolean := False;
+ package body MLib.Utl is
 
 -   Gcc_Name : constant String := Osint.Program_Name ("gcc").all;
 +   Gcc_Name : constant String := Osint.Program_Name ("egcc").all;
--- a/lang/gcc/4.2/patches/patch-gcc_builtins_c
+++ b/lang/gcc/4.2/patches/patch-gcc_builtins_c
@ -0,0 +1,52 @@
+$OpenBSD: patch-gcc_builtins_c,v 1.1 2007/03/17 21:58:46 espie Exp $
+--- gcc/builtins.c.orig	Wed Feb 28 20:21:20 2007
+++ gcc/builtins.c	Mon Mar 12 11:37:52 2007
+@@ -12218,13 +12218,13 @@ do_mpfr_arg2 (tree arg1, tree arg2, tree
+ 	  int inexact;
+ 	  mpfr_t m1, m2;
+ 
+-	  mpfr_inits2 (prec, m1, m2, NULL);
+	  mpfr_inits2 (prec, m1, m2, (void *)0);
+ 	  mpfr_from_real (m1, ra1);
+ 	  mpfr_from_real (m2, ra2);
+ 	  mpfr_clear_flags ();
+ 	  inexact = func (m1, m1, m2, GMP_RNDN);
+ 	  result = do_mpfr_ckconv (m1, type, inexact);
+-	  mpfr_clears (m1, m2, NULL);
+	  mpfr_clears (m1, m2, (void *)0);
+ 	}
+     }
+   
+@@ -12266,14 +12266,14 @@ do_mpfr_arg3 (tree arg1, tree arg2, tree
+ 	  int inexact;
+ 	  mpfr_t m1, m2, m3;
+ 
+-	  mpfr_inits2 (prec, m1, m2, m3, NULL);
+	  mpfr_inits2 (prec, m1, m2, m3, (void *)0);
+ 	  mpfr_from_real (m1, ra1);
+ 	  mpfr_from_real (m2, ra2);
+ 	  mpfr_from_real (m3, ra3);
+ 	  mpfr_clear_flags ();
+ 	  inexact = func (m1, m1, m2, m3, GMP_RNDN);
+ 	  result = do_mpfr_ckconv (m1, type, inexact);
+-	  mpfr_clears (m1, m2, m3, NULL);
+	  mpfr_clears (m1, m2, m3, (void *)0);
+ 	}
+     }
+   
+@@ -12310,13 +12310,13 @@ do_mpfr_sincos (tree arg, tree arg_sinp,
+ 	  int inexact;
+ 	  mpfr_t m, ms, mc;
+ 
+-	  mpfr_inits2 (prec, m, ms, mc, NULL);
+	  mpfr_inits2 (prec, m, ms, mc, (void *)0);
+ 	  mpfr_from_real (m, ra);
+ 	  mpfr_clear_flags ();
+ 	  inexact = mpfr_sin_cos (ms, mc, m, GMP_RNDN);
+ 	  result_s = do_mpfr_ckconv (ms, type, inexact);
+ 	  result_c = do_mpfr_ckconv (mc, type, inexact);
+-	  mpfr_clears (m, ms, mc, NULL);
+	  mpfr_clears (m, ms, mc, (void *)0);
+ 	  if (result_s && result_c)
+ 	    {
+ 	      /* If we are to return in a complex value do so.  */
--- a/lang/gcc/4.2/patches/patch-gcc_c-common_c
+++ b/lang/gcc/4.2/patches/patch-gcc_c-common_c
@ -1,17 +1,15 @@
-$OpenBSD: patch-gcc_c-common_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/c-common.c.orig	Sun Aug 27 01:51:14 2006
-+++ gcc/c-common.c	Wed Oct 18 00:37:31 2006
-@@ -543,7 +543,9 @@ static tree handle_cleanup_attribute (tr
+$OpenBSD: patch-gcc_c-common_c,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/c-common.c.orig	Fri Mar  9 17:16:35 2007
+++ gcc/c-common.c	Mon Mar 12 11:42:55 2007
+@@ -556,6 +556,7 @@ static tree handle_cleanup_attribute (tr
 static tree handle_warn_unused_result_attribute (tree *, tree, tree, int,
 						 bool *);
 static tree handle_sentinel_attribute (tree *, tree, tree, int, bool *);
 +static tree handle_bounded_attribute (tree *, tree, tree, int, bool *);
 
-+
- static void check_function_nonnull (tree, tree);
+ static void check_function_nonnull (tree, int, tree *);
 static void check_nonnull_arg (void *, tree, unsigned HOST_WIDE_INT);
- static bool nonnull_check_p (tree, unsigned HOST_WIDE_INT);
-@@ -620,6 +622,8 @@ const struct attribute_spec c_common_att
+@@ -635,6 +636,8 @@ const struct attribute_spec c_common_att
 			      handle_deprecated_attribute },
   { "vector_size",	      1, 1, false, true, false,
 			      handle_vector_size_attribute },
@ -20,7 +18,7 @@ $OpenBSD: patch-gcc_c-common_c,v 1.2 2006/10/20 13:43:18 espie Exp $
   { "visibility",	      1, 1, false, false, false,
 			      handle_visibility_attribute },
   { "tls_model",	      1, 1, true,  false, false,
-@@ -5595,6 +5599,15 @@ handle_warn_unused_result_attribute (tre
+@@ -6022,6 +6025,15 @@ handle_warn_unused_result_attribute (tre
     }
 
   return NULL_TREE;
--- a/lang/gcc/4.2/patches/patch-gcc_c-incpath_c
+++ b/lang/gcc/4.2/patches/patch-gcc_c-incpath_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_c-incpath_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/c-incpath.c.orig	Fri May 19 00:16:23 2006
-+++ gcc/c-incpath.c	Sun Jul 23 11:26:31 2006
-@@ -145,9 +145,9 @@ add_standard_paths (const char *sysroot,
+$OpenBSD: patch-gcc_c-incpath_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/c-incpath.c.orig	Wed Dec 20 23:34:14 2006
+++ gcc/c-incpath.c	Mon Feb 19 14:09:48 2007
+@@ -146,9 +146,9 @@ add_standard_paths (const char *sysroot,
 		continue;
 	      if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
 		{
@ -13,12 +13,23 @@ $OpenBSD: patch-gcc_c-incpath_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 		  add_path (str, SYSTEM, p->cxx_aware, false);
 		}
 	    }
-@@ -162,12 +162,12 @@ add_standard_paths (const char *sysroot,
+@@ -163,7 +163,7 @@ add_standard_paths (const char *sysroot,
 
 	  /* Should this directory start with the sysroot?  */
 	  if (sysroot && p->add_sysroot)
 -	    str = concat (sysroot, p->fname, NULL);
 +	    str = concat (sysroot, p->fname, (void *)0);
+ 	  else if (!p->add_sysroot && relocated
+ 		   && strncmp (p->fname, cpp_PREFIX, cpp_PREFIX_len) == 0)
+ 	    {
+@@ -171,14 +171,14 @@ add_standard_paths (const char *sysroot,
+ 		 prefix relative path, then we use gcc_exec_prefix instead 
+ 		 of the configured prefix.  */
+ 	      str = concat (gcc_exec_prefix, p->fname
+-			      + cpp_PREFIX_len, NULL);
+			      + cpp_PREFIX_len, (void *)0);
+ 	      str = update_path (str, p->component);
+ 	    }
 	  else
 	    str = update_path (p->fname, p->component);
 
--- a/lang/gcc/4.2/patches/patch-gcc_collect2_c
+++ b/lang/gcc/4.2/patches/patch-gcc_collect2_c
@ -1,6 +1,6 @@
-$OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/collect2.c.orig	Fri Aug 19 03:20:32 2005
-+++ gcc/collect2.c	Mon Sep 12 00:01:23 2005
+$OpenBSD: patch-gcc_collect2_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/collect2.c.orig	Wed Dec 13 10:28:16 2006
+++ gcc/collect2.c	Mon Feb 19 14:10:17 2007
@@ -753,19 +753,19 @@ main (int argc, char **argv)
      qualify the program name with the target machine.  */
 
@ -30,9 +30,9 @@ $OpenBSD: patch-gcc_collect2_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
@@ -958,7 +958,7 @@ main (int argc, char **argv)
   if (c_file_name == 0)
     {
- #ifdef CROSS_COMPILE
+ #ifdef CROSS_DIRECTORY_STRUCTURE
 -      c_file_name = concat (target_machine, "-gcc", NULL);
-+      c_file_name = concat (target_machine, "-gcc", (char *)0);
+      c_file_name = concat (target_machine, "-gcc", (void *)0);
 #else
       c_file_name = "gcc";
 #endif
--- a/lang/gcc/4.2/patches/patch-gcc_config_gcc
+++ b/lang/gcc/4.2/patches/patch-gcc_config_gcc
@ -1,6 +1,6 @@
--- gcc/config.gcc.orig	Tue Oct 10 09:50:29 2006
-+++ gcc/config.gcc	Fri Oct 20 13:47:16 2006
-@@ -612,7 +612,7 @@ alpha*-*-netbsd*)
+--- gcc/config.gcc.orig	Tue Mar  6 10:06:35 2007
+++ gcc/config.gcc	Mon Mar 12 11:37:52 2007
+@@ -628,7 +628,7 @@ alpha*-*-netbsd*)
 	;;
 alpha*-*-openbsd*)
 	tm_defines="${tm_defines} OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT"
@ -9,7 +9,7 @@
 	# default x-alpha is only appropriate for dec-osf.
 	target_cpu_default="MASK_GAS"
 	tmake_file="alpha/t-alpha alpha/t-ieee"
-@@ -1064,10 +1064,15 @@ i[34567]86-*-openbsd2.*|i[34567]86-*open
+@@ -1107,10 +1107,15 @@ i[34567]86-*-openbsd2.*|i[34567]86-*open
 	;;
 i[34567]86-*-openbsd*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
@ -26,16 +26,16 @@
 i[34567]86-*-coff*)
 	tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h dbxcoff.h i386/i386-coff.h"
 	use_fixproto=yes
-@@ -1458,7 +1463,7 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*
- m68k*-*-openbsd*)
+@@ -1528,7 +1533,7 @@ m68k*-*-openbsd*)
+ 	default_cf_cpu=5475
 	# needed to unconfuse gdb
- 	tm_defines="${tm_defines} OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)"
-	tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h"
-+	tm_file="m68k/m68k.h openbsd.h openbsd-libpthread.h m68k/openbsd.h"
+ 	tm_defines="${tm_defines} OBSD_OLD_GAS"
+-	tm_file="${tm_file} openbsd.h m68k/openbsd.h"
+	tm_file="${tm_file} openbsd.h openbsd-libpthread.h m68k/openbsd.h"
 	tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
 	# we need collect2 until our bug is fixed...
 	use_collect2=yes
-@@ -1548,7 +1553,7 @@ mips*-*-linux*)				# Linux MIPS, either 
+@@ -1637,7 +1642,7 @@ mips*-*-linux*)				# Linux MIPS, either 
 mips*-*-openbsd*)
 	tm_defines="${tm_defines} OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS"
 	target_cpu_default="MASK_ABICALLS"
@ -44,7 +44,7 @@
 	case ${target} in
 	mips*el-*-openbsd*)
 	    tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";;
-@@ -2128,7 +2133,7 @@ sparc-*-netbsdelf*)
+@@ -2224,7 +2229,7 @@ sparc-*-netbsdelf*)
 	extra_options="${extra_options} sparc/long-double-switch.opt"
 	;;
 sparc64-*-openbsd*)
@ -53,7 +53,7 @@
 	extra_options="${extra_options} sparc/little-endian.opt"
 	gas=yes gnu_ld=yes
 	with_cpu=ultrasparc
-@@ -2373,7 +2378,7 @@ vax-*-netbsd*)
+@@ -2477,7 +2482,7 @@ vax-*-netbsd*)
 	use_collect2=yes
 	;;
 vax-*-openbsd*)
--- a/lang/gcc/4.2/patches/patch-gcc_config_host
+++ b/lang/gcc/4.2/patches/patch-gcc_config_host
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_config_host,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/config.host.orig	Sat Sep 23 01:50:51 2006
-+++ gcc/config.host	Wed Oct 18 00:37:31 2006
-@@ -192,6 +192,10 @@ case ${host} in
+$OpenBSD: patch-gcc_config_host,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/config.host.orig	Tue Dec  5 17:04:35 2006
+++ gcc/config.host	Mon Feb 19 14:08:47 2007
+@@ -201,6 +201,10 @@ case ${host} in
     out_host_hook_obj=host-solaris.o
     host_xmake_file="${host_xmake_file} x-solaris"
     ;;
--- a/lang/gcc/4.2/patches/patch-gcc_config_i386_driver-i386_c
+++ b/lang/gcc/4.2/patches/patch-gcc_config_i386_driver-i386_c
@ -1,19 +1,29 @@
-$OpenBSD: patch-gcc_config_i386_driver-i386_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/config/i386/driver-i386.c.orig	Sat Sep 23 12:33:27 2006
-+++ gcc/config/i386/driver-i386.c	Wed Oct 18 00:37:31 2006
-@@ -158,13 +158,13 @@ const char *host_detect_local_cpu (int a
+$OpenBSD: patch-gcc_config_i386_driver-i386_c,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/config/i386/driver-i386.c.orig	Thu Mar  1 23:14:23 2007
+++ gcc/config/i386/driver-i386.c	Mon Mar 12 11:46:35 2007
+@@ -65,7 +65,7 @@ describe_cache (unsigned l1_sizekb, unsi
+   sprintf (size, "--param l1-cache-size=%u", size_in_lines);
+   sprintf (line, "--param l1-cache-line-size=%u", l1_line);
+ 
+-  return concat (size, " ", line, " ", NULL);
+  return concat (size, " ", line, " ", (void *)0);
+ }
+ 
+ /* Returns the description of caches for an AMD processor.  */
+@@ -417,7 +417,7 @@ const char *host_detect_local_cpu (int a
     }
 
 done:
-  return concat ("-m", argv[0], "=", cpu, NULL);
-+  return concat ("-m", argv[0], "=", cpu, (void *)0);
+-  return concat (cache, "-m", argv[0], "=", cpu, NULL);
+  return concat (cache, "-m", argv[0], "=", cpu, (void *)0);
 }
 #else
 /* If we aren't compiling with GCC we just provide a minimal
-    default value.  */
- const char *host_detect_local_cpu (int argc, const char **argv)
- {
-  return concat ("-m", argv[0], "=i386", NULL);
-+  return concat ("-m", argv[0], "=i386", (void *)0);
+@@ -443,6 +443,6 @@ const char *host_detect_local_cpu (int a
+   else
+     cpu = "generic";
+ 
+-  return concat ("-m", argv[0], "=", cpu, NULL);
+  return concat ("-m", argv[0], "=", cpu, (void *)0);
 }
 #endif /* GCC_VERSION */
--- a/lang/gcc/4.2/patches/patch-gcc_config_m68k_openbsd_h
+++ b/lang/gcc/4.2/patches/patch-gcc_config_m68k_openbsd_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_config_m68k_openbsd_h,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/config/m68k/openbsd.h.orig	Sat Jun 25 03:22:41 2005
-+++ gcc/config/m68k/openbsd.h	Sun Jul 23 18:43:23 2006
-@@ -44,16 +44,19 @@ Boston, MA 02110-1301, USA.  */
+$OpenBSD: patch-gcc_config_m68k_openbsd_h,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/config/m68k/openbsd.h.orig	Thu Jan 18 20:12:34 2007
+++ gcc/config/m68k/openbsd.h	Mon Feb 19 14:08:47 2007
+@@ -43,16 +43,19 @@ Boston, MA 02110-1301, USA.  */
 
 /* This must agree with <machine/ansi.h> */
 #undef SIZE_TYPE
--- a/lang/gcc/4.2/patches/patch-gcc_coverage_c
+++ b/lang/gcc/4.2/patches/patch-gcc_coverage_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_coverage_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/coverage.c.orig	Wed Jun 21 23:27:19 2006
-+++ gcc/coverage.c	Sun Jul 23 11:24:01 2006
-@@ -807,7 +807,7 @@ build_gcov_info (void)
+$OpenBSD: patch-gcc_coverage_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/coverage.c.orig	Fri Feb 16 00:50:49 2007
+++ gcc/coverage.c	Mon Feb 19 14:08:47 2007
+@@ -828,7 +828,7 @@ build_gcov_info (void)
   fields = field;
   filename = getpwd ();
   filename = (filename && da_file_name[0] != '/'
--- a/lang/gcc/4.2/patches/patch-gcc_cp_call_c
+++ b/lang/gcc/4.2/patches/patch-gcc_cp_call_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_cp_call_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/cp/call.c.orig	Wed Aug 30 06:33:10 2006
-+++ gcc/cp/call.c	Wed Oct 18 00:37:31 2006
-@@ -5265,7 +5265,7 @@ name_as_c_string (tree name, tree type, 
+$OpenBSD: patch-gcc_cp_call_c,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/cp/call.c.orig	Fri Mar  9 17:16:35 2007
+++ gcc/cp/call.c	Mon Mar 12 11:37:53 2007
+@@ -5326,7 +5326,7 @@ name_as_c_string (tree name, tree type, 
 	  || name == base_dtor_identifier
 	  || name == deleting_dtor_identifier)
 	{
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_cp_call_c,v 1.2 2006/10/20 13:43:18 espie Exp $
 	  /* Remember that we need to free the memory allocated.  */
 	  *free_p = true;
 	}
-@@ -5275,7 +5275,7 @@ name_as_c_string (tree name, tree type, 
+@@ -5336,7 +5336,7 @@ name_as_c_string (tree name, tree type, 
       pretty_name = concat ("operator ",
 			    type_as_string (TREE_TYPE (name),
 					    TFF_PLAIN_IDENTIFIER),
--- a/lang/gcc/4.2/patches/patch-gcc_cp_decl2_c
+++ b/lang/gcc/4.2/patches/patch-gcc_cp_decl2_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_cp_decl2_c,v 1.3 2006/11/25 16:26:46 espie Exp $
--- gcc/cp/decl2.c.orig	Fri Oct 20 22:13:42 2006
-+++ gcc/cp/decl2.c	Mon Oct 30 12:43:37 2006
-@@ -3015,7 +3015,7 @@ build_java_method_aliases (void)
+$OpenBSD: patch-gcc_cp_decl2_c,v 1.4 2007/03/17 21:58:46 espie Exp $
+--- gcc/cp/decl2.c.orig	Mon Feb 26 22:14:24 2007
+++ gcc/cp/decl2.c	Mon Mar 12 11:37:53 2007
+@@ -2969,7 +2969,7 @@ build_java_method_aliases (void)
 	  oid = DECL_ASSEMBLER_NAME (fndecl);
 	  oname = IDENTIFIER_POINTER (oid);
 	  gcc_assert (oname[0] == '_' && oname[1] == 'Z');
--- a/lang/gcc/4.2/patches/patch-gcc_cp_parser_c
+++ b/lang/gcc/4.2/patches/patch-gcc_cp_parser_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_cp_parser_c,v 1.3 2006/11/25 16:26:46 espie Exp $
--- gcc/cp/parser.c.orig	Wed Oct 18 01:22:14 2006
-+++ gcc/cp/parser.c	Mon Oct 30 12:43:38 2006
-@@ -16381,7 +16381,7 @@ cp_parser_require (cp_parser* parser,
+$OpenBSD: patch-gcc_cp_parser_c,v 1.4 2007/03/17 21:58:46 espie Exp $
+--- gcc/cp/parser.c.orig	Sat Mar  3 16:32:13 2007
+++ gcc/cp/parser.c	Mon Mar 12 11:37:53 2007
+@@ -16673,7 +16673,7 @@ cp_parser_require (cp_parser* parser,
       /* Output the MESSAGE -- unless we're parsing tentatively.  */
       if (!cp_parser_simulate_error (parser))
 	{
--- a/lang/gcc/4.2/patches/patch-gcc_diagnostic_c
+++ b/lang/gcc/4.2/patches/patch-gcc_diagnostic_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_diagnostic_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/diagnostic.c.orig	Wed Mar 22 20:36:22 2006
-+++ gcc/diagnostic.c	Sun Jul 23 11:24:02 2006
-@@ -398,7 +398,7 @@ diagnostic_report_diagnostic (diagnostic
+$OpenBSD: patch-gcc_diagnostic_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/diagnostic.c.orig	Tue Feb 20 11:18:58 2007
+++ gcc/diagnostic.c	Mon Mar 12 11:37:53 2007
+@@ -412,7 +412,7 @@ diagnostic_report_diagnostic (diagnostic
       if (context->show_option_requested && diagnostic->option_index)
 	diagnostic->message.format_spec
 	  = ACONCAT ((diagnostic->message.format_spec,
--- a/lang/gcc/4.2/patches/patch-gcc_gcc_c
+++ b/lang/gcc/4.2/patches/patch-gcc_gcc_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/gcc.c.orig	Sun Jul 23 11:28:40 2006
-+++ gcc/gcc.c	Sun Jul 23 11:30:25 2006
-@@ -1313,7 +1313,7 @@ translate_options (int *argcp, const cha
+$OpenBSD: patch-gcc_gcc_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/gcc.c.orig	Tue Mar  6 16:50:28 2007
+++ gcc/gcc.c	Mon Mar 12 14:55:44 2007
+@@ -1322,7 +1322,7 @@ translate_options (int *argcp, const cha
 		  /* Store the translation as one argv elt or as two.  */
 		  if (arg != 0 && strchr (arginfo, 'j') != 0)
 		    newv[newindex++] = concat (option_map[j].equivalent, arg,
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 		  else if (arg != 0)
 		    {
 		      newv[newindex++] = option_map[j].equivalent;
-@@ -1642,7 +1642,7 @@ init_gcc_specs (struct obstack *obstack,
+@@ -1660,7 +1660,7 @@ init_gcc_specs (struct obstack *obstack,
 		"%{shared:", shared_name, "}"
 #endif
 #endif
@ -19,7 +19,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 
   obstack_grow (obstack, buf, strlen (buf));
   free (buf);
-@@ -1840,7 +1840,7 @@ set_spec (const char *name, const char *
+@@ -1858,7 +1858,7 @@ set_spec (const char *name, const char *
 
   old_spec = *(sl->ptr_spec);
   *(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
@ -28,7 +28,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 		     : xstrdup (spec));
 
 #ifdef DEBUG_SPECS
-@@ -2410,12 +2410,12 @@ for_each_path (const struct path_prefix 
+@@ -2428,12 +2428,12 @@ for_each_path (const struct path_prefix 
   just_multi_suffix = just_machine_suffix;
   if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
     {
@ -45,7 +45,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 
   while (1)
     {
-@@ -2761,8 +2761,8 @@ add_sysrooted_prefix (struct path_prefix
+@@ -2780,8 +2780,8 @@ add_sysrooted_prefix (struct path_prefix
   if (target_system_root)
     {
       if (target_sysroot_suffix)
@ -56,7 +56,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 
       /* We have to override this because GCC's notion of sysroot
 	 moves along with GCC.  */
-@@ -3344,7 +3344,7 @@ process_command (int argc, const char **
+@@ -3367,7 +3367,7 @@ process_command (int argc, const char **
 	  break;
       new_argv0 = xmemdup (progname, baselen,
 			   baselen + concat_length (new_version, new_machine,
@ -65,7 +65,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
       strcpy (new_argv0 + baselen, new_machine);
       strcat (new_argv0, "-gcc-");
       strcat (new_argv0, new_version);
-@@ -3371,7 +3371,7 @@ process_command (int argc, const char **
+@@ -3394,7 +3394,7 @@ process_command (int argc, const char **
 						 standard_bindir_prefix,
 						 standard_libexec_prefix);
       if (gcc_exec_prefix)
@ -74,7 +74,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
     }
   else
     {
-@@ -3379,7 +3379,7 @@ process_command (int argc, const char **
+@@ -3402,7 +3402,7 @@ process_command (int argc, const char **
 	 GCC_EXEC_PREFIX is typically a directory name with a trailing
 	 / (which is ignored by make_relative_prefix), so append a
 	 program name.  */
@ -83,7 +83,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
       gcc_libexec_prefix = make_relative_prefix (tmp_prefix,
 						 standard_exec_prefix,
 						 standard_libexec_prefix);
-@@ -3426,7 +3426,7 @@ process_command (int argc, const char **
+@@ -3457,7 +3457,7 @@ process_command (int argc, const char **
 	    {
 	      strncpy (nstore, startp, endp - startp);
 	      if (endp == startp)
@ -92,7 +92,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 	      else if (!IS_DIR_SEPARATOR (endp[-1]))
 		{
 		  nstore[endp - startp] = DIR_SEPARATOR;
-@@ -3460,7 +3460,7 @@ process_command (int argc, const char **
+@@ -3491,7 +3491,7 @@ process_command (int argc, const char **
 	    {
 	      strncpy (nstore, startp, endp - startp);
 	      if (endp == startp)
@ -101,7 +101,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 	      else if (!IS_DIR_SEPARATOR (endp[-1]))
 		{
 		  nstore[endp - startp] = DIR_SEPARATOR;
-@@ -3493,7 +3493,7 @@ process_command (int argc, const char **
+@@ -3524,7 +3524,7 @@ process_command (int argc, const char **
 	    {
 	      strncpy (nstore, startp, endp - startp);
 	      if (endp == startp)
@ -110,39 +110,20 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 	      else if (!IS_DIR_SEPARATOR (endp[-1]))
 		{
 		  nstore[endp - startp] = DIR_SEPARATOR;
-@@ -3958,7 +3958,7 @@ warranty; not even for MERCHANTABILITY o
- 	      PREFIX_PRIORITY_LAST, 1, 0);
+@@ -3992,20 +3992,20 @@ warranty; not even for MERCHANTABILITY o
 
+   gcc_assert (!IS_ABSOLUTE_PATH (tooldir_base_prefix));
   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
 -			   dir_separator_str, NULL);
 +			   dir_separator_str, (void *)0);
 
-   /* If tooldir is relative, base it on exec_prefixes.  A relative
-      tooldir lets us move the installed tree as a unit.
-@@ -3973,28 +3973,28 @@ warranty; not even for MERCHANTABILITY o
- 	{
- 	  char *gcc_exec_tooldir_prefix
- 	    = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
-		      spec_version, dir_separator_str, tooldir_prefix, NULL);
-+		      spec_version, dir_separator_str, tooldir_prefix, (void *)0);
- 
- 	  add_prefix (&exec_prefixes,
- 		      concat (gcc_exec_tooldir_prefix, "bin",
-			      dir_separator_str, NULL),
-+			      dir_separator_str, (void *)0),
- 		      NULL, PREFIX_PRIORITY_LAST, 0, 0);
- 	  add_prefix (&startfile_prefixes,
- 		      concat (gcc_exec_tooldir_prefix, "lib",
-			      dir_separator_str, NULL),
-+			      dir_separator_str, (void *)0),
- 		      NULL, PREFIX_PRIORITY_LAST, 0, 1);
- 	}
- 
-       tooldir_prefix = concat (standard_exec_prefix, spec_machine,
- 			       dir_separator_str, spec_version,
-			       dir_separator_str, tooldir_prefix, NULL);
-+			       dir_separator_str, tooldir_prefix, (void *)0);
-     }
+   /* Look for tools relative to the location from which the driver is
+      running, or, if that is not available, the configured prefix.  */
+   tooldir_prefix
+     = concat (gcc_exec_prefix ? gcc_exec_prefix : standard_exec_prefix,
+ 	      spec_machine, dir_separator_str,
+-	      spec_version, dir_separator_str, tooldir_prefix, NULL);
+	      spec_version, dir_separator_str, tooldir_prefix, (void *)0);
 
   add_prefix (&exec_prefixes,
 -	      concat (tooldir_prefix, "bin", dir_separator_str, NULL),
@ -154,7 +135,7 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
 
 #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
-@@ -4118,7 +4118,7 @@ warranty; not even for MERCHANTABILITY o
+@@ -4127,7 +4127,7 @@ warranty; not even for MERCHANTABILITY o
 	{ /* POSIX allows separation of -l and the lib arg;
 	     canonicalize by concatenating -l with its arg */
 	  infiles[n_infiles].language = "*";
@ -163,7 +144,16 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 	}
       else if (strncmp (argv[i], "-l", 2) == 0)
 	{
-@@ -6199,8 +6199,8 @@ main (int argc, char **argv)
+@@ -4991,7 +4991,7 @@ do_spec_1 (const char *spec, int inswitc
+ 	      info.append = "include-fixed";
+ 	      if (*sysroot_hdrs_suffix_spec)
+ 		info.append = concat (info.append, dir_separator_str,
+-				      multilib_dir, NULL);
+				      multilib_dir, (void *)0);
+ 	      info.append_len = strlen (info.append);
+ 	      for_each_path (&include_prefixes, false, info.append_len,
+ 			     spec_path, &info);
+@@ -6196,8 +6196,8 @@ main (int argc, char **argv)
   /* Read specs from a file if there is one.  */
 
   machine_suffix = concat (spec_machine, dir_separator_str,
@ -174,22 +164,16 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 
   specs_file = find_a_file (&startfile_prefixes, "specs", R_OK, true);
   /* Read the specs file unless it is a default one.  */
-@@ -6314,12 +6314,12 @@ main (int argc, char **argv)
- 	  if (gcc_exec_prefix)
- 	    add_prefix (&startfile_prefixes,
- 			concat (gcc_exec_prefix, machine_suffix,
-				standard_startfile_prefix, NULL),
-+				standard_startfile_prefix, (void *)0),
- 			NULL, PREFIX_PRIORITY_LAST, 0, 1);
- 	  add_prefix (&startfile_prefixes,
- 		      concat (standard_exec_prefix,
- 			      machine_suffix,
+@@ -6312,7 +6312,7 @@ main (int argc, char **argv)
+ 		      concat (gcc_exec_prefix 
+ 			      ? gcc_exec_prefix : standard_exec_prefix, 
+ 			      machine_suffix, 
 -			      standard_startfile_prefix, NULL),
 +			      standard_startfile_prefix, (void *)0),
 		      NULL, PREFIX_PRIORITY_LAST, 0, 1);
 	}
 
-@@ -6345,7 +6345,7 @@ main (int argc, char **argv)
+@@ -6340,7 +6340,7 @@ main (int argc, char **argv)
   /* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake.  */
   if (gcc_exec_prefix)
     gcc_exec_prefix = concat (gcc_exec_prefix, spec_machine, dir_separator_str,
@ -198,3 +182,12 @@ $OpenBSD: patch-gcc_gcc_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
 
   /* Now we have the specs.
      Set the `valid' bits for switches that match anything in any spec.  */
+@@ -7675,7 +7675,7 @@ getenv_spec_function (int argc, const ch
+   if (!value)
+     fatal ("environment variable \"%s\" not defined", argv[0]);
+ 
+-  return concat (value, argv[1], NULL);
+  return concat (value, argv[1], (void *)0);
+ }
+ 
+ /* if-exists built-in spec function.
--- a/lang/gcc/4.2/patches/patch-gcc_omp-low_c
+++ b/lang/gcc/4.2/patches/patch-gcc_omp-low_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_omp-low_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/omp-low.c.orig	Tue Aug 15 16:57:52 2006
-+++ gcc/omp-low.c	Wed Oct 18 00:37:31 2006
-@@ -3867,7 +3867,7 @@ lower_omp_critical (tree *stmt_p, omp_co
+$OpenBSD: patch-gcc_omp-low_c,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/omp-low.c.orig	Fri Feb 16 00:50:49 2007
+++ gcc/omp-low.c	Mon Feb 19 14:08:48 2007
+@@ -3894,7 +3894,7 @@ lower_omp_critical (tree *stmt_p, omp_co
 	  decl = create_tmp_var_raw (ptr_type_node, NULL);
 
 	  new_str = ACONCAT ((".gomp_critical_user_",
--- a/lang/gcc/4.2/patches/patch-gcc_passes_c
+++ b/lang/gcc/4.2/patches/patch-gcc_passes_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_passes_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/passes.c.orig	Thu May  4 11:19:02 2006
-+++ gcc/passes.c	Sun Jul 23 11:27:56 2006
-@@ -317,7 +317,7 @@ register_one_dump_file (struct tree_opt_
+$OpenBSD: patch-gcc_passes_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/passes.c.orig	Wed Feb 14 22:54:44 2007
+++ gcc/passes.c	Mon Feb 19 14:08:48 2007
+@@ -319,7 +319,7 @@ register_one_dump_file (struct tree_opt_
     sprintf (num, "%d", ((int) pass->static_pass_number < 0
 			 ? 1 : pass->static_pass_number));
 
@ -10,7 +10,7 @@ $OpenBSD: patch-gcc_passes_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
   if (ipa)
     prefix = "ipa-", flags = TDF_IPA;
   else if (properties & PROP_trees)
-@@ -325,8 +325,8 @@ register_one_dump_file (struct tree_opt_
+@@ -327,8 +327,8 @@ register_one_dump_file (struct tree_opt_
   else
     prefix = "rtl-", flags = TDF_RTL;
 
--- a/lang/gcc/4.2/patches/patch-gcc_tree-dump_c
+++ b/lang/gcc/4.2/patches/patch-gcc_tree-dump_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree-dump_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/tree-dump.c.orig	Thu Mar 16 20:47:19 2006
-+++ gcc/tree-dump.c	Sun Jul 23 11:24:02 2006
-@@ -867,7 +867,7 @@ get_dump_file_name (enum tree_dump_index
+$OpenBSD: patch-gcc_tree-dump_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/tree-dump.c.orig	Mon Feb 19 05:12:49 2007
+++ gcc/tree-dump.c	Mon Mar 12 11:37:54 2007
+@@ -885,7 +885,7 @@ get_dump_file_name (enum tree_dump_index
 	dump_id[0] = '\0';
     }
 
--- a/lang/gcc/4.2/patches/patch-gcc_tree-mudflap_c
+++ b/lang/gcc/4.2/patches/patch-gcc_tree-mudflap_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree-mudflap_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/tree-mudflap.c.orig	Sat Apr 22 18:22:54 2006
-+++ gcc/tree-mudflap.c	Sun Jul 23 11:24:02 2006
-@@ -236,7 +236,7 @@ mf_file_function_line_tree (location_t l
+$OpenBSD: patch-gcc_tree-mudflap_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/tree-mudflap.c.orig	Thu Mar  8 20:02:51 2007
+++ gcc/tree-mudflap.c	Mon Mar 12 11:37:54 2007
+@@ -237,7 +237,7 @@ mf_file_function_line_tree (location_t l
   else
     op = name = cp = "";
 
--- a/lang/gcc/4.2/patches/patch-gcc_tree-nested_c
+++ b/lang/gcc/4.2/patches/patch-gcc_tree-nested_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree-nested_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/tree-nested.c.orig	Tue Sep 26 20:10:58 2006
-+++ gcc/tree-nested.c	Wed Oct 18 00:37:31 2006
-@@ -222,7 +222,7 @@ get_frame_type (struct nesting_info *inf
+$OpenBSD: patch-gcc_tree-nested_c,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/tree-nested.c.orig	Fri Feb 16 00:50:49 2007
+++ gcc/tree-nested.c	Mon Feb 19 14:08:48 2007
+@@ -205,7 +205,7 @@ get_frame_type (struct nesting_info *inf
 
       name = concat ("FRAME.",
 		     IDENTIFIER_POINTER (DECL_NAME (info->context)),
--- a/lang/gcc/4.2/patches/patch-gcc_tree-ssa-pre_c
+++ b/lang/gcc/4.2/patches/patch-gcc_tree-ssa-pre_c
@ -0,0 +1,15 @@
+$OpenBSD: patch-gcc_tree-ssa-pre_c,v 1.1 2007/03/17 21:58:46 espie Exp $
+--- gcc/tree-ssa-pre.c.orig	Mon Feb 19 18:40:03 2007
+++ gcc/tree-ssa-pre.c	Mon Feb 19 18:40:44 2007
+@@ -3221,8 +3221,10 @@ create_value_expr_from (tree expr, basic
+     pool = binary_node_pool;
+   else if (TREE_CODE_CLASS (code) == tcc_comparison)
+     pool = comparison_node_pool;
+-  else
+  else {
+     gcc_assert (code == CALL_EXPR);
+    pool = 0;
+  }
+ 
+   if (code == CALL_EXPR)
+     vexpr = temp_copy_call_expr (expr);
--- a/lang/gcc/4.2/patches/patch-gcc_tree-vect-transform_c
+++ b/lang/gcc/4.2/patches/patch-gcc_tree-vect-transform_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree-vect-transform_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/tree-vect-transform.c.orig	Sun May 28 19:46:46 2006
-+++ gcc/tree-vect-transform.c	Sun Jul 23 11:24:02 2006
-@@ -105,7 +105,7 @@ vect_get_new_vect_var (tree type, enum v
+$OpenBSD: patch-gcc_tree-vect-transform_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/tree-vect-transform.c.orig	Fri Feb 16 00:50:49 2007
+++ gcc/tree-vect-transform.c	Mon Feb 19 14:08:49 2007
+@@ -103,7 +103,7 @@ vect_get_new_vect_var (tree type, enum v
   }
 
   if (name)
--- a/lang/gcc/4.2/patches/patch-gcc_tree_c
+++ b/lang/gcc/4.2/patches/patch-gcc_tree_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_tree_c,v 1.2 2006/10/20 13:43:18 espie Exp $
--- gcc/tree.c.orig	Fri Oct 13 17:59:03 2006
-+++ gcc/tree.c	Wed Oct 18 00:37:32 2006
-@@ -6796,11 +6796,11 @@ build_common_builtin_nodes (void)
+$OpenBSD: patch-gcc_tree_c,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- gcc/tree.c.orig	Sun Mar  4 13:57:13 2007
+++ gcc/tree.c	Mon Mar 12 11:37:54 2007
+@@ -7204,11 +7204,11 @@ build_common_builtin_nodes (void)
 	  *q = TOLOWER (*p);
 	*q = '\0';
 
--- a/lang/gcc/4.2/patches/patch-gcc_varasm_c
+++ b/lang/gcc/4.2/patches/patch-gcc_varasm_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-gcc_varasm_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
--- gcc/varasm.c.orig	Thu Jul 13 22:49:34 2006
-+++ gcc/varasm.c	Sun Jul 23 11:24:03 2006
-@@ -397,7 +397,7 @@ initialize_cold_section_name (void)
+$OpenBSD: patch-gcc_varasm_c,v 1.2 2007/03/17 21:58:46 espie Exp $
+--- gcc/varasm.c.orig	Thu Feb 15 11:33:59 2007
+++ gcc/varasm.c	Mon Feb 19 14:08:49 2007
+@@ -633,7 +633,7 @@ initialize_cold_section_name (void)
 
       stripped_name = targetm.strip_name_encoding (name);
 
--- a/lang/gcc/4.2/patches/patch-libgfortran_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-libgfortran_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-libgfortran_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp $
--- libgfortran/Makefile.in.orig	Sat Oct 14 19:45:54 2006
-+++ libgfortran/Makefile.in	Wed Oct 18 00:39:32 2006
-@@ -369,7 +369,8 @@ toolexeclibdir = @toolexeclibdir@
+$OpenBSD: patch-libgfortran_Makefile_in,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- libgfortran/Makefile.in.orig	Fri Mar  9 23:36:08 2007
+++ libgfortran/Makefile.in	Mon Mar 12 11:37:54 2007
+@@ -390,7 +390,8 @@ toolexeclibdir = @toolexeclibdir@
 ACLOCAL_AMFLAGS = -I ../config
 gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
 toolexeclib_LTLIBRARIES = libgfortran.la
--- a/lang/gcc/4.2/patches/patch-libobjc_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-libobjc_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-libobjc_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp $
--- libobjc/Makefile.in.orig	Sun Oct 15 09:42:57 2006
-+++ libobjc/Makefile.in	Sat Nov 25 16:49:40 2006
-@@ -273,15 +273,17 @@ doc: info dvi pdf html
- .PHONY: install-html
+$OpenBSD: patch-libobjc_Makefile_in,v 1.4 2007/03/17 21:58:46 espie Exp $
+--- libobjc/Makefile.in.orig	Fri Mar  2 00:58:28 2007
+++ libobjc/Makefile.in	Mon Mar 12 11:37:54 2007
+@@ -274,15 +274,17 @@ doc: info dvi pdf html
 install-html:
+ install-pdf:
 
 +include $(top_srcdir)/../libversions
 +
--- a/lang/gcc/4.2/patches/patch-libssp_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-libssp_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-libssp_Makefile_in,v 1.2 2006/10/20 13:43:18 espie Exp $
--- libssp/Makefile.in.orig	Fri Sep 29 23:18:51 2006
-+++ libssp/Makefile.in	Wed Oct 18 00:37:32 2006
-@@ -231,9 +231,10 @@ libssp_la_SOURCES = \
+$OpenBSD: patch-libssp_Makefile_in,v 1.3 2007/03/17 21:58:46 espie Exp $
+--- libssp/Makefile.in.orig	Fri Mar  2 00:50:30 2007
+++ libssp/Makefile.in	Mon Mar 12 11:37:54 2007
+@@ -230,9 +230,10 @@ libssp_la_SOURCES = \
 	strcat-chk.c strcpy-chk.c strncat-chk.c strncpy-chk.c \
 	vsnprintf-chk.c vsprintf-chk.c
 
--- a/lang/gcc/4.2/patches/patch-libstdc++-v3_libsupc++_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-libstdc++-v3_libsupc++_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp $
--- libstdc++-v3/libsupc++/Makefile.in.orig	Mon Oct 16 21:08:22 2006
-+++ libstdc++-v3/libsupc++/Makefile.in	Mon Oct 30 12:43:40 2006
-@@ -308,7 +308,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.4 2007/03/17 21:58:46 espie Exp $
+--- libstdc++-v3/libsupc++/Makefile.in.orig	Sun Mar  4 23:59:49 2007
+++ libstdc++-v3/libsupc++/Makefile.in	Mon Mar 12 11:37:54 2007
+@@ -317,7 +317,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
 # Need this library to both be part of libstdc++.a, and installed
 # separately too.
 # 1) separate libsupc++.la
@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.3 2006/11/25 16:26:46 esp
 # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
 noinst_LTLIBRARIES = libsupc++convenience.la
 headers = \
-@@ -489,7 +489,7 @@ clean-toolexeclibLTLIBRARIES:
+@@ -498,7 +498,7 @@ clean-toolexeclibLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
--- a/lang/gcc/4.2/patches/patch-libstdc++-v3_src_Makefile_in
+++ b/lang/gcc/4.2/patches/patch-libstdc++-v3_src_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp $
--- libstdc++-v3/src/Makefile.in.orig	Mon Oct 16 21:08:22 2006
-+++ libstdc++-v3/src/Makefile.in	Mon Oct 30 12:43:40 2006
-@@ -300,7 +300,7 @@ WARN_CXXFLAGS = \
+$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.4 2007/03/17 21:58:46 espie Exp $
+--- libstdc++-v3/src/Makefile.in.orig	Sun Mar  4 23:59:49 2007
+++ libstdc++-v3/src/Makefile.in	Mon Mar 12 11:37:54 2007
+@@ -309,7 +309,7 @@ WARN_CXXFLAGS = \
 AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
 
 # Cross compiler support.
@ -10,7 +10,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp
 @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
 @ENABLE_SYMVERS_FALSE@version_arg = 
 @ENABLE_SYMVERS_GNU_NAMESPACE_TRUE@@ENABLE_SYMVERS_TRUE@version_arg = -Wl,--version-script=libstdc++-symbols.ver
-@@ -386,9 +386,11 @@ libstdc___la_LIBADD = \
+@@ -395,9 +395,11 @@ libstdc___la_LIBADD = \
 	$(top_builddir)/libmath/libmath.la \
 	$(top_builddir)/libsupc++/libsupc++convenience.la
 
@ -23,7 +23,7 @@ $OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.3 2006/11/25 16:26:46 espie Exp
 
 
 # Use special rules for the deprecated source files so that they find
-@@ -500,7 +502,7 @@ clean-toolexeclibLTLIBRARIES:
+@@ -509,7 +511,7 @@ clean-toolexeclibLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
--- a/lang/gcc/4.2/pkg/PFRAG.I386-main
+++ b/lang/gcc/4.2/pkg/PFRAG.I386-main
@ -1,13 +1,9 @@
-@comment $OpenBSD: PFRAG.I386-main,v 1.1 2006/11/25 16:26:46 espie Exp $
+@comment $OpenBSD: PFRAG.I386-main,v 1.2 2007/03/17 21:58:46 espie Exp $
+lib/gcc/${CONFIG}/${V}/include/ammintrin.h
 lib/gcc/${CONFIG}/${V}/include/emmintrin.h
 lib/gcc/${CONFIG}/${V}/include/mm3dnow.h
 lib/gcc/${CONFIG}/${V}/include/mm_malloc.h
 lib/gcc/${CONFIG}/${V}/include/mmintrin.h
 lib/gcc/${CONFIG}/${V}/include/pmmintrin.h
+lib/gcc/${CONFIG}/${V}/include/tmmintrin.h
 lib/gcc/${CONFIG}/${V}/include/xmmintrin.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/emmintrin.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/mm3dnow.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/mm_malloc.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/mmintrin.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/pmmintrin.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/xmmintrin.h
--- a/lang/gcc/4.2/pkg/PLIST-ada
+++ b/lang/gcc/4.2/pkg/PLIST-ada
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-ada,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+@comment $OpenBSD: PLIST-ada,v 1.2 2007/03/17 21:58:46 espie Exp $
 bin/gnat
 bin/gnatbind
 bin/gnatbl
@ -19,10 +19,16 @@ bin/gprmake
 lib/gcc/${CONFIG}/${V}/adainclude/
 lib/gcc/${CONFIG}/${V}/adainclude/a-astaco.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-astaco.ads
+lib/gcc/${CONFIG}/${V}/adainclude/a-calari.adb
+lib/gcc/${CONFIG}/${V}/adainclude/a-calari.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-caldel.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-caldel.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-calend.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-calend.ads
+lib/gcc/${CONFIG}/${V}/adainclude/a-calfor.adb
+lib/gcc/${CONFIG}/${V}/adainclude/a-calfor.ads
+lib/gcc/${CONFIG}/${V}/adainclude/a-catizo.adb
+lib/gcc/${CONFIG}/${V}/adainclude/a-catizo.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-cdlili.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-cdlili.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-cgaaso.adb
@ -86,6 +92,8 @@ lib/gcc/${CONFIG}/${V}/adainclude/a-crbtgk.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-crbtgk.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-crbtgo.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-crbtgo.ads
+lib/gcc/${CONFIG}/${V}/adainclude/a-crdlli.adb
+lib/gcc/${CONFIG}/${V}/adainclude/a-crdlli.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-cwila1.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-cwila9.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-decima.adb
@ -96,8 +104,11 @@ lib/gcc/${CONFIG}/${V}/adainclude/a-direct.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-direct.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-direio.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-direio.ads
+lib/gcc/${CONFIG}/${V}/adainclude/a-diroro.adb
+lib/gcc/${CONFIG}/${V}/adainclude/a-diroro.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-dirval.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-dirval.ads
+lib/gcc/${CONFIG}/${V}/adainclude/a-dispat.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-dynpri.adb
 lib/gcc/${CONFIG}/${V}/adainclude/a-dynpri.ads
 lib/gcc/${CONFIG}/${V}/adainclude/a-einuoc.adb
@ -613,6 +624,7 @@ lib/gcc/${CONFIG}/${V}/adainclude/s-crc32.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-crtl.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-direio.adb
 lib/gcc/${CONFIG}/${V}/adainclude/s-direio.ads
+lib/gcc/${CONFIG}/${V}/adainclude/s-dsaser.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-errrep.adb
 lib/gcc/${CONFIG}/${V}/adainclude/s-errrep.ads
 lib/gcc/${CONFIG}/${V}/adainclude/s-exctab.adb
@ -999,8 +1011,11 @@ lib/gcc/${CONFIG}/${V}/adainclude/text_io.ads
 lib/gcc/${CONFIG}/${V}/adainclude/unchconv.ads
 lib/gcc/${CONFIG}/${V}/adainclude/unchdeal.ads
 lib/gcc/${CONFIG}/${V}/adalib/
+lib/gcc/${CONFIG}/${V}/adalib/a-calari.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-caldel.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-calend.ali
+lib/gcc/${CONFIG}/${V}/adalib/a-calfor.ali
+lib/gcc/${CONFIG}/${V}/adalib/a-catizo.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-cdlili.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-cgaaso.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-cgarso.ali
@ -1037,13 +1052,16 @@ lib/gcc/${CONFIG}/${V}/adalib/a-coteio.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-crbltr.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-crbtgk.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-crbtgo.ali
+lib/gcc/${CONFIG}/${V}/adalib/a-crdlli.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-cwila1.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-cwila9.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-decima.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-diocst.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-direct.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-direio.ali
+lib/gcc/${CONFIG}/${V}/adalib/a-diroro.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-dirval.ali
+lib/gcc/${CONFIG}/${V}/adalib/a-dispat.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-dynpri.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-einuoc.ali
 lib/gcc/${CONFIG}/${V}/adalib/a-elchha.ali
@ -1343,6 +1361,7 @@ lib/gcc/${CONFIG}/${V}/adalib/s-chepoo.ali
 lib/gcc/${CONFIG}/${V}/adalib/s-crc32.ali
 lib/gcc/${CONFIG}/${V}/adalib/s-crtl.ali
 lib/gcc/${CONFIG}/${V}/adalib/s-direio.ali
+lib/gcc/${CONFIG}/${V}/adalib/s-dsaser.ali
 lib/gcc/${CONFIG}/${V}/adalib/s-errrep.ali
 lib/gcc/${CONFIG}/${V}/adalib/s-exctab.ali
 lib/gcc/${CONFIG}/${V}/adalib/s-exnint.ali
--- a/lang/gcc/4.2/pkg/PLIST-c++
+++ b/lang/gcc/4.2/pkg/PLIST-c++
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-c++,v 1.2 2006/10/20 13:43:18 espie Exp $
+@comment $OpenBSD: PLIST-c++,v 1.3 2007/03/17 21:58:46 espie Exp $
 bin/ec++
 bin/eg++
 bin/${CONFIG}-ec++
@ -6,6 +6,7 @@ bin/${CONFIG}-eg++
 include/c++/
 include/c++/${V}/
 include/c++/${V}/algorithm
+include/c++/${V}/array
 include/c++/${V}/backward/
 include/c++/${V}/backward/algo.h
 include/c++/${V}/backward/algobase.h
@ -108,22 +109,30 @@ include/c++/${V}/bits/valarray_array.tcc
 include/c++/${V}/bits/valarray_before.h
 include/c++/${V}/bits/vector.tcc
 include/c++/${V}/bitset
+include/c++/${V}/c++0x_warning.h
 include/c++/${V}/cassert
+include/c++/${V}/ccomplex
 include/c++/${V}/cctype
 include/c++/${V}/cerrno
+include/c++/${V}/cfenv
 include/c++/${V}/cfloat
+include/c++/${V}/cinttypes
 include/c++/${V}/ciso646
 include/c++/${V}/climits
 include/c++/${V}/clocale
 include/c++/${V}/cmath
 include/c++/${V}/complex
+include/c++/${V}/complex.h
 include/c++/${V}/csetjmp
 include/c++/${V}/csignal
 include/c++/${V}/cstdarg
+include/c++/${V}/cstdbool
 include/c++/${V}/cstddef
+include/c++/${V}/cstdint
 include/c++/${V}/cstdio
 include/c++/${V}/cstdlib
 include/c++/${V}/cstring
+include/c++/${V}/ctgmath
 include/c++/${V}/ctime
 include/c++/${V}/cwchar
 include/c++/${V}/cwctype
@ -165,6 +174,7 @@ include/c++/${V}/ext/bitmap_allocator.h
 include/c++/${V}/ext/codecvt_specializations.h
 include/c++/${V}/ext/concurrence.h
 include/c++/${V}/ext/debug_allocator.h
+include/c++/${V}/ext/enc_filebuf.h
 include/c++/${V}/ext/functional
 include/c++/${V}/ext/hash_fun.h
 include/c++/${V}/ext/hash_map
@ -521,17 +531,21 @@ include/c++/${V}/new
 include/c++/${V}/numeric
 include/c++/${V}/ostream
 include/c++/${V}/queue
+include/c++/${V}/random
+include/c++/${V}/regex
 include/c++/${V}/set
 include/c++/${V}/sstream
 include/c++/${V}/stack
 include/c++/${V}/stdexcept
 include/c++/${V}/streambuf
 include/c++/${V}/string
+include/c++/${V}/tgmath.h
 include/c++/${V}/tr1/
 include/c++/${V}/tr1/array
 include/c++/${V}/tr1/bind_iterate.h
 include/c++/${V}/tr1/bind_repeat.h
 include/c++/${V}/tr1/boost_shared_ptr.h
+include/c++/${V}/tr1/ccomplex
 include/c++/${V}/tr1/cctype
 include/c++/${V}/tr1/cfenv
 include/c++/${V}/tr1/cfloat
@ -540,6 +554,7 @@ include/c++/${V}/tr1/climits
 include/c++/${V}/tr1/cmath
 include/c++/${V}/tr1/common.h
 include/c++/${V}/tr1/complex
+include/c++/${V}/tr1/complex.h
 include/c++/${V}/tr1/cstdarg
 include/c++/${V}/tr1/cstdbool
 include/c++/${V}/tr1/cstdint
@ -553,6 +568,7 @@ include/c++/${V}/tr1/cwctype
 include/c++/${V}/tr1/fenv.h
 include/c++/${V}/tr1/float.h
 include/c++/${V}/tr1/functional
+include/c++/${V}/tr1/functional_hash.h
 include/c++/${V}/tr1/functional_iterate.h
 include/c++/${V}/tr1/hashtable
 include/c++/${V}/tr1/hashtable_policy.h
@ -565,6 +581,7 @@ include/c++/${V}/tr1/random
 include/c++/${V}/tr1/random.tcc
 include/c++/${V}/tr1/ref_fwd.h
 include/c++/${V}/tr1/ref_wrap_iterate.h
+include/c++/${V}/tr1/regex
 include/c++/${V}/tr1/repeat.h
 include/c++/${V}/tr1/stdarg.h
 include/c++/${V}/tr1/stdbool.h
@ -573,6 +590,7 @@ include/c++/${V}/tr1/stdio.h
 include/c++/${V}/tr1/stdlib.h
 include/c++/${V}/tr1/tgmath.h
 include/c++/${V}/tr1/tuple
+include/c++/${V}/tr1/tuple_defs.h
 include/c++/${V}/tr1/tuple_iterate.h
 include/c++/${V}/tr1/type_traits
 include/c++/${V}/tr1/type_traits_fwd.h
@ -581,7 +599,11 @@ include/c++/${V}/tr1/unordered_set
 include/c++/${V}/tr1/utility
 include/c++/${V}/tr1/wchar.h
 include/c++/${V}/tr1/wctype.h
+include/c++/${V}/tuple
+include/c++/${V}/type_traits
 include/c++/${V}/typeinfo
+include/c++/${V}/unordered_map
+include/c++/${V}/unordered_set
 include/c++/${V}/utility
 include/c++/${V}/valarray
 include/c++/${V}/vector
--- a/lang/gcc/4.2/pkg/PLIST-f95
+++ b/lang/gcc/4.2/pkg/PLIST-f95
@ -1,12 +1,12 @@
-@comment $OpenBSD: PLIST-f95,v 1.3 2006/10/20 15:35:25 espie Exp $
+@comment $OpenBSD: PLIST-f95,v 1.4 2007/03/17 21:58:46 espie Exp $
 bin/egfortran
 bin/${CONFIG}-egfortran
@info info/gfortran.info
-lib/libgfortran.a
-lib/libgfortran.la
 lib/gcc/${CONFIG}/${V}/finclude/
 lib/gcc/${CONFIG}/${V}/libgfortranbegin.a
 lib/gcc/${CONFIG}/${V}/libgfortranbegin.la
+lib/libgfortran.a
+lib/libgfortran.la
 libexec/gcc/${CONFIG}/${V}/f951
 %%PIC%%
@man man/man1/egfortran.1
--- a/lang/gcc/4.2/pkg/PLIST-main
+++ b/lang/gcc/4.2/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 16:26:46 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2007/03/17 21:58:46 espie Exp $
@pkgpath lang/gcc/4.2
 %%SHARED%%
 bin/ecpp
@ -16,31 +16,32 @@ lib/gcc/
 lib/gcc/${CONFIG}/
 lib/gcc/${CONFIG}/${V}/
 lib/gcc/${CONFIG}/${V}/include/
-lib/gcc/${CONFIG}/${V}/include/README
-lib/gcc/${CONFIG}/${V}/include/com_err.h
-lib/gcc/${CONFIG}/${V}/include/limits.h
-lib/gcc/${CONFIG}/${V}/include/math.h
-lib/gcc/${CONFIG}/${V}/include/rpc/
-lib/gcc/${CONFIG}/${V}/include/rpc/rpc_des.h
-lib/gcc/${CONFIG}/${V}/include/rpc/svc.h
+lib/gcc/${CONFIG}/${V}/include-fixed/
+lib/gcc/${CONFIG}/${V}/include-fixed/README
+lib/gcc/${CONFIG}/${V}/include-fixed/com_err.h
+lib/gcc/${CONFIG}/${V}/include-fixed/limits.h
+lib/gcc/${CONFIG}/${V}/include-fixed/math.h
+lib/gcc/${CONFIG}/${V}/include-fixed/rpc/
+lib/gcc/${CONFIG}/${V}/include-fixed/rpc/rpc_des.h
+lib/gcc/${CONFIG}/${V}/include-fixed/rpc/svc.h
+lib/gcc/${CONFIG}/${V}/include-fixed/stddef.h
+lib/gcc/${CONFIG}/${V}/include-fixed/stdio.h
+lib/gcc/${CONFIG}/${V}/include-fixed/stdlib.h
+lib/gcc/${CONFIG}/${V}/include-fixed/sys/
+lib/gcc/${CONFIG}/${V}/include-fixed/sys/types.h
+lib/gcc/${CONFIG}/${V}/include-fixed/syslimits.h
 lib/gcc/${CONFIG}/${V}/include/ssp/
 lib/gcc/${CONFIG}/${V}/include/ssp/ssp.h
 lib/gcc/${CONFIG}/${V}/include/ssp/stdio.h
 lib/gcc/${CONFIG}/${V}/include/ssp/string.h
 lib/gcc/${CONFIG}/${V}/include/ssp/unistd.h
-lib/gcc/${CONFIG}/${V}/include/stddef.h
-lib/gcc/${CONFIG}/${V}/include/stdio.h
-lib/gcc/${CONFIG}/${V}/include/stdlib.h
-lib/gcc/${CONFIG}/${V}/include/sys/
-lib/gcc/${CONFIG}/${V}/include/sys/types.h
-lib/gcc/${CONFIG}/${V}/include/syslimits.h
 lib/gcc/${CONFIG}/${V}/include/unwind.h
 lib/gcc/${CONFIG}/${V}/install-tools/
+lib/gcc/${CONFIG}/${V}/install-tools/fixinc_list
 lib/gcc/${CONFIG}/${V}/install-tools/gsyslimits.h
 lib/gcc/${CONFIG}/${V}/install-tools/include/
 lib/gcc/${CONFIG}/${V}/install-tools/include/README
 lib/gcc/${CONFIG}/${V}/install-tools/include/limits.h
-lib/gcc/${CONFIG}/${V}/install-tools/include/unwind.h
 lib/gcc/${CONFIG}/${V}/install-tools/macro_list
 lib/gcc/${CONFIG}/${V}/install-tools/mkheaders.conf
 lib/gcc/${CONFIG}/${V}/libgcc.a
@ -61,6 +62,7 @@ libexec/gcc/${CONFIG}/${V}/install-tools/fixincl
 libexec/gcc/${CONFIG}/${V}/install-tools/mkheaders
 %%I386%%
 %%PIC%%
+libexec/gcc/${CONFIG}/${V}/install-tools/mkinstalldirs
@man man/man1/ecpp.1
@man man/man1/egcc.1
@man man/man1/egcov.1