Module Name: src
Committed By: abs
Date: Fri Jun 22 20:32:35 UTC 2012
Modified Files:
src/external/bsd/cron/bin/cron: Makefile
src/external/gpl3/binutils/lib/libbfd: Makefile
src/external/gpl3/gdb: Makefile.inc
src/share/mk: bsd.own.mk sys.mk
Log Message:
Switch -current vax back to gcc 4.1 to match netbsd-6 - until someone has
time to look at the gcc 4.5 codegen issues we should at least have a usable
-current for vax.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/cron/bin/cron/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.698 -r1.699 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.108 -r1.109 src/share/mk/sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/cron/bin/cron/Makefile
diff -u src/external/bsd/cron/bin/cron/Makefile:1.2 src/external/bsd/cron/bin/cron/Makefile:1.3
--- src/external/bsd/cron/bin/cron/Makefile:1.2 Wed Apr 4 10:59:44 2012
+++ src/external/bsd/cron/bin/cron/Makefile Fri Jun 22 20:32:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/04/04 10:59:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/22 20:32:34 abs Exp $
BINDIR= /usr/sbin
PROG= cron
@@ -8,6 +8,6 @@ CPPFLAGS+=-I${.CURDIR} -DLOGIN_CAP
LDADD+=-lutil
MAN= cron.8
-CWARNFLAGS+= -Wno-string-plus-int
+CWARNFLAGS.clang+= -Wno-string-plus-int
.include <bsd.prog.mk>
Index: src/external/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 src/external/gpl3/binutils/lib/libbfd/Makefile:1.7
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 Sun Sep 25 04:32:46 2011
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/09/25 04:32:46 christos Exp $
+# $NetBSD: Makefile,v 1.7 2012/06/22 20:32:35 abs Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -35,6 +35,10 @@ CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHI
-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
-DDEBUGDIR=\"${DEBUGDIR}\"
+.if (${MACHINE_ARCH} == "vax")
+CPPFLAGS.elf.c += -O0
+.endif
+
GSRCS= ${G_libbfd_la_OBJECTS:libbfd.lo=lib_bfd.lo} \
${G_libbfd_la_DEPENDENCIES:M*.lo}
SRCS= ${GSRCS:.lo=.c}
Index: src/external/gpl3/gdb/Makefile.inc
diff -u src/external/gpl3/gdb/Makefile.inc:1.5 src/external/gpl3/gdb/Makefile.inc:1.6
--- src/external/gpl3/gdb/Makefile.inc:1.5 Wed Apr 4 10:59:45 2012
+++ src/external/gpl3/gdb/Makefile.inc Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2012/04/04 10:59:45 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2012/06/22 20:32:35 abs Exp $
USE_LIBEDIT=no
USE_TUI=yes
@@ -11,8 +11,4 @@ CWARNFLAGS.clang+= -Wno-unused-value -Wn
-Wno-tautological-compare -Wno-format-extra-args \
-Wno-string-plus-int
-.if ${MACHINE} == "vax"
-CWARNFLAGS.gcc+= -Wno-overflow
-.endif
-
DIST= ${NETBSDSRCDIR}/external/gpl3/gdb/dist
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.698 src/share/mk/bsd.own.mk:1.699
--- src/share/mk/bsd.own.mk:1.698 Sun Jun 17 22:59:48 2012
+++ src/share/mk/bsd.own.mk Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.698 2012/06/17 22:59:48 uwe Exp $
+# $NetBSD: bsd.own.mk,v 1.699 2012/06/22 20:32:35 abs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -47,8 +47,14 @@ NEED_OWN_INSTALL_TARGET?= yes
TOOLCHAIN_MISSING?= no
#
-# Everyone uses GCC4.5
+# Platforms still using GCC 4.1
+#
+.if ${MACHINE_CPU} == "vax"
+HAVE_GCC?= 4
+.else
+# Otherwise, default to GCC4.5
HAVE_GCC?= 45
+.endif
.if \
${MACHINE_ARCH} == "i386" || \
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.108 src/share/mk/sys.mk:1.109
--- src/share/mk/sys.mk:1.108 Fri Feb 10 05:57:42 2012
+++ src/share/mk/sys.mk Fri Jun 22 20:32:35 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.108 2012/02/10 05:57:42 matt Exp $
+# $NetBSD: sys.mk,v 1.109 2012/06/22 20:32:35 abs Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@@ -26,8 +26,8 @@ DBG?= -Os -freorder-blocks
.elif ${MACHINE_ARCH} == "m68k" || ${MACHINE_ARCH} == "m68000"
# see src/doc/HACKS for details
DBG?= -Os
-#.elif ${MACHINE_ARCH} == "vax"
-#DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload
+.elif ${MACHINE_ARCH} == "vax"
+DBG?= -O1 -fgcse -fstrength-reduce -fgcse-after-reload
.else
DBG?= -O2
.endif
