[src/trunk]: src introduce an additional switch to enable building GCC3 inste...

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

details:   https://anonhg.NetBSD.org/src/rev/d82342a4d181
branches:  trunk
changeset: 551024:d82342a4d181
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Aug 27 16:03:17 2003 +0000

description:
introduce an additional switch to enable building GCC3 instead of GCC2:
HAVE_GCC3.  if this is set, we also set USE_TOOLS_TOOLCHAIN=no.  change
the definition of the former to be restricted to whether tools/toolchain
is used or not.

diffstat:

 gnu/lib/Makefile                       |   4 ++--
 gnu/usr.bin/Makefile                   |   4 ++--
 include/Makefile                       |   4 ++--
 share/mk/bsd.own.mk                    |  26 ++++++++++++++++++--------
 sys/arch/hpcmips/stand/lcboot/Makefile |   4 ++--
 sys/arch/mips/include/Makefile.inc     |   4 ++--
 6 files changed, 28 insertions(+), 18 deletions(-)

diffs (138 lines):

diff -r f5bb4705c70b -r d82342a4d181 gnu/lib/Makefile
--- a/gnu/lib/Makefile  Wed Aug 27 16:00:30 2003 +0000
+++ b/gnu/lib/Makefile  Wed Aug 27 16:03:17 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2003/07/26 14:55:12 mrg Exp $
+#      $NetBSD: Makefile,v 1.34 2003/08/27 16:03:17 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 .endif
 
 .if ${MKGCC} != "no"
-. if ${USE_TOOLS_TOOLCHAIN} != "no"
+. if ${HAVE_GCC3} == "no"
 SUBDIR+= libg2c libgcc libobjc libstdc++
 . else
 SUBDIR+= libg2c3 libgcc3 libobjc3 libsupc++ libstdc++-v3
diff -r f5bb4705c70b -r d82342a4d181 gnu/usr.bin/Makefile
--- a/gnu/usr.bin/Makefile      Wed Aug 27 16:00:30 2003 +0000
+++ b/gnu/usr.bin/Makefile      Wed Aug 27 16:03:17 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.114 2003/07/25 16:57:07 mrg Exp $
+#      $NetBSD: Makefile,v 1.115 2003/08/27 16:03:17 mrg Exp $
 
 # for OBJECT_FMT
 .include <bsd.own.mk>
@@ -12,7 +12,7 @@
 
 SUBDIR+=       sim .WAIT gdb
 
-.if ${USE_TOOLS_TOOLCHAIN} != "no"
+.if ${HAVE_GCC3} == "no"
 SUBDIR+=       gcc
 .else
 SUBDIR+=       gcc3
diff -r f5bb4705c70b -r d82342a4d181 include/Makefile
--- a/include/Makefile  Wed Aug 27 16:00:30 2003 +0000
+++ b/include/Makefile  Wed Aug 27 16:03:17 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.111 2003/07/26 15:27:13 mrg Exp $
+#      $NetBSD: Makefile,v 1.112 2003/08/27 16:03:18 mrg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -35,7 +35,7 @@
 
 .include <bsd.own.mk>
 
-.if ${USE_TOOLS_TOOLCHAIN} == "no"
+.if ${HAVE_GCC3} == "yes"
 INCS+= stdbool.h
 .endif
 
diff -r f5bb4705c70b -r d82342a4d181 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Wed Aug 27 16:00:30 2003 +0000
+++ b/share/mk/bsd.own.mk       Wed Aug 27 16:03:17 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.352 2003/08/01 22:51:34 mrg Exp $
+#      $NetBSD: bsd.own.mk,v 1.353 2003/08/27 16:03:17 mrg Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -33,25 +33,35 @@
 #
 # Transitional for toolchain upgrade to GCC3.3
 #
+# not working:
+#
 #    ${MACHINE_ARCH} == "m68000" ||
 #    ${MACHINE_ARCH} == "sh3el" ||
 #    ${MACHINE_ARCH} == "sh3eb" ||
 #    ${MACHINE_ARCH} == "powerpc" ||
+# mostly working,:
+#    ${MACHINE_ARCH} == "arm" ||
+#    ${MACHINE_ARCH} == "m68k" ||
+#    ${MACHINE_ARCH} == "mipseb" ||
+#    ${MACHINE_ARCH} == "mipsel" ||
 
-USE_TOOLS_TOOLCHAIN?=  yes
+HAVE_GCC3?=    no
+# these are ready to switch
 .if ${MACHINE_ARCH} == "alpha" || \
-    ${MACHINE_ARCH} == "arm" || \
     ${MACHINE_ARCH} == "i386" || \
-    ${MACHINE_ARCH} == "m68k" || \
-    ${MACHINE_ARCH} == "mipseb" || \
-    ${MACHINE_ARCH} == "mipsel" || \
     ${MACHINE_ARCH} == "sparc" || \
     ${MACHINE_ARCH} == "sparc64"
-USE_TOOLS_TOOLCHAIN?=  no
+HAVE_GCC3?=    yes
 .else
-USE_TOOLS_TOOLCHAIN?=  yes
+HAVE_GCC3?=    no
 .endif
 
+# Do we want to use tools/toolchain or not?
+.if ${HAVE_GCC3} == "yes"
+USE_TOOLS_TOOLCHAIN=no
+.endif
+USE_TOOLS_TOOLCHAIN?=no
+
 #
 # XXX TEMPORARY: If ns32k and not using an external toolchain, then we have
 # to use -idirafter rather than -isystem, because the compiler is too old
diff -r f5bb4705c70b -r d82342a4d181 sys/arch/hpcmips/stand/lcboot/Makefile
--- a/sys/arch/hpcmips/stand/lcboot/Makefile    Wed Aug 27 16:00:30 2003 +0000
+++ b/sys/arch/hpcmips/stand/lcboot/Makefile    Wed Aug 27 16:03:17 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2003/08/09 08:01:42 igy Exp $
+#      $NetBSD: Makefile,v 1.5 2003/08/27 16:03:18 mrg Exp $
 .include <bsd.own.mk>
 
 ROMICE?=       no
@@ -31,7 +31,7 @@
 INCLUDES=      -I${.OBJDIR} -I${S} -I${S}/arch
 CPPFLAGS+=     ${INCLUDES} -nostdinc -D_STANDALONE -DHEAP_LIMIT=0x8002ffff
 CFLAGS+=       -mips2 -EL -mno-abicalls -ffreestanding -mmemcpy
-.if ${USE_TOOLS_TOOLCHAIN} == "yes"
+.if ${HAVE_GCC3} == "no"
 CFLAGS+=       -mno-half-pic
 .endif
 LD_SCRIPT=     lcboot.ldscript
diff -r f5bb4705c70b -r d82342a4d181 sys/arch/mips/include/Makefile.inc
--- a/sys/arch/mips/include/Makefile.inc        Wed Aug 27 16:00:30 2003 +0000
+++ b/sys/arch/mips/include/Makefile.inc        Wed Aug 27 16:03:17 2003 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.2 2003/07/26 18:33:52 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2003/08/27 16:03:18 mrg Exp $
 
 # Standard kernel compile flags
 CFLAGS += -G 0 -mno-abicalls
-.if ${USE_TOOLS_TOOLCHAIN} == "yes"
+.if ${HAVE_GCC3} == "no"
 CFLAGS += -mno-half-pic
 .endif