Module Name: src
Committed By: chs
Date: Mon Oct 31 14:20:12 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk bsd.sys.mk sys.mk
Log Message:
switch everything except vax to gcc 4.5.
switch m68k to -Os since -O2 produces much bigger code
with gcc 4.5 than it did with gcc 4.1.
To generate a diff of this commit:
cvs rdiff -u -r1.688 -r1.689 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.209 -r1.210 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.106 -r1.107 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/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.688 src/share/mk/bsd.own.mk:1.689
--- src/share/mk/bsd.own.mk:1.688 Mon Oct 31 08:14:44 2011
+++ src/share/mk/bsd.own.mk Mon Oct 31 14:20:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.688 2011/10/31 08:14:44 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.689 2011/10/31 14:20:11 chs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -49,10 +49,7 @@ TOOLCHAIN_MISSING?= no
#
# Platforms still using GCC 4.1
#
-.if ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE_CPU} == "arm" || \
- ${MACHINE_CPU} == "m68k" || \
- ${MACHINE_CPU} == "vax"
+.if ${MACHINE_CPU} == "vax"
HAVE_GCC?= 4
.else
# Otherwise, default to GCC4.5
@@ -1089,7 +1086,6 @@ X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIR
s3 s3virge savage siliconmotion sis suncg14 \
suncg6 sunffb sunleo suntcx \
tdfx tga trident tseng vesa vga via vmware wsfb
-
X11SRCDIR.xf86-video-${_v}?= ${X11SRCDIRMIT}/xf86-video-${_v}/dist
.endfor
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.209 src/share/mk/bsd.sys.mk:1.210
--- src/share/mk/bsd.sys.mk:1.209 Tue Sep 20 09:11:06 2011
+++ src/share/mk/bsd.sys.mk Mon Oct 31 14:20:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.209 2011/09/20 09:11:06 joerg Exp $
+# $NetBSD: bsd.sys.mk,v 1.210 2011/10/31 14:20:12 chs Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -66,8 +66,11 @@ CFLAGS+= -Wsign-compare -Wformat=2
CFLAGS+= ${${ACTIVE_CC} == "clang":? -Wpointer-sign -Wmissing-noreturn :}
.endif
.if (defined(HAVE_GCC) && ${HAVE_GCC} == 45 \
- && (${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el"))
-# XXX GCC 4.5 for sh3 (which we compile with -Os) is extra noisy for
+ && (${MACHINE_ARCH} == "sh3eb" || \
+ ${MACHINE_ARCH} == "sh3el" || \
+ ${MACHINE_ARCH} == "m68k" || \
+ ${MACHINE_ARCH} == "m68000"))
+# XXX GCC 4.5 for sh3 and m68k (which we compile with -Os) is extra noisy for
# cases it should be better with
CFLAGS+= -Wno-uninitialized
.endif
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.106 src/share/mk/sys.mk:1.107
--- src/share/mk/sys.mk:1.106 Fri May 20 14:27:48 2011
+++ src/share/mk/sys.mk Mon Oct 31 14:20:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.106 2011/05/20 14:27:48 joerg Exp $
+# $NetBSD: sys.mk,v 1.107 2011/10/31 14:20:12 chs Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
unix?= We run NetBSD.
@@ -20,29 +20,16 @@ COMPILE.S?= ${CC} ${AFLAGS} ${AFLAGS.${<
LINK.S?= ${CC} ${AFLAGS} ${AFLAGS.${<:T}} ${CPPFLAGS} ${LDFLAGS}
CC?= cc
-.if ${MACHINE_ARCH} == "alpha" || \
- ${MACHINE_ARCH} == "arm" || \
- ${MACHINE_ARCH} == "x86_64" || \
- ${MACHINE_ARCH} == "armeb" || \
- ${MACHINE_ARCH} == "hppa" || \
- ${MACHINE_ARCH} == "i386" || \
- ${MACHINE_ARCH} == "m68k" || \
- ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \
- ${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "mips64eb" || \
- ${MACHINE_ARCH} == "powerpc" || \
- ${MACHINE_ARCH} == "sparc" || \
- ${MACHINE_ARCH} == "sparc64"
-DBG?= -O2
-.elif ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
+.if ${MACHINE_ARCH} == "sh3el" || ${MACHINE_ARCH} == "sh3eb"
# -O2 is too -falign-* zealous for low-memory sh3 machines
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} == "m68000"
-# see src/doc/HACKS for details
-DBG?= -O1
.else
-DBG?= -O
+DBG?= -O2
.endif
CFLAGS?= ${DBG}
LDFLAGS?=
