Module Name: src Committed By: martin Date: Sun May 28 09:47:28 UTC 2023
Modified Files: src/external/gpl3/gcc/usr.bin/backend [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/common [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/common-target [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/frontend [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/libcpp [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/libdecnumber [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by lukem in ticket #176): external/gpl3/gcc/usr.bin/libdecnumber/Makefile: revision 1.9 external/gpl3/gcc/usr.bin/common/Makefile: revision 1.12 external/gpl3/gcc/usr.bin/backend/Makefile: revision 1.67 external/gpl3/gcc/usr.bin/common-target/Makefile: revision 1.12 external/gpl3/gcc/usr.bin/frontend/Makefile: revision 1.15 external/gpl3/gcc/usr.bin/libcpp/Makefile: revision 1.10 gcc: fix build with clang++ HOST_CXX Define HOSTPROG_CXX before .include anything that brings in bsd.own.mk. This ensures that HOST_DBG (etc) gets assigned before HOST_CFLAGS and HOST_CXXFLAGS is created. backend: .include <bsd.init.mk> much earlier, as per the other directories. Fixes backend build when using clang++ as the host compiler (e.g., macOS), because backend host tools are now built with -O. Inspired by https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255760 Note that gcc.old/Makefile.prog may be mis-used because it defines HOSTPROG_CXX and this Makefile fragment is included after bsd.*.mk in other Makefiles, but they seem to build ok so leaving it alone for now. Fixes PR toolchain/57014 To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.66.2.1 src/external/gpl3/gcc/usr.bin/backend/Makefile cvs rdiff -u -r1.11 -r1.11.2.1 src/external/gpl3/gcc/usr.bin/common/Makefile cvs rdiff -u -r1.11 -r1.11.2.1 \ src/external/gpl3/gcc/usr.bin/common-target/Makefile cvs rdiff -u -r1.14 -r1.14.2.1 \ src/external/gpl3/gcc/usr.bin/frontend/Makefile cvs rdiff -u -r1.9 -r1.9.2.1 src/external/gpl3/gcc/usr.bin/libcpp/Makefile cvs rdiff -u -r1.8 -r1.8.2.1 \ src/external/gpl3/gcc/usr.bin/libdecnumber/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/backend/Makefile diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.66 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.66.2.1 --- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.66 Sat Sep 18 01:47:08 2021 +++ src/external/gpl3/gcc/usr.bin/backend/Makefile Sun May 28 09:47:27 2023 @@ -1,7 +1,11 @@ -# $NetBSD: Makefile,v 1.66 2021/09/18 01:47:08 christos Exp $ +# $NetBSD: Makefile,v 1.66.2.1 2023/05/28 09:47:27 martin Exp $ +HOSTPROG_CXX= 1 LIBISPRIVATE= yes +# For ../Makefile.inc and bsd.own.mk +.include <bsd.init.mk> + LIB= backend SRCS= ${G_OBJS:S,analyzer/,,} ${G_out_file:T} regsub.c @@ -28,10 +32,6 @@ CPPFLAGS.lto-streamer-in.c+= -DTARGET_MA HOST_CXXFLAGS+= -std=gnu++98 -HOSTPROG_CXX= 1 - -.include <bsd.init.mk> - HOST_LIBIBERTYOBJ!= cd ${.CURDIR}/../host-libiberty && ${PRINTOBJDIR} .include <bsd.lib.mk> Index: src/external/gpl3/gcc/usr.bin/common/Makefile diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.11 src/external/gpl3/gcc/usr.bin/common/Makefile:1.11.2.1 --- src/external/gpl3/gcc/usr.bin/common/Makefile:1.11 Sat Sep 18 01:47:08 2021 +++ src/external/gpl3/gcc/usr.bin/common/Makefile Sun May 28 09:47:27 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2021/09/18 01:47:08 christos Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2023/05/28 09:47:27 martin Exp $ +HOSTPROG_CXX= 1 LIBISPRIVATE= yes # For ../Makefile.inc and bsd.own.mk @@ -21,8 +22,6 @@ CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} MKPIC:= no MKPICLIB:= no -HOSTPROG_CXX= 1 - COPTS.diagnostic.c= -Wno-stack-protector COPTS.intl.c= -Wno-stack-protector Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.11 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.11.2.1 --- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.11 Sat Sep 18 01:47:08 2021 +++ src/external/gpl3/gcc/usr.bin/common-target/Makefile Sun May 28 09:47:27 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2021/09/18 01:47:08 christos Exp $ +# $NetBSD: Makefile,v 1.11.2.1 2023/05/28 09:47:27 martin Exp $ +HOSTPROG_CXX= 1 LIBISPRIVATE= yes # For ../Makefile.inc and bsd.own.mk @@ -43,8 +44,6 @@ HOST_CPPFLAGS+= -DGENERATOR_FILE MKPIC:= no MKPICLIB:= no -HOSTPROG_CXX= 1 - .include <bsd.lib.mk> # Force using C++ for this Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.14 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.14.2.1 --- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.14 Sat Sep 18 01:47:08 2021 +++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Sun May 28 09:47:27 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2021/09/18 01:47:08 christos Exp $ +# $NetBSD: Makefile,v 1.14.2.1 2023/05/28 09:47:27 martin Exp $ +HOSTPROG_CXX= 1 LIBISPRIVATE= yes # For ../Makefile.inc and bsd.own.mk @@ -9,8 +10,6 @@ LIB= frontend SRCS= gcc.c version.c prefix.c -HOSTPROG_CXX= 1 - .include "../Makefile.driver" .include "../Makefile.target-defines" Index: src/external/gpl3/gcc/usr.bin/libcpp/Makefile diff -u src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.9 src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.9.2.1 --- src/external/gpl3/gcc/usr.bin/libcpp/Makefile:1.9 Sat Sep 18 01:47:08 2021 +++ src/external/gpl3/gcc/usr.bin/libcpp/Makefile Sun May 28 09:47:27 2023 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2021/09/18 01:47:08 christos Exp $ +# $NetBSD: Makefile,v 1.9.2.1 2023/05/28 09:47:27 martin Exp $ +HOSTPROG_CXX= 1 LIBISPRIVATE= yes .include <bsd.init.mk> @@ -13,8 +14,6 @@ CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arc ${G_INCLUDES:M-I*:N-I.*} \ -DPREFIX=\"/usr\" -HOSTPROG_CXX= 1 - .include <bsd.lib.mk> COPTS+= -Wno-stack-protector Index: src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile diff -u src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.8 src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.8.2.1 --- src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile:1.8 Sat Sep 18 01:47:09 2021 +++ src/external/gpl3/gcc/usr.bin/libdecnumber/Makefile Sun May 28 09:47:27 2023 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.8 2021/09/18 01:47:09 christos Exp $ +# $NetBSD: Makefile,v 1.8.2.1 2023/05/28 09:47:27 martin Exp $ DIST= ${GCCDIST} GNUHOSTDIST= ${DIST} +HOSTPROG_CXX= 1 LIBISPRIVATE= yes .include <bsd.init.mk> @@ -17,8 +18,6 @@ CPPFLAGS+= -I${DIST}/libgcc COPTS.decNumber.c=-O0 .endif -HOSTPROG_CXX= 1 - .include <bsd.lib.mk> # Force using C++ for this