20 files changed, 524 insertions, 306 deletions

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 2788cbf79dff..df7a74ec2443 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -1,24 +1,26 @@
-# ex:ts=8
-# Ports collection makefile for:	egcs
+# ex:ts=8 
+# Ports collection makefile for:	egcs 
 # Version required: 			1998-09-14
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.55 1999/04/22 00:17:00 scrappy Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
-DISTNAME=	egcs-1.1.2
+DISTNAME=	gcc-2.95
 CATEGORIES=	lang
-MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.2/ \
-		ftp://ftp.crc.ca/pub/packages/egcs/egcs-1.1.2/ \
-		ftp://ftp.funet.fi/mirrors/ftp.cygnus.com/pub/egcs/releases/egcs-1.1.2/ \
-		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.2/ \
-		ftp://ftp.nluug.nl/pub/languages/egcs/releases/egcs-1.1.2/ \
-		ftp://ftp.iij.ad.jp/pub/egcs/releases/egcs-1.1.2/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.2/ \
-		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.2/
-DISTFILES=	egcs-core-1.1.2${EXTRACT_SUFX} egcs-g++-1.1.2${EXTRACT_SUFX} \
-		egcs-g77-1.1.2${EXTRACT_SUFX} egcs-objc-1.1.2${EXTRACT_SUFX}
+MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/releases/gcc-2.95/ \
+		ftp://egcs.cygnus.com/pub/egcs/releases/gcc-2.95/ \
+		ftp://ftp.nluug.nl/pub/languages/egcs/releases/gcc-2.95/ \
+		ftp://ftp.iij.ad.jp/pub/egcs/releases/gcc-2.95/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+		ftp://cambridge.cygnus.com/pub/egcs/releases/gcc-2.95/
+DISTFILES=	gcc-chill-2.95${EXTRACT_SUFX} \
+		gcc-core-2.95${EXTRACT_SUFX} \
+		gcc-g++-2.95${EXTRACT_SUFX} \
+		gcc-g77-2.95${EXTRACT_SUFX} \
+		gcc-java-2.95${EXTRACT_SUFX} \
+		gcc-objc-2.95${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
@@ -26,8 +28,9 @@ USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.91.66
-LIBSTDCPP_REV=	2.9.0
+EGCS_REV=	2.95
+#EGCS_REV=	${DISTNAME:S/gcc-//g}
+LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -46,27 +49,29 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+.if defined(WANT_THREADS)
+#	?is this an ObjC only thing?
+CONFIGURE_ARGS+= --enable-threads=posix
+.endif
 ALL_TARGET=	bootstrap
-MAN1=		cccp.1 g++.1 g77.1 gcc.1
+MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 
 pre-patch:
-	@${MV} ${WRKSRC}/gcc/config/i386/t-freebsd ${WRKSRC}/gcc/config/
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
-	@${CP} ${FILESDIR}/alpha-freebsd-elf.h ${WRKSRC}/gcc/config/alpha/freebsd-elf.h
-	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 
 pre-configure:
-	@# Keep from running `autoconf' and `autoheader' since we modified
-	@# configure.in by patching it.
-	@touch ${WRKSRC}/gcc/configure
-	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
 		>${WRKSRC}/gcc/config/freebsd.h )
+	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
 	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
 .endif
+	@# Keep from running `autoconf' and `autoheader' since we modified
+	@# configure.in by patching it.
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
@@ -75,23 +80,30 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
-	ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
-	ln -f ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
+	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
+	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
+	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
+	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
-	${MV} -f ${PREFIX}/lib/libstdc++.a  \
+	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/libstdc++.a
+	${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
+	${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
+	${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
diff --git a/lang/egcs/distinfo b/lang/egcs/distinfo
index 55665654d3f3..f2aa950eb8a6 100644
--- a/lang/egcs/distinfo
+++ b/lang/egcs/distinfo
@@ -1,4 +1,6 @@
-MD5 (egcs-core-1.1.2.tar.bz2) = ad12b8eb6014a3f4fd3fe7f9bd6df01d
-MD5 (egcs-g++-1.1.2.tar.bz2) = defecf8027a98c18b0ecbff0ab970243
-MD5 (egcs-g77-1.1.2.tar.bz2) = d5e7e645896a549bdbdfebbb01bc3235
-MD5 (egcs-objc-1.1.2.tar.bz2) = 91e12ee2e12fa866aeec41174bcf1dfe
+MD5 (gcc-chill-2.95.tar.bz2) = 333a99f39f25d8a14e61ba5ab780eb9c
+MD5 (gcc-core-2.95.tar.bz2) = 004125166945eaa208a0c61efb37cfda
+MD5 (gcc-g++-2.95.tar.bz2) = 4f17b967c48678cdba833419d4787dc4
+MD5 (gcc-g77-2.95.tar.bz2) = 3639c3aa750811cde2e0f25ada85697a
+MD5 (gcc-java-2.95.tar.bz2) = a9aecfe117f57ab89671e38f52dc3458
+MD5 (gcc-objc-2.95.tar.bz2) = 45a1e42d5ece87257d7b6e724d286c69
diff --git a/lang/egcs/files/alpha-freebsd.h b/lang/egcs/files/alpha-freebsd.h
index e6f81cca503a..f10b264f9594 100644
--- a/lang/egcs/files/alpha-freebsd.h
+++ b/lang/egcs/files/alpha-freebsd.h
@@ -38,6 +38,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* This is the char to use for continuation (in case we need to turn
    continuation back on). */
 
+#undef DBX_CONTIN_CHAR
 #define DBX_CONTIN_CHAR '?'
 
 #undef ASM_FINAL_SPEC
@@ -46,20 +47,28 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    XXX FreeBSD, by convention, shouldn't do __alpha, but lots of applications
    expect it because that's what OSF/1 does. */
 
+#undef TARGET_VERSION
+#define TARGET_VERSION fprintf (stderr, " (FreeBSD/alpha ELF)");
+
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_FP | MASK_FPREGS | MASK_GAS)
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "\
--D__alpha__ -D__alpha -Acpu(alpha) -Amachine(alpha) " \
-CPP_FBSD_PREDEFINES \
-SUB_CPP_PREDEFINES
+#define CPP_PREDEFINES \
+  "-D__alpha__ -D__alpha -D__ELF__ -Acpu(alpha) -Amachine(alpha)"  \
+  CPP_FBSD_PREDEFINES
+
+#undef CPP_SPEC
+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
 
 /* Make gcc agree with <machine/ansi.h> */
 
 #undef WCHAR_TYPE
 #define WCHAR_TYPE "int"
 
+#undef WCHAR_UNSIGNED
+#define WCHAR_UNSIGNED 0
+
 #undef WCHAR_TYPE_SIZE
 #define WCHAR_TYPE_SIZE 32
 
@@ -94,6 +103,7 @@ SUB_CPP_PREDEFINES
   fprintf (FILE, "\t.set noat\n");				\
 }
 
+#undef ASM_OUTPUT_SOURCE_LINE
 #define ASM_OUTPUT_SOURCE_LINE(STREAM, LINE)				\
   alpha_output_lineno (STREAM, LINE)
 extern void alpha_output_lineno ();
@@ -105,14 +115,18 @@ extern void output_file_directive ();
    .ident string is patterned after the ones produced by native svr4
    C compilers.  */
 
+#undef IDENT_ASM_OP
 #define IDENT_ASM_OP ".ident"
 
 #ifdef IDENTIFY_WITH_IDENT
+#undef ASM_IDENTIFY_GCC
 #define ASM_IDENTIFY_GCC(FILE) /* nothing */
+#undef ASM_IDENTIFY_LANGUAGE
 #define ASM_IDENTIFY_LANGUAGE(FILE)			\
  fprintf(FILE, "\t%s \"GCC (%s) %s\"\n", IDENT_ASM_OP,	\
 	 lang_identify(), version_string)
 #else
+#undef ASM_FILE_END
 #define ASM_FILE_END(FILE)					\
 do {				 				\
      fprintf ((FILE), "\t%s\t\"GCC: (GNU) %s\"\n",		\
@@ -126,12 +140,14 @@ do {				 				\
 
 /* Output #ident as a .ident.  */
 
+#undef ASM_OUTPUT_IDENT
 #define ASM_OUTPUT_IDENT(FILE, NAME) \
   fprintf (FILE, "\t%s\t\"%s\"\n", IDENT_ASM_OP, NAME);
 
 /* This is how to allocate empty space in some section.  The .zero
    pseudo-op is used for this on most svr4 assemblers.  */
 
+#undef SKIP_ASM_OP
 #define SKIP_ASM_OP	".zero"
 
 #undef ASM_OUTPUT_SKIP
@@ -146,6 +162,7 @@ do {				 				\
    make sure that the location counter for the .rodata section gets pro-
    perly re-aligned prior to the actual beginning of the jump table.  */
 
+#undef ALIGN_ASM_OP
 #define ALIGN_ASM_OP ".align"
 
 #ifndef ASM_OUTPUT_BEFORE_CASE_LABEL
@@ -164,6 +181,7 @@ do {				 				\
    library routines (e.g. .udiv) be explicitly declared as .globl
    in each assembly file where they are referenced.  */
 
+#undef ASM_OUTPUT_EXTERNAL_LIBCALL
 #define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, FUN)				\
   ASM_GLOBALIZE_LABEL (FILE, XSTR (FUN, 0))
 
@@ -172,6 +190,7 @@ do {				 				\
    the linker seems to want the alignment of data objects
    to depend on their types.  We do exactly that here.  */
 
+#undef COMMON_ASM_OP
 #define COMMON_ASM_OP	".comm"
 
 #undef ASM_OUTPUT_ALIGNED_COMMON
@@ -187,6 +206,7 @@ do {									\
    the linker seems to want the alignment of data objects
    to depend on their types.  We do exactly that here.  */
 
+#undef LOCAL_ASM_OP
 #define LOCAL_ASM_OP	".local"
 
 #undef ASM_OUTPUT_ALIGNED_LOCAL
@@ -201,6 +221,7 @@ do {									\
 /* This is the pseudo-op used to generate a 64-bit word of data with a
    specific value in some section.  */
 
+#undef INT_ASM_OP
 #define INT_ASM_OP		".quad"
 
 /* This is the pseudo-op used to generate a contiguous sequence of byte
@@ -218,8 +239,10 @@ do {									\
    EXTRA_SECTIONS, EXTRA_SECTION_FUNCTIONS, SELECT_SECTION, and
    SELECT_RTX_SECTION.  We do both here just to be on the safe side.  */
 
+#undef USE_CONST_SECTION
 #define USE_CONST_SECTION	1
 
+#undef CONST_SECTION_ASM_OP
 #define CONST_SECTION_ASM_OP	".section\t.rodata"
 
 /* Define the pseudo-ops used to switch to the .ctors and .dtors sections.
@@ -237,7 +260,9 @@ do {									\
    errors unless the .ctors and .dtors sections are marked as writable
    via the SHF_WRITE attribute.)  */
 
+#undef CTORS_SECTION_ASM_OP
 #define CTORS_SECTION_ASM_OP	".section\t.ctors,\"aw\""
+#undef DTORS_SECTION_ASM_OP
 #define DTORS_SECTION_ASM_OP	".section\t.dtors,\"aw\""
 
 /* On svr4, we *do* have support for the .init and .fini sections, and we
@@ -246,7 +271,9 @@ do {									\
    The definitions say how to change sections to the .init and .fini
    sections.  This is the same for all known svr4 assemblers.  */
 
+#undef INIT_SECTION_ASM_OP
 #define INIT_SECTION_ASM_OP	".section\t.init"
+#undef FINI_SECTION_ASM_OP
 #define FINI_SECTION_ASM_OP	".section\t.fini"
 
 /* A default list of other sections which we might be "in" at any given
@@ -272,6 +299,7 @@ do {									\
 
 extern void text_section ();
 
+#undef CONST_SECTION_FUNCTION
 #define CONST_SECTION_FUNCTION						\
 void									\
 const_section ()							\
@@ -285,6 +313,7 @@ const_section ()							\
     }									\
 }
 
+#undef CTORS_SECTION_FUNCTION
 #define CTORS_SECTION_FUNCTION						\
 void									\
 ctors_section ()							\
@@ -296,6 +325,7 @@ ctors_section ()							\
     }									\
 }
 
+#undef DTORS_SECTION_FUNCTION
 #define DTORS_SECTION_FUNCTION						\
 void									\
 dtors_section ()							\
@@ -312,6 +342,7 @@ dtors_section ()							\
 
    We make the section read-only and executable for a function decl,
    read-only for a const data decl, and writable for a non-const data decl.  */
+#undef ASM_OUTPUT_SECTION_NAME
 #define ASM_OUTPUT_SECTION_NAME(FILE, DECL, NAME, RELOC) \
   fprintf (FILE, ".section\t%s,\"%s\",@progbits\n", NAME, \
 	   (DECL) && TREE_CODE (DECL) == FUNCTION_DECL ? "ax" : \
@@ -320,6 +351,7 @@ dtors_section ()							\
 
 /* A C statement (sans semicolon) to output an element in the table of
    global constructors.  */
+#undef ASM_OUTPUT_CONSTRUCTOR
 #define ASM_OUTPUT_CONSTRUCTOR(FILE,NAME)				\
   do {									\
     ctors_section ();							\
@@ -330,6 +362,7 @@ dtors_section ()							\
 
 /* A C statement (sans semicolon) to output an element in the table of
    global destructors.  */
+#undef ASM_OUTPUT_DESTRUCTOR
 #define ASM_OUTPUT_DESTRUCTOR(FILE,NAME)       				\
   do {									\
     dtors_section ();                   				\
@@ -343,6 +376,7 @@ dtors_section ()							\
    or a constant of some sort.  RELOC indicates whether forming
    the initial value of DECL requires link-time relocations.  */
 
+#undef SELECT_SECTION
 #define SELECT_SECTION(DECL,RELOC)					\
 {									\
   if (TREE_CODE (DECL) == STRING_CST)					\
@@ -376,17 +410,20 @@ dtors_section ()							\
 #undef SELECT_RTX_SECTION
 #define SELECT_RTX_SECTION(MODE,RTX) const_section()
 
-/* Define the strings used for the special svr4 .type and .size directives.
+/* Define the strings used for the .type, .size and .set directives.
    These strings generally do not vary from one system running svr4 to
    another, but if a given system (e.g. m88k running svr) needs to use
    different pseudo-op names for these, they may be overridden in the
    file which includes this one.  */
 
+#undef TYPE_ASM_OP
 #define TYPE_ASM_OP	".type"
+#undef SIZE_ASM_OP
 #define SIZE_ASM_OP	".size"
 
 /* This is how we tell the assembler that two symbols have the same value.  */
 
+#undef ASM_OUTPUT_DEF
 #define ASM_OUTPUT_DEF(FILE,NAME1,NAME2) \
   do { assemble_name(FILE, NAME1); 	 \
        fputs(" = ", FILE);		 \
@@ -407,6 +444,7 @@ dtors_section ()							\
    the i386) don't know about that.  Also, we don't use \v
    since some versions of gas, such as 2.2 did not accept it.  */
 
+#undef ESCAPES
 #define ESCAPES \
 "\1\1\1\1\1\1\1\1btn\1fr\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\
 \0\0\"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\
@@ -429,15 +467,83 @@ dtors_section ()							\
    should define this to zero.
 */
 
+#undef STRING_LIMIT
 #define STRING_LIMIT	((unsigned) 256)
 
+#undef STRING_ASM_OP
 #define STRING_ASM_OP	".string"
 
 /*
  * We always use gas here, so we don't worry about ECOFF assembler problems.
  */
 #undef TARGET_GAS
-#define TARGET_GAS	(1)
+#define TARGET_GAS	1
 
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
+
+#undef LINK_SPEC
+#define LINK_SPEC "-m elf64alpha 				\
+  %{p:%e`-p' not supported; use `-pg' and gprof(1)}		\
+  %{Wl,*:%*}							\
+  %{assert*} %{R*} %{rpath*} %{defsym*}				\
+  %{shared:-Bshareable %{h*} %{soname*}}			\
+  %{symbolic:-Bsymbolic}					\
+  %{!shared:							\
+    %{!static:							\
+      %{rdynamic:-export-dynamic}				\
+      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld-elf.so.1}} \
+    %{static:-Bstatic}}"
+
+#undef	STARTFILE_SPEC
+#define STARTFILE_SPEC \
+  "%{!shared: %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} %{!p:crt1.o%s}}} \
+     %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
+
+/* Provide a ENDFILE_SPEC appropriate for ELF.  Here we tack on the
+   magical crtend.o file which provides part of the support for
+   getting C++ file-scope static object constructed before entering
+   `main', followed by a normal ELF "finalizer" file, `crtn.o'.  */
+
+#undef	ENDFILE_SPEC
+#define ENDFILE_SPEC \
+  "%{!shared:crtend.o%s} %{shared:crtendS.o%s}"
+
+/* Implicit library calls should use memcpy, not bcopy, etc.  */
+
+#define TARGET_MEM_FUNCTIONS
+
+/* Handle #pragma weak and #pragma pack.  */
+
+#define HANDLE_SYSV_PRAGMA
+
+/*
+ * Some imports from svr4.h in support of shared libraries.
+ * Currently, we need the DECLARE_OBJECT_SIZE stuff.
+ */
+
+/* This is how we tell the assembler that a symbol is weak.  */
+
+#undef ASM_WEAKEN_LABEL
+#define ASM_WEAKEN_LABEL(FILE,NAME) \
+  do { fputs ("\t.globl\t", FILE); assemble_name (FILE, NAME); \
+       fputc ('\n', FILE); \
+       fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \
+       fputc ('\n', FILE); } while (0)
+
+/* The following macro defines the format used to output the second
+   operand of the .type assembler directive.  Different svr4 assemblers
+   expect various different forms for this operand.  The one given here
+   is just a default.  You may need to override it in your machine-
+   specific tm.h file (depending upon the particulars of your assembler).  */
+
+#undef TYPE_OPERAND_FMT
+#define TYPE_OPERAND_FMT	"@%s"
+
+/* Write the extra assembler code needed to declare a function's result.
+   Most svr4 assemblers don't require any special declaration of the
+   result value, but there are exceptions.  */
+
+#ifndef ASM_DECLARE_RESULT
+#define ASM_DECLARE_RESULT(FILE, RESULT)
+#endif
diff --git a/lang/egcs/files/freebsd.h b/lang/egcs/files/freebsd.h
index 5719d55a4b9b..40ed10359025 100644
--- a/lang/egcs/files/freebsd.h
+++ b/lang/egcs/files/freebsd.h
@@ -1,3 +1,4 @@
+/* $Id: freebsd.h,v 1.8 1999/07/25 03:34:38 obrien Exp $ */
 /* Base configuration file for all FreeBSD targets.
    Copyright (C) 1999 Free Software Foundation, Inc.
 
@@ -25,59 +26,81 @@ Boston, MA 02111-1307, USA.  */
    egcs/gcc/config/i386/freebsd-elf.h version by David O'Brien  */
 
 
-/* Don't assume anything about the header files. */
+/* Don't assume anything about the header files.  */
 #undef NO_IMPLICIT_EXTERN_C
 #define NO_IMPLICIT_EXTERN_C
 
 /* This defines which switch letters take arguments.  On FreeBSD, most of
    the normal cases (defined in gcc.c) apply, and we also have -h* and
    -z* options (for the linker) (comming from svr4).
-   We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */
+   We also have -R (alias --rpath), no -z, --soname (-h), --assert etc.  */
+
+#define FBSD_SWITCH_TAKES_ARG(CHAR)					\
+  (DEFAULT_SWITCH_TAKES_ARG (CHAR)					\
+    || (CHAR) == 'h'							\
+    || (CHAR) == 'z' /* ignored by ld */				\
+    || (CHAR) == 'R')
 
 #undef SWITCH_TAKES_ARG
-#define SWITCH_TAKES_ARG(CHAR) \
-  (DEFAULT_SWITCH_TAKES_ARG (CHAR) \
-   || (CHAR) == 'h' \
-   || (CHAR) == 'z' /* ignored by ld */ \
-   || (CHAR) == 'R')
+#define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR))
 
-#undef WORD_SWITCH_TAKES_ARG
-#define WORD_SWITCH_TAKES_ARG(STR)					\
+#define FBSD_WORD_SWITCH_TAKES_ARG(STR)					\
   (DEFAULT_WORD_SWITCH_TAKES_ARG (STR)					\
    || !strcmp (STR, "rpath") || !strcmp (STR, "rpath-link")		\
    || !strcmp (STR, "soname") || !strcmp (STR, "defsym") 		\
    || !strcmp (STR, "assert") || !strcmp (STR, "dynamic-linker"))
 
+#undef WORD_SWITCH_TAKES_ARG
+#define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR))
 
+/* Place spaces around this string.  We depend on string splicing to produce
+   the final CPP_PREDEFINES value.  */
 #define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) "
 
+/* Provide a LIB_SPEC appropriate for FreeBSD.  Just select the appropriate
+   libc, depending on whether we're doing profiling or need threads support.
+   (simular to the default, except no -lg, and no -p).  */
+
+#undef LIB_SPEC
+#define LIB_SPEC "%{!shared: \
+   %{!pg:%{!pthread:%{!kthread:-lc} \
+     %{kthread:-lpthread -lc}} \
+     %{pthread:-lc_r}} \
+   %{pg:%{!pthread:%{!kthread:-lc_p} \
+     %{kthread:-lpthread_p -lc_p}} \
+     %{pthread:-lc_r_p}}}"
+
+/* Tell gcc to locate libgcc.a for us according to the -m rules.  */
+#undef LIBGCC_SPEC
+#define LIBGCC_SPEC \
+ "%{!shared:%{!pthread:%{!kthread:libgcc.a%s}}%{pthread|kthread:libgcc_r.a%s}}"
+
 
 /* Code generation parameters.  */
 
 /* Don't default to pcc-struct-return, because gcc is the only compiler, and
-   we want to retain compatibility with older gcc versions.  
+   we want to retain compatibility with older gcc versions
    (even though the svr4 ABI for the i386 says that records and unions are
-   returned in memory)  */
+   returned in memory).  */
 #undef DEFAULT_PCC_STRUCT_RETURN
 #define DEFAULT_PCC_STRUCT_RETURN 0
 
 /* Ensure we the configuration knows our system correctly so we can link with
-   libraries compiled with the native cc. */
+   libraries compiled with the native cc.  */
 #undef NO_DOLLAR_IN_LABEL
 
-/* Use more efficient ``thunks'' to implement C++ vtables.  XXX note that 
-   this setting is claimed to have a few bugs by the EGCS maintainers.  They
-   believe the bugs will be worked out in EGCS 1.2. */
+/* Use more efficient ``thunks'' to implement C++ vtables.  */
 #undef DEFAULT_VTABLE_THUNKS
 #define DEFAULT_VTABLE_THUNKS 1
 
-/* Our malloc can allocte pagesized blocks efficiently.  The default size 
-   of 4072 bytes is not optimal on the i386 nor the Alpha. */
-#undef OBSTACK_CHUNK_SIZE
-#define OBSTACK_CHUNK_SIZE	(getpagesize())
-
 
 /* Miscellaneous parameters.  */
 
 /* Tell libgcc2.c that FreeBSD targets support atexit(3).  */
 #define HAVE_ATEXIT
+
+#ifdef BOOTSTRAP_BOMBS_ON_CURRENT
+/* Our malloc can allocte pagesized blocks efficiently.  The default size 
+   of 4072 bytes is not optimal on the i386 nor the Alpha.  */
+#define OBSTACK_CHUNK_SIZE	(getpagesize())
+#endif
diff --git a/lang/egcs/files/patch-ad b/lang/egcs/files/patch-ad
index bea070deb344..f8a3b90fdb1a 100644
--- a/lang/egcs/files/patch-ad
+++ b/lang/egcs/files/patch-ad
@@ -1,5 +1,5 @@
---- gcc/config/i386/freebsd-aout.h.orig	Mon Mar  1 14:47:33 1999
-+++ gcc/config/i386/freebsd-aout.h	Sat Mar 20 00:27:02 1999
+--- gcc/config/i386/freebsd-aout.h.orig	Tue Jun  1 17:02:37 1999
++++ gcc/config/i386/freebsd-aout.h	Mon Jun 14 14:11:20 1999
 @@ -20,6 +20,10 @@
  the Free Software Foundation, 59 Temple Place - Suite 330,
  Boston, MA 02111-1307, USA.  */
@@ -8,25 +8,31 @@
 +/* Get generic FreeBSD definitions.  */
 +#include <freebsd.h>
 +
- /* This goes away when the math-emulator is fixed */
- #define TARGET_CPU_DEFAULT 0400		/* TARGET_NO_FANCY_MATH_387 */
+ /* This is tested by i386gas.h.  */
+ #define YES_UNDERSCORES
  
-@@ -35,7 +39,7 @@
+@@ -32,12 +36,10 @@
  #include "i386/perform.h"
  
+ /* This goes away when the math-emulator is fixed */
+-#undef TARGET_DEFAULT
+-#define TARGET_DEFAULT \
+-  (MASK_80387 | MASK_IEEE_FP | MASK_FLOAT_RETURNS | MASK_NO_FANCY_MATH_387)
++#define TARGET_CPU_DEFAULT 0400		/* TARGET_NO_FANCY_MATH_387 */
+ 
  #undef CPP_PREDEFINES
 -#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
 +#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES
  
  /* Like the default, except no -lg.  */
  #define LIB_SPEC "%{!shared:%{!pg:-lc}%{pg:-lc_p}}"
-@@ -85,14 +89,6 @@
+@@ -87,14 +89,6 @@
     necessary when compiling PIC code.  */
  
  #define JUMP_TABLES_IN_TEXT_SECTION 1
 -
--/* Don't default to pcc-struct-return, because gcc is the only compiler, and
--   we want to retain compatibility with older gcc versions.  */
+-/* Don't default to pcc-struct-return, because in FreeBSD we prefer the
+-   superior nature of the older gcc way.  */
 -#define DEFAULT_PCC_STRUCT_RETURN 0
 -
 -/* Ensure we the configuration knows our system correctly so we can link with
@@ -35,7 +41,7 @@
  
  /* i386 freebsd still uses old binutils that don't insert nops by default
     when the .align directive demands to insert extra space in the text
-@@ -103,19 +99,18 @@
+@@ -105,19 +99,18 @@
  
  /* Profiling routines, partially copied from i386/osfrose.h.  */
  
@@ -58,7 +64,7 @@
        fprintf (FILE, "\tcall mcount\n");				\
      }									\
  }
-@@ -133,6 +128,7 @@
+@@ -135,6 +128,7 @@
  
  #define TYPE_ASM_OP	".type"
  #define SIZE_ASM_OP	".size"
@@ -66,7 +72,7 @@
  
  /* The following macro defines the format used to output the second
     operand of the .type assembler directive.  Different svr4 assemblers
-@@ -142,6 +138,12 @@
+@@ -144,6 +138,12 @@
  
  #define TYPE_OPERAND_FMT	"@%s"
  
@@ -79,34 +85,9 @@
  /* Write the extra assembler code needed to declare a function's result.
     Most svr4 assemblers don't require any special declaration of the
     result value, but there are exceptions.  */
-@@ -244,29 +246,4 @@
+@@ -245,3 +245,5 @@
+ #define STARTFILE_SPEC  \
    "%{shared:c++rt0.o%s} \
     %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}"
- 
--/* This is defined when gcc is compiled in the BSD-directory-tree, and must
-- * make up for the gap to all the stuff done in the GNU-makefiles.
-- */
--
--#ifdef FREEBSD_NATIVE
--
--#define INCLUDE_DEFAULTS { \
--	{ "/usr/include", 0, 0, 0 }, \
--	{ "/usr/include/g++", "G++", 1, 1 }, \
--	{ 0, 0, 0, 0} \
--	}
--
--#undef MD_EXEC_PREFIX
--#define MD_EXEC_PREFIX "/usr/libexec/"
--
--#undef STANDARD_STARTFILE_PREFIX
--#define STANDARD_STARTFILE_PREFIX "/usr/lib"
--
--#if 0 /* This is very wrong!!! */
--#define DEFAULT_TARGET_MACHINE "i386-unknown-freebsd_1.0"
--#define GPLUSPLUS_INCLUDE_DIR "/usr/local/lib/gcc-lib/i386-unknown-freebsd_1.0/2.5.8/include"
--#define TOOL_INCLUDE_DIR "/usr/local/i386-unknown-freebsd_1.0/include"
--#define GCC_INCLUDE_DIR "/usr/local/lib/gcc-lib/i386-unknown-freebsd_1.0/2.5.8/include"
--#endif
--
--#endif /* FREEBSD_NATIVE */
++
 +#define MD_STARTFILE_PREFIX "/usr/lib/aout/"
diff --git a/lang/egcs/files/patch-af b/lang/egcs/files/patch-af
index c1f1ba0e855f..533a35a95584 100644
--- a/lang/egcs/files/patch-af
+++ b/lang/egcs/files/patch-af
@@ -1,85 +1,83 @@
---- gcc/config/i386/freebsd.h.orig	Mon Mar  1 14:47:32 1999
-+++ gcc/config/i386/freebsd.h	Sun Mar 21 16:58:39 1999
-@@ -21,19 +21,13 @@
- the Free Software Foundation, 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.  */
- 
-+
-+/* Get generic FreeBSD definitions.  */
-+#include <freebsd.h>
-+
- #undef TARGET_VERSION
- #define TARGET_VERSION fprintf (stderr, " (i386 FreeBSD/ELF)");
- 
--/* The svr4 ABI for the i386 says that records and unions are returned
--   in memory.  */
--/* On FreeBSD, we do not. */
--#undef DEFAULT_PCC_STRUCT_RETURN
--#define DEFAULT_PCC_STRUCT_RETURN 0
--
--/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using
--   libraries compiled with the native cc, so undef it. */
--#undef NO_DOLLAR_IN_LABEL
--
- /* This is how to output an element of a case-vector that is relative.
-    This is only used for PIC code.  See comments by the `casesi' insn in
-    i386.md for an explanation of the expression this outputs. */
-@@ -113,22 +107,19 @@
+--- gcc/config/i386/freebsd.h.orig	Thu Jun 17 05:33:32 1999
++++ gcc/config/i386/freebsd.h	Sat Jul 24 17:59:06 1999
+@@ -135,6 +135,10 @@
   : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \
   : (-1))
  
--/* Output assembler code to FILE to increment profiler label # LABELNO
--   for profiling a function entry.  */
-+/* Tell final.c that we don't need a label passed to mcount.  */
++/* Don't use EGCS's normal profiling code -- we have our own fine-grained
++   basic block profiling.  */
 +#define NO_PROFILE_DATA
++
+ /* Tell final.c that we don't need a label passed to mcount.  */
  
  #undef FUNCTION_PROFILER
- #define FUNCTION_PROFILER(FILE, LABELNO)  \
- {									\
-   if (flag_pic)								\
-     {									\
--      fprintf (FILE, "\tleal %sP%d@GOTOFF(%%ebx),%%edx\n",		\
--	       LPREFIX, (LABELNO));					\
--      fprintf (FILE, "\tcall *mcount@GOT(%%ebx)\n");			\
-+      fprintf (FILE, "\tcall *.mcount@GOT(%%ebx)\n");			\
-     }									\
-   else									\
-     {									\
--      fprintf (FILE, "\tmovl $%sP%d,%%edx\n", LPREFIX, (LABELNO));	\
--      fprintf (FILE, "\tcall mcount\n");				\
-+      fprintf (FILE, "\tcall .mcount\n");				\
-     }									\
- }
- 
-@@ -145,26 +136,16 @@
+@@ -162,22 +166,30 @@
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
 -#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
-+#define CPP_PREDEFINES "-Di386 -D__ELF__ -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES
++#define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386)" CPP_FBSD_PREDEFINES
  
  #undef CPP_SPEC
 -#define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
-+#define CPP_SPEC \
-+  "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{m486:-D__i486__}"
-+  /* %{pthread:-D_REENTRANT} */
++#if TARGET_CPU_DEFAULT == 2
++#define CPP_SPEC "\
++  %{!maout: -D__ELF__} \
++  %{munderscores: -D__UNDERSCORES__} \
++  %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \
++  %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__}"
++#else
++#define CPP_SPEC "\
++  %{!maout: -D__ELF__} \
++  %{munderscores: -D__UNDERSCORES__} \
++  %{maout: %{!mno-underscores: -D__UNDERSCORES__}} \
++  %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__}"
++#endif
++
++#undef CC1_SPEC
++#define CC1_SPEC "\
++  %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
++  %{maout: %{!mno-underscores: %{!munderscores: -munderscores }}}"
+ 
+-/* This defines which switch letters take arguments.  On FreeBSD, most of
+-   the normal cases (defined in gcc.c) apply, and we also have -h* and
+-   -z* options (for the linker) (comming from svr4).
+-   We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */
+-
+-#undef SWITCH_TAKES_ARG
+-#define SWITCH_TAKES_ARG(CHAR) \
+-  (DEFAULT_SWITCH_TAKES_ARG (CHAR) \
+-   || (CHAR) == 'h' \
+-   || (CHAR) == 'z' \
+-   || (CHAR) == 'R')
++#undef  ASM_SPEC
++#define ASM_SPEC	"%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}"
  
- #undef	LIB_SPEC
--#if 1
--/* We no longer link with libc_p.a or libg.a by default. If you
-- * want to profile or debug the C library, please add
-- * -lc_p or -ggdb to LDFLAGS at the link time, respectively.
-- */
--#define LIB_SPEC \
--  "%{!shared: %{mieee-fp:-lieee} %{p:-lgmon} %{pg:-lgmon} \
--     %{!ggdb:-lc} %{ggdb:-lg}}"
--#else
- #define LIB_SPEC \
+ /* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add
+    the magical crtbegin.o file (see crtstuff.c) which provides part 
+@@ -186,11 +198,11 @@
+    
+ #undef	STARTFILE_SPEC
+ #define STARTFILE_SPEC \
 -  "%{!shared: \
--     %{mieee-fp:-lieee} %{p:-lgmon -lc_p} %{pg:-lgmon -lc_p} \
--       %{!p:%{!pg:%{!g*:-lc} %{g*:-lg}}}}"
--#endif
-+  "%{!shared:%{!pg:%{!pthread:%{!kthread:-lc}%{kthread:-lpthread -lc}}%{pthread:-lc_r}}%{pg:%{!pthread:%{!kthread:-lc_p}%{kthread:-lpthread_p -lc_p}}%{pthread:-lc_r_p}}}"
+-     %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
+-		       %{!p:%{profile:gcrt1.o%s} \
+-			 %{!profile:crt1.o%s}}}} \
+-   crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
++  "%{maout: %{shared:c++rt0.o%s} \
++    %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}} \
++  %{!maout:  %{!shared: \
++    %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} %{!p:crt1.o%s}}} \
++    crti.o%s %{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}"
+ 
+ /* Provide a ENDFILE_SPEC appropriate for FreeBSD.  Here we tack on
+    the magical crtend.o file (see crtstuff.c) which provides part of 
+@@ -200,7 +212,7 @@
+ 
+ #undef	ENDFILE_SPEC
+ #define ENDFILE_SPEC \
+-  "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
++  "%{!maout: %{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s}"
  
- /* Provide a LINK_SPEC appropriate for FreeBSD.  Here we provide support
-    for the special GCC options -static and -shared, which allow us to
+ /* Provide a LIB_SPEC appropriate for FreeBSD.  Just select the appropriate
+    libc, depending on whether we're doing profiling or need threads support.
diff --git a/lang/egcs/files/patch-aj b/lang/egcs/files/patch-aj
index 035627fc0908..4666dfa4e86f 100644
--- a/lang/egcs/files/patch-aj
+++ b/lang/egcs/files/patch-aj
@@ -1,14 +1,14 @@
---- config.guess.orig	Mon Mar  1 14:37:59 1999
-+++ config.guess	Sat Mar 13 19:28:44 1999
-@@ -478,9 +478,9 @@
+--- config.guess.orig	Sun May 30 09:04:33 1999
++++ config.guess	Mon Jun 21 00:55:29 1999
+@@ -521,9 +521,9 @@
  	exit 0 ;;
      *:FreeBSD:*:*)
- 	if test -x /usr/bin/objformat -a "elf" = "`/usr/bin/objformat`"; then
--		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
--	else
- 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	else
-+		echo ${UNAME_MACHINE}-unknown-freebsdaout`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	fi
+         if test -x /usr/bin/objformat -a "elf" = "`/usr/bin/objformat`"; then
+-          echo ${UNAME_MACHINE}-unknown-freebsdelf
++          echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+         else
+-	  echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
++	  echo ${UNAME_MACHINE}-unknown-freebsdaout`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+       fi
  	exit 0 ;;
      *:NetBSD:*:*)
diff --git a/lang/egcs/files/patch-ak b/lang/egcs/files/patch-ak
index 2e54beea1a61..b8eaba90c2fa 100644
--- a/lang/egcs/files/patch-ak
+++ b/lang/egcs/files/patch-ak
@@ -1,11 +1,11 @@
---- gcc/configure.orig	Sun Mar 14 02:59:02 1999
-+++ gcc/configure	Sat Mar 20 00:40:05 1999
-@@ -2395,6 +2395,15 @@
+--- gcc/configure.orig	Tue Jun  8 02:19:23 1999
++++ gcc/configure	Mon Jun 14 23:54:18 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
 +	alpha*-*-freebsd*)
-+		tm_file="${tm_file} freebsd.h alpha/freebsd.h alpha/freebsd-elf.h"
++		tm_file="${tm_file} freebsd.h alpha/freebsd.h"
 +		xm_file="${xm_file} xm-freebsd.h"
 +		target_cpu_default="MASK_GAS"
 +		tmake_file="t-freebsd alpha/t-crtbe"
@@ -14,36 +14,29 @@
 +		gas=yes gnu_ld=yes
 +		;;
  	alpha*-*-netbsd*)
- 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsdl-elf.h"
- 		xm_file="xm-netbsd.h ${xm_file}"
-@@ -2851,21 +2860,21 @@
+ 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
+ 		target_cpu_default="MASK_GAS"
+@@ -3536,17 +3545,17 @@
  # Next line turned off because both 386BSD and BSD/386 use GNU ld.
  #		use_collect2=yes
  		;;
 -	i[34567]86-*-freebsdelf*)
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd-aout.h
- 		# On FreeBSD, the headers are already ok, except for math.h.
- 		fixincludes=fixinc.wrap
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
--		tmake_file=i386/t-freebsd
--		gas=yes
--		gnu_ld=yes
--		stabs=yes
+-		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
- 		;;
- 	i[34567]86-*-freebsd*)
++		;;
++	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h"
+ 		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+ 		tmake_file=t-freebsd
+ 		gas=yes
+ 		gnu_ld=yes
+ 		stabs=yes
+-		;;
+-	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd.h i386/perform.h"
- 		# On FreeBSD, the headers are already ok, except for math.h.
- 		fixincludes=fixinc.wrap
--		tmake_file=i386/t-freebsd
-+		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tmake_file=t-freebsd
-+		gas=yes
-+		gnu_ld=yes
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  	i[34567]86-*-netbsd*)
  		tm_file=i386/netbsd.h
diff --git a/lang/egcs/files/patch-al b/lang/egcs/files/patch-al
index c8a195127ed0..de95c4439b95 100644
--- a/lang/egcs/files/patch-al
+++ b/lang/egcs/files/patch-al
@@ -1,11 +1,11 @@
---- gcc/configure.in.orig	Sun Mar  7 16:22:22 1999
-+++ gcc/configure.in	Sat Mar 20 00:40:58 1999
-@@ -416,6 +416,15 @@
+--- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
++++ gcc/configure.in	Mon Jun 14 19:25:53 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
 +	alpha*-*-freebsd*)
-+		tm_file="${tm_file} freebsd.h alpha/freebsd.h alpha/freebsd-elf.h"
++		tm_file="${tm_file} freebsd.h alpha/freebsd.h"
 +		xm_file="${xm_file} xm-freebsd.h"
 +		target_cpu_default="MASK_GAS"
 +		tmake_file="t-freebsd alpha/t-crtbe"
@@ -14,36 +14,34 @@
 +		gas=yes gnu_ld=yes
 +		;;
  	alpha*-*-netbsd*)
- 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsdl-elf.h"
- 		xm_file="xm-netbsd.h ${xm_file}"
-@@ -872,21 +881,21 @@
- # Next line turned off because both 386BSD and BSD/386 use GNU ld.
+ 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
+ 		target_cpu_default="MASK_GAS"
+@@ -1136,20 +1145,20 @@
  #		use_collect2=yes
  		;;
--	i[[34567]]86-*-freebsdelf*)
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+	i[[34567]]86-*-freebsdaout*)
-+		tm_file=i386/freebsd-aout.h
- 		# On FreeBSD, the headers are already ok, except for math.h.
- 		fixincludes=fixinc.wrap
+ changequote(,)dnl
+-	i[34567]86-*-freebsdelf*)
+++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
 -		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
--		tmake_file=i386/t-freebsd
++		tm_file=i386/freebsd.h
+ 		tmake_file=t-freebsd
 -		gas=yes
 -		gnu_ld=yes
 -		stabs=yes
-+		tmake_file=t-freebsd
  		;;
- 	i[[34567]]86-*-freebsd*)
+ changequote(,)dnl
+-	i[34567]86-*-freebsd*)
++	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
+ changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd.h i386/perform.h"
- 		# On FreeBSD, the headers are already ok, except for math.h.
- 		fixincludes=fixinc.wrap
--		tmake_file=i386/t-freebsd
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.h i386/freebsd.h i386/perform.h"
 +		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tmake_file=t-freebsd
+ 		tmake_file=t-freebsd
 +		gas=yes
 +		gnu_ld=yes
 +		stabs=yes
  		;;
- 	i[[34567]]86-*-netbsd*)
- 		tm_file=i386/netbsd.h
+ changequote(,)dnl
+ 	i[34567]86-*-netbsd*)
diff --git a/lang/egcs/files/patch-am b/lang/egcs/files/patch-am
index f69f6ffa7798..c3c4553367c9 100644
--- a/lang/egcs/files/patch-am
+++ b/lang/egcs/files/patch-am
@@ -1,12 +1,7 @@
---- libstdc++/stl/stl_rope.h.orig	Fri Feb 20 03:13:44 1998
-+++ libstdc++/stl/stl_rope.h	Sun Feb 28 03:50:24 1999
-@@ -702,7 +702,8 @@
- 	__rope_iterator_base<charT,Alloc>(r.tree_ptr, pos) {}
-     __rope_const_iterator& operator= (const __rope_const_iterator & x) {
- 	if (0 != x.buf_ptr) {
--	    *this = x;
-+	    *(static_cast<__rope_iterator_base<charT,Alloc>*>(this)) = x; 
-+	    // bugfix by Kevin Atkinosn (kevina@clark.net) was *this = x;
- 	} else {
- 	    current_pos = x.current_pos;
- 	    root = x.root;
+--- gcc/config/t-freebsd.orig	Tue Jun  1 17:02:39 1999
++++ gcc/config/t-freebsd	Tue Jun 22 11:05:25 1999
+@@ -1,4 +1,2 @@
+ # Don't run fixproto
+ STMP_FIXPROTO =
+-# Use only native include files
+-USER_H = $(EXTRA_HEADERS) $(LANG_EXTRA_HEADERS)
diff --git a/lang/egcs/files/patch-an b/lang/egcs/files/patch-an
new file mode 100644
index 000000000000..36378bfeee3f
--- /dev/null
+++ b/lang/egcs/files/patch-an
@@ -0,0 +1,11 @@
+--- gcc/fixinc/mkfixinc.sh.orig	Sat May 15 11:21:35 1999
++++ gcc/fixinc/mkfixinc.sh	Thu Jun 10 19:49:25 1999
+@@ -40,7 +40,7 @@
+ 
+ 	*-*-netbsd* | \
+ 	alpha*-*-linux-gnulibc1* | \
+-	i[34567]86-*-freebsd* | \
++	*-*-freebsd* | \
+ 	i[34567]86-*-netbsd* | i[34567]86-*-openbsd* | \
+ 	i[34567]86-*-solaris2* | \
+ 	sparcv9-*-solaris2* | \
diff --git a/lang/egcs/files/patch-ap b/lang/egcs/files/patch-ap
new file mode 100644
index 000000000000..f7a486910063
--- /dev/null
+++ b/lang/egcs/files/patch-ap
@@ -0,0 +1,26 @@
+--- gcc/ginclude/stddef.h.orig	Wed Dec 16 13:19:25 1998
++++ gcc/ginclude/stddef.h	Tue Jun 22 11:05:25 1999
+@@ -109,7 +109,6 @@
+ #define _T_PTRDIFF
+ #define __PTRDIFF_T
+ #define _PTRDIFF_T_
+-#define _BSD_PTRDIFF_T_
+ #define ___int_ptrdiff_t_h
+ #define _GCC_PTRDIFF_T
+ #ifndef __PTRDIFF_TYPE__
+@@ -156,7 +155,6 @@
+ #define _T_SIZE
+ #define __SIZE_T
+ #define _SIZE_T_
+-#define _BSD_SIZE_T_
+ #define _SIZE_T_DEFINED_
+ #define _SIZE_T_DEFINED
+ #define ___int_size_t_h
+@@ -217,7 +215,6 @@
+ #define _T_WCHAR
+ #define __WCHAR_T
+ #define _WCHAR_T_
+-#define _BSD_WCHAR_T_
+ #define _WCHAR_T_DEFINED_
+ #define _WCHAR_T_DEFINED
+ #define _WCHAR_T_H
diff --git a/lang/egcs/files/patch-aq b/lang/egcs/files/patch-aq
new file mode 100644
index 000000000000..32f0788b5379
--- /dev/null
+++ b/lang/egcs/files/patch-aq
@@ -0,0 +1,11 @@
+--- gcc/ginclude/stdarg.h.orig	Fri May  7 18:52:35 1999
++++ gcc/ginclude/stdarg.h	Wed Jun 23 16:38:00 1999
+@@ -67,7 +67,7 @@
+ 
+ #ifndef __GNUC_VA_LIST
+ #define __GNUC_VA_LIST
+-#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
++#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__) || defined(__FreeBSD__)
+ typedef char *__gnuc_va_list;
+ #else
+ typedef void *__gnuc_va_list;
diff --git a/lang/egcs/files/patch-bc b/lang/egcs/files/patch-bc
index c6faefae79d6..c3159ca2788c 100644
--- a/lang/egcs/files/patch-bc
+++ b/lang/egcs/files/patch-bc
@@ -1,16 +1,16 @@
---- libstdc++/Makefile.in.orig	Sat Jul 11 19:20:49 1998
-+++ libstdc++/Makefile.in	Sun Mar 14 21:48:39 1999
+--- libstdc++/Makefile.in.orig	Sat Jul 17 22:50:47 1999
++++ libstdc++/Makefile.in	Tue Jul 20 07:56:00 1999
 @@ -14,7 +14,7 @@
  # along with this library; see the file COPYING.  If not, write to the Free
  # Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  
--VERSION = 2.9.0
-+VERSION = 3
+-VERSION = 2.10.0
++VERSION = 4
+ INTERFACE = 3
  
- OBJS  = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o
- SUBLIBS = $(STAMP)-string $(STAMP)-complx
-@@ -98,7 +98,8 @@
- 	ln -f -s $(SHLIB) $(SHLINK)
+ gxx_include_dir=${includedir}/g++
+@@ -111,7 +111,8 @@
+ 	$(LN_S) $(SHLIB) $(SHLINK) || cp $(ARLIB) $(ARLINK)
  
  mshlink:
 -	@$(MAKE) $(MSHLINK) "SHLINK=$(MSHLINK)"
@@ -19,15 +19,16 @@
  
  $(IO_DIR)/iostream.list: force
  	cd $(IO_DIR) ; $(MAKE) $(FLAGS_TO_PASS) iostream.list
-@@ -281,10 +282,7 @@
- 	  if [ $$FILE = $(SHLINK) ] ; then \
- 	    ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+@@ -336,11 +337,7 @@
+ 		|| cp $${RELINSTALLDIR}$(ARLIB) $${INSTALLLINKDIR}$(MULTISUBDIR)/$$FILE ; \
+ 	    fi; \
  	  elif [ $$FILE = mshlink ]; then \
 -	    for FILE in $(MSHLINK) ; do \
 -	      rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
--	      ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+-	      $(LN_S) $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE \
+-		|| cp $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
 -	    done; \
 +	    true; \
- 	  elif [ $$FILE = $(SHLIB) ]; then \
- 	    $(INSTALL_PROGRAM) $$FILE $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
- 	    : On the HP, shared libraries must be mode 555. ;\
+ 	  elif [ $$FILE = marlink ]; then \
+ 	    for FILE in $(MARLINK) ; do \
+ 	      rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
diff --git a/lang/egcs/files/patch-fb b/lang/egcs/files/patch-fb
index b86da95cfa90..dae6d331898c 100644
--- a/lang/egcs/files/patch-fb
+++ b/lang/egcs/files/patch-fb
@@ -1,12 +1,13 @@
---- gcc/flags.h.orig	Sat Feb 27 10:33:03 1999
-+++ gcc/flags.h	Tue Mar 30 03:36:49 1999
-@@ -449,6 +449,9 @@
+--- gcc/flags.h.orig	Sun Jan 31 09:46:18 1999
++++ gcc/flags.h	Tue Mar 30 13:17:11 1999
+@@ -137,6 +137,10 @@
+ 
+ extern int warn_aggregate_return;
  
- /* Do the full regmove optimization pass.  */
- extern int flag_regmove;
-+
 +/* Nonzero means that -Wformat accepts certain non-ANSI formats.  */
++
 +extern int flag_format_extensions;
- 
- /* Other basic status info about current function.  */
++
+ /* Nonzero if generating code to do profiling.  */
  
+ extern int profile_flag;
diff --git a/lang/egcs/files/patch-fc b/lang/egcs/files/patch-fc
index 24fefb020007..a3f44c5e158b 100644
--- a/lang/egcs/files/patch-fc
+++ b/lang/egcs/files/patch-fc
@@ -1,22 +1,21 @@
---- gcc/toplev.c.orig	Sat Feb 27 10:33:02 1999
-+++ gcc/toplev.c	Tue Mar 30 03:37:57 1999
-@@ -728,6 +728,10 @@
+--- gcc/toplev.c.orig	Mon Mar 22 15:23:26 1999
++++ gcc/toplev.c	Tue Mar 30 13:13:44 1999
+@@ -754,6 +754,9 @@
  
- extern int flag_dump_unnumbered;
+ int flag_no_ident = 0;
  
 +/* Nonzero means that -Wformat accepts certain system-dependent formats.  */
-+
 +int flag_format_extensions = 0;
 +
- 
  /* Table of supported debugging formats.  */
  static struct
-@@ -915,6 +919,8 @@
+ {
+@@ -954,6 +957,8 @@
     "Generate code to check every memory access" },
    {"prefix-function-name", &flag_prefix_function_name, 1,
     "Add a prefix to all function names" },
 +  {"format-extensions", &flag_format_extensions, 1,
 +   "-Wformat accepts certain FreeBSD system-dependent formats" },
-   {"dump-unnumbered", &flag_dump_unnumbered, 1}
- };
- 
+   {"dump-unnumbered", &flag_dump_unnumbered, 1,
+    "Suppress output of instruction numbers and line number notes in debugging dumps"},
+   {"instrument-functions", &flag_instrument_function_entry_exit, 1,
diff --git a/lang/egcs/files/patch-va b/lang/egcs/files/patch-va
new file mode 100644
index 000000000000..48040ffa6e96
--- /dev/null
+++ b/lang/egcs/files/patch-va
@@ -0,0 +1,20 @@
+--- gcc/Makefile.in.orig	Thu Feb 25 12:40:16 1999
++++ gcc/Makefile.in	Mon Mar  1 04:36:40 1999
+@@ -793,7 +793,7 @@
+ 	rm -f config.run
+ 
+ $(srcdir)/configure: $(srcdir)/configure.in
+-	cd $(srcdir); autoconf
++	cd $(srcdir); echo "wants to run autoconf"
+ 
+ # cstamp-h.in controls rebuilding of config.in.
+ # It is named cstamp-h.in and not stamp-h.in so the mostlyclean rule doesn't
+@@ -806,7 +806,7 @@
+ # ??? Newer versions have a maintainer mode that may be useful here.
+ $(srcdir)/config.in: $(srcdir)/cstamp-h.in
+ $(srcdir)/cstamp-h.in: $(srcdir)/configure.in $(srcdir)/acconfig.h
+-	cd $(srcdir) && autoheader
++	cd $(srcdir) && echo "want to run autoheader"
+ 	@rm -f $(srcdir)/cstamp-h.in
+ 	echo timestamp > $(srcdir)/cstamp-h.in
+ auto-host.h: cstamp-h ; @true
diff --git a/lang/egcs/pkg-comment b/lang/egcs/pkg-comment
index c23b39554386..5386f1ed981f 100644
--- a/lang/egcs/pkg-comment
+++ b/lang/egcs/pkg-comment
@@ -1 +1 @@
-EGCS enhanced version of the GNU compiler suite
+GNU compiler suite
diff --git a/lang/egcs/pkg-descr b/lang/egcs/pkg-descr
index 0429360a5404..b99caf889035 100644
--- a/lang/egcs/pkg-descr
+++ b/lang/egcs/pkg-descr
@@ -1,17 +1,10 @@
-Egcs (pronounced "eggs") is an enhanced version of the GNU compiler
-suite, including gcc, g++, and g77.  Egcs is based on a recent
-snapshot of the gcc-2.8 development sources; it contains nearly
-all of the new features found in gcc-2.8.  Egcs also contains many
-improvements and features not found in gcc-2.7 and even the soon to be
-released gcc-2.8 compilers.  C++ support, and in particular template
-support, is vastly improved over gcc-2.7.
+This is GNU's latest offering of GCC (the GNU Compiler Collection).
+Version 2.95 contains many improvements and features not found in the
+gcc-2.7.2 and gcc-2.8.1 compliers.  C++ support, is vastly improved, in
+particular template support is worlds above that that of gcc-2.7.2.
 
-For more details, see <http://www.cygnus.com/egcs/>.
+For more details, see <http://gcc.gnu.org/>.
 
-Beware: This port installs new versions of "gcc", "g++", "c++" and
-so forth into the "${PREFIX}/bin" directory.  Mind your PATHs if you
-don't want to use this compiler by default.
+- David O'Brien <obrien@FreeBSD.org>
 
-- John Polstra <jdp@polstra.com>
-
-WWW: http://egcs.cygnus.com
+WWW: http://gcc.gnu.org
diff --git a/lang/egcs/pkg-plist b/lang/egcs/pkg-plist
index 0c1c86753fa7..37ab9486b69e 100644
--- a/lang/egcs/pkg-plist
+++ b/lang/egcs/pkg-plist
@@ -1,23 +1,26 @@
-@comment $Id: PLIST,v 1.21 1998/12/26 20:10:02 obrien Exp $
-bin/g++filt
-bin/g++
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
+bin/chill
+bin/eg++filt
 bin/eg++
-bin/g77
-bin/gcc
+bin/eg77
 bin/egcc
-bin/gcov
 bin/%%GNU_HOST%%-gcc
+bin/gcj
+bin/gcjh
+bin/gcov
+bin/jv-scan
+bin/jcf-dump
 bin/protoize
 bin/unprotoize
 %%GNU_HOST%%/include/_G_config.h
 %%GNU_HOST%%/include/assert.h
-%%GNU_HOST%%/lib/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/PlotFile.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/SFile.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algo.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algobase.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/algorithm
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/alloc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/bitset
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/builtinbuf.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/bvector.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/cassert
@@ -101,8 +104,18 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/complext.cc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/complext.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/dcomplex.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/fcomplex.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/gslice.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/gslice_array.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/indirect_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/ldcomplex.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/mask_array.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stl.h
@@ -147,11 +160,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/tempbuf.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/tree.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/type_traits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/utility
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/valarray
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
+@unexec install-info --delete %D/info/chill.info %D/info/dir
+info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -170,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
@@ -200,6 +217,7 @@ info/gcc.info-26
 info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
+info/gcc.info-30
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -207,13 +225,16 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
+@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -226,6 +247,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/iso646.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
@@ -241,8 +263,35 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -252,7 +301,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libg2c.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
-@dirrm %%GNU_HOST%%/lib
 @dirrm %%GNU_HOST%%
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std