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

remove some more GCC 4.5 code. make GCC 5.3 be HAVE_GCC=53, so that,

Browse Source 
for example, HAVE_GCC >= 48 works properly.
This commit is contained in:
mrg 2016-03-13 01:06:51 +00:00
parent cc476093dc
commit 8872ffd0f4
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/softfloat/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.20 2015/04/08 13:16:37 martin Exp $
# $NetBSD: Makefile.inc,v 1.21 2016/03/13 01:06:51 mrg Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@ -31,11 +31,8 @@ SRCS+= ${SRCS.softfloat}
# XXX
.if defined(HAVE_GCC)
. if (${LIBC_MACHINE_CPU} == "arm") && (${HAVE_GCC} == "45")
# See doc/HACKS for more information.
COPTS.softfloat.c+= -Wno-enum-compare
COPTS.softfloat.c+= ${${ACTIVE_CXX} == "gcc":? -fno-tree-vrp :}
.elif (${LIBC_MACHINE_CPU} == "mips" || \
. if (${LIBC_MACHINE_CPU} == "mips" || \
${LIBC_MACHINE_CPU} == "sh3")
COPTS.softfloat.c+= -Wno-enum-compare
. endif

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

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.905 2016/03/01 10:29:40 uwe Exp $
# $NetBSD: bsd.own.mk,v 1.906 2016/03/13 01:06:51 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@ -78,7 +78,7 @@ MKGCCCMDS?= no
# We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is
# set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC.
#
.if ${HAVE_GCC} == 5
.if ${HAVE_GCC} == 53
EXTERNAL_GCC_SUBDIR= gcc
.elif ${HAVE_GCC} == 48
EXTERNAL_GCC_SUBDIR= gcc.old

4
sys/arch/sun68k/stand/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.25 2014/07/26 17:24:04 tsutsui Exp $
# $NetBSD: Makefile.inc,v 1.26 2016/03/13 01:06:51 mrg Exp $
# Must have S=/usr/src/sys (or equivalent)
# But note: this is w.r.t. a subdirectory
@ -22,7 +22,7 @@ RELOC?= 240000
DEFS?= -Dsun3 -D_STANDALONE -D__daddr_t=int32_t
INCL?= -I. -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 48
.if defined(HAVE_GCC)
# gcc 4.8 convers -mc68000 to -mcpu=68000 and that breaks gas
# which works for -march=68010 but breaks for -mcpu=68010
CPUFLAGS= -march=68010

4
tools/gcc/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.76 2016/02/15 13:25:12 martin Exp $
# $NetBSD: Makefile,v 1.77 2016/03/13 01:06:51 mrg Exp $
.include <bsd.own.mk>
@ -83,7 +83,7 @@ BUILD_MAKE=${TOOL_GMAKE}
MKNATIVE_CONFIG_TARGET_LIBS=
.if ${HAVE_GCC} == 5
.if ${HAVE_GCC} >= 50
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc5