[src/netbsd-6]: src Apply patches (requested by martin in ticket #153):

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

details:   https://anonhg.NetBSD.org/src/rev/86273f31937a
branches:  netbsd-6
changeset: 774095:86273f31937a
user:      riz <riz%NetBSD.org@localhost>
date:      Thu May 17 18:02:30 2012 +0000

description:
Apply patches (requested by martin in ticket #153):

share/mk/bsd.own.mk                             patch
share/mk/sys.mk                                 patch
external/gpl3/gdb/Makefile.inc                  patch
external/gpl3/binutils/lib/libbfd/Makefile      patch

        Switch the vax port back to GCC 4.1.
        [martin, ticket #153]

diffstat:

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

diffs (83 lines):

diff -r 6de10ef5829d -r 86273f31937a external/gpl3/binutils/lib/libbfd/Makefile
--- a/external/gpl3/binutils/lib/libbfd/Makefile        Thu May 17 17:53:01 2012 +0000
+++ b/external/gpl3/binutils/lib/libbfd/Makefile        Thu May 17 18:02:30 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2011/09/25 04:32:46 christos Exp $
+#      $NetBSD: Makefile,v 1.6.4.1 2012/05/17 18:02:30 riz 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 6de10ef5829d -r 86273f31937a external/gpl3/gdb/Makefile.inc
--- a/external/gpl3/gdb/Makefile.inc    Thu May 17 17:53:01 2012 +0000
+++ b/external/gpl3/gdb/Makefile.inc    Thu May 17 18:02:30 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2012/02/05 17:47:30 matt Exp $
+# $NetBSD: Makefile.inc,v 1.4.2.1 2012/05/17 18:02:31 riz Exp $
 
 USE_LIBEDIT=no
 USE_TUI=yes
@@ -10,8 +10,4 @@
                        -Wno-format-security \
                        -Wno-tautological-compare -Wno-format-extra-args
 
-.if ${MACHINE} == "vax"
-CWARNFLAGS.gcc+=       -Wno-overflow
-.endif
-
 DIST=          ${NETBSDSRCDIR}/external/gpl3/gdb/dist
diff -r 6de10ef5829d -r 86273f31937a share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Thu May 17 17:53:01 2012 +0000
+++ b/share/mk/bsd.own.mk       Thu May 17 18:02:30 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.696.2.1 2012/02/18 18:05:05 riz Exp $
+#      $NetBSD: bsd.own.mk,v 1.696.2.2 2012/05/17 18:02:30 riz 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 6de10ef5829d -r 86273f31937a share/mk/sys.mk
--- a/share/mk/sys.mk   Thu May 17 17:53:01 2012 +0000
+++ b/share/mk/sys.mk   Thu May 17 18:02:30 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.108.2.1 2012/05/17 18:02:30 riz 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