Make "-fsjlj-exceptions" (use setjmp/longjmp for exceptions) the

default for FreeBSD.  The standard exception implementation reliably
dumps core under FreeBSD.  Users can put "-fno-sjlj-exceptions" on
the command line if they really want to override the new default.

Configure with "--with-gnu-as" and "--with-gnu-ld".

Define "__FreeBSD__" as 3.

40 files changed, 380 insertions, 40 deletions

diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/egcs/files/patch-ad b/lang/egcs/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/egcs/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc-devel/files/patch-ad b/lang/gcc-devel/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc-devel/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc-ooo/files/patch-ad b/lang/gcc-ooo/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc-ooo/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc/files/patch-ad b/lang/gcc/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc295/files/patch-ad b/lang/gcc295/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc295/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc30/files/patch-ad b/lang/gcc30/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc30/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc31/files/patch-ad b/lang/gcc31/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc31/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc32/files/patch-ad b/lang/gcc32/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc32/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc33/files/patch-ad b/lang/gcc33/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc33/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc34/files/patch-ad b/lang/gcc34/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc34/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc35/files/patch-ad b/lang/gcc35/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc35/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc40/files/patch-ad b/lang/gcc40/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc40/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc41/files/patch-ad b/lang/gcc41/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc41/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc42/files/patch-ad b/lang/gcc42/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc42/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc43/files/patch-ad b/lang/gcc43/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc43/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc44/files/patch-ad b/lang/gcc44/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc44/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc45/files/patch-ad b/lang/gcc45/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc45/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc46/files/patch-ad b/lang/gcc46/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc46/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc47/files/patch-ad b/lang/gcc47/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc47/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 335f43bc237..8d432dde1bb 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.2 1998/01/13 05:18:16 asami Exp $
+# $Id: Makefile,v 1.3 1998/01/14 07:24:54 obrien Exp $
 #
 
 DISTNAME=	egcs-1.0.1
@@ -16,7 +16,7 @@ MAINTAINER=	jdp@polstra.com
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	i386-unknown-freebsd
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 FME=${PREFIX}
diff --git a/lang/gcc48/files/patch-ad b/lang/gcc48/files/patch-ad
new file mode 100644
index 00000000000..207c128cff6
--- /dev/null
+++ b/lang/gcc48/files/patch-ad
@@ -0,0 +1,17 @@
+--- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
++++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
+@@ -35,10 +35,13 @@
+ #include "i386/perform.h"
+ 
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
++#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=3 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
+ 
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
+ 
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"