Module Name:    src
Committed By:   mrg
Date:           Mon Apr 12 00:05:56 UTC 2021

Modified Files:
        src/external/gpl3/gcc/dist/gcc/config: netbsd.h
        src/external/gpl3/gcc/dist/libgomp: acc_prof.h
        src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: numeric_traits.h
        src/external/gpl3/gcc/lib/libgcc: Makefile.inc
        src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile
        src/external/gpl3/gcc/lib/libgcc/libgcc_eh: Makefile
        src/external/gpl3/gcc/lib/libgcc/libgcc_s: Makefile
        src/external/gpl3/gcc/lib/libgomp: Makefile defs.mk
        src/external/gpl3/gcc/lib/libiberty: defs.mk
        src/external/gpl3/gcc/lib/libstdc++-v3/include: Makefile
        src/external/gpl3/gcc/lib/libubsan: Makefile
        src/external/gpl3/gcc/usr.bin: Makefile.inc
        src/external/gpl3/gcc/usr.bin/backend: Makefile
        src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
        src/external/gpl3/gcc/usr.bin/common: defs.mk
        src/external/gpl3/gcc/usr.bin/lto1: Makefile
Added Files:
        src/external/gpl3/gcc: README.gcc10
Removed Files:
        src/external/gpl3/gcc: README.gcc9

Log Message:
various changes to get GCC 10 to build here.

- fix path to compiler-specific includes
- missing (void) for (older) C
- fix __is_signed/__is_signed_val change
- avoid compiler warning-as-errors
- add to existing COPTS.file values, instead of setting
- bump libgomp minor; functions were added
- add new 'compare' c++ header
- handle new analyzer subdirectory.  set TARGET_MACHINE for lto-streamer-in.c.
  remove params.list etc handling.
- coroutines.cc is another .cc not .c.  adjust .PATH to suit.
- add new lto1 sources
- couple of files not in /arch/ subdirs missed in mknative update.

rs6000.c is still not merged.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/README.gcc10
cvs rdiff -u -r1.16 -r0 src/external/gpl3/gcc/README.gcc9
cvs rdiff -u -r1.36 -r1.37 src/external/gpl3/gcc/dist/gcc/config/netbsd.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libgomp/acc_prof.h
cvs rdiff -u -r1.9 -r1.10 \
    src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h
cvs rdiff -u -r1.46 -r1.47 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
cvs rdiff -u -r1.10 -r1.11 \
    src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
cvs rdiff -u -r1.25 -r1.26 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libgomp/defs.mk
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gcc/lib/libiberty/defs.mk
cvs rdiff -u -r1.11 -r1.12 \
    src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/lib/libubsan/Makefile
cvs rdiff -u -r1.32 -r1.33 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.63 -r1.64 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/common/defs.mk
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/lto1/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/dist/gcc/config/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.36 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.37
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.36	Sun Apr 11 00:02:12 2021
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h	Mon Apr 12 00:05:54 2021
@@ -63,7 +63,7 @@ along with GCC; see the file COPYING3.  
  * XXX figure out a better way to do this
  */
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include/gcc-9"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-10"
 
 /* Under NetBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */

Index: src/external/gpl3/gcc/dist/libgomp/acc_prof.h
diff -u src/external/gpl3/gcc/dist/libgomp/acc_prof.h:1.1.1.1 src/external/gpl3/gcc/dist/libgomp/acc_prof.h:1.2
--- src/external/gpl3/gcc/dist/libgomp/acc_prof.h:1.1.1.1	Sat Apr 10 22:09:57 2021
+++ src/external/gpl3/gcc/dist/libgomp/acc_prof.h	Mon Apr 12 00:05:54 2021
@@ -235,7 +235,7 @@ extern void acc_prof_register (acc_event
 			       acc_register_t) __GOACC_NOTHROW;
 extern void acc_prof_unregister (acc_event_t, acc_prof_callback,
 				 acc_register_t) __GOACC_NOTHROW;
-typedef void (*acc_query_fn) ();
+typedef void (*acc_query_fn) (void);
 typedef acc_query_fn (*acc_prof_lookup_func) (const char *);
 extern acc_query_fn acc_prof_lookup (const char *) __GOACC_NOTHROW;
 /* Don't tag 'acc_register_library' as '__GOACC_NOTHROW': this function can be

Index: src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h
diff -u src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h:1.9 src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h:1.10
--- src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h:1.9	Sun Apr 11 00:02:25 2021
+++ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/numeric_traits.h	Mon Apr 12 00:05:54 2021
@@ -67,15 +67,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       // NB: these two are also available in std::numeric_limits as compile
       // time constants, but <limits> is big and we can avoid including it.
-      static const bool __is_signed = (_Value)(-1) < 0;
+      static const bool __is_signed_val = (_Value)(-1) < 0;
       static const int __digits
-	= __is_integer_nonstrict<_Value>::__width - __is_signed;
+	= __is_integer_nonstrict<_Value>::__width - __is_signed_val;
 
       // The initializers must be constants so that __max and __min are too.
-      static const _Value __max = __is_signed
+      static const _Value __max = __is_signed_val
 	? (((((_Value)1 << (__digits - 1)) - 1) << 1) + 1)
 	: ~(_Value)0;
-      static const _Value __min = __is_signed ? -__max - 1 : (_Value)0;
+      static const _Value __min = __is_signed_val ? -__max - 1 : (_Value)0;
     };
 
   template<typename _Value>

Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.46 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.47
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.46	Sat Sep  5 11:40:56 2020
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc	Mon Apr 12 00:05:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.46 2020/09/05 11:40:56 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.47 2021/04/12 00:05:55 mrg Exp $
 
 LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
 GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/}
@@ -209,3 +209,7 @@ EXTRA_FAKEHEADERS=	options.h libgcc_tm.h
 # XXX insn-modes.h
 BINBACKENDOBJ!=	cd ${.CURDIR}/../../../usr.bin/backend && ${PRINTOBJDIR}
 CPPFLAGS+=	-I${BINBACKENDOBJ}
+
+#.if !empty(LIBGCC_MACHINE_ARCH:Mearm*)
+COPTS.unwind-dw2.c+=	-Wno-discarded-qualifiers
+#.endif

Index: src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.28 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.29
--- src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile:1.28	Thu Aug  3 22:01:30 2017
+++ src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile	Mon Apr 12 00:05:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2017/08/03 22:01:30 mrg Exp $
+#	$NetBSD: Makefile,v 1.29 2021/04/12 00:05:55 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -46,7 +46,7 @@ CPPFLAGS+=	-DPIC
 # the -fpic/-FPIC present in ${G_LIBGCC2_CFLAGS}.
 MKPIC:= no
 
-COPTS.unwind-dw2.c = -Wno-stack-protector
+COPTS.unwind-dw2.c += -Wno-stack-protector
 
 .include <bsd.lib.mk>
 

Index: src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.10 src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.11
--- src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile:1.10	Sun Jun  1 19:51:01 2014
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_eh/Makefile	Mon Apr 12 00:05:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2014/06/01 19:51:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.11 2021/04/12 00:05:55 mrg Exp $
 
 REQUIRETOOLS=	yes
 NOLINT=		# defined
@@ -15,8 +15,8 @@ LIB=		gcc_eh
 .cc: # disable .cc->NULL transform
 
 SRCS+=		${LIB2_EH} ${LIB2_EHASM} empty.c
-COPTS.c-typeck.c=	-Wno-stack-protector
-COPTS.unwind-dw2.c=	-Wno-stack-protector
+COPTS.c-typeck.c+=	-Wno-stack-protector
+COPTS.unwind-dw2.c+=	-Wno-stack-protector
 
 MKPIC:=	no
 

Index: src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile
diff -u src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.14 src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.15
--- src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile:1.14	Fri Oct 21 23:44:09 2016
+++ src/external/gpl3/gcc/lib/libgcc/libgcc_s/Makefile	Mon Apr 12 00:05:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2016/10/21 23:44:09 christos Exp $
+#	$NetBSD: Makefile,v 1.15 2021/04/12 00:05:55 mrg Exp $
 
 USE_SHLIBDIR=	yes
 REQUIRETOOLS=	yes
@@ -40,7 +40,7 @@ SRCS+=		${LIB2FUNCS} ${LIB2DIVMOD} ${LIB
 		${LIB2ADD_HACK:T:S/.asm/.S/} \
 		${G_LIB2ADD_ST:T} ${LIB1ASMFUNCS}
 
-COPTS.unwind-dw2.c = -Wno-stack-protector
+COPTS.unwind-dw2.c += -Wno-stack-protector
 
 DPADD+=		libgcc.map
 CLEANFILES+=	libgcc.map

Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.25 src/external/gpl3/gcc/lib/libgomp/Makefile:1.26
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.25	Fri May 15 14:29:29 2020
+++ src/external/gpl3/gcc/lib/libgomp/Makefile	Mon Apr 12 00:05:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.25 2020/05/15 14:29:29 joerg Exp $
+#	$NetBSD: Makefile,v 1.26 2021/04/12 00:05:55 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -32,7 +32,7 @@ CPPFLAGS+= \
 CFLAGS+=-pthread
 
 SHLIB_MAJOR=	2
-SHLIB_MINOR=	0
+SHLIB_MINOR=	1
 
 LDFLAGS+=	-Wl,--version-script,${DIST}/libgomp/libgomp.map
 

Index: src/external/gpl3/gcc/lib/libgomp/defs.mk
diff -u src/external/gpl3/gcc/lib/libgomp/defs.mk:1.4 src/external/gpl3/gcc/lib/libgomp/defs.mk:1.5
--- src/external/gpl3/gcc/lib/libgomp/defs.mk:1.4	Wed Sep  9 07:27:46 2020
+++ src/external/gpl3/gcc/lib/libgomp/defs.mk	Mon Apr 12 00:05:55 2021
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.112 2020/09/09 07:12:04 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.114 2021/04/11 07:35:45 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 affinity-fmt.c teams.c 
+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 affinity-fmt.c teams.c oacc-profiling.c oacc-target.c 

Index: src/external/gpl3/gcc/lib/libiberty/defs.mk
diff -u src/external/gpl3/gcc/lib/libiberty/defs.mk:1.27 src/external/gpl3/gcc/lib/libiberty/defs.mk:1.28
--- src/external/gpl3/gcc/lib/libiberty/defs.mk:1.27	Wed Sep  9 07:27:46 2020
+++ src/external/gpl3/gcc/lib/libiberty/defs.mk	Mon Apr 12 00:05:55 2021
@@ -1,8 +1,8 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.112 2020/09/09 07:12:04 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.114 2021/04/11 07:35:45 mrg Exp 
 # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp 
 #
 G_ALLOCA=
 G_EXTRA_OFILES=
 G_LIBOBJS=mempcpy.o strverscmp.o
-G_REQUIRED_OFILES=regex.o cplus-dem.o cp-demangle.o md5.o sha1.o alloca.o argv.o choose-temp.o concat.o cp-demint.o crc32.o d-demangle.o dwarfnames.o dyn-string.o fdmatch.o fibheap.o filename_cmp.o floatformat.o fnmatch.o fopen_unlocked.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o hex.o lbasename.o lrealpath.o make-relative-prefix.o make-temp-file.o objalloc.o obstack.o partition.o pexecute.o physmem.o pex-common.o pex-one.o pex-unix.o vprintf-support.o rust-demangle.o safe-ctype.o simple-object.o simple-object-coff.o simple-object-elf.o simple-object-mach-o.o simple-object-xcoff.o sort.o spaces.o splay-tree.o stack-limit.o strerror.o strsignal.o timeval-utils.o unlink-if-ordinary.o xasprintf.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o xstrerror.o xstrndup.o xvasprintf.o
+G_REQUIRED_OFILES=regex.o cplus-dem.o cp-demangle.o md5.o sha1.o alloca.o argv.o choose-temp.o concat.o cp-demint.o crc32.o d-demangle.o dwarfnames.o dyn-string.o fdmatch.o fibheap.o filedescriptor.o filename_cmp.o floatformat.o fnmatch.o fopen_unlocked.o getopt.o getopt1.o getpwd.o getruntime.o hashtab.o hex.o lbasename.o lrealpath.o make-relative-prefix.o make-temp-file.o objalloc.o obstack.o partition.o pexecute.o physmem.o pex-common.o pex-one.o pex-unix.o vprintf-support.o rust-demangle.o safe-ctype.o simple-object.o simple-object-coff.o simple-object-elf.o simple-object-mach-o.o simple-object-xcoff.o sort.o spaces.o splay-tree.o stack-limit.o strerror.o strsignal.o timeval-utils.o unlink-if-ordinary.o xasprintf.o xatexit.o xexit.o xmalloc.o xmemdup.o xstrdup.o xstrerror.o xstrndup.o xvasprintf.o

Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.11 src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.12
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile:1.11	Wed Sep  9 07:23:45 2020
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/Makefile	Mon Apr 12 00:05:55 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2020/09/09 07:23:45 mrg Exp $
+#	$NetBSD: Makefile,v 1.12 2021/04/12 00:05:55 mrg Exp $
 
 SUBDIR=		backward ext bits debug decimal parallel pb profile pstl
 SUBDIR+=	tr1 tr2
@@ -13,8 +13,9 @@ SUBDIR+=	tr1 tr2
 DIST=		${GCCDIST}
 GNUHOSTDIST=	${DIST}
 
+# XXXmknative libstdc++-v3/libsupc++/Makefile.am::std_HEADERS
 # libsupc++
-INCS=		exception new typeinfo cxxabi.h initializer_list
+INCS=		compare cxxabi.h exception initializer_list new typeinfo
 
 # others
 INCS+=		cerrno

Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.18 src/external/gpl3/gcc/lib/libubsan/Makefile:1.19
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.18	Mon Sep 14 15:01:58 2020
+++ src/external/gpl3/gcc/lib/libubsan/Makefile	Mon Apr 12 00:05:56 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2020/09/14 15:01:58 kamil Exp $
+#	$NetBSD: Makefile,v 1.19 2021/04/12 00:05:56 mrg Exp $
 
 UNSUPPORTED_COMPILER.clang=	# defined
 LIBISCXX = yes
@@ -37,4 +37,7 @@ LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
 LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
 CPPFLAGS+=-DCAN_SANITIZE_UB=1
 
+# XXX
+COPTS.ubsan_handlers.cc+=-Wno-error=maybe-uninitialized
+
 .include <bsd.lib.mk>

Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.32 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.33
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.32	Fri Feb  1 10:39:48 2019
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc	Mon Apr 12 00:05:56 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.32 2019/02/01 10:39:48 mrg Exp $
+#	$NetBSD: Makefile.inc,v 1.33 2021/04/12 00:05:56 mrg Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -114,4 +114,7 @@ NOCLANGERROR=	# defined
 WARNS=1
 COPTS+=-Wno-narrowing -Wno-unused
 
+# Lots trigger this.
+CFLAGS+=	-Wno-format-diag
+
 .endif

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.63 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.64
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.63	Tue Sep 15 05:19:34 2020
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Mon Apr 12 00:05:56 2021
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.63 2020/09/15 05:19:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.64 2021/04/12 00:05:56 mrg Exp $
 
 LIBISPRIVATE=	yes
 
 LIB=		backend
 
-SRCS=		${G_OBJS} ${G_out_file:T} regsub.c
+SRCS=		${G_OBJS:S,analyzer/,,} ${G_out_file:T} regsub.c
 
 # XXX: something misses these.
 CLEANDIRFILES+=	${G_OBJS:.o=.d}
@@ -24,6 +24,7 @@ CPPFLAGS+=	-I${.CURDIR}/../../lib/libgcc
 
 CPPFLAGS.cppdefault.c+=	-DPREFIX=\"/usr\" \
 			-DNATIVE_SYSTEM_HEADER_DIR=\"${G_NATIVE_SYSTEM_HEADER_DIR}\"
+CPPFLAGS.lto-streamer-in.c+=	-DTARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\"
 
 HOST_CXXFLAGS+=	-std=gnu++98
 
@@ -435,15 +436,6 @@ insn-conditions.md: gencondmd
 	./gencondmd >${.TARGET}
 CLEANFILES+=	insn-conditions.md 
 
-# build params.list for params.h.
-params.h: params.list
-${SRCS}: params.list
-params-list.h: params.def
-params.list: params-list.h
-	${CPP} ${.ALLSRC} | sed 's/^#.*//;/^$$/d' > params.list.tmp && \
-	mv params.list.tmp params.list
-CLEANFILES+=	params.list.tmp params.list
-
 # build case-cfn-macros.h and cfn-operators.pd
 case-cfn-macros.h: gencfn-macros
 	./gencfn-macros -c > case-cfn-macros.h.tmp && \
@@ -624,6 +616,7 @@ CFLAGS+= -fno-exceptions -fno-rtti -fasy
 
 .PATH: ${DIST}/gcc ${DIST}/libiberty ${GCCARCH} ${G_out_file:H} ${DIST}/include
 .PATH: ${DIST}/gcc/config
+.PATH: ${DIST}/gcc/analyzer
 .if ${MACHINE_CPU} == "aarch64"
 .PATH: ${DIST}/gcc/config/arm
 .endif

Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.14 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.15
--- src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.14	Sat Sep  5 14:24:26 2020
+++ src/external/gpl3/gcc/usr.bin/cc1plus/Makefile	Mon Apr 12 00:05:56 2021
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.14 2020/09/05 14:24:26 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2021/04/12 00:05:56 mrg Exp $
 
 PROG=		cc1plus
-SRCS=		${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:Nlibcpp.a:.o=.c}
+SRCS=		${G_CXX_OBJS:S,c-family/,,:S,cp/,,:S,constraint.o,constraint.cc,:S,logic.o,logic.cc,:S,known-headers.o,known-headers.cc,:S,c-spellcheck.o,c-spellcheck.cc,:S,coroutines.o,coroutines.cc,:Nlibcpp.a:.o=.c}
 SRCS+=		main.c ${PROG}-checksum.c
 
 # XXX
@@ -57,6 +57,6 @@ COPTS.c-common.c+=-O3
 LDADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
 DPADD+=	${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
 
-.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/config
+.PATH: ${DIST}/gcc/cp ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/config ${DIST}/gcc/cp
 .PATH: ${G_out_file:H}
 

Index: src/external/gpl3/gcc/usr.bin/common/defs.mk
diff -u src/external/gpl3/gcc/usr.bin/common/defs.mk:1.5 src/external/gpl3/gcc/usr.bin/common/defs.mk:1.6
--- src/external/gpl3/gcc/usr.bin/common/defs.mk:1.5	Wed Sep  9 07:27:50 2020
+++ src/external/gpl3/gcc/usr.bin/common/defs.mk	Mon Apr 12 00:05:56 2021
@@ -1,5 +1,5 @@
 # This file is automatically generated.  DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.112 2020/09/09 07:12:04 mrg Exp 
+# Generated from: NetBSD: mknative-gcc,v 1.114 2021/04/11 07:35:45 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 diagnostic-format-json.o json.o edit-context.o pretty-print.o intl.o sbitmap.o vec.o input.o version.o hash-table.o ggc-none.o memory-block.o selftest.o selftest-diagnostic.o sort.o

Index: src/external/gpl3/gcc/usr.bin/lto1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.5 src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.6
--- src/external/gpl3/gcc/usr.bin/lto1/Makefile:1.5	Sat Sep  5 14:24:26 2020
+++ src/external/gpl3/gcc/usr.bin/lto1/Makefile	Mon Apr 12 00:05:56 2021
@@ -1,12 +1,13 @@
-#	$NetBSD: Makefile,v 1.5 2020/09/05 14:24:26 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2021/04/12 00:05:56 mrg Exp $
 
 PROG=		lto1
-SRCS=		lto-partition.c \
-		lto-object.c \
-		lto.c \
+SRCS=		attribs.c \
+		lto-common.c \
 		lto-lang.c \
+		lto-object.c \
+		lto-partition.c \
 		lto-symtab.c \
-		attribs.c \
+		lto.c \
 		main.c
 
 CPPFLAGS+=	-DPREFIX=\"/usr\"

Added files:

Index: src/external/gpl3/gcc/README.gcc10
diff -u /dev/null src/external/gpl3/gcc/README.gcc10:1.1
--- /dev/null	Mon Apr 12 00:05:56 2021
+++ src/external/gpl3/gcc/README.gcc10	Mon Apr 12 00:05:54 2021
@@ -0,0 +1,116 @@
+$NetBSD: README.gcc10,v 1.1 2021/04/12 00:05:54 mrg Exp $
+
+
+new stuff:
+	cc1objcplus
+	libmpx
+	liboffloadmic
+	libvtv
+	libcet
+	libphobos
+	d
+	gfortran
+	lto-dump
+	libbacktrace: +dwarf5_CFLAGS = $(libbacktrace_TEST_CFLAGS) -gdwarf-5
+
+
+todo:
+	- audit all uses of new warning-disable variables and
+	  convert some from -Wno- to -Wno-error=
+
+arch/feature list.
+
+tools:		does build.sh tools work?
+kernels:	does a kernel run?
+libgcc:		does libgcc build?
+native-gcc:	does a full mknative-gcc complete?
+make release:	does build.sh release complete?
+runs:		does the system boot with a full world?
+atf:		does atf run / compare well
+switched:	has port switched?  y (yes), n (no/ready), ? (not ready)
+
+
+architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf	switched
+------------	-----	-------	------	----------	------------	----	---	--------
+aarch64		y	n	n	y		n		?	?	?
+aarch64be	y	n	n	y		n		?	?	?
+alpha		y	n	n	y		n		?	?	?
+earmv4		y	n	n	y		n		?	?	?
+earmv4eb	y	n	n	y		n		?	?	?
+earmv5		y	n	n	y		n		?	?	?
+earmv5eb	y	n	n	y		n		?	?	?
+earmv5hf	y	n	n	y		n		?	?	?
+earmv5hfeb	y	n	n	y		n		?	?	?
+earmv6		y	n	n	y		n		?	?	?
+earmv6eb	y	n	n	y		n		?	?	?
+earmv6hf	y	n	n	y		n		?	?	?
+earmv6hfeb	y	n	n	y		n		?	?	?
+earmv7		y	n	n	y		n		?	?	?
+earmv7eb	y	n	n	y		n		?	?	?
+earmv7hf	y	n	n	y		n		?	?	?
+earmv7hfeb	y	n	n	y		n		?	?	?
+hppa		y	n	n	y		n		?	?	?
+i386		y	n	n	y		n		?	?	?
+ia64		y	n	n	y		n		?	N/A	?
+m68000		y	n	n	y		n		?	?	?
+m68k		y	n	n	y		n		?	?	?
+mipseb		y	n	n	y		n		?	?	?
+mipsel		y	n	n	y		n		?	?	?
+mips64eb	y	n	n	y		n		?	?	?
+mips64el	y	n	n	y		n		?	?	?
+powerpc		n[1]	n	n	n		n		?	?	?
+powerpc64	n[1]	n	n	n		n		N/A	N/A	?
+sh3eb		y	n	n	y		n		?	?	?
+sh3el		y	n	n	y		n		?	?	?
+sparc		y	y	y	y		y		y	?	?
+sparc64		y	y	y	y		y		y	?	?
+vax		y	n	n	y		n		?	?	?
+x86_64		y	y	y	y		y		y	?	?
+riscv32		y	N/A	y	y		y		N/A	N/A	n
+riscv64		y	N/A	y	y		y		N/A	N/A	n
+--
+coldfire	?	N/A	?	?		?		N/A	N/A
+------------	-----	-------	------	----------	------------	----	---
+architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
+
+[1] - rs6000.c is not yet merged, build issues.
+
+
+
+
+CPU vs platform test table (for CPUs with multiple ports).  this is "make release" or just kernels.
+values:		y (yes), k (kernels only), n (failed), r (running), ? (not attempted), nx (yes, no x11)
+
+CPU		platform list
+---		-------- ----
+		acorn32		cats	epoc32	evbarm-eb	evbarm-el	hpcarm		iyonix		netwinder	shark 		zaurus
+earmv4:		n		n	n	n		n		n		 		n		n		 
+earm:		 		 	 	n		n		 		n		 		 		n
+earmhf:		 		 	 	n		n		 		 		 		 		 
+earmv6:		 		 	 	n		n
+earmv6hf:	 		 	 	n		n
+earmv7:		 		 	 	n		n
+earmv7hf:	 		 	 	n		n
+
+		amiga		atari	cesfic	hp300		luna68k		mac68k		mvme68k		news68k		next68k		sun3	x68k
+m68k:		n		n	n	n		n		n		n		n		n		n 	n
+
+		evbmips		emips		ews4800mips	mipsco		newsmips	sgimips
+mipseb:		n		n		n		n		n		n
+
+		evbmips		algor		arc		cobalt		hpcmips		pmax
+mipsel:		n		n		n		n		n		n
+
+		algor		evbmips		pmax
+mips64eb:	 		n		 
+mips64el:	n		n		n
+
+		amigappc	bebox	evbppc	ibmnws		macppc		mvmeppc		ofppc		prep		rs6000		sandpoint
+powerpc:	n		n	n	n		n		n		n		n		n		n
+
+		evbppc		macppc		ofppc
+powerpc64:	n		n[1]		n[1]
+
+		dreamcast	evbsh3		hpcsh		landisk		mmeye
+sh3eb:		 		n		 		 		n
+sh3el:		n		n		n		n

Reply via email to