move the target defines into a makefile fragment and add the new GCC

5.3 defines necessary.  remove "cp/" prefix from sources.
This commit is contained in:
mrg 2016-03-15 19:12:06 +00:00
parent d03320977e
commit 9688a4384e
5 changed files with 20 additions and 25 deletions

View File

@ -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=\"\"

View File

@ -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

View File

@ -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

View File

@ -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++

View File

@ -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