[src/trunk]: src/sys/arch Don't use -traditional-cpp if HAVE_GCC3.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/56f7258c436a
branches:  trunk
changeset: 532288:56f7258c436a
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jun 04 21:39:09 2002 +0000

description:
Don't use -traditional-cpp if HAVE_GCC3.

diffstat:

 sys/arch/amiga/conf/Makefile.amiga     |   6 +++++-
 sys/arch/atari/conf/Makefile.atari     |   6 +++++-
 sys/arch/cesfic/conf/Makefile.cesfic   |   6 +++++-
 sys/arch/hp300/conf/Makefile.hp300     |   6 +++++-
 sys/arch/i386/conf/Makefile.i386       |   6 +++++-
 sys/arch/luna68k/conf/Makefile.luna68k |   6 +++++-
 sys/arch/m68k/fpsp/Makefile            |   6 +++++-
 sys/arch/mac68k/conf/Makefile.mac68k   |  11 ++++++-----
 sys/arch/mips/conf/Makefile.mips       |   6 +++++-
 sys/arch/mvme68k/conf/Makefile.mvme68k |   6 +++++-
 sys/arch/news68k/conf/Makefile.news68k |   6 +++++-
 sys/arch/next68k/conf/Makefile.next68k |   6 +++++-
 sys/arch/sparc/conf/Makefile.sparc     |   6 +++++-
 sys/arch/sparc64/conf/Makefile.sparc64 |   6 +++++-
 sys/arch/sun2/conf/Makefile.sun2       |  17 ++++++-----------
 sys/arch/sun3/conf/Makefile.sun3       |   6 +++++-
 sys/arch/x68k/conf/Makefile.x68k       |   6 +++++-
 17 files changed, 87 insertions(+), 31 deletions(-)

diffs (truncated from 380 to 300 lines):

diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/amiga/conf/Makefile.amiga
--- a/sys/arch/amiga/conf/Makefile.amiga        Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/amiga/conf/Makefile.amiga        Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.amiga,v 1.99 2002/05/26 12:47:42 jdolecek Exp $
+#      $NetBSD: Makefile.amiga,v 1.100 2002/06/04 21:39:09 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -38,7 +38,11 @@
 CMACHFLAGS=    -m68060 -Wa,-m68030 -Wa,-m68851
 .endif
 CFLAGS+=       ${CMACHFLAGS} -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/atari/conf/Makefile.atari
--- a/sys/arch/atari/conf/Makefile.atari        Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/atari/conf/Makefile.atari        Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.atari,v 1.66 2001/12/09 05:00:43 atatat Exp $
+#      $NetBSD: Makefile.atari,v 1.67 2002/06/04 21:39:09 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -33,7 +33,11 @@
 CMACHFLAGS=    -m68060 -Wa,-m68030
 .endif
 CFLAGS+=       ${CMACHFLAGS} -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/cesfic/conf/Makefile.cesfic
--- a/sys/arch/cesfic/conf/Makefile.cesfic      Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/cesfic/conf/Makefile.cesfic      Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.cesfic,v 1.7 2001/12/09 05:00:43 atatat Exp $
+#      $NetBSD: Makefile.cesfic,v 1.8 2002/06/04 21:39:09 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -34,7 +34,11 @@
 WEAK_POINTERS= yes
 CWARNFLAGS+=   -Wno-format
 CFLAGS+=       -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp -Wa,-m68030 -Wa,-m68851 -Wa,-m68040
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp -Wa,-m68030 -Wa,-m68851 -Wa,-m68040
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/hp300/conf/Makefile.hp300
--- a/sys/arch/hp300/conf/Makefile.hp300        Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/hp300/conf/Makefile.hp300        Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.hp300,v 1.82 2001/12/09 05:00:44 atatat Exp $
+#      $NetBSD: Makefile.hp300,v 1.83 2002/06/04 21:39:10 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -33,7 +33,11 @@
 ##
 CPPFLAGS+=     -Dhp300
 CFLAGS+=       -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/i386/conf/Makefile.i386
--- a/sys/arch/i386/conf/Makefile.i386  Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/i386/conf/Makefile.i386  Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.i386,v 1.122 2001/12/09 05:00:45 atatat Exp $
+#      $NetBSD: Makefile.i386,v 1.123 2002/06/04 21:39:10 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,11 @@
 ## (2) compile settings
 ##
 CPPFLAGS+=     -Di386
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/luna68k/conf/Makefile.luna68k
--- a/sys/arch/luna68k/conf/Makefile.luna68k    Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/luna68k/conf/Makefile.luna68k    Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.luna68k,v 1.13 2001/12/09 05:00:45 atatat Exp $
+#      $NetBSD: Makefile.luna68k,v 1.14 2002/06/04 21:39:10 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -32,7 +32,11 @@
 ##
 CPPFLAGS+=     -Dluna68k
 CFLAGS+=       -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/m68k/fpsp/Makefile
--- a/sys/arch/m68k/fpsp/Makefile       Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/m68k/fpsp/Makefile       Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2001/10/07 01:39:51 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.10 2002/06/04 21:39:10 thorpej Exp $
 
 #      MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP
 #      M68000 Hi-Performance Microprocessor Division
@@ -47,7 +47,11 @@
 
 AS?            = as
 LD?            = ld
+.if defined(HAVE_GCC3)
+AFLAGS         = -x assembler-with-cpp -m68040
+.else
 AFLAGS         = -x assembler-with-cpp -traditional-cpp -m68040
+.endif
 
 #
 # For the Library Version:
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/mac68k/conf/Makefile.mac68k
--- a/sys/arch/mac68k/conf/Makefile.mac68k      Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/mac68k/conf/Makefile.mac68k      Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mac68k,v 1.83 2001/12/09 05:00:45 atatat Exp $
+#      $NetBSD: Makefile.mac68k,v 1.84 2002/06/04 21:39:10 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -33,10 +33,11 @@
 ##
 CPPFLAGS+=     -Dmac68k
 CFLAGS+=       -msoft-float
-AFLAGS+=       -traditional
-
-NORMAL_S=      ${CPP} ${AFLAGS} ${CPPFLAGS} $< | sed -e 's/^\#.*//' | \
-               ${AS} -o ${.TARGET}
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
+AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/mips/conf/Makefile.mips
--- a/sys/arch/mips/conf/Makefile.mips  Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/mips/conf/Makefile.mips  Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mips,v 1.26 2002/03/05 14:28:31 simonb Exp $
+#      $NetBSD: Makefile.mips,v 1.27 2002/06/04 21:39:11 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -59,7 +59,11 @@
 DEFGP?=                -G 0
 GP?=           ${DEFGP}
 CFLAGS+=       ${ENDIAN} ${GP} -mno-abicalls -mno-half-pic
+.if defined(HAVE_GCC3)
+AFLAGS+=       ${ENDIAN} -x assembler-with-cpp
+.else
 AFLAGS+=       ${ENDIAN} -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/mvme68k/conf/Makefile.mvme68k
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k    Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k    Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mvme68k,v 1.55 2001/12/09 05:00:47 atatat Exp $
+#      $NetBSD: Makefile.mvme68k,v 1.56 2002/06/04 21:39:11 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -46,7 +46,11 @@
 .endif
 .endif
 CFLAGS+=       ${CMACHFLAGS} -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/news68k/conf/Makefile.news68k
--- a/sys/arch/news68k/conf/Makefile.news68k    Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/news68k/conf/Makefile.news68k    Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.news68k,v 1.13 2001/12/09 05:00:48 atatat Exp $
+#      $NetBSD: Makefile.news68k,v 1.14 2002/06/04 21:39:11 thorpej Exp $
 #
 # Makefile for NetBSD
 #
@@ -36,7 +36,11 @@
 ##
 CPPFLAGS+=     -Dnews68k
 CFLAGS+=       -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/next68k/conf/Makefile.next68k
--- a/sys/arch/next68k/conf/Makefile.next68k    Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/next68k/conf/Makefile.next68k    Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.next68k,v 1.23 2001/12/09 05:00:48 atatat Exp $
+# $NetBSD: Makefile.next68k,v 1.24 2002/06/04 21:39:11 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -33,7 +33,11 @@
 ##
 CPPFLAGS+=     -Dnext68k
 CFLAGS+=       -msoft-float
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/sparc/conf/Makefile.sparc
--- a/sys/arch/sparc/conf/Makefile.sparc        Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/sparc/conf/Makefile.sparc        Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc,v 1.79 2002/01/22 17:04:31 pk Exp $
+#      $NetBSD: Makefile.sparc,v 1.80 2002/06/04 21:39:12 thorpej Exp $
 
 # Makefile for NetBSD
 #
@@ -34,7 +34,11 @@
 # work around GCC (egcs-2.91.66) bug which is liable
 # to use FPU registers as temporaries:
 CFLAGS+=       -mno-fpu
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 ##
 ## (3) libkern and compat
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Tue Jun 04 21:14:59 2002 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Tue Jun 04 21:39:09 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc64,v 1.45 2002/03/19 18:10:33 eeh Exp $
+#      $NetBSD: Makefile.sparc64,v 1.46 2002/06/04 21:39:12 thorpej Exp $
 
 #=========================================================================
 #
@@ -70,7 +70,11 @@
 AFLAGS+=       -Wa,-Av8plusa
 .endif
 CFLAGS+=       -mno-fpu
+.if defined(HAVE_GCC3)
+AFLAGS+=       -x assembler-with-cpp
+.else
 AFLAGS+=       -x assembler-with-cpp -traditional-cpp
+.endif
 
 NOOPT_C=       ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -O0 -c $<
 
diff -r 73f2611bd6cb -r 56f7258c436a sys/arch/sun2/conf/Makefile.sun2
--- a/sys/arch/sun2/conf/Makefile.sun2  Tue Jun 04 21:14:59 2002 +0000