Module Name: src
Committed By: mrg
Date: Sat May 31 22:55:17 UTC 2014
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.gcc-tool Makefile.inc
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/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
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
Log Message:
make sure that files containing version numbers are rebuilt when
the version actually changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.4 -r1.5 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/Makefile.gcc-tool
diff -u src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.1 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool Sat May 31 22:55:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gcc-tool,v 1.1 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.gcc-tool,v 1.2 2014/05/31 22:55:16 mrg Exp $
PROG= gcc-${GCC_TOOL}
SRCS= gcc-ar.c file-find.c
@@ -15,6 +15,8 @@ CPPFLAGS= \
# Skip these because we don't have them in paths.
# -DDEFAULT_TARGET_VERSION=\"${G_version}\"
# -DDEFAULT_TARGET_MACHINE=\"{GNU_MACHINE_ARCH}\"
+#
+# ${SRCS}: ${GCCARCH}/defs.mk
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.22 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.23
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.22 Thu May 29 07:40:37 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Sat May 31 22:55:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2014/05/29 07:40:37 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.23 2014/05/31 22:55:16 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -79,6 +79,7 @@ VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\"
-DBUGURL=$(G_BUGURL_s)
CPPFLAGS.version.c+= ${VER_CPPFLAGS}
+version.c: ${GCCARCH}/defs.mk ${TOP}/tools/gcc/gcc-version.mk
.include "${GCCARCH}/defs.mk"
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.8 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.8 Sat Mar 22 19:52:21 2014
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/03/22 19:52:21 tron Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/31 22:55:17 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -30,6 +30,7 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# 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
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.7 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.7 Sat Mar 22 17:57:47 2014
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -33,6 +33,7 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# 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
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.8 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.8 Fri Apr 4 01:19:57 2014
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/04/04 01:19:57 christos Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/31 22:55:17 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -33,6 +33,7 @@ CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbac
## 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
Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.2 src/external/gpl3/gcc/usr.bin/common/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.2 Wed Mar 5 21:37:02 2014
+++ src/external/gpl3/gcc/usr.bin/common/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/05 21:37:02 tron Exp $
+# $NetBSD: Makefile,v 1.3 2014/05/31 22:55:17 mrg Exp $
LIBISPRIVATE= yes
@@ -25,6 +25,8 @@ HOSTPROG_CXX= 1
COPTS.diagnostic.c= -Wno-stack-protector
COPTS.intl.c= -Wno-stack-protector
+${SRCS}: ${GCCARCH}/defs.mk
+
.include <bsd.lib.mk>
# Force using C++ for this
Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.3 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.4
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.3 Sat Mar 15 23:12:58 2014
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/15 23:12:58 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/31 22:55:17 mrg Exp $
LIBISPRIVATE= yes
@@ -27,6 +27,8 @@ GENPROG_ERROR_DEPENDS=errors.lo
.include "../Makefile.options"
.include "../../Makefile.hooks"
+${SRCS}: ${GCCARCH}/defs.mk
+
${G_common_out_file:T:R}.o: common/common-target-hooks-def.h
DPSRCS+= options.h
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.7 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.7 Sat Mar 22 17:57:48 2014
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:48 tron Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
@@ -24,6 +24,8 @@ DPADD+= ${LIBINTL}
.include "../Makefile.frontend"
+${SRCS}: ${GCCARCH}/defs.mk
+
.include <bsd.info.mk>
COPTS.gcc.c= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.7 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.7 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $
LIBISPRIVATE= yes
@@ -31,6 +31,8 @@ HOST_CPPFLAGS+= -I${GCCARCH} ${G_ALL_CFL
DPSRCS+= specs.h
+${SRCS}: ${GCCARCH}/defs.mk
+
MKPIC:= no
MKPICLIB:= no
Index: src/external/gpl3/gcc/usr.bin/g++/Makefile
diff -u src/external/gpl3/gcc/usr.bin/g++/Makefile:1.4 src/external/gpl3/gcc/usr.bin/g++/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/g++/Makefile:1.4 Sat Mar 22 17:57:48 2014
+++ src/external/gpl3/gcc/usr.bin/g++/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/31 22:55:17 mrg Exp $
PROG= gplusplus
PROGNAME= g++
@@ -20,6 +20,8 @@ DPADD+= ${LIBINTL}
.include "../Makefile.frontend"
+${SRCS}: ${GCCARCH}/defs.mk
+
COPTS.gcc.c= -Wno-stack-protector
.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/cp
Index: src/external/gpl3/gcc/usr.bin/gcc/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.4 src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/gcc/Makefile:1.4 Sat Mar 22 17:57:48 2014
+++ src/external/gpl3/gcc/usr.bin/gcc/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/22 17:57:48 tron Exp $
+# $NetBSD: Makefile,v 1.5 2014/05/31 22:55:17 mrg Exp $
PROG= gcc
SRCS= gccspec.c ${G_GCC_OBJS:.o=.c}
@@ -24,6 +24,8 @@ DPADD+= ${LIBINTL}
.include "../Makefile.frontend"
+${SRCS}: ${GCCARCH}/defs.mk
+
.include <bsd.info.mk>
COPTS.gcc.c= -Wno-stack-protector
