Module Name: src
Committed By: mrg
Date: Tue Mar 15 19:12:06 UTC 2016
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/g++: Makefile
src/external/gpl3/gcc/usr.bin/gcc: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin: Makefile.target-defines
Log Message:
move the target defines into a makefile fragment and add the new GCC
5.3 defines necessary. remove "cp/" prefix from sources.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile.target-defines
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/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/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.8 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.8 Sat May 31 22:55:17 2014
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Tue Mar 15 19:12:06 2016
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2016/03/15 19:12:06 mrg Exp $
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
-CPPFLAGS+= -I${BACKENDOBJ}
-# XXX
-CPPFLAGS+= -DCONFIGURE_SPECS="\"\"" \
- -DDEFAULT_TARGET_VERSION=\"${G_version}\" \
- -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\"
+.include "../Makefile.target-defines"
COPTS+= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.9 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.10
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.9 Wed Jan 7 02:05:41 2015
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Tue Mar 15 19:12:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2015/01/07 02:05:41 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/03/15 19:12:06 mrg Exp $
LIBISPRIVATE= yes
@@ -21,12 +21,11 @@ SRCS+= driver-rs6000.c
.PATH: ${DIST}/gcc/config/rs6000
.endif
-CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
+.include "../Makefile.target-defines"
+
+CPPFLAGS+= -I${GCCARCH} -I. \
${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
- -DPREFIX=\"/usr\" \
- -DDEFAULT_TARGET_VERSION=\"${G_version}\" \
- -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\" \
- -DCONFIGURE_SPECS="\"\""
+ -DPREFIX=\"/usr\"
HOST_CPPFLAGS+= -I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
DPSRCS+= specs.h
Index: src/external/gpl3/gcc/usr.bin/g++/Makefile
diff -u src/external/gpl3/gcc/usr.bin/g++/Makefile:1.5 src/external/gpl3/gcc/usr.bin/g++/Makefile:1.6
--- src/external/gpl3/gcc/usr.bin/g++/Makefile:1.5 Sat May 31 22:55:17 2014
+++ src/external/gpl3/gcc/usr.bin/g++/Makefile Tue Mar 15 19:12:06 2016
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2014/05/31 22:55:17 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2016/03/15 19:12:06 mrg Exp $
PROG= gplusplus
PROGNAME= g++
-SRCS= ${G_GXX_OBJS:.o=.c}
+SRCS= ${G_GXX_OBJS:S/cp\///:.o=.c}
NOMAN= # Linked to gcc.1
.include <bsd.own.mk>
-CPPFLAGS+= -I${BACKENDOBJ}
-# XXX
-CPPFLAGS+= -DCONFIGURE_SPECS="\"\"" \
- -DDEFAULT_TARGET_VERSION=\"${G_version}\" \
- -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\"
+.include "../Makefile.target-defines"
LINKS+= ${BINDIR}/g++ ${BINDIR}/c++
Index: src/external/gpl3/gcc/usr.bin/gcc/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.6 src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.6 Fri Apr 17 12:41:46 2015
+++ src/external/gpl3/gcc/usr.bin/gcc/Makefile Tue Mar 15 19:12:06 2016
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/04/17 12:41:46 martin Exp $
+# $NetBSD: Makefile,v 1.7 2016/03/15 19:12:06 mrg Exp $
PROG= gcc
SRCS= gccspec.c ${G_GCC_OBJS:.o=.c}
-CPPFLAGS+= -I${BACKENDOBJ}
-# XXX
-CPPFLAGS+= -DCONFIGURE_SPECS="\"\"" \
- -DDEFAULT_TARGET_VERSION=\"${G_version}\" \
- -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\"
+.include "../Makefile.target-defines"
COPTS.builtins.c = -Wno-stack-protector
Added files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.target-defines
diff -u /dev/null src/external/gpl3/gcc/usr.bin/Makefile.target-defines:1.1
--- /dev/null Tue Mar 15 19:12:06 2016
+++ src/external/gpl3/gcc/usr.bin/Makefile.target-defines Tue Mar 15 19:12:06 2016
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile.target-defines,v 1.1 2016/03/15 19:12:06 mrg Exp $
+
+CPPFLAGS+= -I${BACKENDOBJ}
+CPPFLAGS+= -DCONFIGURE_SPECS="\"\"" \
+ -DDEFAULT_TARGET_VERSION=\"${G_version}\" \
+ -DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\" \
+ -DDEFAULT_REAL_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\" \
+ -DACCEL_DIR_SUFFIX=\"\"
