Module Name: src
Committed By: maya
Date: Wed Feb 22 12:34:49 UTC 2017
Modified Files:
src/external/bsd/file: Makefile.inc
src/tests/lib/libc/sync: Makefile
src/tools/gcc: gcc-version.mk
Log Message:
GC more gcc 4.8 specific (dead) logic
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libc/sync/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tools/gcc/gcc-version.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/bsd/file/Makefile.inc
diff -u src/external/bsd/file/Makefile.inc:1.5 src/external/bsd/file/Makefile.inc:1.6
--- src/external/bsd/file/Makefile.inc:1.5 Fri Jan 17 20:24:20 2014
+++ src/external/bsd/file/Makefile.inc Wed Feb 22 12:34:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/01/17 20:24:20 martin Exp $
+# $NetBSD: Makefile.inc,v 1.6 2017/02/22 12:34:49 maya Exp $
WARNS=4
DIST=${NETBSDSRCDIR}/external/bsd/file/dist
@@ -20,8 +20,4 @@ CPPFLAGS+= -DMAGIC='"${MAGIC}"' -DHAVE_C
-DELFCORE -DVERSION='"${VERSION}"'
CPPFLAGS+= -I${.CURDIR}/../include -I${DIST}/src
-.if ${ACTIVE_CC}=="gcc" && ${HAVE_GCC}=="48"
-CPPFLAGS.readelf.c += -Wno-error=maybe-uninitialized
-.endif
-
.PATH: ${DIST}/src ${DIST}/doc
Index: src/tests/lib/libc/sync/Makefile
diff -u src/tests/lib/libc/sync/Makefile:1.6 src/tests/lib/libc/sync/Makefile:1.7
--- src/tests/lib/libc/sync/Makefile:1.6 Sat Oct 18 02:22:35 2014
+++ src/tests/lib/libc/sync/Makefile Wed Feb 22 12:34:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/10/18 02:22:35 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2017/02/22 12:34:49 maya Exp $
WARNS=0
NOMAN=1
@@ -7,12 +7,9 @@ NOMAN=1
PROG= all_sync_ops_linkable
-.if "${ACTIVE_CC}" == "clang" || \
- ("${ACTIVE_CC}" == "gcc" && "${HAVE_GCC}" == "48")
-
+.if "${ACTIVE_CC}" == "clang"
CXXFLAGS+= -std=c++11
PROG_CXX+= cpp_atomic_ops_linkable
-
.endif
proginstall:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.6 src/tools/gcc/gcc-version.mk:1.7
--- src/tools/gcc/gcc-version.mk:1.6 Tue Jun 7 08:12:13 2016
+++ src/tools/gcc/gcc-version.mk Wed Feb 22 12:34:49 2017
@@ -1,9 +1,5 @@
-# $NetBSD: gcc-version.mk,v 1.6 2016/06/07 08:12:13 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.7 2017/02/22 12:34:49 maya Exp $
# common location for tools and native build
-.if ${HAVE_GCC} == 48
-NETBSD_GCC_VERSION=nb3 20151015
-.else
NETBSD_GCC_VERSION=nb1 20160606
-.endif
