Module Name: src
Committed By: mrg
Date: Sat Sep 5 14:24:26 UTC 2020
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.backend
src/external/gpl3/gcc/usr.bin/backend: Makefile
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/gcov: Makefile
src/external/gpl3/gcc/usr.bin/lto1: Makefile
Log Message:
make GCC 9.3.0 build itself:
- common-target is needed before common now
- complete build-sort.o framework
- fix cyclic dep
- fix .c vs .cc issues
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r1.60 -r1.61 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/lto1/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.8 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.9
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.8 Fri Feb 1 10:34:18 2019
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend Sat Sep 5 14:24:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.8 2019/02/01 10:34:18 mrg Exp $
+# $NetBSD: Makefile.backend,v 1.9 2020/09/05 14:24:25 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -15,6 +15,7 @@ CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ}
DPADD+= ${BACKENDOBJ}/libbackend.a
LDADD+= ${BACKENDOBJ}/libbackend.a
+.include "../Makefile.common-target"
.include "../Makefile.common"
.include "../Makefile.libiberty"
.include "../Makefile.prog"
Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.60 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.61
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.60 Sat Sep 5 09:50:16 2020
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Sat Sep 5 14:24:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2020/09/05 09:50:16 mrg Exp $
+# $NetBSD: Makefile,v 1.61 2020/09/05 14:24:26 mrg Exp $
LIBISPRIVATE= yes
@@ -312,6 +312,13 @@ build-vec.c: vec.c vec.h ${G_GGC_H}
build-vec.lo: ${HH_NORTL}
CLEANFILES+= build-vec.c
+build-sort.cc: sort.cc sort.h ${G_GGC_H}
+ ${_MKTARGET_CREATE}
+ rm -f build-sort.cc
+ cat ${GNUHOSTDIST}/gcc/sort.cc >${.TARGET}
+build-sort.lo: ${HH_NORTL}
+CLEANFILES+= build-sort.cc
+
build-genattrtab.o: ${G_GGC_H}
#
@@ -334,15 +341,13 @@ GENPROG_RTL_DEPENDS= ${G_BUILD_RTL:.o=.l
#
# First we generate the rules for the generators.
#
-GENDEPS.cfn-macros= build-sort.lo
-
.for f in attr attr-common attrtab automata codes conditions config emit \
extract flags opinit output peep preds recog mddump condmd \
target-def cfn-macros
-gen${f}.lo: ${HH} gen${f}.c ${G_RTL_BASE_H} ${GENDEPS.${f}}
+gen${f}.lo: ${HH} gen${f}.c ${G_RTL_BASE_H} build-sort.lo
gen${f}: gen${f}.lo ${GENPROG_RTL_DEPENDS}
${_MKTARGET_LINK}
- ${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}}
+ ${HOST_LINK.cc} -o ${.TARGET} ${.ALLSRC} ${NBCOMPATLIB} ${HOSTLIBIBERTY} ${LDFLAGS.${.TARGET}} build-sort.lo
CLEANFILES+= gen${f} gen${f}.lo
.endfor
@@ -489,7 +494,7 @@ gcov-io.h: gcov-iov.h
df-scan.d df-scan.o: target-hooks-def.h
read-md.d read-md.o read-md.lo: auto-build.h
hash-table.d hash-table.o hash-table.lo: auto-build.h gtype-desc.h
-gencfn-macros.d gencfn-macros.o gencfn-macros.lo: gtype-desc.h case-cfn-macros.h
+gencfn-macros.d gencfn-macros.o gencfn-macros.lo: gtype-desc.h
pass_manager.h passes.c: pass-instances.def
context.d coverage.d lto-cgraph.d passes.d statistics.d toplev.d cgraphunit.d: pass_manager.h
context.o coverage.o lto-cgraph.o passes.o statistics.o toplev.o cgraphunit.o: pass_manager.h
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.18 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.19
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.18 Mon Jun 29 08:34:17 2020
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Sat Sep 5 14:24:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/06/29 08:34:17 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2020/09/05 14:24:26 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
@@ -7,17 +7,14 @@ CPPFLAGS+= -DPREFIX=\"/usr\"
.include "../Makefile.backend"
.include "../Makefile.backtrace"
-.include "../Makefile.common"
-.include "../Makefile.common-target"
.include "../Makefile.libcpp"
.include "../Makefile.libdecnumber"
-.include "../Makefile.libiberty"
CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \
main.o \
${LIBBACKTRACEOBJ}/libbacktrace.a \
- ${COMMONOBJ}/libcommon.a \
${COMMONTARGETOBJ}/libcommon-target.a \
+ ${COMMONOBJ}/libcommon.a \
${LIBCPPOBJ}/libcpp.a \
${LIBDECNUMBEROBJ}/libdecnumber.a \
${LIBIBERTYOBJ}/libiberty.a \
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.16 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.17
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.16 Mon Jun 29 08:34:17 2020
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Sat Sep 5 14:24:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/06/29 08:34:17 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2020/09/05 14:24:26 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -10,17 +10,14 @@ CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\"
.include "../Makefile.backend"
.include "../Makefile.backtrace"
-.include "../Makefile.common"
-.include "../Makefile.common-target"
.include "../Makefile.libcpp"
.include "../Makefile.libdecnumber"
-.include "../Makefile.libiberty"
CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.a \
main.o \
${LIBBACKTRACEOBJ}/libbacktrace.a \
- ${COMMONOBJ}/libcommon.a \
${COMMONTARGETOBJ}/libcommon-target.a \
+ ${COMMONOBJ}/libcommon.a \
${LIBCPPOBJ}/libcpp.a \
${LIBDECNUMBEROBJ}/libdecnumber.a \
${LIBIBERTYOBJ}/libiberty.a \
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.13 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.14
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.13 Mon Jun 29 08:34:17 2020
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile Sat Sep 5 14:24:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/06/29 08:34:17 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2020/09/05 14:24:26 mrg Exp $
PROG= cc1plus
SRCS= ${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
@@ -12,15 +12,12 @@ CPPFLAGS.prefix.c+= -DPREFIX=\"/usr\
.include "../Makefile.backend"
.include "../Makefile.backtrace"
-.include "../Makefile.common"
-.include "../Makefile.common-target"
.include "../Makefile.libcpp"
.include "../Makefile.libdecnumber"
-.include "../Makefile.libiberty"
CHECKSUM_OBJS= ${LIBBACKTRACEOBJ}/libbacktrace.a \
- ${COMMONOBJ}/libcommon.a \
${COMMONTARGETOBJ}/libcommon-target.a \
+ ${COMMONOBJ}/libcommon.a \
${LIBCPPOBJ}/libcpp.a \
${LIBDECNUMBEROBJ}/libdecnumber.a \
${LIBIBERTYOBJ}/libiberty.a \
Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.9 src/external/gpl3/gcc/usr.bin/common/Makefile:1.10
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.9 Mon Feb 4 04:49:20 2019
+++ src/external/gpl3/gcc/usr.bin/common/Makefile Sat Sep 5 14:24:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/04 04:49:20 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2020/09/05 14:24:26 mrg Exp $
LIBISPRIVATE= yes
@@ -8,7 +8,7 @@ LIBISPRIVATE= yes
LIB= common
.include "${.CURDIR}/defs.mk"
-SRCS= ${G_OBJS-libcommon:S/memory-block.o/memory-block.cc/:.o=.c}
+SRCS= ${G_OBJS-libcommon:S/memory-block.o/memory-block.cc/:S/diagnostic-format-json.o/diagnostic-format-json.cc/:S/sort.o/sort.cc/:S/json.o/json.cc/:.o=.c}
# XXX make sure this doesn't have more than it needs
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
Index: src/external/gpl3/gcc/usr.bin/gcov/Makefile
diff -u src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.10 src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/gcov/Makefile:1.10 Sat Sep 5 09:50:16 2020
+++ src/external/gpl3/gcc/usr.bin/gcov/Makefile Sat Sep 5 14:24:26 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2020/09/05 09:50:16 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2020/09/05 14:24:26 mrg Exp $
.include <bsd.init.mk>
PROG= gcov
-SRCS= ${G_GCOV_OBJS:.o=.c}
+SRCS= ${G_GCOV_OBJS:S/json.o/json.cc/:.o=.c}
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
DPADD+= ${LIBZ}
Index: src/external/gpl3/gcc/usr.bin/lto1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.4 src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.5
--- src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.4 Thu Mar 24 00:02:52 2016
+++ src/external/gpl3/gcc/usr.bin/lto1/Makefile Sat Sep 5 14:24:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/03/24 00:02:52 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/09/05 14:24:26 mrg Exp $
PROG= lto1
SRCS= lto-partition.c \
@@ -16,11 +16,8 @@ COPTS.lto-lang.c+= -Wno-stack-protector
.include "../Makefile.backend"
.include "../Makefile.backtrace"
-.include "../Makefile.common"
-.include "../Makefile.common-target"
.include "../Makefile.libcpp"
.include "../Makefile.libdecnumber"
-.include "../Makefile.libiberty"
.if ${MACHINE_ARCH} == "vax"
COPTS.lto-lang.c+=-O0
