[src/trunk]: src Switch -current vax back to gcc 4.1 to match netbsd-6 - unti...

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

details:   https://anonhg.NetBSD.org/src/rev/5cf9374701e7
branches:  trunk
changeset: 779850:5cf9374701e7
user:      abs <abs%NetBSD.org@localhost>
date:      Fri Jun 22 20:32:34 2012 +0000

description:
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.

diffstat:

 external/bsd/cron/bin/cron/Makefile        |   4 ++--
 external/gpl3/binutils/lib/libbfd/Makefile |   6 +++++-
 external/gpl3/gdb/Makefile.inc             |   6 +-----
 share/mk/bsd.own.mk                        |  10 ++++++++--
 share/mk/sys.mk                            |   6 +++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diffs (100 lines):

diff -r 2ab8f2b09743 -r 5cf9374701e7 external/bsd/cron/bin/cron/Makefile
--- a/external/bsd/cron/bin/cron/Makefile       Fri Jun 22 18:54:00 2012 +0000
+++ b/external/bsd/cron/bin/cron/Makefile       Fri Jun 22 20:32:34 2012 +0000
@@ -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 @@
 LDADD+=-lutil
 MAN=   cron.8
 
-CWARNFLAGS+=   -Wno-string-plus-int
+CWARNFLAGS.clang+=     -Wno-string-plus-int
 
 .include <bsd.prog.mk>
diff -r 2ab8f2b09743 -r 5cf9374701e7 external/gpl3/binutils/lib/libbfd/Makefile
--- a/external/gpl3/binutils/lib/libbfd/Makefile        Fri Jun 22 18:54:00 2012 +0000
+++ b/external/gpl3/binutils/lib/libbfd/Makefile        Fri Jun 22 20:32:34 2012 +0000
@@ -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 @@
                -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}
diff -r 2ab8f2b09743 -r 5cf9374701e7 external/gpl3/gdb/Makefile.inc
--- a/external/gpl3/gdb/Makefile.inc    Fri Jun 22 18:54:00 2012 +0000
+++ b/external/gpl3/gdb/Makefile.inc    Fri Jun 22 20:32:34 2012 +0000
@@ -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 @@
                        -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
diff -r 2ab8f2b09743 -r 5cf9374701e7 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Fri Jun 22 18:54:00 2012 +0000
+++ b/share/mk/bsd.own.mk       Fri Jun 22 20:32:34 2012 +0000
@@ -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 @@
 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" || \
diff -r 2ab8f2b09743 -r 5cf9374701e7 share/mk/sys.mk
--- a/share/mk/sys.mk   Fri Jun 22 18:54:00 2012 +0000
+++ b/share/mk/sys.mk   Fri Jun 22 20:32:34 2012 +0000
@@ -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 @@
 .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