Module Name: src
Committed By: mrg
Date: Sat Jan 19 17:11:03 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Added Files:
src/external/gpl3/gcc/lib: Makefile.gthr
Removed Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.srcs
Log Message:
begin to handle new unwind.h and gthr-default.h stuff.
put gthr stuff in a common makefile.
remove ancient unused Makefile.srcs.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/Makefile.gthr
cvs rdiff -u -r1.37 -r1.38 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.3 -r0 src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libsupc++/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/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.37 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.38
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.37 Wed Sep 5 00:51:42 2018
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.37 2018/09/05 00:51:42 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.38 2019/01/19 17:11:02 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -103,7 +103,6 @@ LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
.if ${HAVE_LIBGCC_EH} == "no"
LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
@@ -192,14 +191,7 @@ dp-bit.c: ${.CURDIR}/Makefile
.include "../Makefile.tconfigh"
DPSRCS+= tconfig.h
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+= ${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
+.include "../Makefile.gthr"
EXTRA_FAKEHEADERS= options.h libgcc_tm.h
.include "../../Makefile.hacks"
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.15 src/external/gpl3/gcc/lib/libobjc/Makefile:1.16
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.15 Wed Apr 20 17:18:52 2016
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/04/20 17:18:52 christos Exp $
+# $NetBSD: Makefile,v 1.16 2019/01/19 17:11:02 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -74,19 +74,7 @@ ${OBJS} ${POBJS} ${SOBJS}: runtime-info.
${SRCS}: tconfig.h options.h
-.if ${HAVE_LIBGCC_EH} == "no"
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
-.endif
-
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+= ${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
-
+.include "../Makefile.gthr"
.include "../Makefile.tconfigh"
.include "../Makefile.hacks"
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.34 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.35
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.34 Mon Nov 5 08:45:32 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/11/05 08:45:32 mrg Exp $
+# $NetBSD: Makefile,v 1.35 2019/01/19 17:11:02 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -134,18 +134,7 @@ BUILDSYMLINKS+= \
${GLIBCXX_SRCDIR}/src/c++11/codecvt.cc c11-codecvt.cc
SRCS+= c98-codecvt.cc c11-codecvt.cc
-.if ${HAVE_LIBGCC_EH} == "no"
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
-.endif
-
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+= ${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
+.include "../Makefile.gthr"
# XXX Make this either/or, not one, and maybe another
CXX11_ALWAYS= localename.cc \
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.19 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.20
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.19 Tue Nov 14 00:55:29 2017
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/11/14 00:55:29 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2019/01/19 17:11:02 mrg Exp $
.include <bsd.init.mk>
@@ -9,10 +9,11 @@
GNUHOSTDIST= ${DIST}
BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
-BUILDINCS+= messages_members.h time_members.h opt_random.h gthr-default.h
+BUILDINCS+= messages_members.h time_members.h opt_random.h
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_host_headers}
-INCS+= gthr.h gthr-single.h gthr-posix.h
+# XXX gthr-default.h should be a symlink to gthr-posix.h
+INCS+= gthr-default.h gthr.h gthr-single.h gthr-posix.h
INCS+= ${BUILDINCS}
# libsupc++
@@ -41,13 +42,6 @@ COPYHEADERS= \
messages_members.h ${CXXDIST}/${G_CMESSAGES_H} \
time_members.h ${CXXDIST}/${G_CTIME_H}
-# gthr-default.h is a little special
-.for _src _dst in ${G_CONFIGLINKS}
-. if ${_dst} == "gthr-default.h"
-COPYHEADERS+= ${_dst} ${_src}
-. endif
-.endfor
-
.for _h _s in ${COPYHEADERS}
${_h}: ${_s}
cp -pf ${.ALLSRC} ${.TARGET}
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile:1.11 src/external/gpl3/gcc/lib/libsupc++/Makefile:1.12
--- src/external/gpl3/gcc/lib/libsupc++/Makefile:1.11 Wed Apr 20 17:18:52 2016
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/04/20 17:18:52 christos Exp $
+# $NetBSD: Makefile,v 1.12 2019/01/19 17:11:02 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -27,18 +27,7 @@ CXXFLAGS+= ${G_SECTION_FLAGS}
COPTS.cp-demangle.c = -Wno-stack-protector -Wno-unused-function
-.if ${HAVE_LIBGCC_EH} == "no"
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
-.endif
-
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+= ${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
+.include "../Makefile.gthr"
.include <bsd.lib.mk>
Added files:
Index: src/external/gpl3/gcc/lib/Makefile.gthr
diff -u /dev/null src/external/gpl3/gcc/lib/Makefile.gthr:1.1
--- /dev/null Sat Jan 19 17:11:03 2019
+++ src/external/gpl3/gcc/lib/Makefile.gthr Sat Jan 19 17:11:02 2019
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.gthr,v 1.1 2019/01/19 17:11:02 mrg Exp $
+
+# makefile fragment to setup files selected by configure
+
+.if ${MKGCC} != "no"
+CONFIG_LINKS= \
+ ${G_enable_execute_stack} enable-execute-stack.c \
+ ${G_unwind_header} unwind.h \
+ ${G_md_unwind_header} md-unwind-support.h \
+ ${G_sfp_machine_header} sfp-machine.h \
+ ${G_thread_header} gthr-default.h
+BUILDSYMLINKS+= ${CONFIG_LINKS}
+. for _src _dst in ${CONFIG_LINKS}
+DPSRCS+= ${_dst}
+. endfor
+.endif
