From 152572105da9520e2b5a39cd467b24a514c8fb37 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Tue, 27 Apr 1999 19:29:44 +0000
Subject: Simplify the definition of FBSD_SWITCH_TAKES_ARG, and make sure
 SWITCH_TAKES_ARG isn't defined (which svr4.h does) when we assign our
 definition to it.

---
 contrib/gcc/config/alpha/freebsd4.h |  3 +++
 contrib/gcc/config/freebsd.h        | 23 +++++------------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/contrib/gcc/config/alpha/freebsd4.h b/contrib/gcc/config/alpha/freebsd4.h
index 6094e75..b693893 100644
--- a/contrib/gcc/config/alpha/freebsd4.h
+++ b/contrib/gcc/config/alpha/freebsd4.h
@@ -49,7 +49,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (FreeBSD/alpha ELF)");
 
+#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
diff --git a/contrib/gcc/config/freebsd.h b/contrib/gcc/config/freebsd.h
index 8db7f10..f86f32c 100644
--- a/contrib/gcc/config/freebsd.h
+++ b/contrib/gcc/config/freebsd.h
@@ -1,4 +1,4 @@
-/* $Id: freebsd.h,v 1.8 1999/04/22 17:45:01 obrien Exp $ */
+/* $Id: freebsd.h,v 1.9 1999/04/27 15:43:56 obrien Exp $ */
 /* Base configuration file for all FreeBSD targets.
    Copyright (C) 1999 Free Software Foundation, Inc.
 
@@ -30,26 +30,13 @@ Boston, MA 02111-1307, USA.  */
 #undef NO_IMPLICIT_EXTERN_C
 #define NO_IMPLICIT_EXTERN_C
 
-/* This defines which switch letters take arguments.  On svr4, most of
+/* 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).  We have a slightly different mix.  We
-   have -R (alias --rpath), no -z, --soname (-h), --assert etc. */
+   -z* options (for the linker) (comming from svr4).
+   We also have -R (alias --rpath), no -z, --soname (-h), --assert etc. */
 
 #define FBSD_SWITCH_TAKES_ARG(CHAR) \
-  (   (CHAR) == 'D' \
-   || (CHAR) == 'U' \
-   || (CHAR) == 'o' \
-   || (CHAR) == 'e' \
-   || (CHAR) == 'T' \
-   || (CHAR) == 'u' \
-   || (CHAR) == 'I' \
-   || (CHAR) == 'm' \
-   || (CHAR) == 'x' \
-   || (CHAR) == 'L' \
-   || (CHAR) == 'A' \
-   || (CHAR) == 'V' \
-   || (CHAR) == 'B' \
-   || (CHAR) == 'b' \
+  (DEFAULT_SWITCH_TAKES_ARG (CHAR) \
    || (CHAR) == 'h' \
    || (CHAR) == 'z' /* ignored by ld */ \
    || (CHAR) == 'R')
-- 
cgit v1.1