[src/trunk]: src/external/gpl3/gcc move libgomp, libcommon and libcommon-targ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0387f9e42704
branches:  trunk
changeset: 448478:0387f9e42704
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Feb 04 03:01:52 2019 +0000

description:
move libgomp, libcommon and libcommon-target source lists into the
generated files.  libcommon-target has a per-arch list, but the
other two are the same.

diffstat:

 external/gpl3/gcc/lib/libgomp/Makefile           |  13 ++++---------
 external/gpl3/gcc/lib/libgomp/defs.mk            |   5 +++++
 external/gpl3/gcc/usr.bin/common-target/Makefile |   9 +++------
 external/gpl3/gcc/usr.bin/common/Makefile        |  18 +++---------------
 external/gpl3/gcc/usr.bin/common/defs.mk         |   5 +++++
 5 files changed, 20 insertions(+), 30 deletions(-)

diffs (102 lines):

diff -r 7d482a8abd62 -r 0387f9e42704 external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Mon Feb 04 03:00:11 2019 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Mon Feb 04 03:01:52 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.22 2019/02/03 12:11:11 mrg Exp $
+#      $NetBSD: Makefile,v 1.23 2019/02/04 03:01:52 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -11,16 +11,11 @@
 
 DIST=  ${GCCDIST}
 
+
 LIB=   gomp
-# XXX mknative-gcc should pull out libgomp_la_SOURCES
-SRCS= \
-       alloc.c atomic.c barrier.c critical.c env.c error.c \
-       icv.c icv-device.c iter.c iter_ull.c loop.c loop_ull.c ordered.c \
-       parallel.c sections.c single.c task.c team.c work.c lock.c mutex.c \
-       proc.c sem.c bar.c ptrlock.c time.c fortran.c affinity.c target.c \
-       splay-tree.c libgomp-plugin.c oacc-parallel.c oacc-host.c oacc-init.c \
-       oacc-mem.c oacc-async.c oacc-plugin.c oacc-cuda.c priority_queue.c
 
+.include "${.CURDIR}/defs.mk"
+SRCS=  ${G_libgomp_la_SOURCES}
 
 GOMP_MACHINE_ARCH?=    ${MACHINE_ARCH:S/earmv5/earm/}
 ARCHDIR=               ${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
diff -r 7d482a8abd62 -r 0387f9e42704 external/gpl3/gcc/lib/libgomp/defs.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/lib/libgomp/defs.mk     Mon Feb 04 03:01:52 2019 +0000
@@ -0,0 +1,5 @@
+# This file is automatically generated.  DO NOT EDIT!
+# Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp 
+# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
+#
+G_libgomp_la_SOURCES=alloc.c atomic.c barrier.c critical.c env.c error.c icv.c icv-device.c iter.c iter_ull.c loop.c loop_ull.c ordered.c parallel.c sections.c single.c task.c team.c work.c lock.c 
mutex.c proc.c sem.c bar.c ptrlock.c time.c fortran.c affinity.c target.c splay-tree.c libgomp-plugin.c oacc-parallel.c oacc-host.c oacc-init.c oacc-mem.c oacc-async.c oacc-plugin.c oacc-cuda.c 
priority_queue.c 
diff -r 7d482a8abd62 -r 0387f9e42704 external/gpl3/gcc/usr.bin/common-target/Makefile
--- a/external/gpl3/gcc/usr.bin/common-target/Makefile  Mon Feb 04 03:00:11 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/common-target/Makefile  Mon Feb 04 03:01:52 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2019/02/01 10:39:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2019/02/04 03:01:52 mrg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -7,11 +7,8 @@
 
 LIB=           common-target
 
-# XXX pullout OBJS-libcommon-target
-SRCS=          prefix.c params.c opts.c opts-common.c options.c vec.c \
-               hooks.c common-targhooks.c hash-table.c file-find.c \
-               spellcheck.c selftest.c \
-               ${G_common_out_file:T}
+.include "${.CURDIR}/arch/${GCC_MACHINE_ARCH}.mk"
+SRCS=          ${G_OBJS-libcommon-target:.o=.c}
 
 CPPFLAGS+=     -I${GCCARCH} -I${BACKENDOBJ} -I. \
                ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
diff -r 7d482a8abd62 -r 0387f9e42704 external/gpl3/gcc/usr.bin/common/Makefile
--- a/external/gpl3/gcc/usr.bin/common/Makefile Mon Feb 04 03:00:11 2019 +0000
+++ b/external/gpl3/gcc/usr.bin/common/Makefile Mon Feb 04 03:01:52 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2019/02/01 10:39:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.8 2019/02/04 03:01:52 mrg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -7,20 +7,8 @@
 
 LIB=           common
 
-# XXX pullout OBJS-libcommon-target
-SRCS=          diagnostic.c \
-               diagnostic-color.c \
-               diagnostic-show-locus.o \
-               edit-context.o \
-               pretty-print.c \
-               intl.c \
-               vec.c \
-               input.c \
-               version.c \
-               hash-table.c \
-               ggc-none.c \
-               memory-block.cc \
-               selftest.cc
+.include "${.CURDIR}/defs.mk"
+SRCS=  ${G_OBJS-libcommon:.o=.c}
 
 # XXX make sure this doesn't have more than it needs
 CPPFLAGS+=     -I${GCCARCH} -I${BACKENDOBJ} -I. \
diff -r 7d482a8abd62 -r 0387f9e42704 external/gpl3/gcc/usr.bin/common/defs.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl3/gcc/usr.bin/common/defs.mk  Mon Feb 04 03:01:52 2019 +0000
@@ -0,0 +1,5 @@
+# This file is automatically generated.  DO NOT EDIT!
+# Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp 
+# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
+#
+G_OBJS-libcommon=diagnostic.o diagnostic-color.o diagnostic-show-locus.o edit-context.o pretty-print.o intl.o vec.o input.o version.o hash-table.o ggc-none.o memory-block.o selftest.o