Module Name: src
Committed By: mrg
Date: Sun Mar 13 01:06:51 UTC 2016
Modified Files:
src/lib/libc/softfloat: Makefile.inc
src/share/mk: bsd.own.mk
src/sys/arch/sun68k/stand: Makefile.inc
src/tools/gcc: Makefile
Log Message:
remove some more GCC 4.5 code. make GCC 5.3 be HAVE_GCC=53, so that,
for example, HAVE_GCC >= 48 works properly.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/softfloat/Makefile.inc
cvs rdiff -u -r1.905 -r1.906 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun68k/stand/Makefile.inc
cvs rdiff -u -r1.76 -r1.77 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/softfloat/Makefile.inc
diff -u src/lib/libc/softfloat/Makefile.inc:1.20 src/lib/libc/softfloat/Makefile.inc:1.21
--- src/lib/libc/softfloat/Makefile.inc:1.20 Wed Apr 8 13:16:37 2015
+++ src/lib/libc/softfloat/Makefile.inc Sun Mar 13 01:06:51 2016
@@ -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
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.905 src/share/mk/bsd.own.mk:1.906
--- src/share/mk/bsd.own.mk:1.905 Tue Mar 1 10:29:40 2016
+++ src/share/mk/bsd.own.mk Sun Mar 13 01:06:51 2016
@@ -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
Index: src/sys/arch/sun68k/stand/Makefile.inc
diff -u src/sys/arch/sun68k/stand/Makefile.inc:1.25 src/sys/arch/sun68k/stand/Makefile.inc:1.26
--- src/sys/arch/sun68k/stand/Makefile.inc:1.25 Sat Jul 26 17:24:04 2014
+++ src/sys/arch/sun68k/stand/Makefile.inc Sun Mar 13 01:06:51 2016
@@ -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
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.76 src/tools/gcc/Makefile:1.77
--- src/tools/gcc/Makefile:1.76 Mon Feb 15 13:25:12 2016
+++ src/tools/gcc/Makefile Sun Mar 13 01:06:51 2016
@@ -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
