Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/gpl3/gcc/lib begin to handle new unwind.h and gthr-...
details: https://anonhg.NetBSD.org/src/rev/a43eef3c7d50
branches: trunk
changeset: 448041:a43eef3c7d50
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Jan 19 17:11:02 2019 +0000
description:
begin to handle new unwind.h and gthr-default.h stuff.
put gthr stuff in a common makefile.
remove ancient unused Makefile.srcs.
diffstat:
external/gpl3/gcc/lib/Makefile.gthr | 16 ++++++++++++++++
external/gpl3/gcc/lib/libgcc/Makefile.inc | 12 ++----------
external/gpl3/gcc/lib/libgcc/Makefile.srcs | 13 -------------
external/gpl3/gcc/lib/libobjc/Makefile | 16 ++--------------
external/gpl3/gcc/lib/libstdc++-v3/Makefile | 15 ++-------------
external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile | 14 ++++----------
external/gpl3/gcc/lib/libsupc++/Makefile | 15 ++-------------
7 files changed, 28 insertions(+), 73 deletions(-)
diffs (195 lines):
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/Makefile.gthr
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/Makefile.gthr Sat Jan 19 17:11:02 2019 +0000
@@ -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
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/libgcc/Makefile.inc
--- a/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Jan 19 17:08:39 2019 +0000
+++ b/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Jan 19 17:11:02 2019 +0000
@@ -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 @@
.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 @@
.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"
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/libgcc/Makefile.srcs
--- a/external/gpl3/gcc/lib/libgcc/Makefile.srcs Sat Jan 19 17:08:39 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile.srcs,v 1.3 2014/03/01 10:00:33 mrg Exp $
-
-#
-# Generated makefiles.
-#
-
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.tmplsrcs.mk"
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.cppflags.mk"
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/srcs.copts.mk"
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.srcs.mk"
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplsrcs.mk"
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplfpsrcs.mk"
-.include "${.CURDIR}/../arch/${LIBGCC_MACHINE_ARCH}/libs.lib${LIB}.tmplsrcs.tmplasmsrcs.mk"
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/libobjc/Makefile
--- a/external/gpl3/gcc/lib/libobjc/Makefile Sat Jan 19 17:08:39 2019 +0000
+++ b/external/gpl3/gcc/lib/libobjc/Makefile Sat Jan 19 17:11:02 2019 +0000
@@ -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 @@
${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"
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/libstdc++-v3/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat Jan 19 17:08:39 2019 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat Jan 19 17:11:02 2019 +0000
@@ -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 @@
${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 \
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
--- a/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Jan 19 17:08:39 2019 +0000
+++ b/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Jan 19 17:11:02 2019 +0000
@@ -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 @@
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}
diff -r f3d9f11ede03 -r a43eef3c7d50 external/gpl3/gcc/lib/libsupc++/Makefile
--- a/external/gpl3/gcc/lib/libsupc++/Makefile Sat Jan 19 17:08:39 2019 +0000
+++ b/external/gpl3/gcc/lib/libsupc++/Makefile Sat Jan 19 17:11:02 2019 +0000
@@ -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 @@
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>
Home |
Main Index |
Thread Index |
Old Index