Module Name: src
Committed By: mrg
Date: Fri Feb 1 10:34:19 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.backend Makefile.frontend
Makefile.gcc-tool
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
src/external/gpl3/gcc/usr.bin/gcov-dump: Makefile
src/external/gpl3/gcc/usr.bin/lto-wrapper: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin: Makefile.prog
Log Message:
- move various stuff into Makefile.prog
- make sure VER_CPPFLAGS is applied to all required files
- add ADD_FRONTEND_LIBRARY to avoid linking libfrontend, while
using the rest of this fragment
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/Makefile.frontend
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile.prog
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/lto-wrapper/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/Makefile.backend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backend:1.7 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.8
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.7 Sun Feb 11 02:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.7 2018/02/11 02:12:28 christos Exp $
+# $NetBSD: Makefile.backend,v 1.8 2019/02/01 10:34:18 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -17,19 +17,7 @@ LDADD+= ${BACKENDOBJ}/libbackend.a
.include "../Makefile.common"
.include "../Makefile.libiberty"
-
-HOSTPROG_CXX= 1
-
-.include <bsd.prog.mk>
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS}
-
-# Don't auto-frob .y or .l files.
-.l.c .y.c .y.h:
- @true
+.include "../Makefile.prog"
# Find our (local) libraries
LIBGMPDIR!= cd ${GMPDISTDIR}/lib/libgmp && ${PRINTOBJDIR}
Index: src/external/gpl3/gcc/usr.bin/Makefile.frontend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.5 src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.6
--- src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.5 Sun Feb 11 02:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile.frontend Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.frontend,v 1.5 2018/02/11 02:12:28 christos Exp $
+# $NetBSD: Makefile.frontend,v 1.6 2019/02/01 10:34:18 mrg Exp $
BINDIR= /usr/bin
@@ -9,8 +9,10 @@ CPPFLAGS+= -I${GCCARCH} -I${FRONTENDOBJ}
NOCTF= # defined
.include <bsd.init.mk>
+.if ${ADD_FRONTEND_LIBRARY:Uyes} != "no"
DPADD+= ${FRONTENDOBJ}/libfrontend.a
LDADD+= -L${FRONTENDOBJ} -lfrontend
+.endif
.include "../Makefile.common"
.include "../Makefile.common-target"
@@ -19,14 +21,7 @@ LDADD+= -L${FRONTENDOBJ} -lfrontend
.include "../Makefile.libiberty"
.include "../Makefile.libdecnumber"
-HOSTPROG_CXX= 1
-
-.include <bsd.prog.mk>
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS}
+.include "../Makefile.prog"
gcc-vers.texi:
(echo "@set version-GCC $(BASEVER)"; \
Index: src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool
diff -u src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.2 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.3
--- src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.2 Sat May 31 22:55:16 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gcc-tool,v 1.2 2014/05/31 22:55:16 mrg Exp $
+# $NetBSD: Makefile.gcc-tool,v 1.3 2019/02/01 10:34:18 mrg Exp $
PROG= gcc-${GCC_TOOL}
SRCS= gcc-ar.c file-find.c
@@ -23,19 +23,14 @@ CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ}
BINDIR= /usr/bin
NOMAN= # defined
-.include <bsd.prog.mk>
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS}
-
.include "../Makefile.common"
.include "../Makefile.libcpp"
.include "../Makefile.backtrace"
.include "../Makefile.libiberty"
.include "../Makefile.libdecnumber"
+.include "../Makefile.prog"
+
COPTS+= -Wno-stack-protector
.PATH: ${DIST}/gcc
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.12 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.13
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.12 Thu Mar 24 00:02:52 2016
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/03/24 00:02:52 christos Exp $
+# $NetBSD: Makefile,v 1.13 2019/02/01 10:34:18 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -28,10 +28,6 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# XXX check this out, probably need it for plugins?
# LDFLAGS+= -rdynamic
-# VER_CPPFLAGS from Makefile.inc
-CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
-c-cppbuiltin.c: ${GCCARCH}/defs.mk
-
COPTS.c-ada-spec.c= -Wno-stack-protector
COPTS.c-aux-info.c= -Wno-stack-protector
COPTS.c-common.c= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.10 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.10 Thu Mar 24 00:02:52 2016
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/03/24 00:02:52 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/01 10:34:18 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -31,10 +31,6 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# XXX check this out
# LDFLAGS+= -rdynamic
-# VER_CPPFLAGS from Makefile.inc
-CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
-c-cppbuiltin.c: ${GCCARCH}/defs.mk
-
COPTS.c-ada-spec.c+= -Wno-stack-protector
COPTS.c-aux-info.c+= -Wno-stack-protector
COPTS.c-common.c+= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.10 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.10 Thu Mar 24 00:02:52 2016
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/03/24 00:02:52 christos Exp $
+# $NetBSD: Makefile,v 1.11 2019/02/01 10:34:18 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -31,10 +31,6 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
# XXX check this out
# LDFLAGS+= -rdynamic
-## VER_CPPFLAGS from Makefile.inc
-#CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
-#c-cppbuiltin.c: ${GCCARCH}/defs.mk
-
# YUCK. but see timevar.h:POP_TIMEVAR_AND_RETURN
CFLAGS+= -Wno-error # not good enough: -Wno-return-type
COPTS+= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.7 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.7 Sun Feb 11 02:12:29 2018
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/02/11 02:12:29 christos Exp $
+# $NetBSD: Makefile,v 1.8 2019/02/01 10:34:18 mrg Exp $
.include <bsd.init.mk>
@@ -11,14 +11,7 @@ BINDIR= /usr/bin
MAN= gcov.1
-HOSTPROG_CXX= 1
-
-.include <bsd.prog.mk>
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS} -Wno-stack-protector
+.include "../Makefile.prog"
.include "../Makefile.common"
.include "../Makefile.libcpp"
Index: src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.2 src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile:1.2 Sun Feb 11 02:12:29 2018
+++ src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile Fri Feb 1 10:34:19 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/02/11 02:12:29 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/02/01 10:34:19 mrg Exp $
.include <bsd.init.mk>
@@ -11,21 +11,14 @@ BINDIR= /usr/bin
MAN= gcov-dump.1
-HOSTPROG_CXX= 1
-
-.include <bsd.prog.mk>
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS} -Wno-stack-protector
-
.include "../Makefile.common"
.include "../Makefile.libcpp"
.include "../Makefile.backtrace"
.include "../Makefile.libiberty"
.include "../Makefile.libdecnumber"
+.include "../Makefile.prog"
+
LDADD+= -lintl
DPADD+= ${LIBINTL}
Index: src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.3 src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile:1.3 Fri Mar 18 17:52:30 2016
+++ src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile Fri Feb 1 10:34:19 2019
@@ -1,24 +1,26 @@
-# $NetBSD: Makefile,v 1.3 2016/03/18 17:52:30 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/02/01 10:34:19 mrg Exp $
NOMAN=1
PROG= lto-wrapper
+# XXX pullout from LTO_WRAPPER_OBJS
SRCS= lto-wrapper.c \
- collect-utils.c
-CPPFLAGS+= -DPREFIX=\"/usr\"
+ collect-utils.c \
+ ggc-none.o
-.include "../Makefile.backend"
-.include "../Makefile.backtrace"
+BINDIR= /usr/libexec
+
+CPPFLAGS+= -DPREFIX=\"/usr\" -I${GCCARCH} -I${G_ALL_CPPFLAGS}
+
+.include "../Makefile.prog"
+.include "../Makefile.target-defines"
.include "../Makefile.common-target"
+.include "../Makefile.common"
.include "../Makefile.libcpp"
+.include "../Makefile.backtrace"
+.include "../Makefile.libiberty"
COPTS.lto-wrapper.c= -Wno-stack-protector
-
-DPADD+= ${LIBIBERTYOBJ}/libiberty.a
-LDADD+= ${LIBIBERTYOBJ}/libiberty.a
-
-# VER_CPPFLAGS from Makefile.inc
-
LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
Added files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.prog
diff -u /dev/null src/external/gpl3/gcc/usr.bin/Makefile.prog:1.1
--- /dev/null Fri Feb 1 10:34:19 2019
+++ src/external/gpl3/gcc/usr.bin/Makefile.prog Fri Feb 1 10:34:18 2019
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.prog,v 1.1 2019/02/01 10:34:18 mrg Exp $
+
+# common fragment for any thing linking with C++
+
+.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_PROG_
+_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_PROG_=1
+
+HOSTPROG_CXX= 1
+
+.include <bsd.prog.mk>
+
+# Force using C++ for this
+HOST_CC:= ${HOST_CXX}
+CC:= ${CXX}
+CFLAGS:= ${CXXFLAGS}
+
+# Don't auto-frob .y or .l files.
+.l.c .y.c .y.h:
+ @true
+
+.endif
