diff options
| author | obrien <obrien@FreeBSD.org> | 1999-07-25 11:34:39 +0800 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1999-07-25 11:34:39 +0800 |
| commit | 982647bbf83f573f1c85cb01f8883996ba746f72 (patch) | |
| tree | a40be8b25799609859a9b1ea0ee0f21a1b7c8c57 /lang/gcc34 | |
| parent | 42cee9026c7a7e8408558d615de360e7a1eb3847 (diff) | |
| download | freebsd-ports-gnome-982647bbf83f573f1c85cb01f8883996ba746f72.tar.gz freebsd-ports-gnome-982647bbf83f573f1c85cb01f8883996ba746f72.tar.zst freebsd-ports-gnome-982647bbf83f573f1c85cb01f8883996ba746f72.zip | |
Fix SWITCH_TAKES_ARG / WORD_SWITCH_TAKES_ARG breakage on the Alpha created
when I changed from defining these in gcc/config/freebsd.h and instead defined
extensable FreeBSD-wide definitions.
While I am here, move the *SWITCH_TAKES_ARG = FBSD_*SWITCH_TAKES_ARG
assignments to the global file to remove one more thing from the arch specific
config files.
Diffstat (limited to 'lang/gcc34')
| -rw-r--r-- | lang/gcc34/files/alpha-freebsd.h | 8 | ||||
| -rw-r--r-- | lang/gcc34/files/patch-af | 20 |
2 files changed, 8 insertions, 20 deletions
diff --git a/lang/gcc34/files/alpha-freebsd.h b/lang/gcc34/files/alpha-freebsd.h index 6aace60c7a44..f10b264f9594 100644 --- a/lang/gcc34/files/alpha-freebsd.h +++ b/lang/gcc34/files/alpha-freebsd.h @@ -50,14 +50,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ #undef TARGET_VERSION #define TARGET_VERSION fprintf (stderr, " (FreeBSD/alpha ELF)"); -/* defined in freebsd.h -#undef SWITCH_TAKES_ARG -#define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR)) - -#undef WORD_SWITCH_TAKES_ARG -#define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) -*/ - #undef TARGET_DEFAULT #define TARGET_DEFAULT (MASK_FP | MASK_FPREGS | MASK_GAS) diff --git a/lang/gcc34/files/patch-af b/lang/gcc34/files/patch-af index 8176fca21e10..533a35a95584 100644 --- a/lang/gcc34/files/patch-af +++ b/lang/gcc34/files/patch-af @@ -1,5 +1,5 @@ --- gcc/config/i386/freebsd.h.orig Thu Jun 17 05:33:32 1999 -+++ gcc/config/i386/freebsd.h Mon Jun 28 03:14:19 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)) @@ -11,7 +11,7 @@ /* Tell final.c that we don't need a label passed to mcount. */ #undef FUNCTION_PROFILER -@@ -162,22 +166,36 @@ +@@ -162,22 +166,30 @@ #define WCHAR_TYPE_SIZE BITS_PER_WORD #undef CPP_PREDEFINES @@ -43,23 +43,19 @@ - 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 ASM_SPEC -+#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" - - #undef SWITCH_TAKES_ARG +- +-#undef SWITCH_TAKES_ARG -#define SWITCH_TAKES_ARG(CHAR) \ - (DEFAULT_SWITCH_TAKES_ARG (CHAR) \ - || (CHAR) == 'h' \ - || (CHAR) == 'z' \ - || (CHAR) == 'R') -+#define SWITCH_TAKES_ARG(CHAR) (FBSD_SWITCH_TAKES_ARG(CHAR)) -+ -+#undef WORD_SWITCH_TAKES_ARG -+#define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR)) ++#undef ASM_SPEC ++#define ASM_SPEC "%{v*: -v} %{maout: %{fpic:-k} %{fPIC:-k}}" /* Provide a STARTFILE_SPEC appropriate for FreeBSD. Here we add the magical crtbegin.o file (see crtstuff.c) which provides part -@@ -186,11 +204,11 @@ +@@ -186,11 +198,11 @@ #undef STARTFILE_SPEC #define STARTFILE_SPEC \ @@ -76,7 +72,7 @@ /* 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 +218,7 @@ +@@ -200,7 +212,7 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC \ |