Module Name: src
Committed By: mrg
Date: Mon Oct 31 08:14:44 UTC 2011
Modified Files:
src/distrib/sets: mkvars.mk
src/external/gpl3: Makefile
src/share/mk: bsd.own.mk
src/tools/binutils: Makefile
src/tools/dbsym: Makefile
src/tools/mdsetimage: Makefile
Log Message:
obsolete now useless (and wrongly set to "219" :-) HAVE_BINUTILS.
switch the sense of the gdb and gcc tests to list the platforms not
switched to gcc 4.5 or gdb 7, which is now:
GCC 4.1:
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_CPU} == "arm" || \
${MACHINE_CPU} == "m68k" || \
${MACHINE_CPU} == "vax"
GDB 6:
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "hppa" || \
${MACHINE_CPU} == "mips" || \
${MACHINE_CPU} == "sh3" || \
${MACHINE_ARCH} == "vax"
let's go, people! (-:
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/Makefile
cvs rdiff -u -r1.687 -r1.688 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.20 -r1.21 src/tools/binutils/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tools/dbsym/Makefile
cvs rdiff -u -r1.8 -r1.9 src/tools/mdsetimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.4 src/distrib/sets/mkvars.mk:1.5
--- src/distrib/sets/mkvars.mk:1.4 Tue Dec 28 09:15:24 2010
+++ src/distrib/sets/mkvars.mk Mon Oct 31 08:14:43 2011
@@ -1,10 +1,9 @@
-# $NetBSD: mkvars.mk,v 1.4 2010/12/28 09:15:24 he Exp $
+# $NetBSD: mkvars.mk,v 1.5 2011/10/31 08:14:43 mrg Exp $
MKEXTRAVARS= \
MACHINE \
MACHINE_ARCH \
MACHINE_CPU \
- HAVE_BINUTILS \
HAVE_GCC \
HAVE_GDB \
HAS_SSP \
Index: src/external/gpl3/Makefile
diff -u src/external/gpl3/Makefile:1.5 src/external/gpl3/Makefile:1.6
--- src/external/gpl3/Makefile:1.5 Sat Oct 8 21:52:15 2011
+++ src/external/gpl3/Makefile Mon Oct 31 08:14:44 2011
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2011/10/08 21:52:15 christos Exp $
+# $NetBSD: Makefile,v 1.6 2011/10/31 08:14:44 mrg Exp $
.include <bsd.own.mk>
-.if ${MKBINUTILS} != "no" && ${HAVE_BINUTILS} == "219"
+.if ${MKBINUTILS} != "no"
SUBDIR+= binutils
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.687 src/share/mk/bsd.own.mk:1.688
--- src/share/mk/bsd.own.mk:1.687 Sun Oct 30 08:50:14 2011
+++ src/share/mk/bsd.own.mk Mon Oct 31 08:14:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.687 2011/10/30 08:50:14 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.688 2011/10/31 08:14:44 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -47,27 +47,18 @@ NEED_OWN_INSTALL_TARGET?= yes
TOOLCHAIN_MISSING?= no
#
-# Platforms using GCC 4.5
+# Platforms still using GCC 4.1
#
-.if ${MACHINE_ARCH} == "hppa" || \
- ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_CPU} == "mips" || \
- ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "powerpc64" || \
- ${MACHINE_CPU} == "sh3" || \
- ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64" || \
- ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "alpha" || \
+ ${MACHINE_CPU} == "arm" || \
+ ${MACHINE_CPU} == "m68k" || \
+ ${MACHINE_CPU} == "vax"
+HAVE_GCC?= 4
+.else
+# Otherwise, default to GCC4.5
HAVE_GCC?= 45
.endif
-#
-# Otherwise, default to GCC4.1
-#
-.if !defined(HAVE_GCC) && !defined(HAVE_PCC)
-HAVE_GCC= 4
-.endif
-
.if \
${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "powerpc" || \
@@ -76,27 +67,22 @@ USE_COMPILERCRTSTUFF?= no
.endif
USE_COMPILERCRTSTUFF?= yes
+
#
-# Platforms using GDB 7
+# Platforms still using GDB 6
#
-.if ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "sparc64" || \
- ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "arm" || \
- ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "powerpc64" || \
- ${MACHINE_CPU} == "m68k"
-HAVE_GDB?= 7
+.if ${MACHINE_ARCH} == "alpha" || \
+ ${MACHINE_ARCH} == "hppa" || \
+ ${MACHINE_CPU} == "mips" || \
+ ${MACHINE_CPU} == "sh3" || \
+ ${MACHINE_ARCH} == "vax"
+HAVE_GDB?= 6
.else
-# default to GDB6
-HAVE_GDB?= 6
+# Otherwise, default to GDB7
+HAVE_GDB?= 7
.endif
-# default to binutils 2.19
-HAVE_BINUTILS?= 219
-
.if empty(.MAKEFLAGS:M-V*)
.if defined(MAKEOBJDIRPREFIX) || defined(MAKEOBJDIR)
PRINTOBJDIR= ${MAKE} -r -V .OBJDIR -f /dev/null xxx
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.20 src/tools/binutils/Makefile:1.21
--- src/tools/binutils/Makefile:1.20 Thu Aug 4 02:38:41 2011
+++ src/tools/binutils/Makefile Mon Oct 31 08:14:44 2011
@@ -1,19 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2011/08/04 02:38:41 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2011/10/31 08:14:44 mrg Exp $
.include <bsd.own.mk>
MODULE= binutils
-.if $(HAVE_BINUTILS) == "219"
GNUHOSTDIST= ${.CURDIR}/../../external/gpl3/binutils/dist
BRANDING?= \
--with-pkgversion="NetBSD Binutils nb1" \
--with-bugurl="http://www.NetBSD.org/support/send-pr.html"; \
--with-lib-path="=/usr/lib" --with-sysroot
-.else
-BRANDING?=
-.endif
CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
--program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
Index: src/tools/dbsym/Makefile
diff -u src/tools/dbsym/Makefile:1.6 src/tools/dbsym/Makefile:1.7
--- src/tools/dbsym/Makefile:1.6 Tue Oct 27 14:20:21 2009
+++ src/tools/dbsym/Makefile Mon Oct 31 08:14:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/10/27 14:20:21 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2011/10/31 08:14:44 mrg Exp $
NOMAN= # defined
@@ -6,11 +6,7 @@ NOMAN= # defined
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-dbsym
-.if $(HAVE_BINUTILS) == "219"
HOST_SRCDIR= external/gpl3/binutils/usr.sbin/dbsym
-.else
-HOST_SRCDIR= gnu/usr.sbin/dbsym
-.endif
TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils && ${PRINTOBJDIR}
BFDDIR= ${TOOLCHAINOBJ}/build/bfd
Index: src/tools/mdsetimage/Makefile
diff -u src/tools/mdsetimage/Makefile:1.8 src/tools/mdsetimage/Makefile:1.9
--- src/tools/mdsetimage/Makefile:1.8 Tue Oct 27 14:20:21 2009
+++ src/tools/mdsetimage/Makefile Mon Oct 31 08:14:44 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/10/27 14:20:21 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2011/10/31 08:14:44 mrg Exp $
NOMAN= # defined
@@ -6,11 +6,7 @@ NOMAN= # defined
HOSTPROGNAME= ${MACHINE_GNU_PLATFORM}-mdsetimage
-.if $(HAVE_BINUTILS) == "219"
HOST_SRCDIR= external/gpl3/binutils/usr.sbin/mdsetimage
-.else
-HOST_SRCDIR= gnu/usr.sbin/mdsetimage
-.endif
TOOLCHAINOBJ!= cd ${.CURDIR}/../binutils && ${PRINTOBJDIR}
BFDDIR= ${TOOLCHAINOBJ}/build/bfd
