diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1998-04-12 13:29:02 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1998-04-12 13:29:02 +0000 |
| commit | 39789a91811889b2ca728436fc3a77069cb00453 (patch) | |
| tree | 5c706980ade00c2f373761b42e63004c2e934f10 /lang/gcc28 | |
| parent | Bump comment from 2.8 to 2.8.1. (diff) | |
Sync-up CPP predefines w/our stock compiler and EGCS.
1. we are not 386BSD
2. ELF shouldn't need "-fsjlj-exceptions"
Notes
Notes:
svn path=/head/; revision=10494
Diffstat (limited to 'lang/gcc28')
| -rw-r--r-- | lang/gcc28/files/patch-01 | 14 | ||||
| -rw-r--r-- | lang/gcc28/files/patch-02 | 19 |
2 files changed, 11 insertions, 22 deletions
diff --git a/lang/gcc28/files/patch-01 b/lang/gcc28/files/patch-01 index 7807f16b594b..1d9f93258aeb 100644 --- a/lang/gcc28/files/patch-01 +++ b/lang/gcc28/files/patch-01 @@ -1,9 +1,12 @@ --- config/i386/freebsd.h.orig Sun Oct 19 09:31:05 1997 -+++ config/i386/freebsd.h Wed Mar 11 03:04:25 1998 -@@ -37,6 +37,15 @@ - #undef CPP_PREDEFINES - #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" ++++ config/i386/freebsd.h Sun Apr 12 06:19:42 1998 +@@ -35,7 +35,16 @@ + #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__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" ++ +/* need "-fsjlj-exceptions" (use setjmp/longjmp for exceptions) the default. + The standard exception implementation reliably + dumps core under FreeBSD. Users can put "-fno-sjlj-exceptions" on @@ -12,7 +15,6 @@ +#error "CC1PLUS_SPEC needs ``-fsjlj-exceptions'', but is already defined." +#endif +#define CC1PLUS_SPEC "-fsjlj-exceptions" -+ + /* Like the default, except no -lg. */ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}" - diff --git a/lang/gcc28/files/patch-02 b/lang/gcc28/files/patch-02 index 217ef1d83b89..5f939868a404 100644 --- a/lang/gcc28/files/patch-02 +++ b/lang/gcc28/files/patch-02 @@ -1,24 +1,11 @@ --- config/i386/freebsd-elf.h.orig Fri Dec 5 04:15:34 1997 -+++ config/i386/freebsd-elf.h Wed Mar 11 03:05:09 1998 -@@ -140,10 +140,20 @@ ++++ config/i386/freebsd-elf.h Sun Apr 12 06:23:12 1998 +@@ -140,7 +140,7 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__=2 -Asystem(FreeBSD)" -+#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__ -Asystem(FreeBSD)" ++#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(FreeBSD) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" #undef CPP_SPEC #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}" -+ -+ -+/* need "-fsjlj-exceptions" (use setjmp/longjmp for exceptions) the default. -+ 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. */ -+#ifdef CC1PLUS_SPEC -+#error "CC1PLUS_SPEC needs ``-fsjlj-exceptions'', but is already defined." -+#endif -+#define CC1PLUS_SPEC "-fsjlj-exceptions" - - #undef LIB_SPEC - #if 1 |