Module Name: src
Committed By: riz
Date: Thu May 17 18:02:31 UTC 2012
Modified Files:
src/external/gpl3/binutils/lib/libbfd [netbsd-6]: Makefile
src/external/gpl3/gdb [netbsd-6]: Makefile.inc
src/share/mk [netbsd-6]: bsd.own.mk sys.mk
Log Message:
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]
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/external/gpl3/binutils/lib/libbfd/Makefile
cvs rdiff -u -r1.4 -r1.4.2.1 src/external/gpl3/gdb/Makefile.inc
cvs rdiff -u -r1.696.2.1 -r1.696.2.2 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.108 -r1.108.2.1 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/gpl3/binutils/lib/libbfd/Makefile
diff -u src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 src/external/gpl3/binutils/lib/libbfd/Makefile:1.6.4.1
--- src/external/gpl3/binutils/lib/libbfd/Makefile:1.6 Sun Sep 25 04:32:46 2011
+++ src/external/gpl3/binutils/lib/libbfd/Makefile Thu May 17 18:02:30 2012
@@ -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 @@ 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.4 src/external/gpl3/gdb/Makefile.inc:1.4.2.1
--- src/external/gpl3/gdb/Makefile.inc:1.4 Sun Feb 5 17:47:30 2012
+++ src/external/gpl3/gdb/Makefile.inc Thu May 17 18:02:31 2012
@@ -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 @@ CWARNFLAGS.clang+= -Wno-unused-value -Wn
-Wno-format-security \
-Wno-tautological-compare -Wno-format-extra-args
-.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.696.2.1 src/share/mk/bsd.own.mk:1.696.2.2
--- src/share/mk/bsd.own.mk:1.696.2.1 Sat Feb 18 18:05:05 2012
+++ src/share/mk/bsd.own.mk Thu May 17 18:02:30 2012
@@ -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 @@ 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.108.2.1
--- src/share/mk/sys.mk:1.108 Fri Feb 10 05:57:42 2012
+++ src/share/mk/sys.mk Thu May 17 18:02:30 2012
@@ -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 @@ 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
