Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch everything except vax to gcc 4.5.

Browse Source 
switch m68k to -Os since -O2 produces much bigger code
with gcc 4.5 than it did with gcc 4.1.
This commit is contained in:
chs 2011-10-31 14:20:11 +00:00
parent 29af9462d1
commit 8c0bc12273
3 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
share/mk/bsd.own.mk
View File

@ -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}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist
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

9
share/mk/bsd.sys.mk
View File

@ -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

25
share/mk/sys.mk
View File

@ -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.${<:T}} ${CPPFLAGS} ${_ASM_TRADITIONAL_CPP}
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?=