head	1.4;
access;
symbols
	old_old_old_old_old_old_old_old_old_old_RELEASE_4_8_0:1.3
	old_old_old_old_old_old_old_old_old_old_RELEASE_5_0_0:1.3
	old_old_old_old_old_old_old_old_old_old_gcc_32_20021007:1.3
	old_old_old_old_old_old_old_old_old_old_RELEASE_4_7_0:1.3
	old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_6_1:1.3
	old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_6_0:1.3
	old_old_old_old_old_old_old_old_old_old_old_RELEASE_5_0_DP1:1.3
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20020128:1.3
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_5_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_4_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20010430:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_3_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20010205:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20001225:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20001218:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20001211:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20001120:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_2_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20001002:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_1_1:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000828:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000717:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000501:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_1_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_3_5_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000313:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_RELEASE_4_0_0:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000306:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000221:1.2
	old_old_old_old_old_old_old_old_old_old_old_old_egcs_20000207:1.2;
locks; strict;
comment	@# @;


1.4
date	2003.04.20.17.20.51;	author obrien;	state dead;
branches;
next	1.3;

1.3
date	2002.02.03.07.15.30;	author obrien;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.14.11.39.37;	author obrien;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.17.12.27.58;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Not sure how I missed these patches in my 24-March-2003 GCC 3.3
in-development snapshot upgrade.
@
text
@--- gcc/config/freebsd-spec.h.orig	Tue Nov 20 18:06:45 2001
+++ gcc/config/freebsd-spec.h	Sat Feb  2 13:37:38 2002
@@@@ -48,29 +48,32 @@@@
    || !strcmp ((STR), "soname") || !strcmp ((STR), "defsym") 		\
    || !strcmp ((STR), "assert") || !strcmp ((STR), "dynamic-linker"))
 
+/* Place spaces around this string.  We depend on string splicing to produce
+   the final CPP_PREDEFINES value.  */
+
 #if FBSD_MAJOR == 6
 #define FBSD_CPP_PREDEFINES \
-  "-D__FreeBSD__=6 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
+  " -D__FreeBSD__=6 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
 #endif
 
 #if FBSD_MAJOR == 5
 #define FBSD_CPP_PREDEFINES \
-  "-D__FreeBSD__=5 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
+  " -D__FreeBSD__=5 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
 #endif
 
 #if FBSD_MAJOR == 4
 #define FBSD_CPP_PREDEFINES \
-  "-D__FreeBSD__=4 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
+  " -D__FreeBSD__=4 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
 #endif
 
 #if FBSD_MAJOR == 3
 #define FBSD_CPP_PREDEFINES \
-  "-D__FreeBSD__=3 -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
+  " -D__FreeBSD__=3 -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
 #endif
 
 #ifndef FBSD_CPP_PREDEFINES
 #define FBSD_CPP_PREDEFINES \
-  "-D__FreeBSD__   -Dunix -D__ELF__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD"
+  " -D__FreeBSD__   -Dunix -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=bsd -Asystem=FreeBSD "
 #endif
 
 /* Provide a CPP_SPEC appropriate for FreeBSD.  We just deal with the GCC 
@@@@ -79,7 +82,10 @@@@
 #define FBSD_CPP_SPEC "							\
   %(cpp_cpu)								\
   %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__}		\
-  %{posix:-D_POSIX_SOURCE}"
+  %{posix:-D_POSIX_SOURCE}						\
+  %{!maout: -D__ELF__}							\
+  %{munderscores: -D__UNDERSCORES__}					\
+  %{maout: %{!mno-underscores: -D__UNDERSCORES__}}"
 
 /* Provide a STARTFILE_SPEC appropriate for FreeBSD.  Here we add
    the magical crtbegin.o file (see crtstuff.c) which provides part 
@


1.3
log
@Upgrade to the 28-Jan-2002 GCC 3.1 development snapshot.
@
text
@@


1.2
log
@Upgrade to the 2000-02-07 GCC 2.96 development snapshot.
@
text
@d1 5
a5 5
--- gcc/config/freebsd.h.orig	Mon Nov 22 22:17:32 1999
+++ gcc/config/freebsd.h	Fri Feb  4 05:29:31 2000
@@@@ -48,13 +48,26 @@@@
 #undef WORD_SWITCH_TAKES_ARG
 #define WORD_SWITCH_TAKES_ARG(STR) (FBSD_WORD_SWITCH_TAKES_ARG(STR))
a8 4
+#define FBSD_CPP_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(bsd) -Asystem(FreeBSD) "
+
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES  FBSD_CPP_PREDEFINES
d10 30
d41 3
a43 6
    option `-posix', and PIC issues.  */
 
-#undef CPP_SPEC
-#define CPP_SPEC "%(cpp_cpu)						\
+#define FBSD_CPP_SPEC "							\
+  %(cpp_cpu)								\
a49 3
+
+#undef CPP_SPEC
+#define CPP_SPEC FBSD_CPP_SPEC
d51 2
a52 2
 /* Provide a LIB_SPEC appropriate for FreeBSD.  Just select the appropriate
    libc, depending on whether we're doing profiling or need threads support.
@


1.1
log
@Upgrade to the 2000-01-10 GCC 2.96 development snapshot.
@
text
@d2 2
a3 2
+++ gcc/config/freebsd.h	Sat Dec 18 14:42:03 1999
@@@@ -48,13 +48,23 @@@@
d9 4
a12 1
+#define CPP_FBSD_PREDEFINES " -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) "
@

