[src/trunk]: src/external/gpl3/gcc/usr.bin move the target defines into a mak...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ff5d85c06285
branches:  trunk
changeset: 344146:ff5d85c06285
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Mar 15 19:12:06 2016 +0000

description:
move the target defines into a makefile fragment and add the new GCC
5.3 defines necessary.  remove "cp/" prefix from sources.

diffstat:

 external/gpl3/gcc/usr.bin/Makefile.target-defines |   8 ++++++++
 external/gpl3/gcc/usr.bin/cpp/Makefile            |   8 ++------
 external/gpl3/gcc/usr.bin/frontend/Makefile       |  11 +++++------
 external/gpl3/gcc/usr.bin/g++/Makefile            |  10 +++-------
 external/gpl3/gcc/usr.bin/gcc/Makefile            |   8 ++------
 5 files changed, 20 insertions(+), 25 deletions(-)

diffs (100 lines):

diff -r 4f7097745b59 -r ff5d85c06285 external/gpl3/gcc/usr.bin/Makefile.target-defines
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.target-defines Tue Mar 15 19:12:06 2016 +0000
@@ -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=\"\"
diff -r 4f7097745b59 -r ff5d85c06285 external/gpl3/gcc/usr.bin/cpp/Makefile
--- a/external/gpl3/gcc/usr.bin/cpp/Makefile    Tue Mar 15 18:40:50 2016 +0000
+++ b/external/gpl3/gcc/usr.bin/cpp/Makefile    Tue Mar 15 19:12:06 2016 +0000
@@ -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
 
diff -r 4f7097745b59 -r ff5d85c06285 external/gpl3/gcc/usr.bin/frontend/Makefile
--- a/external/gpl3/gcc/usr.bin/frontend/Makefile       Tue Mar 15 18:40:50 2016 +0000
+++ b/external/gpl3/gcc/usr.bin/frontend/Makefile       Tue Mar 15 19:12:06 2016 +0000
@@ -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 @@
 .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
diff -r 4f7097745b59 -r ff5d85c06285 external/gpl3/gcc/usr.bin/g++/Makefile
--- a/external/gpl3/gcc/usr.bin/g++/Makefile    Tue Mar 15 18:40:50 2016 +0000
+++ b/external/gpl3/gcc/usr.bin/g++/Makefile    Tue Mar 15 19:12:06 2016 +0000
@@ -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++
 
diff -r 4f7097745b59 -r ff5d85c06285 external/gpl3/gcc/usr.bin/gcc/Makefile
--- a/external/gpl3/gcc/usr.bin/gcc/Makefile    Tue Mar 15 18:40:50 2016 +0000
+++ b/external/gpl3/gcc/usr.bin/gcc/Makefile    Tue Mar 15 19:12:06 2016 +0000
@@ -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