[src/trunk]: src/external/gpl3/gcc/lib update for GCC 5.3

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

details:   https://anonhg.NetBSD.org/src/rev/13b0063bcef7
branches:  trunk
changeset: 814276:13b0063bcef7
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Mar 15 06:12:11 2016 +0000

description:
update for GCC 5.3

diffstat:

 external/gpl3/gcc/lib/libgcc/libgcov/Makefile |  26 ++++++++++++++++++++++----
 external/gpl3/gcc/lib/libgomp/Makefile        |  22 +++++++++++++++++-----
 2 files changed, 39 insertions(+), 9 deletions(-)

diffs (105 lines):

diff -r 6d80ffcad846 -r 13b0063bcef7 external/gpl3/gcc/lib/libgcc/libgcov/Makefile
--- a/external/gpl3/gcc/lib/libgcc/libgcov/Makefile     Tue Mar 15 06:11:27 2016 +0000
+++ b/external/gpl3/gcc/lib/libgcc/libgcov/Makefile     Tue Mar 15 06:12:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2014/06/01 19:51:01 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2016/03/15 06:12:11 mrg Exp $
 
 REQUIRETOOLS=  yes
 NOPIC=         # defined
@@ -15,7 +15,13 @@
 
 .include "${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}/defs.mk"
 
-LIBGCOVSRCS=   ${G_LIBGCOV:=.c}
+LIBGCOVMERGESRCS=      ${G_LIBGCOV_MERGE:=.c}
+LIBGCOVPROFILERSRCS=   ${G_LIBGCOV_PROFILER:=.c}
+LIBGCOVINTERFACESRCS=  ${G_LIBGCOV_INTERFACE:=.c}
+LIBGCOVDRIVERSRCS=     ${G_LIBGCOV_DRIVER:=.c}
+
+LIBGCOVSRCS=   ${LIBGCOVMERGESRCS} ${LIBGCOVPROFILERSRCS} \
+               ${LIBGCOVINTERFACESRCS} ${LIBGCOVDRIVERSRCS}
 
 CPPFLAGS+=     -I${.CURDIR}/arch/${LIBGCC_MACHINE_ARCH}
 CPPFLAGS+=     -Wno-stack-protector
@@ -25,9 +31,21 @@
 
 CLEANFILES+=   ${LIBGCOVSRCS}
 
-${LIBGCOVSRCS}: ${.CURDIR}/Makefile
+${LIBGCOVMERGESRCS}: ${.CURDIR}/Makefile
+       ${_MKTARGET_CREATE}
+       printf '#define L${.PREFIX}\n#include <libgcov-merge.c>\n' >${.TARGET}
+
+${LIBGCOVPROFILERSRCS}: ${.CURDIR}/Makefile
        ${_MKTARGET_CREATE}
-       printf '#define L${.PREFIX}\n#include <libgcov.c>\n' >${.TARGET}
+       printf '#define L${.PREFIX}\n#include <libgcov-profiler.c>\n' >${.TARGET}
+
+${LIBGCOVINTERFACESRCS}: ${.CURDIR}/Makefile
+       ${_MKTARGET_CREATE}
+       printf '#define L${.PREFIX}\n#include <libgcov-interface.c>\n' >${.TARGET}
+
+${LIBGCOVDRIVERSRCS}: ${.CURDIR}/Makefile
+       ${_MKTARGET_CREATE}
+       printf '#define L${.PREFIX}\n#include <libgcov-driver.c>\n' >${.TARGET}
 
 .include <bsd.lib.mk>
 .else
diff -r 6d80ffcad846 -r 13b0063bcef7 external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Tue Mar 15 06:11:27 2016 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Tue Mar 15 06:12:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.14 2016/03/12 23:07:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.15 2016/03/15 06:12:30 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -37,7 +37,18 @@
        ptrlock.c \
        time.c \
        fortran.c \
-       affinity.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
+
 
 GOMP_MACHINE_ARCH?=    ${MACHINE_ARCH:S/earmv5/earm/}
 ARCHDIR=               ${.CURDIR}/arch/${GOMP_MACHINE_ARCH}
@@ -47,15 +58,16 @@
        -I${DIST}/libgomp \
        -I${DIST}/libgomp/config/posix \
        -I${DIST}/libgcc \
+       -I${DIST}/include \
        -I${ARCHDIR}
 CFLAGS+=-pthread
 
 CWARNFLAGS.clang+=     -Wno-conversion
 
 # libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
-# XXXGCC5
+# XXXGCC5 -- marking 1.2 for GCC 5.3 for now
 SHLIB_MAJOR=   1
-SHLIB_MINOR=   1
+SHLIB_MINOR=   2
 
 LDFLAGS+=      -Wl,--version-script,${DIST}/libgomp/libgomp.map
 
@@ -64,7 +76,7 @@
 FILES=         libgomp.spec
 FILESDIR=      ${LIBDIR}
 
-INCS=          omp.h
+INCS=          omp.h openacc.h
 INCSDIR=       /usr/include/gcc-5
 .endif