4.2 branch of gcc

lang/gcc/4.2/Makefile

@@ -0,0 +1,205 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+
+ONLY_FOR_ARCHS=	alpha i386 m68k sparc sparc64 powerpc vax
+#BROKEN='adjust for types changes'
+
+V=4.2.0
+DATE=20060715
+FULL_VERSION=4.2-${DATE}
+FULL_PKGVERSION=4.2.${DATE}
+SHARED_LIBS=	estdc++		7.0 \
+		gfortran	2.0 \
+		-org-w3c-dom	1.0 \
+		-org-xml-sax	1.0 \
+		gcj		5.0 \
+		objc		2.0 \
+		objc_gc		2.0 \
+		ssp		0.0 \
+		gomp		1.0
+
+MAINTAINER=	Marc Espie <espie@openbsd.org>
+
+ADAI386=	adastrap-i386-3.3.6-3.tgz:0
+DISTFILES=  ${DISTNAME}.tar.bz2
+SUPDISTFILES=	${ADAI386}
+MAKE_GXX=Yes
+MAKE_FORTRAN=Yes
+MAKE_OBJC=Yes
+#MAKE_JAVA=Yes
+.if ${MACHINE_ARCH} == "i386"
+MAKE_ADA=Yes
+DISTFILES+=${ADAI386}
+.endif
+
+MAKE_GXX?=No
+MAKE_FORTRAN?=No
+MAKE_OBJC?=No
+MAKE_JAVA?=No
+MAKE_ADA?=No
+
+
+BUILD_DEPENDS+= ::devel/autoconf/2.59
+BUILD_DEPENDS+=	::devel/metaauto
+USE_LIBTOOL=	Yes
+
+SUBPACKAGE?=
+WANTLIB=c
+.if ${SUBPACKAGE} == "-estdc"
+WANTLIB+=m
+.endif
+
+.if ${MAKE_JAVA:L} == "yes"
+.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-java"
+LIB_DEPENDS+=gc::devel/boehm-gc
+.  endif
+.endif
+
+# This can be patched out, apart from java that wants a pure parser.
+BUILD_DEPENDS+= :bison-*:devel/bison
+
+
+.if ${MAKE_JAVA:L} == "yes"
+MAKE_GXX=Yes
+.endif
+
+MULTI_PACKAGES=
+# No sub packages description
+DESCR=${PKGDIR}/DESCR
+
+REGRESS_DEPENDS=::devel/dejagnu
+
+# No way around it, java wants a pure parser
+.if ${MAKE_JAVA:L} == "yes"
+BUILD_DEPENDS+=:bison-*:devel/bison
+.endif
+
+
+DISTNAME=   	gcc-${FULL_VERSION}
+
+
+
+MASTER_SITES=	${MASTER_SITE_GCC:=snapshots/$(FULL_VERSION)/}
+MASTER_SITES0=	ftp://quatramaran.ens.fr/pub/espie/
+
+CONFIGURE_STYLE=	gnu
+MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/gcc
+
+LANGS=c
+.if ${MAKE_GXX:L} == "yes"
+LANGS:=${LANGS},c++
+MULTI_PACKAGES+=-c++ -estdc
+.endif
+.if ${MAKE_FORTRAN:L} == "yes"
+LANGS:=${LANGS},fortran
+MULTI_PACKAGES+=-f95
+CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
+.endif
+.if ${MAKE_OBJC:L} == "yes"
+LANGS:=${LANGS},objc
+MULTI_PACKAGES+=-objc
+.endif
+.if ${MAKE_JAVA:L} == "yes"
+LANGS:=${LANGS},java
+#MULTI_PACKAGES+=-java
+CONFIGURE_ARGS+=--enable-java-gc=system-boehm
+.endif
+.if ${MAKE_ADA:L} == "yes"
+LANGS:=${LANGS},ada
+MULTI_PACKAGES+=-ada
+#DISTFILES+=adastrap-${MACHINE_ARCH}-4.0-20050102-1.tgz:0
+CONFIGURE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
+MAKE_ENV=ADAC=${WRKDIR}/bin/egcc GNATBIND=${WRKDIR}/bin/gnatbind
+CC=${WRKDIR}/bin/egcc
+.endif
+
+post-extract:
+.for f in egcc gnatbind gnatmake gnatlink
+	echo "#! /bin/sh" >${WRKDIR}/bin/$f
+	echo 'GNAT_ROOT=${WRKDIR}/bootstrap GCC_ROOT=${WRKDIR}/bootstrap exec ${WRKDIR}/bootstrap/bin/$f "$$@"' >>${WRKDIR}/bin/$f
+	chmod a+x ${WRKDIR}/bin/$f
+.endfor
+	ln -s /usr/bin/nm ${WRKDIR}/bin/enm
+	echo "# This file automatically generated" >> ${WRKSRC}/libversions
+.for l v in ${SHARED_LIBS}
+	echo "LIB$l_LTVERSION = -version-info ${v:S/./:/}" >> ${WRKSRC}/libversions
+.endfor
+
+CONFIGURE_ENV+=am_cv_func_iconv=no
+CONFIGURE_ENV+=ac_cv_prog_CONFIGURED_M4=/usr/bin/m4
+
+# Note: the configure target passes CFLAGS to the configure script anyways.
+
+CFLAGS=-O2 -g
+
+
+CONFIGURE_ARGS+= \
+	--verbose \
+	--program-transform-name=s,^,e, \
+	--disable-nls  \
+	--disable-checking \
+	--with-system-zlib \
+	--disable-libmudflap \
+	--disable-libgomp \
+	--with-as=/usr/bin/as \
+	--with-ld=/usr/bin/ld \
+	--with-gnu-ld \
+	--with-gnu-as \
+	--enable-languages=${LANGS}
+
+# This is needed, as internal cpp is no longer compatible with the
+# visible beast
+CONFIGURE_ARGS+=--enable-cpp
+
+.if ${MAKE_JAVA:L} == "yes"
+CONFIGURE_ARGS+=--enable-sjlj-exceptions
+.endif
+
+
+# if you wish to try your luck
+#CONFIGURE_ARGS+= --enable-threads=posix
+
+CONFIGURE_ARGS += --with-gnu-as 
+CONFIGURE_ARGS += --with-gnu-ld 
+CONFIGURE_ARGS += ${CONFIGURE_SHARED}
+
+post-patch:
+	cd ${WRKDIST}/libstdc++-v3 && AUTOCONF_VERSION=2.59 autoconf
+
+SEPARATE_BUILD=concurrent
+
+USE_GMAKE= yes
+
+# you shouldn't skip bootstrap unless you know what you're doing
+# use bootstrap-lean if you're pressed for space
+ALL_TARGET=bootstrap
+
+MAKE_FLAGS=libstdc___la_LDFLAGS='-version-info 31:0:0 -lm'
+
+
+.if ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "sparc"
+PKG_ARGS+=-DPIC=1
+.else
+PKG_ARGS+=-DPIC=0
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+PKG_ARGS+=-DPPC=1
+.else
+PKG_ARGS+=-DPPC=0
+.endif
+
+SUBPACKAGE?=
+.if defined(PACKAGING)
+.  if !empty(SUBPACKAGE) && ${SUBPACKAGE} != "-estdc"
+RUN_DEPENDS+=::${PKGPATH}
+.  endif
+.  if ${SUBPACKAGE} == "-c++"
+RUN_DEPENDS+=:gcc-${FULL_PKGVERSION}:${PKGPATH},-estdc
+.  endif
+.endif
+.if !defined(PACKAGING) || ${SUBPACKAGE} == "-f95"
+LIB_DEPENDS+=gmp:gmp->=4.1.4:devel/gmp
+.endif
+
+.include <bsd.port.mk>
+

lang/gcc/4.2/distinfo

@@ -0,0 +1,8 @@
+MD5 (gcc/adastrap-i386-3.3.6-3.tgz) = 309f8e55ca87f16ca1aca948f00942ac
+MD5 (gcc/gcc-4.2-20060715.tar.bz2) = 06dca73d3dd192d333c4f03d81d81a99
+RMD160 (gcc/adastrap-i386-3.3.6-3.tgz) = 3bfa0dd36f6f7ff3d13592957572dc0e57ab8d99
+RMD160 (gcc/gcc-4.2-20060715.tar.bz2) = 5160b3f61598cc5fae57982b3869eaf218a027f3
+SHA1 (gcc/adastrap-i386-3.3.6-3.tgz) = 692221546f48df2cd26f313c7364faacd657d891
+SHA1 (gcc/gcc-4.2-20060715.tar.bz2) = a7478a82088af390aa586dc87eca371658970583
+SIZE (gcc/adastrap-i386-3.3.6-3.tgz) = 16788003
+SIZE (gcc/gcc-4.2-20060715.tar.bz2) = 39949045

lang/gcc/4.2/patches/keep

@@ -0,0 +1,100 @@
+$OpenBSD: keep,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/c-format.c.orig	Mon Mar 27 10:35:04 2006
++++ gcc/c-format.c	Mon Mar 27 10:56:06 2006
+@@ -62,6 +62,7 @@ enum format_type { printf_format_type, a
+ 		   gcc_cdiag_format_type,
+ 		   gcc_cxxdiag_format_type, gcc_gfc_format_type,
+ 		   scanf_format_type, strftime_format_type,
++		   kprintf_format_type, syslog_format_type,
+ 		   strfmon_format_type, format_type_error = -1};
+ 
+ typedef struct function_format_info
+@@ -294,6 +295,15 @@ static const format_length_info printf_l
+   { NULL, 0, 0, NULL, 0, 0 }
+ };
+ 
++static const format_length_info kprintf_length_specs[] =
++{
++  { "h", FMT_LEN_h, STD_C89, NULL, 0, 0 },
++  { "l", FMT_LEN_l, STD_C89, "ll", FMT_LEN_ll, STD_C9L },
++  { "q", FMT_LEN_ll, STD_EXT, NULL, 0, 0 },
++  { "L", FMT_LEN_L, STD_C89, NULL, 0, 0 },
++  { NULL, 0, 0, NULL, 0, 0 }
++};
++
+ /* Length specifiers valid for asm_fprintf.  */
+ static const format_length_info asm_fprintf_length_specs[] =
+ {
+@@ -509,6 +519,24 @@ static const format_char_info print_char
+   { NULL,  0, 0, NOLENGTHS, NULL, NULL, NULL }
+ };
+ 
++static const format_char_info kprint_char_table[] =
++{
++  /* C89 conversion specifiers.  */
++  { "di",  0, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  TEX_LL,  T99_SST, T99_PD,  T99_IM  }, "-wp0 +'I", "i", NULL  },
++  { "oxX", 0, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "-wp0#",    "i", NULL  },
++  { "u",   0, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "-wp0'I",   "i", NULL  },
++  { "c",   0, STD_C89, { T89_I,   BADLEN,  BADLEN,  T94_WI,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-w",       "", NULL   },
++  { "s",   1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-wp",      "cR", NULL },
++  { "p",   1, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-w",       "c", NULL  },
++/* Kernel bitmap formatting */
++  { "b",   1, STD_C89, { T89_C,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN }, "",		"", NULL   },
++/* Kernel recursive format */
++  { ":",   1, STD_C89, { T89_V,	  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN }, "",		"", NULL   },
++/* Kernel debugger auto-radix printing */
++  { "nrz", 0, STD_C89, { T89_I,	  T89_I,   T89_I,   T89_L,   T9L_LL,  TEX_LL,  BADLEN,	BADLEN,  BADLEN }, "-wp0# +",	"", NULL   },
++  { NULL,  0, 0, NOLENGTHS, NULL, NULL, NULL }
++};
++
+ static const format_char_info asm_fprintf_char_table[] =
+ {
+   /* C89 conversion specifiers.  */
+@@ -641,6 +669,28 @@ static const format_char_info gcc_gfc_ch
+   { NULL,  0, 0, NOLENGTHS, NULL, NULL, NULL }
+ };
+ 
++static const format_char_info syslog_char_table[] =
++{
++  /* C89 conversion specifiers.  */
++  { "di",  0, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  TEX_LL,  T99_SST, T99_PD,  T99_IM  }, "-wp0 +'I", "i", NULL  },
++  { "oxX", 0, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "-wp0#",    "i", NULL  },
++  { "u",   0, STD_C89, { T89_UI,  T99_UC,  T89_US,  T89_UL,  T9L_ULL, TEX_ULL, T99_ST,  T99_UPD, T99_UIM }, "-wp0'I",   "i", NULL  },
++  { "fgG", 0, STD_C89, { T89_D,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T89_LD,  BADLEN,  BADLEN,  BADLEN  }, "-wp0 +#'", "", NULL   },
++  { "eE",  0, STD_C89, { T89_D,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T89_LD,  BADLEN,  BADLEN,  BADLEN  }, "-wp0 +#",  "", NULL   },
++  { "c",   0, STD_C89, { T89_I,   BADLEN,  BADLEN,  T94_WI,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-w",       "", NULL   },
++  { "s",   1, STD_C89, { T89_C,   BADLEN,  BADLEN,  T94_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-wp",      "cR", NULL },
++  { "p",   1, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-w",       "c" , NULL },
++  { "n",   1, STD_C89, { T89_I,   T99_SC,  T89_S,   T89_L,   T9L_LL,  BADLEN,  T99_SST, T99_PD,  T99_IM  }, "",         "W", NULL  },
++  /* C99 conversion specifiers.  */
++  { "F",   0, STD_C99, { T99_D,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T99_LD,  BADLEN,  BADLEN,  BADLEN  }, "-wp0 +#'", "", NULL   },
++  { "aA",  0, STD_C99, { T99_D,   BADLEN,  BADLEN,  T99_D,   BADLEN,  T99_LD,  BADLEN,  BADLEN,  BADLEN  }, "-wp0 +#",  "", NULL   },
++  /* X/Open conversion specifiers.  */
++  { "C",   0, STD_EXT, { TEX_WI,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-w",       "", NULL   },
++  { "S",   1, STD_EXT, { TEX_W,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-wp",      "R", NULL  },
++  { "m",   0, STD_C89, { T89_V,   BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN,  BADLEN  }, "-wp",      "", NULL   },
++  { NULL,  0, 0, NOLENGTHS, NULL, NULL, NULL }
++};
++
+ static const format_char_info scan_char_table[] =
+ {
+   /* C89 conversion specifiers.  */
+@@ -698,6 +748,18 @@ static const format_char_info monetary_c
+ static const format_kind_info format_types_orig[] =
+ {
+   { "printf",   printf_length_specs,  print_char_table, " +#0-'I", NULL, 
++    printf_flag_specs, printf_flag_pairs,
++    FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
++    'w', 0, 'p', 0, 'L',
++    &integer_type_node, &integer_type_node
++  },
++  { "kprintf",   kprintf_length_specs,  kprint_char_table, " +#0-'I", NULL, 
++    printf_flag_specs, printf_flag_pairs,
++    FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
++    'w', 0, 'p', 0, 'L',
++    &integer_type_node, &integer_type_node
++  },
++  { "syslog",   printf_length_specs,  syslog_char_table, " +#0-'I", NULL, 
+     printf_flag_specs, printf_flag_pairs,
+     FMT_FLAG_ARG_CONVERT|FMT_FLAG_DOLLAR_MULTIPLE|FMT_FLAG_USE_DOLLAR|FMT_FLAG_EMPTY_PREC_OK,
+     'w', 0, 'p', 0, 'L',

lang/gcc/4.2/patches/patch-fixincludes_Makefile_in

@@ -0,0 +1,14 @@
+$OpenBSD: patch-fixincludes_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- fixincludes/Makefile.in.orig	Sat Jul 16 16:17:51 2005
++++ fixincludes/Makefile.in	Thu Aug  4 10:53:59 2005
+@@ -169,8 +169,8 @@ $(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/
+ 	cp $(srcdir)/../gcc/aclocal.m4 .
+ 
+ check : all
+-	autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
+-	$(SHELL) ./check.sh $(srcdir)/tests/base
++	-autogen -T $(srcdir)/check.tpl $(srcdir)/inclhack.def
++	-$(SHELL) ./check.sh $(srcdir)/tests/base
+ 	@rm -f ./check.sh
+ 
+ install : all

lang/gcc/4.2/patches/patch-gcc_ada_Makefile_in

@@ -0,0 +1,18 @@
+$OpenBSD: patch-gcc_ada_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/ada/Makefile.in.orig	Sat Apr  8 22:11:21 2006
++++ gcc/ada/Makefile.in	Mon Jul 24 12:30:01 2006
+@@ -116,12 +116,12 @@ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ GNATBIND = $(STAGE_PREFIX)gnatbind
+ GNATBIND_FLAGS = -static -x
+-ADA_CFLAGS =
++ADA_CFLAGS = -O1
+ ADAFLAGS = -W -Wall -gnatpg -gnata
+ SOME_ADAFLAGS =-gnata
+ FORCE_DEBUG_ADAFLAGS = -g
+ GNATLIBFLAGS = -gnatpg -nostdinc
+-GNATLIBCFLAGS = -g -O2
++GNATLIBCFLAGS = -g -O1
+ GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
+ 	-DIN_RTS
+ ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)

lang/gcc/4.2/patches/patch-gcc_ada_adaint_c

@@ -0,0 +1,21 @@
+$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
+ 
+   strcpy (path, "GNAT-XXXXXX");
+ 
+-#if (defined (__FreeBSD__) || defined (linux)) && !defined (__vxworks)
++#if (defined (__FreeBSD__) || defined (__OpenBSD__) || defined (linux)) && !defined (__vxworks)
+   return mkstemp (path);
+ #elif defined (__Lynx__)
+   mktemp (path);
+@@ -884,7 +884,7 @@ __gnat_tmp_name (char *tmp_filename)
+     free (pname);
+   }
+ 
+-#elif defined (linux) || defined (__FreeBSD__)
++#elif defined (linux) || defined (__FreeBSD__) || defined(__OpenBSD__)
+ #define MAX_SAFE_PATH 1000
+   char *tmpdir = getenv ("TMPDIR");
+ 

lang/gcc/4.2/patches/patch-gcc_ada_env_c

@@ -0,0 +1,13 @@
+$OpenBSD: patch-gcc_ada_env_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/ada/env.c.orig	Sun Jul 23 19:38:16 2006
++++ gcc/ada/env.c	Sun Jul 23 19:38:44 2006
+@@ -287,7 +287,8 @@ void __gnat_clearenv (void) {
+     env[index]=NULL;
+     index++;
+   }
+-#elif defined (__MINGW32__) || defined (__FreeBSD__) || defined (__APPLE__) \
++#elif defined (__MINGW32__) || defined (__FreeBSD__) \
++   || defined(__OpenBSD__) || defined (__APPLE__) \
+    || (defined (__vxworks) && defined (__RTP__)) || defined (__CYGWIN__)
+   /* On Windows, FreeBSD and MacOS there is no function to clean all the
+      environment but there is a "clean" way to unset a variable. So go

lang/gcc/4.2/patches/patch-gcc_ada_gnatchop_adb

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_ada_gnatchop_adb,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/ada/gnatchop.adb.orig	Thu Feb 10 14:49:13 2005
++++ gcc/ada/gnatchop.adb	Tue Feb 22 19:38:40 2005
+@@ -45,7 +45,7 @@ procedure Gnatchop is
+    Config_File_Name : constant String_Access := new String'("gnat.adc");
+    --  The name of the file holding the GNAT configuration pragmas
+ 
+-   Gcc : String_Access := new String'("gcc");
++   Gcc : String_Access := new String'("egcc");
+    --  May be modified by switch --GCC=
+ 
+    Gcc_Set : Boolean := False;

lang/gcc/4.2/patches/patch-gcc_ada_gnatlink_adb

@@ -0,0 +1,12 @@
+$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
+    --  This table collects the arguments to be passed to compile the binder
+    --  generated file.
+ 
+-   Gcc : String_Access := Program_Name ("gcc");
++   Gcc : String_Access := Program_Name ("egcc");
+ 
+    Read_Mode  : constant String := "r" & ASCII.Nul;
+ 

lang/gcc/4.2/patches/patch-gcc_ada_make_adb

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_ada_make_adb,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/ada/make.adb.orig	Tue Nov 15 15:00:29 2005
++++ gcc/ada/make.adb	Sat Mar  4 14:34:45 2006
+@@ -601,7 +601,7 @@ package body Make is
+    -- Compiler, Binder & Linker Data and Subprograms --
+    ----------------------------------------------------
+ 
+-   Gcc             : String_Access := Program_Name ("gcc");
++   Gcc             : String_Access := Program_Name ("egcc");
+    Gnatbind        : String_Access := Program_Name ("gnatbind");
+    Gnatlink        : String_Access := Program_Name ("gnatlink");
+    --  Default compiler, binder, linker programs

lang/gcc/4.2/patches/patch-gcc_ada_mlib-utl_adb

@@ -0,0 +1,12 @@
+$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
+ 
+    Initialized : Boolean := False;
+ 
+-   Gcc_Name : constant String := Osint.Program_Name ("gcc").all;
++   Gcc_Name : constant String := Osint.Program_Name ("egcc").all;
+    Gcc_Exec : OS_Lib.String_Access;
+ 
+    Ar_Name    : OS_Lib.String_Access;

lang/gcc/4.2/patches/patch-gcc_c-aux-info_c

@@ -0,0 +1,245 @@
+$OpenBSD: patch-gcc_c-aux-info_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/c-aux-info.c.orig	Fri May 19 00:16:23 2006
++++ gcc/c-aux-info.c	Sun Jul 23 11:25:55 2006
+@@ -91,14 +91,14 @@ affix_data_type (const char *param)
+      add a blank after the data-type of course.  */
+ 
+   if (p == type_or_decl)
+-    return concat (data_type, " ", type_or_decl, NULL);
++    return concat (data_type, " ", type_or_decl, (void *)0);
+ 
+   saved = *p;
+   *p = '\0';
+-  qualifiers_then_data_type = concat (type_or_decl, data_type, NULL);
++  qualifiers_then_data_type = concat (type_or_decl, data_type, (void *)0);
+   *p = saved;
+   return reconcat (qualifiers_then_data_type,
+-		   qualifiers_then_data_type, " ", p, NULL);
++		   qualifiers_then_data_type, " ", p, (void *)0);
+ }
+ 
+ /* Given a tree node which represents some "function type", generate the
+@@ -123,13 +123,13 @@ gen_formal_list_for_type (tree fntype, f
+       const char *this_type;
+ 
+       if (*formal_list)
+-	formal_list = concat (formal_list, ", ", NULL);
++	formal_list = concat (formal_list, ", ", (void *)0);
+ 
+       this_type = gen_type ("", TREE_VALUE (formal_type), ansi);
+       formal_list
+ 	= ((strlen (this_type))
+-	   ? concat (formal_list, affix_data_type (this_type), NULL)
+-	   : concat (formal_list, data_type, NULL));
++	   ? concat (formal_list, affix_data_type (this_type), (void *)0)
++	   : concat (formal_list, data_type, (void *)0));
+ 
+       formal_type = TREE_CHAIN (formal_type);
+     }
+@@ -178,10 +178,10 @@ gen_formal_list_for_type (tree fntype, f
+ 	 petered out to a NULL (i.e. without being terminated by a
+ 	 void_type_node) then we need to tack on an ellipsis.  */
+       if (!formal_type)
+-	formal_list = concat (formal_list, ", ...", NULL);
++	formal_list = concat (formal_list, ", ...", (void *)0);
+     }
+ 
+-  return concat (" (", formal_list, ")", NULL);
++  return concat (" (", formal_list, ")", (void *)0);
+ }
+ 
+ /* For the generation of an ANSI prototype for a function definition, we have
+@@ -237,23 +237,23 @@ gen_formal_list_for_func_def (tree fndec
+       const char *this_formal;
+ 
+       if (*formal_list && ((style == ansi) || (style == k_and_r_names)))
+-	formal_list = concat (formal_list, ", ", NULL);
++	formal_list = concat (formal_list, ", ", (void *)0);
+       this_formal = gen_decl (formal_decl, 0, style);
+       if (style == k_and_r_decls)
+-	formal_list = concat (formal_list, this_formal, "; ", NULL);
++	formal_list = concat (formal_list, this_formal, "; ", (void *)0);
+       else
+-	formal_list = concat (formal_list, this_formal, NULL);
++	formal_list = concat (formal_list, this_formal, (void *)0);
+       formal_decl = TREE_CHAIN (formal_decl);
+     }
+   if (style == ansi)
+     {
+       if (!DECL_ARGUMENTS (fndecl))
+-	formal_list = concat (formal_list, "void", NULL);
++	formal_list = concat (formal_list, "void", (void *)0);
+       if (deserves_ellipsis (TREE_TYPE (fndecl)))
+-	formal_list = concat (formal_list, ", ...", NULL);
++	formal_list = concat (formal_list, ", ...", (void *)0);
+     }
+   if ((style == ansi) || (style == k_and_r_names))
+-    formal_list = concat (" (", formal_list, ")", NULL);
++    formal_list = concat (" (", formal_list, ")", (void *)0);
+   return formal_list;
+ }
+ 
+@@ -312,14 +312,14 @@ gen_type (const char *ret_val, tree t, f
+ 	{
+ 	case POINTER_TYPE:
+ 	  if (TYPE_READONLY (t))
+-	    ret_val = concat ("const ", ret_val, NULL);
++	    ret_val = concat ("const ", ret_val, (void *)0);
+ 	  if (TYPE_VOLATILE (t))
+-	    ret_val = concat ("volatile ", ret_val, NULL);
++	    ret_val = concat ("volatile ", ret_val, (void *)0);
+ 
+-	  ret_val = concat ("*", ret_val, NULL);
++	  ret_val = concat ("*", ret_val, (void *)0);
+ 
+ 	  if (TREE_CODE (TREE_TYPE (t)) == ARRAY_TYPE || TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE)
+-	    ret_val = concat ("(", ret_val, ")", NULL);
++	    ret_val = concat ("(", ret_val, ")", (void *)0);
+ 
+ 	  ret_val = gen_type (ret_val, TREE_TYPE (t), style);
+ 
+@@ -327,17 +327,17 @@ gen_type (const char *ret_val, tree t, f
+ 
+ 	case ARRAY_TYPE:
+ 	  if (!COMPLETE_TYPE_P (t) || TREE_CODE (TYPE_SIZE (t)) != INTEGER_CST)
+-	    ret_val = gen_type (concat (ret_val, "[]", NULL),
++	    ret_val = gen_type (concat (ret_val, "[]", (void *)0),
+ 				TREE_TYPE (t), style);
+ 	  else if (int_size_in_bytes (t) == 0)
+-	    ret_val = gen_type (concat (ret_val, "[0]", NULL),
++	    ret_val = gen_type (concat (ret_val, "[0]", (void *)0),
+ 				TREE_TYPE (t), style);
+ 	  else
+ 	    {
+ 	      int size = (int_size_in_bytes (t) / int_size_in_bytes (TREE_TYPE (t)));
+ 	      char buff[10];
+ 	      sprintf (buff, "[%d]", size);
+-	      ret_val = gen_type (concat (ret_val, buff, NULL),
++	      ret_val = gen_type (concat (ret_val, buff, (void *)0),
+ 				  TREE_TYPE (t), style);
+ 	    }
+ 	  break;
+@@ -345,7 +345,7 @@ gen_type (const char *ret_val, tree t, f
+ 	case FUNCTION_TYPE:
+ 	  ret_val = gen_type (concat (ret_val,
+ 				      gen_formal_list_for_type (t, style),
+-				      NULL),
++				      (void *)0),
+ 			      TREE_TYPE (t), style);
+ 	  break;
+ 
+@@ -374,13 +374,13 @@ gen_type (const char *ret_val, tree t, f
+ 	      while (chain_p)
+ 		{
+ 		  data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
+-				      NULL);
++				      (void *)0);
+ 		  chain_p = TREE_CHAIN (chain_p);
+-		  data_type = concat (data_type, "; ", NULL);
++		  data_type = concat (data_type, "; ", (void *)0);
+ 		}
+-	      data_type = concat ("{ ", data_type, "}", NULL);
++	      data_type = concat ("{ ", data_type, "}", (void *)0);
+ 	    }
+-	  data_type = concat ("struct ", data_type, NULL);
++	  data_type = concat ("struct ", data_type, (void *)0);
+ 	  break;
+ 
+ 	case UNION_TYPE:
+@@ -393,13 +393,13 @@ gen_type (const char *ret_val, tree t, f
+ 	      while (chain_p)
+ 		{
+ 		  data_type = concat (data_type, gen_decl (chain_p, 0, ansi),
+-				      NULL);
++				      (void *)0);
+ 		  chain_p = TREE_CHAIN (chain_p);
+-		  data_type = concat (data_type, "; ", NULL);
++		  data_type = concat (data_type, "; ", (void *)0);
+ 		}
+-	      data_type = concat ("{ ", data_type, "}", NULL);
++	      data_type = concat ("{ ", data_type, "}", (void *)0);
+ 	    }
+-	  data_type = concat ("union ", data_type, NULL);
++	  data_type = concat ("union ", data_type, (void *)0);
+ 	  break;
+ 
+ 	case ENUMERAL_TYPE:
+@@ -412,14 +412,14 @@ gen_type (const char *ret_val, tree t, f
+ 	      while (chain_p)
+ 		{
+ 		  data_type = concat (data_type,
+-			IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), NULL);
++			IDENTIFIER_POINTER (TREE_PURPOSE (chain_p)), (void *)0);
+ 		  chain_p = TREE_CHAIN (chain_p);
+ 		  if (chain_p)
+-		    data_type = concat (data_type, ", ", NULL);
++		    data_type = concat (data_type, ", ", (void *)0);
+ 		}
+-	      data_type = concat ("{ ", data_type, " }", NULL);
++	      data_type = concat ("{ ", data_type, " }", (void *)0);
+ 	    }
+-	  data_type = concat ("enum ", data_type, NULL);
++	  data_type = concat ("enum ", data_type, (void *)0);
+ 	  break;
+ 
+ 	case TYPE_DECL:
+@@ -431,7 +431,7 @@ gen_type (const char *ret_val, tree t, f
+ 	  /* Normally, `unsigned' is part of the deal.  Not so if it comes
+ 	     with a type qualifier.  */
+ 	  if (TYPE_UNSIGNED (t) && TYPE_QUALS (t))
+-	    data_type = concat ("unsigned ", data_type, NULL);
++	    data_type = concat ("unsigned ", data_type, (void *)0);
+ 	  break;
+ 
+ 	case REAL_TYPE:
+@@ -451,11 +451,11 @@ gen_type (const char *ret_val, tree t, f
+ 	}
+     }
+   if (TYPE_READONLY (t))
+-    ret_val = concat ("const ", ret_val, NULL);
++    ret_val = concat ("const ", ret_val, (void *)0);
+   if (TYPE_VOLATILE (t))
+-    ret_val = concat ("volatile ", ret_val, NULL);
++    ret_val = concat ("volatile ", ret_val, (void *)0);
+   if (TYPE_RESTRICT (t))
+-    ret_val = concat ("restrict ", ret_val, NULL);
++    ret_val = concat ("restrict ", ret_val, (void *)0);
+   return ret_val;
+ }
+ 
+@@ -494,9 +494,9 @@ gen_decl (tree decl, int is_func_definit
+      generate the qualifiers here.  */
+ 
+   if (TREE_THIS_VOLATILE (decl))
+-    ret_val = concat ("volatile ", ret_val, NULL);
++    ret_val = concat ("volatile ", ret_val, (void *)0);
+   if (TREE_READONLY (decl))
+-    ret_val = concat ("const ", ret_val, NULL);
++    ret_val = concat ("const ", ret_val, (void *)0);
+ 
+   data_type = "";
+ 
+@@ -515,7 +515,7 @@ gen_decl (tree decl, int is_func_definit
+   if (TREE_CODE (decl) == FUNCTION_DECL && is_func_definition)
+     {
+       ret_val = concat (ret_val, gen_formal_list_for_func_def (decl, ansi),
+-			NULL);
++			(void *)0);
+ 
+       /* Since we have already added in the formals list stuff, here we don't
+ 	 add the whole "type" of the function we are considering (which
+@@ -532,11 +532,11 @@ gen_decl (tree decl, int is_func_definit
+   ret_val = affix_data_type (ret_val);
+ 
+   if (TREE_CODE (decl) != FUNCTION_DECL && C_DECL_REGISTER (decl))
+-    ret_val = concat ("register ", ret_val, NULL);
++    ret_val = concat ("register ", ret_val, (void *)0);
+   if (TREE_PUBLIC (decl))
+-    ret_val = concat ("extern ", ret_val, NULL);
++    ret_val = concat ("extern ", ret_val, (void *)0);
+   if (TREE_CODE (decl) == FUNCTION_DECL && !TREE_PUBLIC (decl))
+-    ret_val = concat ("static ", ret_val, NULL);
++    ret_val = concat ("static ", ret_val, (void *)0);
+ 
+   return ret_val;
+ }

lang/gcc/4.2/patches/patch-gcc_c-common_c

@@ -0,0 +1,38 @@
+$OpenBSD: patch-gcc_c-common_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/c-common.c.orig	Thu Jul  6 04:09:02 2006
++++ gcc/c-common.c	Sun Jul 23 14:24:16 2006
+@@ -543,7 +543,9 @@ 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_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
+ 			      handle_deprecated_attribute },
+   { "vector_size",	      1, 1, false, true, false,
+ 			      handle_vector_size_attribute },
++  { "bounded",                3, 4, false, true, false,
++                              handle_bounded_attribute },
+   { "visibility",	      1, 1, false, false, false,
+ 			      handle_visibility_attribute },
+   { "tls_model",	      1, 1, true,  false, false,
+@@ -5590,6 +5594,15 @@ handle_warn_unused_result_attribute (tre
+     }
+ 
+   return NULL_TREE;
++}
++
++static tree
++handle_bounded_attribute (tree *ARG_UNUSED (node), tree ARG_UNUSED (name), 
++			   tree ARG_UNUSED (args),
++			   int ARG_UNUSED (flags), bool *no_add_attrs)
++{
++	*no_add_attrs = true;
++	return NULL_TREE;
+ }
+ 
+ /* Handle a "sentinel" attribute.  */

lang/gcc/4.2/patches/patch-gcc_c-incpath_c

@@ -0,0 +1,30 @@
+$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,
+ 		continue;
+ 	      if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
+ 		{
+-		  char *str = concat (iprefix, p->fname + len, NULL);
++		  char *str = concat (iprefix, p->fname + len, (void *)0);
+ 		  if (p->multilib && imultilib)
+-		    str = concat (str, dir_separator_str, imultilib, NULL);
++		    str = concat (str, dir_separator_str, imultilib, (void *)0);
+ 		  add_path (str, SYSTEM, p->cxx_aware, false);
+ 		}
+ 	    }
+@@ -162,12 +162,12 @@ 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
+ 	    str = update_path (p->fname, p->component);
+ 
+ 	  if (p->multilib && imultilib)
+-	    str = concat (str, dir_separator_str, imultilib, NULL);
++	    str = concat (str, dir_separator_str, imultilib, (void *)0);
+ 
+ 	  add_path (str, SYSTEM, p->cxx_aware, false);
+ 	}

lang/gcc/4.2/patches/patch-gcc_collect2_c

@@ -0,0 +1,76 @@
+$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
+@@ -753,19 +753,19 @@ main (int argc, char **argv)
+      qualify the program name with the target machine.  */
+ 
+   const char *const full_ld_suffix =
+-    concat(target_machine, "-", ld_suffix, NULL);
++    concat(target_machine, "-", ld_suffix, (char *)0);
+   const char *const full_nm_suffix =
+-    concat (target_machine, "-", nm_suffix, NULL);
++    concat (target_machine, "-", nm_suffix, (char *)0);
+   const char *const full_gnm_suffix =
+-    concat (target_machine, "-", gnm_suffix, NULL);
++    concat (target_machine, "-", gnm_suffix, (char *)0);
+ #ifdef LDD_SUFFIX
+   const char *const full_ldd_suffix =
+-    concat (target_machine, "-", ldd_suffix, NULL);
++    concat (target_machine, "-", ldd_suffix, (char *)0);
+ #endif
+   const char *const full_strip_suffix =
+-    concat (target_machine, "-", strip_suffix, NULL);
++    concat (target_machine, "-", strip_suffix, (char *)0);
+   const char *const full_gstrip_suffix =
+-    concat (target_machine, "-", gstrip_suffix, NULL);
++    concat (target_machine, "-", gstrip_suffix, (char *)0);
+ #else
+   const char *const full_ld_suffix	= ld_suffix;
+   const char *const full_nm_suffix	= nm_suffix;
+@@ -958,7 +958,7 @@ main (int argc, char **argv)
+   if (c_file_name == 0)
+     {
+ #ifdef CROSS_COMPILE
+-      c_file_name = concat (target_machine, "-gcc", NULL);
++      c_file_name = concat (target_machine, "-gcc", (char *)0);
+ #else
+       c_file_name = "gcc";
+ #endif
+@@ -1236,7 +1236,7 @@ main (int argc, char **argv)
+ 
+   if (exports.first)
+     {
+-      char *buf = concat ("-bE:", export_file, NULL);
++      char *buf = concat ("-bE:", export_file, (char *)0);
+ 
+       *ld1++ = buf;
+       *ld2++ = buf;
+@@ -1401,7 +1401,7 @@ main (int argc, char **argv)
+   /* Tell the linker that we have initializer and finalizer functions.  */
+ #ifdef LD_INIT_SWITCH
+ #ifdef COLLECT_EXPORT_LIST
+-  *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, NULL);
++  *ld2++ = concat (LD_INIT_SWITCH, ":", initname, ":", fininame, (char *)0);
+ #else
+   *ld2++ = LD_INIT_SWITCH;
+   *ld2++ = initname;
+@@ -1416,7 +1416,7 @@ main (int argc, char **argv)
+       /* If we did not add export flag to link arguments before, add it to
+ 	 second link phase now.  No new exports should have been added.  */
+       if (! exports.first)
+-	*ld2++ = concat ("-bE:", export_file, NULL);
++	*ld2++ = concat ("-bE:", export_file, (char *)0);
+ 
+ #ifndef LD_INIT_SWITCH
+       add_to_list (&exports, initname);
+@@ -1811,8 +1811,8 @@ write_c_file_stat (FILE *stream, const c
+     notice ("\nwrite_c_file - output name is %s, prefix is %s\n",
+ 	    output_file, prefix);
+ 
+-  initname = concat ("_GLOBAL__FI_", prefix, NULL);
+-  fininame = concat ("_GLOBAL__FD_", prefix, NULL);
++  initname = concat ("_GLOBAL__FI_", prefix, (char *)0);
++  fininame = concat ("_GLOBAL__FD_", prefix, (char *)0);
+ 
+   free (prefix);
+ 

lang/gcc/4.2/patches/patch-gcc_config_host

@@ -0,0 +1,14 @@
+$OpenBSD: patch-gcc_config_host,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config.host.orig	Thu May 18 15:19:27 2006
++++ gcc/config.host	Sun Jul 23 11:48:55 2006
+@@ -195,6 +195,10 @@ case ${host} in
+     out_host_hook_obj=host-solaris.o
+     host_xmake_file="${host_xmake_file} x-solaris"
+     ;;
++  *-*-openbsd*)
++    out_host_hook_obj=host-openbsd.o
++    host_xmake_file="${host_xmake_file} x-openbsd"
++    ;;
+   *-*-linux*)
+     out_host_hook_obj=host-linux.o
+     host_xmake_file="${host_xmake_file} x-linux"

lang/gcc/4.2/patches/patch-gcc_config_host-openbsd_c

@@ -0,0 +1,45 @@
+$OpenBSD: patch-gcc_config_host-openbsd_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/host-openbsd.c.orig	Mon Jan 31 15:01:58 2005
++++ gcc/config/host-openbsd.c	Mon Jan 31 16:12:04 2005
+@@ -0,0 +1,41 @@
++/* OpenBSD host-specific hook definitions.
++   Copyright (C) 2005 Free Software Foundation, Inc.
++
++   This file is part of GCC.
++
++   GCC is free software; you can redistribute it and/or modify it
++   under the terms of the GNU General Public License as published
++   by the Free Software Foundation; either version 2, or (at your
++   option) any later version.
++
++   GCC is distributed in the hope that it will be useful, but WITHOUT
++   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
++   License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with GCC; see the file COPYING.  If not, write to the
++   Free Software Foundation, 59 Temple Place - Suite 330, Boston,
++   MA 02111-1307, USA.  */
++
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include <sys/mman.h>
++#include "hosthooks.h"
++#include "hosthooks-def.h"
++
++
++#undef HOST_HOOKS_GT_PCH_USE_ADDRESS
++#define HOST_HOOKS_GT_PCH_USE_ADDRESS openbsd_gt_pch_use_address
++
++static int
++openbsd_gt_pch_use_address (void *base ATTRIBUTE_UNUSED, 
++  size_t size ATTRIBUTE_UNUSED, int fd ATTRIBUTE_UNUSED, 
++  size_t offset ATTRIBUTE_UNUSED)
++{
++  return -1;
++}
++
++
++const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;

lang/gcc/4.2/patches/patch-gcc_config_i386_driver-i386_c

@@ -0,0 +1,20 @@
+$OpenBSD: patch-gcc_config_i386_driver-i386_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/i386/driver-i386.c.orig	Sun Jul 23 14:55:23 2006
++++ gcc/config/i386/driver-i386.c	Sun Jul 23 14:55:40 2006
+@@ -161,14 +161,14 @@ const char *host_detect_local_cpu (int a
+     }
+ 
+ done:
+-  return concat ("-m", argv[0], "=", cpu, NULL);
++  return concat ("-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);
+ }
+ #endif
+ #endif

lang/gcc/4.2/patches/patch-gcc_config_i386_openbsd_h

@@ -0,0 +1,25 @@
+$OpenBSD: patch-gcc_config_i386_openbsd_h,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/i386/openbsd.h.orig	Sat Jun 25 03:22:41 2005
++++ gcc/config/i386/openbsd.h	Sun Jul 23 18:43:15 2006
+@@ -41,16 +41,19 @@ Boston, MA 02110-1301, USA.  */
+ 
+ /* This must agree with <machine/ansi.h> */
+ #undef SIZE_TYPE
+-#define SIZE_TYPE "unsigned int"
++#define SIZE_TYPE "long unsigned int"
+ 
+ #undef PTRDIFF_TYPE
+-#define PTRDIFF_TYPE "int"
++#define PTRDIFF_TYPE "long int"
+ 
+ #undef WCHAR_TYPE
+ #define WCHAR_TYPE "int"
+ 
+ #undef WCHAR_TYPE_SIZE
+ #define WCHAR_TYPE_SIZE 32
++
++#undef WINT_TYPE
++#define WINT_TYPE "int"
+ 
+ /* Assembler format: overall framework.  */
+ 

lang/gcc/4.2/patches/patch-gcc_config_m68k_openbsd_h

@@ -0,0 +1,25 @@
+$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.  */
+ 
+ /* This must agree with <machine/ansi.h> */
+ #undef SIZE_TYPE
+-#define SIZE_TYPE "unsigned int"
++#define SIZE_TYPE "long unsigned int"
+ 
+ #undef PTRDIFF_TYPE
+-#define PTRDIFF_TYPE "int"
++#define PTRDIFF_TYPE "long int"
+ 
+ #undef WCHAR_TYPE
+ #define WCHAR_TYPE "int"
+ 
+ #undef WCHAR_TYPE_SIZE
+ #define WCHAR_TYPE_SIZE 32
++
++#undef WINT_TYPE
++#define WINT_TYPE "int"
+ 
+ /* Storage layout.  */
+ 

lang/gcc/4.2/patches/patch-gcc_config_mips_openbsd_h

@@ -0,0 +1,25 @@
+$OpenBSD: patch-gcc_config_mips_openbsd_h,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/mips/openbsd.h.orig	Sat Aug  6 15:26:35 2005
++++ gcc/config/mips/openbsd.h	Sun Jul 23 18:43:31 2006
+@@ -58,16 +58,19 @@ Boston, MA 02110-1301, USA.  */
+ 
+ /* This must agree with <machine/ansi.h>.  */
+ #undef SIZE_TYPE
+-#define SIZE_TYPE "unsigned int"
++#define SIZE_TYPE "long unsigned int"
+ 
+ #undef PTRDIFF_TYPE
+-#define PTRDIFF_TYPE "int"
++#define PTRDIFF_TYPE "long int"
+ 
+ #undef WCHAR_TYPE
+ #define WCHAR_TYPE "int"
+ 
+ #undef WCHAR_TYPE_SIZE
+ #define WCHAR_TYPE_SIZE 32
++
++#undef WINT_TYPE
++#define WINT_TYPE "int"
+ 
+ /* Controlling the compilation driver.  */
+ 

lang/gcc/4.2/patches/patch-gcc_config_t-openbsd

@@ -0,0 +1,7 @@
+$OpenBSD: patch-gcc_config_t-openbsd,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/t-openbsd.orig	Sat Jul 22 23:29:24 2006
++++ gcc/config/t-openbsd	Sat Jul 22 23:29:32 2006
+@@ -1,2 +1,2 @@
+ # We don't need GCC's own include files.
+-USER_H =
++USER_H = $(EXTRA_HEADERS)

lang/gcc/4.2/patches/patch-gcc_config_vax_openbsd_h

@@ -0,0 +1,23 @@
+$OpenBSD: patch-gcc_config_vax_openbsd_h,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/vax/openbsd.h.orig	Sat Jun 25 03:22:41 2005
++++ gcc/config/vax/openbsd.h	Sun Jul 23 18:43:38 2006
+@@ -34,13 +34,17 @@ Boston, MA 02110-1301, USA.  */
+ 
+ /* This must agree with <machine/ansi.h>  */
+ #undef SIZE_TYPE
+-#define SIZE_TYPE "unsigned int"
++#define SIZE_TYPE "long unsigned int"
+ 
+ #undef PTRDIFF_TYPE
+-#define PTRDIFF_TYPE "int"
++#define PTRDIFF_TYPE "long int"
+ 
+ #undef WCHAR_TYPE
+ #define WCHAR_TYPE "int"
+ 
+ #undef WCHAR_TYPE_SIZE
+ #define WCHAR_TYPE_SIZE 32
++
++#undef WINT_TYPE
++#define WINT_TYPE "int"
++

lang/gcc/4.2/patches/patch-gcc_config_x-openbsd

@@ -0,0 +1,8 @@
+$OpenBSD: patch-gcc_config_x-openbsd,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/config/x-openbsd.orig	Mon Jan 31 14:50:47 2005
++++ gcc/config/x-openbsd	Mon Jan 31 14:51:13 2005
+@@ -0,0 +1,4 @@
++host-openbsd.o : $(srcdir)/config/host-openbsd.c $(CONFIG_H) $(SYSTEM_H) \
++  coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
++	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
++		$(srcdir)/config/host-openbsd.c

lang/gcc/4.2/patches/patch-gcc_coverage_c

@@ -0,0 +1,12 @@
+$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)
+   fields = field;
+   filename = getpwd ();
+   filename = (filename && da_file_name[0] != '/'
+-	      ? concat (filename, "/", da_file_name, NULL)
++	      ? concat (filename, "/", da_file_name, (void *)0)
+ 	      : da_file_name);
+   filename_len = strlen (filename);
+   filename_string = build_string (filename_len + 1, filename);

lang/gcc/4.2/patches/patch-gcc_cp_call_c

@@ -0,0 +1,21 @@
+$OpenBSD: patch-gcc_cp_call_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/cp/call.c.orig	Fri Jun 30 22:48:42 2006
++++ gcc/cp/call.c	Sun Jul 23 11:24:02 2006
+@@ -5257,7 +5257,7 @@ name_as_c_string (tree name, tree type, 
+ 	  || name == base_dtor_identifier
+ 	  || name == deleting_dtor_identifier)
+ 	{
+-	  pretty_name = concat ("~", pretty_name, NULL);
++	  pretty_name = concat ("~", pretty_name, (void *)0);
+ 	  /* Remember that we need to free the memory allocated.  */
+ 	  *free_p = true;
+ 	}
+@@ -5267,7 +5267,7 @@ name_as_c_string (tree name, tree type, 
+       pretty_name = concat ("operator ",
+ 			    type_as_string (TREE_TYPE (name),
+ 					    TFF_PLAIN_IDENTIFIER),
+-			    NULL);
++			    (void *)0);
+       /* Remember that we need to free the memory allocated.  */
+       *free_p = true;
+     }

lang/gcc/4.2/patches/patch-gcc_cp_decl2_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_cp_decl2_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/cp/decl2.c.orig	Sat Jul 15 16:44:48 2006
++++ gcc/cp/decl2.c	Sun Jul 23 11:24:02 2006
+@@ -2983,7 +2983,7 @@ build_java_method_aliases (void)
+ 	  oid = DECL_ASSEMBLER_NAME (fndecl);
+ 	  oname = IDENTIFIER_POINTER (oid);
+ 	  gcc_assert (oname[0] == '_' && oname[1] == 'Z');
+-	  nname = ACONCAT (("_ZGA", oname+2, NULL));
++	  nname = ACONCAT (("_ZGA", oname+2, (char *)0));
+ 	  nid = get_identifier (nname);
+ 
+ 	  alias = make_alias_for (fndecl, nid);

lang/gcc/4.2/patches/patch-gcc_cp_g++spec_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_cp_g++spec_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/cp/g++spec.c.orig	Sat Jun 25 02:58:12 2005
++++ gcc/cp/g++spec.c	Thu Aug  4 10:54:00 2005
+@@ -40,7 +40,7 @@ Boston, MA 02110-1301, USA.  */
+ #endif
+ 
+ #ifndef LIBSTDCXX
+-#define LIBSTDCXX "-lstdc++"
++#define LIBSTDCXX "-lestdc++"
+ #endif
+ #ifndef LIBSTDCXX_PROFILE
+ #define LIBSTDCXX_PROFILE LIBSTDCXX

lang/gcc/4.2/patches/patch-gcc_cp_parser_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_cp_parser_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/cp/parser.c.orig	Sat Jul 15 17:00:28 2006
++++ gcc/cp/parser.c	Sun Jul 23 11:24:02 2006
+@@ -16284,7 +16284,7 @@ cp_parser_require (cp_parser* parser,
+       /* Output the MESSAGE -- unless we're parsing tentatively.  */
+       if (!cp_parser_simulate_error (parser))
+ 	{
+-	  char *message = concat ("expected ", token_desc, NULL);
++	  char *message = concat ("expected ", token_desc, (void *)0);
+ 	  cp_parser_error (parser, message);
+ 	  free (message);
+ 	}

lang/gcc/4.2/patches/patch-gcc_dbxout_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_dbxout_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/dbxout.c.orig	Fri Jul 14 17:54:23 2006
++++ gcc/dbxout.c	Sun Jul 23 11:24:02 2006
+@@ -1009,7 +1009,7 @@ dbxout_init (const char *input_file_name
+ 	  if (cwd[0] == '\0')
+ 	    cwd = "/";
+ 	  else if (!IS_DIR_SEPARATOR (cwd[strlen (cwd) - 1]))
+-	    cwd = concat (cwd, "/", NULL);
++	    cwd = concat (cwd, "/", (void *)0);
+ 	}
+ #ifdef DBX_OUTPUT_MAIN_SOURCE_DIRECTORY
+       DBX_OUTPUT_MAIN_SOURCE_DIRECTORY (asm_out_file, cwd);

lang/gcc/4.2/patches/patch-gcc_diagnostic_c

@@ -0,0 +1,12 @@
+$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
+       if (context->show_option_requested && diagnostic->option_index)
+ 	diagnostic->message.format_spec
+ 	  = ACONCAT ((diagnostic->message.format_spec,
+-		      " [", cl_options[diagnostic->option_index].opt_text, "]", NULL));
++		      " [", cl_options[diagnostic->option_index].opt_text, "]", (char *)0));
+ 
+       diagnostic->message.locus = &diagnostic->location;
+       pp_format (context->printer, &diagnostic->message);

lang/gcc/4.2/patches/patch-gcc_gcc_c

@@ -0,0 +1,200 @@
+$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
+ 		  /* 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,
+-					       NULL);
++					       (void *)0);
+ 		  else if (arg != 0)
+ 		    {
+ 		      newv[newindex++] = option_map[j].equivalent;
+@@ -1642,7 +1642,7 @@ init_gcc_specs (struct obstack *obstack,
+ 		"%{shared:", shared_name, "}"
+ #endif
+ #endif
+-		"}}", NULL);
++		"}}", (void *)0);
+ 
+   obstack_grow (obstack, buf, strlen (buf));
+   free (buf);
+@@ -1840,7 +1840,7 @@ set_spec (const char *name, const char *
+ 
+   old_spec = *(sl->ptr_spec);
+   *(sl->ptr_spec) = ((spec[0] == '+' && ISSPACE ((unsigned char)spec[1]))
+-		     ? concat (old_spec, spec + 1, NULL)
++		     ? concat (old_spec, spec + 1, (void *)0)
+ 		     : xstrdup (spec));
+ 
+ #ifdef DEBUG_SPECS
+@@ -2410,12 +2410,12 @@ for_each_path (const struct path_prefix 
+   just_multi_suffix = just_machine_suffix;
+   if (do_multi && multilib_dir && strcmp (multilib_dir, ".") != 0)
+     {
+-      multi_dir = concat (multilib_dir, dir_separator_str, NULL);
+-      multi_suffix = concat (multi_suffix, multi_dir, NULL);
+-      just_multi_suffix = concat (just_multi_suffix, multi_dir, NULL);
++      multi_dir = concat (multilib_dir, dir_separator_str, (void *)0);
++      multi_suffix = concat (multi_suffix, multi_dir, (void *)0);
++      just_multi_suffix = concat (just_multi_suffix, multi_dir, (void *)0);
+     }
+   if (do_multi && multilib_os_dir && strcmp (multilib_os_dir, ".") != 0)
+-    multi_os_dir = concat (multilib_os_dir, dir_separator_str, NULL);
++    multi_os_dir = concat (multilib_os_dir, dir_separator_str, (void *)0);
+ 
+   while (1)
+     {
+@@ -2761,8 +2761,8 @@ add_sysrooted_prefix (struct path_prefix
+   if (target_system_root)
+     {
+       if (target_sysroot_suffix)
+-	  prefix = concat (target_sysroot_suffix, prefix, NULL);
+-      prefix = concat (target_system_root, prefix, NULL);
++	  prefix = concat (target_sysroot_suffix, prefix, (void *)0);
++      prefix = concat (target_system_root, prefix, (void *)0);
+ 
+       /* 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 **
+ 	  break;
+       new_argv0 = xmemdup (progname, baselen,
+ 			   baselen + concat_length (new_version, new_machine,
+-						    "-gcc-", NULL) + 1);
++						    "-gcc-", (void *)0) + 1);
+       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 **
+ 						 standard_bindir_prefix,
+ 						 standard_libexec_prefix);
+       if (gcc_exec_prefix)
+-	putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, NULL));
++	putenv (concat ("GCC_EXEC_PREFIX=", gcc_exec_prefix, (void *)0));
+     }
+   else
+     {
+@@ -3379,7 +3379,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.  */
+-      char *tmp_prefix = concat (gcc_exec_prefix, "gcc", NULL);
++      char *tmp_prefix = concat (gcc_exec_prefix, "gcc", (void *)0);
+       gcc_libexec_prefix = make_relative_prefix (tmp_prefix,
+ 						 standard_exec_prefix,
+ 						 standard_libexec_prefix);
+@@ -3426,7 +3426,7 @@ process_command (int argc, const char **
+ 	    {
+ 	      strncpy (nstore, startp, endp - startp);
+ 	      if (endp == startp)
+-		strcpy (nstore, concat (".", dir_separator_str, NULL));
++		strcpy (nstore, concat (".", dir_separator_str, (void *)0));
+ 	      else if (!IS_DIR_SEPARATOR (endp[-1]))
+ 		{
+ 		  nstore[endp - startp] = DIR_SEPARATOR;
+@@ -3460,7 +3460,7 @@ process_command (int argc, const char **
+ 	    {
+ 	      strncpy (nstore, startp, endp - startp);
+ 	      if (endp == startp)
+-		strcpy (nstore, concat (".", dir_separator_str, NULL));
++		strcpy (nstore, concat (".", dir_separator_str, (void *)0));
+ 	      else if (!IS_DIR_SEPARATOR (endp[-1]))
+ 		{
+ 		  nstore[endp - startp] = DIR_SEPARATOR;
+@@ -3493,7 +3493,7 @@ process_command (int argc, const char **
+ 	    {
+ 	      strncpy (nstore, startp, endp - startp);
+ 	      if (endp == startp)
+-		strcpy (nstore, concat (".", dir_separator_str, NULL));
++		strcpy (nstore, concat (".", dir_separator_str, (void *)0));
+ 	      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);
+ 
+   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);
+     }
+ 
+   add_prefix (&exec_prefixes,
+-	      concat (tooldir_prefix, "bin", dir_separator_str, NULL),
++	      concat (tooldir_prefix, "bin", dir_separator_str, (void *)0),
+ 	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, 0);
+   add_prefix (&startfile_prefixes,
+-	      concat (tooldir_prefix, "lib", dir_separator_str, NULL),
++	      concat (tooldir_prefix, "lib", dir_separator_str, (void *)0),
+ 	      "BINUTILS", PREFIX_PRIORITY_LAST, 0, 1);
+ 
+ #if defined(TARGET_SYSTEM_ROOT_RELOCATABLE) && !defined(VMS)
+@@ -4118,7 +4118,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 = "*";
+-	  infiles[n_infiles++].name = concat ("-l", argv[++i], NULL);
++	  infiles[n_infiles++].name = concat ("-l", argv[++i], (void *)0);
+ 	}
+       else if (strncmp (argv[i], "-l", 2) == 0)
+ 	{
+@@ -6199,8 +6199,8 @@ main (int argc, char **argv)
+   /* Read specs from a file if there is one.  */
+ 
+   machine_suffix = concat (spec_machine, dir_separator_str,
+-			   spec_version, dir_separator_str, NULL);
+-  just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
++			   spec_version, dir_separator_str, (void *)0);
++  just_machine_suffix = concat (spec_machine, dir_separator_str, (void *)0);
+ 
+   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,
+-			      standard_startfile_prefix, NULL),
++			      standard_startfile_prefix, (void *)0),
+ 		      NULL, PREFIX_PRIORITY_LAST, 0, 1);
+ 	}
+ 
+@@ -6345,7 +6345,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,
+-			      spec_version, dir_separator_str, NULL);
++			      spec_version, dir_separator_str, (void *)0);
+ 
+   /* Now we have the specs.
+      Set the `valid' bits for switches that match anything in any spec.  */

lang/gcc/4.2/patches/patch-gcc_gensupport_c

@@ -0,0 +1,21 @@
+$OpenBSD: patch-gcc_gensupport_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/gensupport.c.orig	Wed Mar 15 11:14:51 2006
++++ gcc/gensupport.c	Sun Jul 23 11:24:02 2006
+@@ -220,7 +220,7 @@ process_include (rtx desc, int lineno)
+ 	{
+ 	  static const char sep[2] = { DIR_SEPARATOR, '\0' };
+ 
+-	  pathname = concat (stackp->fname, sep, filename, NULL);
++	  pathname = concat (stackp->fname, sep, filename, (void *)0);
+ 	  input_file = fopen (pathname, "r");
+ 	  if (input_file != NULL)
+ 	    goto success;
+@@ -229,7 +229,7 @@ process_include (rtx desc, int lineno)
+     }
+ 
+   if (base_dir)
+-    pathname = concat (base_dir, filename, NULL);
++    pathname = concat (base_dir, filename, (void *)0);
+   else
+     pathname = xstrdup (filename);
+   input_file = fopen (pathname, "r");

lang/gcc/4.2/patches/patch-gcc_objc_objc-act_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_objc_objc-act_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/objc/objc-act.c.orig	Tue Jun  6 12:22:54 2006
++++ gcc/objc/objc-act.c	Sun Jul 23 11:24:02 2006
+@@ -494,7 +494,7 @@ objc_init (void)
+   /* If gen_declaration desired, open the output file.  */
+   if (flag_gen_declaration)
+     {
+-      register char * const dumpname = concat (dump_base_name, ".decl", NULL);
++      register char * const dumpname = concat (dump_base_name, ".decl", (void *)0);
+       gen_declaration_file = fopen (dumpname, "w");
+       if (gen_declaration_file == 0)
+ 	fatal_error ("can't open %s: %m", dumpname);

lang/gcc/4.2/patches/patch-gcc_omp-low_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_omp-low_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/omp-low.c.orig	Sun Jul 23 14:31:14 2006
++++ gcc/omp-low.c	Sun Jul 23 14:31:35 2006
+@@ -3863,7 +3863,7 @@ lower_omp_critical (tree *stmt_p, omp_co
+ 	  decl = create_tmp_var_raw (ptr_type_node, NULL);
+ 
+ 	  new_str = ACONCAT ((".gomp_critical_user_",
+-			      IDENTIFIER_POINTER (name), NULL));
++			      IDENTIFIER_POINTER (name), (void *)0));
+ 	  DECL_NAME (decl) = get_identifier (new_str);
+ 	  TREE_PUBLIC (decl) = 1;
+ 	  TREE_STATIC (decl) = 1;

lang/gcc/4.2/patches/patch-gcc_passes_c

@@ -0,0 +1,23 @@
+$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_
+     sprintf (num, "%d", ((int) pass->static_pass_number < 0
+ 			 ? 1 : pass->static_pass_number));
+ 
+-  dot_name = concat (".", pass->name, num, NULL);
++  dot_name = concat (".", pass->name, num, (void *)0);
+   if (ipa)
+     prefix = "ipa-", flags = TDF_IPA;
+   else if (properties & PROP_trees)
+@@ -325,8 +325,8 @@ register_one_dump_file (struct tree_opt_
+   else
+     prefix = "rtl-", flags = TDF_RTL;
+ 
+-  flag_name = concat (prefix, pass->name, num, NULL);
+-  glob_name = concat (prefix, pass->name, NULL);
++  flag_name = concat (prefix, pass->name, num, (void *)0);
++  glob_name = concat (prefix, pass->name, (void *)0);
+   pass->static_pass_number = dump_register (dot_name, flag_name, glob_name,
+                                             flags, pass->letter);
+ }

lang/gcc/4.2/patches/patch-gcc_prefix_c

@@ -0,0 +1,35 @@
+$OpenBSD: patch-gcc_prefix_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/prefix.c.orig	Fri Mar 18 16:24:19 2005
++++ gcc/prefix.c	Mon May 16 17:43:13 2005
+@@ -99,7 +99,7 @@ get_key_value (char *key)
+ #endif
+ 
+   if (prefix == 0)
+-    prefix = getenv (temp = concat (key, "_ROOT", NULL));
++    prefix = getenv (temp = concat (key, "_ROOT", (void *)0));
+ 
+   if (prefix == 0)
+     prefix = std_prefix;
+@@ -223,7 +223,7 @@ translate_name (char *name)
+ 	 together.  */
+ 
+       old_name = name;
+-      name = concat (prefix, &name[keylen + 1], NULL);
++      name = concat (prefix, &name[keylen + 1], (void *)0);
+       free (old_name);
+     }
+ 
+@@ -261,11 +261,11 @@ update_path (const char *path, const cha
+ 
+       if (key[0] != '$')
+ 	{
+-	  key = concat ("@", key, NULL);
++	  key = concat ("@", key, (void *)0);
+ 	  free_key = true;
+ 	}
+ 
+-      result = concat (key, &path[len], NULL);
++      result = concat (key, &path[len], (void *)0);
+       if (free_key)
+ 	free ((char *) key);
+       result = translate_name (result);

lang/gcc/4.2/patches/patch-gcc_read-rtl_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_read-rtl_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/read-rtl.c.orig	Sat Feb 18 23:06:53 2006
++++ gcc/read-rtl.c	Sun Jul 23 11:24:02 2006
+@@ -784,7 +784,7 @@ join_c_conditions (const char *cond1, co
+   if (cond2 == 0 || cond2[0] == 0)
+     return cond1;
+ 
+-  result = concat ("(", cond1, ") && (", cond2, ")", NULL);
++  result = concat ("(", cond1, ") && (", cond2, ")", (void *)0);
+   obstack_ptr_grow (&joined_conditions_obstack, result);
+   obstack_ptr_grow (&joined_conditions_obstack, cond1);
+   obstack_ptr_grow (&joined_conditions_obstack, cond2);

lang/gcc/4.2/patches/patch-gcc_testsuite_ada_acats_run_acats

@@ -0,0 +1,14 @@
+$OpenBSD: patch-gcc_testsuite_ada_acats_run_acats,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/testsuite/ada/acats/run_acats.orig	Fri Jan  7 04:04:46 2005
++++ gcc/testsuite/ada/acats/run_acats	Fri Jan  7 04:06:26 2005
+@@ -7,8 +7,8 @@ fi
+ 
+ # Set up environment to use the Ada compiler from the object tree
+ 
+-host_gnatchop=`type gnatchop | awk '{print $3}'`
+-host_gnatmake=`type gnatmake | awk '{print $3}'`
++host_gnatchop=`which gnatchop`
++host_gnatmake=`which gnatmake`
+ ROOT=`${PWDCMD-pwd}`
+ BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
+ 

lang/gcc/4.2/patches/patch-gcc_testsuite_ada_acats_run_all_sh

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_testsuite_ada_acats_run_all_sh,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/testsuite/ada/acats/run_all.sh.orig	Mon May  8 18:50:40 2006
++++ gcc/testsuite/ada/acats/run_all.sh	Sun Jul 23 11:24:02 2006
+@@ -84,7 +84,7 @@ display target gcc is $GCC
+ display `$GCC -v 2>&1`
+ display host=`gcc -dumpmachine`
+ display target=$target
+-display `type gnatmake`
++display `which gnatmake`
+ gnatls -v >> $dir/acats.log
+ display ""
+ 

lang/gcc/4.2/patches/patch-gcc_testsuite_gcc_dg_format_format_h

@@ -0,0 +1,17 @@
+$OpenBSD: patch-gcc_testsuite_gcc_dg_format_format_h,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/testsuite/gcc.dg/format/format.h.orig	Sat Jul 22 23:16:52 2006
++++ gcc/testsuite/gcc.dg/format/format.h	Sat Jul 22 23:17:34 2006
+@@ -4,11 +4,13 @@
+ #include <stdarg.h>
+ #include <stddef.h>
+ 
++#ifndef _WINT_T_DEFINED_
+ #ifndef _WINT_T
+ #ifndef __WINT_TYPE__
+ #define __WINT_TYPE__ unsigned int
+ #endif
+ typedef __WINT_TYPE__ wint_t;
++#endif
+ #endif
+ 
+ /* Kludges to get types corresponding to size_t and ptrdiff_t.  */

lang/gcc/4.2/patches/patch-gcc_tree-complex_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_tree-complex_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/tree-complex.c.orig	Fri Jul 29 16:51:58 2005
++++ gcc/tree-complex.c	Thu Aug  4 10:54:45 2005
+@@ -397,7 +397,7 @@ create_one_component_var (tree type, tre
+       const char *name = IDENTIFIER_POINTER (DECL_NAME (orig));
+       tree inner_type;
+ 
+-      DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, NULL)));
++      DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, (char *)0)));
+ 
+       inner_type = TREE_TYPE (TREE_TYPE (orig));
+       SET_DECL_DEBUG_EXPR (r, build1 (code, type, orig));

lang/gcc/4.2/patches/patch-gcc_tree-dump_c

@@ -0,0 +1,12 @@
+$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
+ 	dump_id[0] = '\0';
+     }
+ 
+-  return concat (dump_base_name, dump_id, dfi->suffix, NULL);
++  return concat (dump_base_name, dump_id, dfi->suffix, (void *)0);
+ }
+ 
+ /* Begin a tree dump for PHASE. Stores any user supplied flag in

lang/gcc/4.2/patches/patch-gcc_tree-mudflap_c

@@ -0,0 +1,12 @@
+$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
+   else
+     op = name = cp = "";
+ 
+-  string = concat (file, colon, line, op, name, cp, NULL);
++  string = concat (file, colon, line, op, name, cp, (void *)0);
+   result = mf_build_string (string);
+   free (string);
+ 

lang/gcc/4.2/patches/patch-gcc_tree-nested_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-gcc_tree-nested_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/tree-nested.c.orig	Tue Jun 13 10:55:40 2006
++++ gcc/tree-nested.c	Sun Jul 23 11:24:02 2006
+@@ -218,7 +218,7 @@ get_frame_type (struct nesting_info *inf
+ 
+       name = concat ("FRAME.",
+ 		     IDENTIFIER_POINTER (DECL_NAME (info->context)),
+-		     NULL);
++		     (void *)0);
+       TYPE_NAME (type) = get_identifier (name);
+       free (name);
+ 

lang/gcc/4.2/patches/patch-gcc_tree-vect-transform_c

@@ -0,0 +1,12 @@
+$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
+   }
+ 
+   if (name)
+-    new_vect_var = create_tmp_var (type, concat (prefix, name, NULL));
++    new_vect_var = create_tmp_var (type, concat (prefix, name, (void *)0));
+   else
+     new_vect_var = create_tmp_var (type, prefix);
+ 

lang/gcc/4.2/patches/patch-gcc_tree_c

@@ -0,0 +1,17 @@
+$OpenBSD: patch-gcc_tree_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- gcc/tree.c.orig	Thu Jul 13 00:43:27 2006
++++ gcc/tree.c	Sun Jul 23 11:24:02 2006
+@@ -6712,11 +6712,11 @@ build_common_builtin_nodes (void)
+ 	  *q = TOLOWER (*p);
+ 	*q = '\0';
+ 
+-	built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", NULL);
++	built_in_names[mcode] = concat ("__mul", mode_name_buf, "3", (void *)0);
+         local_define_builtin (built_in_names[mcode], ftype, mcode,
+ 			      built_in_names[mcode], ECF_CONST | ECF_NOTHROW);
+ 
+-	built_in_names[dcode] = concat ("__div", mode_name_buf, "3", NULL);
++	built_in_names[dcode] = concat ("__div", mode_name_buf, "3", (void *)0);
+         local_define_builtin (built_in_names[dcode], ftype, dcode,
+ 			      built_in_names[dcode], ECF_CONST | ECF_NOTHROW);
+       }

lang/gcc/4.2/patches/patch-gcc_varasm_c

@@ -0,0 +1,12 @@
+$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)
+ 
+       stripped_name = targetm.strip_name_encoding (name);
+ 
+-      buffer = ACONCAT ((stripped_name, "_unlikely", NULL));
++      buffer = ACONCAT ((stripped_name, "_unlikely", (char *)0));
+       cfun->unlikely_text_section_name = ggc_strdup (buffer);
+     }
+   else

lang/gcc/4.2/patches/patch-libgfortran_Makefile_in

@@ -0,0 +1,13 @@
+$OpenBSD: patch-libgfortran_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libgfortran/Makefile.in.orig	Sun Jul  2 23:17:05 2006
++++ libgfortran/Makefile.in	Sat Jul 22 18:04:32 2006
+@@ -362,7 +362,8 @@ toolexeclibdir = @toolexeclibdir@
+ ACLOCAL_AMFLAGS = -I ../config
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ toolexeclib_LTLIBRARIES = libgfortran.la libgfortranbegin.la
+-libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)
++include $(top_srcdir)/../libversions
++libgfortran_la_LDFLAGS = $(LIBgfortran_LTVERSION) -lm $(extra_ldflags_libgfortran)
+ libgfortranbegin_la_SOURCES = fmain.c
+ libgfortranbegin_la_LDFLAGS = -static
+ AM_CPPFLAGS = -iquote$(srcdir)/io -I$(srcdir)/$(MULTISRCTOP)../gcc \

lang/gcc/4.2/patches/patch-libmudflap_mf-runtime_c

@@ -0,0 +1,11 @@
+$OpenBSD: patch-libmudflap_mf-runtime_c,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libmudflap/mf-runtime.c.orig	Sat Mar  4 17:28:52 2006
++++ libmudflap/mf-runtime.c	Sat Mar  4 17:29:27 2006
+@@ -45,6 +45,7 @@ Software Foundation, 51 Franklin Street,
+ #define _ALL_SOURCE
+ #define _LARGE_FILE_API
+ #define _XOPEN_SOURCE_EXTENDED 1
++#define __BSD_VISIBLE
+ 
+ #include <stdio.h>
+ #include <stdlib.h>

lang/gcc/4.2/patches/patch-libmudflap_mf-runtime_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-libmudflap_mf-runtime_h,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libmudflap/mf-runtime.h.orig	Sat Mar  4 17:22:03 2006
++++ libmudflap/mf-runtime.h	Sat Mar  4 17:27:25 2006
+@@ -36,7 +36,7 @@ Software Foundation, 51 Franklin Street,
+ #define MF_RUNTIME_H
+ 
+ typedef void *__mf_ptr_t;
+-typedef unsigned int __mf_uintptr_t __attribute__ ((__mode__ (__pointer__)));
++typedef unsigned long __mf_uintptr_t __attribute__ ((__mode__ (__pointer__)));
+ typedef __SIZE_TYPE__ __mf_size_t;
+ 
+ /* Global declarations used by instrumentation.  When _MUDFLAP is

lang/gcc/4.2/patches/patch-libobjc_Makefile_in

@@ -0,0 +1,23 @@
+$OpenBSD: patch-libobjc_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libobjc/Makefile.in.orig	Wed May 24 03:22:17 2006
++++ libobjc/Makefile.in	Sun Jul 23 11:24:03 2006
+@@ -273,15 +273,17 @@ doc: info dvi html
+ .PHONY: install-html
+ install-html:
+ 
++include $(toplevel_srcdir)/libversions
++
+ libobjc$(libext).la: $(OBJS)
+ 	$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
+ 		-rpath $(toolexeclibdir) \
+-		-version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc)
++		$(LIBobjc_LTVERSION) $(extra_ldflags_libobjc)
+ 
+ libobjc_gc$(libext).la: $(OBJS_GC)
+ 	$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
+ 		-rpath $(toolexeclibdir) \
+-		-version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc)
++		$(LIBobjc_gc_LTVERSION) $(extra_ldflags_libobjc)
+ 
+ #
+ # FIXME -- The following part does not fit in the libtool context. 

lang/gcc/4.2/patches/patch-libssp_Makefile_in

@@ -0,0 +1,15 @@
+$OpenBSD: patch-libssp_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libssp/Makefile.in.orig	Sun Mar  5 12:49:20 2006
++++ libssp/Makefile.in	Sun Mar  5 12:50:03 2006
+@@ -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
+ 
++include $(top_srcdir)/../libversions
+ libssp_la_LIBADD = 
+ libssp_la_DEPENDENCIES = $(version_dep) $(libssp_la_LIBADD)
+-libssp_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
++libssp_la_LDFLAGS = $(LIBssp_LTVERSION) \
+ 		    $(version_arg)
+ 
+ libssp_nonshared_la_SOURCES = \

lang/gcc/4.2/patches/patch-libstdc++-v3_libsupc++_Makefile_in

@@ -0,0 +1,21 @@
+$OpenBSD: patch-libstdc++-v3_libsupc++_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libstdc++-v3/libsupc++/Makefile.in.orig	Tue Feb  7 23:23:58 2006
++++ libstdc++-v3/libsupc++/Makefile.in	Sun Jul 23 11:24:03 2006
+@@ -304,7 +304,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+ # Need this library to both be part of libstdc++.a, and installed
+ # separately too.
+ # 1) separate libsupc++.la
+-toolexeclib_LTLIBRARIES = libsupc++.la
++toolexeclib_LTLIBRARIES = libesupc++.la
+ # 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
+ noinst_LTLIBRARIES = libsupc++convenience.la
+ headers = \
+@@ -485,7 +485,7 @@ clean-toolexeclibLTLIBRARIES:
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libsupc++.la: $(libsupc___la_OBJECTS) $(libsupc___la_DEPENDENCIES) 
++libesupc++.la: $(libsupc___la_OBJECTS) $(libsupc___la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(toolexeclibdir) $(libsupc___la_LDFLAGS) $(libsupc___la_OBJECTS) $(libsupc___la_LIBADD) $(LIBS)
+ libsupc++convenience.la: $(libsupc__convenience_la_OBJECTS) $(libsupc__convenience_la_DEPENDENCIES) 
+ 	$(CXXLINK)  $(libsupc__convenience_la_LDFLAGS) $(libsupc__convenience_la_OBJECTS) $(libsupc__convenience_la_LIBADD) $(LIBS)

lang/gcc/4.2/patches/patch-libstdc++-v3_src_Makefile_in

@@ -0,0 +1,34 @@
+$OpenBSD: patch-libstdc++-v3_src_Makefile_in,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libstdc++-v3/src/Makefile.in.orig	Tue Jun 13 01:24:22 2006
++++ libstdc++-v3/src/Makefile.in	Sun Jul 23 11:28:32 2006
+@@ -296,7 +296,7 @@ WARN_CXXFLAGS = \
+ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
+ 
+ # Cross compiler support.
+-toolexeclib_LTLIBRARIES = libstdc++.la
++toolexeclib_LTLIBRARIES = libestdc++.la
+ @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
+@@ -383,9 +383,11 @@ libstdc___la_LIBADD = \
+ 	$(top_builddir)/libmath/libmath.la \
+ 	$(top_builddir)/libsupc++/libsupc++convenience.la
+ 
++include $(top_srcdir)/../libversions
++
+ libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
+ libstdc___la_LDFLAGS = \
+-	-version-info $(libtool_VERSION) ${version_arg} -lm 
++	$(LIBestdc++_LTVERSION) ${version_arg} -lm 
+ 
+ 
+ # Use special rules for the deprecated source files so that they find
+@@ -497,7 +499,7 @@ clean-toolexeclibLTLIBRARIES:
+ 	  echo "rm -f \"$${dir}/so_locations\""; \
+ 	  rm -f "$${dir}/so_locations"; \
+ 	done
+-libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 
++libestdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES) 
+ 	$(CXXLINK) -rpath $(toolexeclibdir) $(libstdc___la_LDFLAGS) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:

lang/gcc/4.2/patches/patch-libtool_m4

@@ -0,0 +1,14 @@
+$OpenBSD: patch-libtool_m4,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- libtool.m4.orig	Tue May 10 03:31:58 2005
++++ libtool.m4	Mon May 16 17:43:15 2005
+@@ -757,6 +757,10 @@ newsos6)
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
++openbsd*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
+ osf3* | osf4* | osf5*)
+   # this will be overridden with pass_all, but let us keep it just in case
+   lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'

lang/gcc/4.2/patches/patch-ltcf-c_sh

@@ -0,0 +1,19 @@
+$OpenBSD: patch-ltcf-c_sh,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- ltcf-c.sh.orig	Thu May  5 17:04:38 2005
++++ ltcf-c.sh	Mon May 16 17:43:16 2005
+@@ -514,10 +514,13 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
++    archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    remove_lgcc=yes
++    output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+     ;;
+ 
+   os2*)

lang/gcc/4.2/patches/patch-ltcf-cxx_sh

@@ -0,0 +1,23 @@
+$OpenBSD: patch-ltcf-cxx_sh,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- ltcf-cxx.sh.orig	Thu May  5 17:04:39 2005
++++ ltcf-cxx.sh	Mon May 16 17:43:16 2005
+@@ -453,6 +453,19 @@ case $host_os in
+   netbsd* | knetbsd*-gnu)
+     # NetBSD uses g++ - do we need to do anything?
+     ;;
++  openbsd*)
++    if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
++      # MM: OpenBSD 2.7 uses G++, but not GNU ld
++      archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      old_archive_cmds="$old_archive_cmds~"'$RANLIB $oldlib'
++      hardcode_libdir_flag_spec='${wl}-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      remove_lgcc=yes
++      output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
++    fi
++    ;;
+   osf3*)
+     case $cc_basename in
+       KCC)

lang/gcc/4.2/patches/patch-ltcf-gcj_sh

@@ -0,0 +1,19 @@
+$OpenBSD: patch-ltcf-gcj_sh,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- ltcf-gcj.sh.orig	Thu May  5 17:04:39 2005
++++ ltcf-gcj.sh	Mon May 16 17:43:16 2005
+@@ -489,10 +489,13 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
++    archive_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    archive_expsym_cmds='$CC $pic_flag -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    remove_lgcc=yes
++    output_verbose_link_cmds='$CC $ac_cv_prog_cc_pic -shared $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+     ;;
+ 
+   os2*)

lang/gcc/4.2/patches/patch-ltconfig

@@ -0,0 +1,30 @@
+$OpenBSD: patch-ltconfig,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+--- ltconfig.orig	Tue Jul  4 22:30:34 2006
++++ ltconfig	Sat Jul 22 19:45:19 2006
+@@ -626,7 +626,12 @@ old_postuninstall_cmds=
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="~$old_postinstall_cmds~\$RANLIB \$oldlib"
++  case $host_os in
++  openbsd*)
++      old_postinstall_cmds="~$old_postinstall_cmds~\$RANLIB -t \$oldlib";;
++  *)
++      old_postinstall_cmds="~$old_postinstall_cmds~\$RANLIB \$oldlib";;
++  esac
+ fi
+ 
+ # Source the script associated with the $tagname tag configuration.
+@@ -1306,8 +1311,11 @@ openbsd*)
+     need_version=no
+   fi
+   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  #finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  deplib_check_method=pass_all
++  sys_lib_dlsearch_path_spec='/usr/lib /usr/local/lib /usr/X11R6/lib'
+   ;;
+ 
+ os2*)

lang/gcc/4.2/pkg/PFRAG.shared

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+@lib lib/libssp.so.${LIBssp_VERSION}

lang/gcc/4.2/pkg/PFRAG.shared-estdc

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-estdc,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+@lib lib/libestdc++.so.${LIBestdc++_VERSION}

lang/gcc/4.2/pkg/PFRAG.shared-f95

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-f95,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+@lib lib/libgfortran.so.${LIBgfortran_VERSION}

lang/gcc/4.2/pkg/PFRAG.shared-objc

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared-objc,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+@lib lib/libobjc.so.${LIBobjc_VERSION}

lang/gcc/4.2/pkg/PLIST

@@ -0,0 +1,79 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+%%SHARED%%
+bin/ecpp
+bin/egcc
+bin/egccbug
+bin/egcov
+bin/${CONFIG}-egcc
+bin/${CONFIG}-gcc-${V}
+@info info/cpp.info
+@info info/cppinternals.info
+@info info/gcc.info
+@info info/gccinstall.info
+@info info/gccint.info
+lib/gcc/
+lib/gcc/${CONFIG}/
+lib/gcc/${CONFIG}/${V}/
+lib/gcc/${CONFIG}/${V}/finclude/
+lib/gcc/${CONFIG}/${V}/include/
+lib/gcc/${CONFIG}/${V}/include/README
+lib/gcc/${CONFIG}/${V}/include/com_err.h
+lib/gcc/${CONFIG}/${V}/include/emmintrin.h
+lib/gcc/${CONFIG}/${V}/include/limits.h
+lib/gcc/${CONFIG}/${V}/include/math.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/rpc/
+lib/gcc/${CONFIG}/${V}/include/rpc/rpc_des.h
+lib/gcc/${CONFIG}/${V}/include/rpc/svc.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}/include/xmmintrin.h
+lib/gcc/${CONFIG}/${V}/install-tools/
+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/emmintrin.h
+lib/gcc/${CONFIG}/${V}/install-tools/include/limits.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/unwind.h
+lib/gcc/${CONFIG}/${V}/install-tools/include/xmmintrin.h
+lib/gcc/${CONFIG}/${V}/install-tools/macro_list
+lib/gcc/${CONFIG}/${V}/install-tools/mkheaders.conf
+lib/gcc/${CONFIG}/${V}/libgcc.a
+lib/gcc/${CONFIG}/${V}/libgcov.a
+lib/libiberty.a
+lib/libssp.a
+lib/libssp.la
+lib/libssp_nonshared.a
+lib/libssp_nonshared.la
+libexec/gcc/
+libexec/gcc/${CONFIG}/
+libexec/gcc/${CONFIG}/${V}/
+libexec/gcc/${CONFIG}/${V}/cc1
+libexec/gcc/${CONFIG}/${V}/collect2
+libexec/gcc/${CONFIG}/${V}/install-tools/
+libexec/gcc/${CONFIG}/${V}/install-tools/fixinc.sh
+libexec/gcc/${CONFIG}/${V}/install-tools/fixincl
+libexec/gcc/${CONFIG}/${V}/install-tools/mkheaders
+@man man/man1/ecpp.1
+@man man/man1/egcc.1
+@man man/man1/egcov.1
+@man man/man7/fsf-funding.7
+@man man/man7/gfdl.7
+@man man/man7/gpl.7

lang/gcc/4.2/pkg/PLIST-c++

@@ -0,0 +1,602 @@
+@comment $OpenBSD: PLIST-c++,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+bin/ec++
+bin/eg++
+bin/${CONFIG}-ec++
+bin/${CONFIG}-eg++
+include/c++/
+include/c++/${V}/
+include/c++/${V}/algorithm
+include/c++/${V}/backward/
+include/c++/${V}/backward/algo.h
+include/c++/${V}/backward/algobase.h
+include/c++/${V}/backward/alloc.h
+include/c++/${V}/backward/backward_warning.h
+include/c++/${V}/backward/bvector.h
+include/c++/${V}/backward/complex.h
+include/c++/${V}/backward/defalloc.h
+include/c++/${V}/backward/deque.h
+include/c++/${V}/backward/fstream.h
+include/c++/${V}/backward/function.h
+include/c++/${V}/backward/hash_map.h
+include/c++/${V}/backward/hash_set.h
+include/c++/${V}/backward/hashtable.h
+include/c++/${V}/backward/heap.h
+include/c++/${V}/backward/iomanip.h
+include/c++/${V}/backward/iostream.h
+include/c++/${V}/backward/istream.h
+include/c++/${V}/backward/iterator.h
+include/c++/${V}/backward/list.h
+include/c++/${V}/backward/map.h
+include/c++/${V}/backward/multimap.h
+include/c++/${V}/backward/multiset.h
+include/c++/${V}/backward/new.h
+include/c++/${V}/backward/ostream.h
+include/c++/${V}/backward/pair.h
+include/c++/${V}/backward/queue.h
+include/c++/${V}/backward/rope.h
+include/c++/${V}/backward/set.h
+include/c++/${V}/backward/slist.h
+include/c++/${V}/backward/stack.h
+include/c++/${V}/backward/stream.h
+include/c++/${V}/backward/streambuf.h
+include/c++/${V}/backward/strstream
+include/c++/${V}/backward/tempbuf.h
+include/c++/${V}/backward/tree.h
+include/c++/${V}/backward/vector.h
+include/c++/${V}/bits/
+include/c++/${V}/bits/allocator.h
+include/c++/${V}/bits/atomicity.h
+include/c++/${V}/bits/basic_ios.h
+include/c++/${V}/bits/basic_ios.tcc
+include/c++/${V}/bits/basic_string.h
+include/c++/${V}/bits/basic_string.tcc
+include/c++/${V}/bits/boost_concept_check.h
+include/c++/${V}/bits/char_traits.h
+include/c++/${V}/bits/cmath.tcc
+include/c++/${V}/bits/codecvt.h
+include/c++/${V}/bits/concept_check.h
+include/c++/${V}/bits/concurrence.h
+include/c++/${V}/bits/cpp_type_traits.h
+include/c++/${V}/bits/deque.tcc
+include/c++/${V}/bits/fstream.tcc
+include/c++/${V}/bits/functexcept.h
+include/c++/${V}/bits/gslice.h
+include/c++/${V}/bits/gslice_array.h
+include/c++/${V}/bits/indirect_array.h
+include/c++/${V}/bits/ios_base.h
+include/c++/${V}/bits/istream.tcc
+include/c++/${V}/bits/list.tcc
+include/c++/${V}/bits/locale_classes.h
+include/c++/${V}/bits/locale_facets.h
+include/c++/${V}/bits/locale_facets.tcc
+include/c++/${V}/bits/localefwd.h
+include/c++/${V}/bits/mask_array.h
+include/c++/${V}/bits/ostream.tcc
+include/c++/${V}/bits/postypes.h
+include/c++/${V}/bits/slice_array.h
+include/c++/${V}/bits/sstream.tcc
+include/c++/${V}/bits/stl_algo.h
+include/c++/${V}/bits/stl_algobase.h
+include/c++/${V}/bits/stl_bvector.h
+include/c++/${V}/bits/stl_construct.h
+include/c++/${V}/bits/stl_deque.h
+include/c++/${V}/bits/stl_function.h
+include/c++/${V}/bits/stl_heap.h
+include/c++/${V}/bits/stl_iterator.h
+include/c++/${V}/bits/stl_iterator_base_funcs.h
+include/c++/${V}/bits/stl_iterator_base_types.h
+include/c++/${V}/bits/stl_list.h
+include/c++/${V}/bits/stl_map.h
+include/c++/${V}/bits/stl_multimap.h
+include/c++/${V}/bits/stl_multiset.h
+include/c++/${V}/bits/stl_numeric.h
+include/c++/${V}/bits/stl_pair.h
+include/c++/${V}/bits/stl_queue.h
+include/c++/${V}/bits/stl_raw_storage_iter.h
+include/c++/${V}/bits/stl_relops.h
+include/c++/${V}/bits/stl_set.h
+include/c++/${V}/bits/stl_stack.h
+include/c++/${V}/bits/stl_tempbuf.h
+include/c++/${V}/bits/stl_tree.h
+include/c++/${V}/bits/stl_uninitialized.h
+include/c++/${V}/bits/stl_vector.h
+include/c++/${V}/bits/stream_iterator.h
+include/c++/${V}/bits/streambuf.tcc
+include/c++/${V}/bits/streambuf_iterator.h
+include/c++/${V}/bits/stringfwd.h
+include/c++/${V}/bits/valarray_after.h
+include/c++/${V}/bits/valarray_array.h
+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}/cassert
+include/c++/${V}/cctype
+include/c++/${V}/cerrno
+include/c++/${V}/cfloat
+include/c++/${V}/ciso646
+include/c++/${V}/climits
+include/c++/${V}/clocale
+include/c++/${V}/cmath
+include/c++/${V}/complex
+include/c++/${V}/csetjmp
+include/c++/${V}/csignal
+include/c++/${V}/cstdarg
+include/c++/${V}/cstddef
+include/c++/${V}/cstdio
+include/c++/${V}/cstdlib
+include/c++/${V}/cstring
+include/c++/${V}/ctime
+include/c++/${V}/cwchar
+include/c++/${V}/cwctype
+include/c++/${V}/cxxabi.h
+include/c++/${V}/debug/
+include/c++/${V}/debug/bitset
+include/c++/${V}/debug/debug.h
+include/c++/${V}/debug/deque
+include/c++/${V}/debug/formatter.h
+include/c++/${V}/debug/functions.h
+include/c++/${V}/debug/hash_map
+include/c++/${V}/debug/hash_map.h
+include/c++/${V}/debug/hash_multimap.h
+include/c++/${V}/debug/hash_multiset.h
+include/c++/${V}/debug/hash_set
+include/c++/${V}/debug/hash_set.h
+include/c++/${V}/debug/list
+include/c++/${V}/debug/macros.h
+include/c++/${V}/debug/map
+include/c++/${V}/debug/map.h
+include/c++/${V}/debug/multimap.h
+include/c++/${V}/debug/multiset.h
+include/c++/${V}/debug/safe_base.h
+include/c++/${V}/debug/safe_iterator.h
+include/c++/${V}/debug/safe_iterator.tcc
+include/c++/${V}/debug/safe_sequence.h
+include/c++/${V}/debug/set
+include/c++/${V}/debug/set.h
+include/c++/${V}/debug/string
+include/c++/${V}/debug/vector
+include/c++/${V}/deque
+include/c++/${V}/exception
+include/c++/${V}/exception_defines.h
+include/c++/${V}/ext/
+include/c++/${V}/ext/algorithm
+include/c++/${V}/ext/array_allocator.h
+include/c++/${V}/ext/bitmap_allocator.h
+include/c++/${V}/ext/codecvt_specializations.h
+include/c++/${V}/ext/debug_allocator.h
+include/c++/${V}/ext/functional
+include/c++/${V}/ext/hash_fun.h
+include/c++/${V}/ext/hash_map
+include/c++/${V}/ext/hash_set
+include/c++/${V}/ext/hashtable.h
+include/c++/${V}/ext/iterator
+include/c++/${V}/ext/malloc_allocator.h
+include/c++/${V}/ext/memory
+include/c++/${V}/ext/mt_allocator.h
+include/c++/${V}/ext/new_allocator.h
+include/c++/${V}/ext/numeric
+include/c++/${V}/ext/pb_ds/
+include/c++/${V}/ext/pb_ds/assoc_container.hpp
+include/c++/${V}/ext/pb_ds/detail/
+include/c++/${V}/ext/pb_ds/detail/basic_tree_policy/
+include/c++/${V}/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
+include/c++/${V}/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
+include/c++/${V}/ext/pb_ds/detail/basic_tree_policy/traits.hpp
+include/c++/${V}/ext/pb_ds/detail/basic_types.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_/
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
+include/c++/${V}/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/cond_dealtor.hpp
+include/c++/${V}/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/container_base_dispatch.hpp
+include/c++/${V}/ext/pb_ds/detail/eq_fn/
+include/c++/${V}/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+include/c++/${V}/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
+include/c++/${V}/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/
+include/c++/${V}/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
+include/c++/${V}/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_policy/
+include/c++/${V}/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
+include/c++/${V}/ext/pb_ds/detail/map_debug_base.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+include/c++/${V}/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/head.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/internal_node.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/leaf.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/node_base.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/traits.hpp
+include/c++/${V}/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/node.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/
+include/c++/${V}/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+include/c++/${V}/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/node.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/splay_tree_/traits.hpp
+include/c++/${V}/ext/pb_ds/detail/standard_policies.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+include/c++/${V}/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
+include/c++/${V}/ext/pb_ds/detail/tree_policy/
+include/c++/${V}/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+include/c++/${V}/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
+include/c++/${V}/ext/pb_ds/detail/tree_trace_base.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/
+include/c++/${V}/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
+include/c++/${V}/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+include/c++/${V}/ext/pb_ds/detail/type_utils.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/
+include/c++/${V}/ext/pb_ds/detail/typelist.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_append.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_apply.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_assoc_container_find.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_at_index.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_contains.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_filter.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_flatten.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_transform.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist/typelist_typelist_append.hpp
+include/c++/${V}/ext/pb_ds/detail/typelist_assoc_container.hpp
+include/c++/${V}/ext/pb_ds/detail/types_traits.hpp
+include/c++/${V}/ext/pb_ds/detail/unordered_iterator/
+include/c++/${V}/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/unordered_iterator/iterator.hpp
+include/c++/${V}/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
+include/c++/${V}/ext/pb_ds/exception.hpp
+include/c++/${V}/ext/pb_ds/hash_policy.hpp
+include/c++/${V}/ext/pb_ds/list_update_policy.hpp
+include/c++/${V}/ext/pb_ds/priority_queue.hpp
+include/c++/${V}/ext/pb_ds/tag_and_trait.hpp
+include/c++/${V}/ext/pb_ds/tree_policy.hpp
+include/c++/${V}/ext/pb_ds/trie_policy.hpp
+include/c++/${V}/ext/pod_char_traits.h
+include/c++/${V}/ext/pool_allocator.h
+include/c++/${V}/ext/rb_tree
+include/c++/${V}/ext/rc_string_base.h
+include/c++/${V}/ext/rope
+include/c++/${V}/ext/ropeimpl.h
+include/c++/${V}/ext/slist
+include/c++/${V}/ext/sso_string_base.h
+include/c++/${V}/ext/stdio_filebuf.h
+include/c++/${V}/ext/stdio_sync_filebuf.h
+include/c++/${V}/ext/typelist.h
+include/c++/${V}/ext/vstring.h
+include/c++/${V}/ext/vstring.tcc
+include/c++/${V}/ext/vstring_fwd.h
+include/c++/${V}/ext/vstring_util.h
+include/c++/${V}/fstream
+include/c++/${V}/functional
+include/c++/${V}/${CONFIG}/
+include/c++/${V}/${CONFIG}/bits/
+include/c++/${V}/${CONFIG}/bits/atomic_word.h
+include/c++/${V}/${CONFIG}/bits/basic_file.h
+include/c++/${V}/${CONFIG}/bits/c++allocator.h
+include/c++/${V}/${CONFIG}/bits/c++config.h
+include/c++/${V}/${CONFIG}/bits/c++io.h
+include/c++/${V}/${CONFIG}/bits/c++locale.h
+include/c++/${V}/${CONFIG}/bits/cpu_defines.h
+include/c++/${V}/${CONFIG}/bits/ctype_base.h
+include/c++/${V}/${CONFIG}/bits/ctype_inline.h
+include/c++/${V}/${CONFIG}/bits/ctype_noninline.h
+include/c++/${V}/${CONFIG}/bits/cxxabi_tweaks.h
+include/c++/${V}/${CONFIG}/bits/gthr-default.h
+include/c++/${V}/${CONFIG}/bits/gthr-posix.h
+include/c++/${V}/${CONFIG}/bits/gthr-single.h
+include/c++/${V}/${CONFIG}/bits/gthr-tpf.h
+include/c++/${V}/${CONFIG}/bits/gthr.h
+include/c++/${V}/${CONFIG}/bits/messages_members.h
+include/c++/${V}/${CONFIG}/bits/os_defines.h
+include/c++/${V}/${CONFIG}/bits/time_members.h
+include/c++/${V}/iomanip
+include/c++/${V}/ios
+include/c++/${V}/iosfwd
+include/c++/${V}/iostream
+include/c++/${V}/istream
+include/c++/${V}/iterator
+include/c++/${V}/limits
+include/c++/${V}/list
+include/c++/${V}/locale
+include/c++/${V}/map
+include/c++/${V}/memory
+include/c++/${V}/new
+include/c++/${V}/numeric
+include/c++/${V}/ostream
+include/c++/${V}/queue
+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}/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/cctype
+include/c++/${V}/tr1/cfenv
+include/c++/${V}/tr1/cfloat
+include/c++/${V}/tr1/cinttypes
+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/cstdarg
+include/c++/${V}/tr1/cstdbool
+include/c++/${V}/tr1/cstdint
+include/c++/${V}/tr1/cstdio
+include/c++/${V}/tr1/cstdlib
+include/c++/${V}/tr1/ctgmath
+include/c++/${V}/tr1/ctime
+include/c++/${V}/tr1/ctype.h
+include/c++/${V}/tr1/cwchar
+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_iterate.h
+include/c++/${V}/tr1/hashtable
+include/c++/${V}/tr1/inttypes.h
+include/c++/${V}/tr1/limits.h
+include/c++/${V}/tr1/math.h
+include/c++/${V}/tr1/memory
+include/c++/${V}/tr1/mu_iterate.h
+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/repeat.h
+include/c++/${V}/tr1/stdarg.h
+include/c++/${V}/tr1/stdbool.h
+include/c++/${V}/tr1/stdint.h
+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_iterate.h
+include/c++/${V}/tr1/type_traits
+include/c++/${V}/tr1/type_traits_fwd.h
+include/c++/${V}/tr1/unordered_map
+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}/typeinfo
+include/c++/${V}/utility
+include/c++/${V}/valarray
+include/c++/${V}/vector
+lib/libestdc++.a
+lib/libestdc++.la
+lib/libesupc++.a
+lib/libesupc++.la
+libexec/gcc/${CONFIG}/${V}/cc1plus
+@man man/man1/eg++.1

lang/gcc/4.2/pkg/PLIST-estdc

@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-estdc,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+%%SHARED%%

lang/gcc/4.2/pkg/PLIST-f95

@@ -0,0 +1,10 @@
+@comment $OpenBSD: PLIST-f95,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+bin/egfortran
+bin/${CONFIG}-egfortran
+@info info/gfortran.info
+lib/libgfortran.a
+lib/libgfortran.la
+lib/libgfortranbegin.a
+lib/libgfortranbegin.la
+libexec/gcc/${CONFIG}/${V}/f951
+@man man/man1/egfortran.1

lang/gcc/4.2/pkg/PLIST-objc

@@ -0,0 +1,18 @@
+@comment $OpenBSD: PLIST-objc,v 1.1.1.1 2006/07/31 09:50:53 espie Exp $
+%%SHARED%%
+lib/gcc/${CONFIG}/${V}/include/objc/
+lib/gcc/${CONFIG}/${V}/include/objc/NXConstStr.h
+lib/gcc/${CONFIG}/${V}/include/objc/Object.h
+lib/gcc/${CONFIG}/${V}/include/objc/Protocol.h
+lib/gcc/${CONFIG}/${V}/include/objc/encoding.h
+lib/gcc/${CONFIG}/${V}/include/objc/hash.h
+lib/gcc/${CONFIG}/${V}/include/objc/objc-api.h
+lib/gcc/${CONFIG}/${V}/include/objc/objc-decls.h
+lib/gcc/${CONFIG}/${V}/include/objc/objc-list.h
+lib/gcc/${CONFIG}/${V}/include/objc/objc.h
+lib/gcc/${CONFIG}/${V}/include/objc/sarray.h
+lib/gcc/${CONFIG}/${V}/include/objc/thr.h
+lib/gcc/${CONFIG}/${V}/include/objc/typedstream.h
+lib/libobjc.a
+lib/libobjc.la
+libexec/gcc/${CONFIG}/${V}/cc1obj