gcc9: update to 9.3.0.

GCC 9.3 is a bug-fix release from the GCC 9 branch containing
important fixes for regressions and serious bugs in GCC 9.2 with
more than 157 bugs fixed since the previous release.

Fix RELRO build while here.
Adapt PLIST.Linux by guessing.

6 files changed, 31 insertions, 37 deletions

diff --git a/lang/gcc9/Makefile b/lang/gcc9/Makefile
index 3a3cb250cb7..9cc5c8e0aaf 100644
--- a/lang/gcc9/Makefile
+++ b/lang/gcc9/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2020/03/08 23:52:54 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2020/04/08 16:35:59 wiz Exp $
 
-GCC9_VERSION=	9.2.0
+GCC9_VERSION=	9.3.0
 
 DISTNAME=	gcc-${GCC9_VERSION}
 PKGNAME=	gcc9-${GCC9_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC9_VERSION}/}
 EXTRACT_SUFX=	.tar.xz
@@ -76,7 +75,7 @@ LANGS=			c
 LINKER_RPATH_FLAG:=	${LINKER_RPATH_FLAG:S/-rpath/& /}
 
 ## The Library rpath to use in end programs.
-LDFLAGS_FOR_TARGET=	${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*}
+LDFLAGS_FOR_TARGET=	${LDFLAGS:M${COMPILER_RPATH_FLAG}*:N*/usr/lib*} ${LDFLAGS:M-Wl,-z*}
 
 # The "-static-libstdc++ -static-libgcc" flags are normally added to the
 # boot-ldflags by configure but because we are supply the boot-ldflags
diff --git a/lang/gcc9/PLIST.Linux-x86_64 b/lang/gcc9/PLIST.Linux-x86_64
index 5d801974384..b5740d8a66c 100644
--- a/lang/gcc9/PLIST.Linux-x86_64
+++ b/lang/gcc9/PLIST.Linux-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.Linux-x86_64,v 1.1 2020/01/28 21:33:39 rillig Exp $
+@comment $NetBSD: PLIST.Linux-x86_64,v 1.2 2020/04/08 16:35:59 wiz Exp $
 gcc9/bin/c++
 gcc9/bin/cc
 gcc9/bin/cpp
@@ -1409,7 +1409,7 @@ gcc9/lib64/libsanitizer.spec
 gcc9/lib64/libssp.la
 gcc9/lib64/libssp_nonshared.la
 gcc9/lib64/libstdc++.la
-gcc9/lib64/libstdc++.so.6.0.27-gdb.py
+gcc9/lib64/libstdc++.so.6.0.28-gdb.py
 gcc9/lib64/libstdc++fs.la
 gcc9/lib64/libsupc++.la
 gcc9/lib64/libtsan.la
diff --git a/lang/gcc9/PLIST.NetBSD-x86_64 b/lang/gcc9/PLIST.NetBSD-x86_64
index d75968dee1c..c2d84f007a2 100644
--- a/lang/gcc9/PLIST.NetBSD-x86_64
+++ b/lang/gcc9/PLIST.NetBSD-x86_64
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD-x86_64,v 1.2 2020/01/10 07:46:43 rillig Exp $
+@comment $NetBSD: PLIST.NetBSD-x86_64,v 1.3 2020/04/08 16:35:59 wiz Exp $
 gcc9/bin/c++
 gcc9/bin/cc
 gcc9/bin/cpp
@@ -1401,7 +1401,7 @@ gcc9/lib/libitm.spec
 ${PLIST.objc}gcc9/lib/libobjc.la
 gcc9/lib/libquadmath.la
 gcc9/lib/libstdc++.la
-gcc9/lib/libstdc++.so.7.27-gdb.py
+gcc9/lib/libstdc++.so.7.28-gdb.py
 gcc9/lib/libstdc++fs.la
 gcc9/lib/libsupc++.la
 gcc9/libexec/gcc/${MACHINE_GNU_PLATFORM}/${PKGVERSION}/cc1
diff --git a/lang/gcc9/distinfo b/lang/gcc9/distinfo
index 1e20f090acc..2486e766b79 100644
--- a/lang/gcc9/distinfo
+++ b/lang/gcc9/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2020/01/10 07:49:48 rillig Exp $
+$NetBSD: distinfo,v 1.3 2020/04/08 16:35:59 wiz Exp $
 
-SHA1 (gcc-9.2.0.tar.xz) = 306d27c3465fa36862c206738d06d65fff5c3645
-RMD160 (gcc-9.2.0.tar.xz) = a51d7f812f45980c517c4505e04a217cf319a992
-SHA512 (gcc-9.2.0.tar.xz) = a12dff52af876aee0fd89a8d09cdc455f35ec46845e154023202392adc164848faf8ee881b59b681b696e27c69fd143a214014db4214db62f9891a1c8365c040
-Size (gcc-9.2.0.tar.xz) = 70607648 bytes
-SHA1 (patch-libgomp_affinity-fmt.c) = 4dd5c204f1d45b466269e7a854ecadb99a7d6eeb
+SHA1 (gcc-9.3.0.tar.xz) = b746688bf045a316fc92c3528138ad10d0822b6b
+RMD160 (gcc-9.3.0.tar.xz) = e0ade31726b8fbb1eb308e2b1383a79633aef996
+SHA512 (gcc-9.3.0.tar.xz) = 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de
+Size (gcc-9.3.0.tar.xz) = 70533868 bytes
+SHA1 (patch-gcc_gimplify.c) = f933a033d4a6c11fa82c8c9c6785842ba7993862
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = f12f6a97f94d13efa73a2500411bc77b27887edd
 SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 007bce70f75deace18f60924b5a3f94bf7a0af2f
diff --git a/lang/gcc9/patches/patch-gcc_gimplify.c b/lang/gcc9/patches/patch-gcc_gimplify.c
new file mode 100644
index 00000000000..df2dcd5b89f
--- /dev/null
+++ b/lang/gcc9/patches/patch-gcc_gimplify.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-gcc_gimplify.c,v 1.1 2020/04/08 16:35:59 wiz Exp $
+
+Fix -fstack-check on NetBSD.
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94479
+
+--- gcc/gimplify.c.orig	2020-03-12 11:07:21.000000000 +0000
++++ gcc/gimplify.c
+@@ -6086,7 +6086,9 @@ gimplify_addr_expr (tree *expr_p, gimple
+ 
+       /* For various reasons, the gimplification of the expression
+ 	 may have made a new INDIRECT_REF.  */
+-      if (TREE_CODE (op0) == INDIRECT_REF)
++      if (TREE_CODE (op0) == INDIRECT_REF
++         || (TREE_CODE (op0) == MEM_REF
++             && integer_zerop (TREE_OPERAND (op0, 1))))
+ 	goto do_indirect_ref;
+ 
+       mark_addressable (TREE_OPERAND (expr, 0));
diff --git a/lang/gcc9/patches/patch-libgomp_affinity-fmt.c b/lang/gcc9/patches/patch-libgomp_affinity-fmt.c
deleted file mode 100644
index 75874657494..00000000000
--- a/lang/gcc9/patches/patch-libgomp_affinity-fmt.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-libgomp_affinity-fmt.c,v 1.1 2020/01/10 07:49:48 rillig Exp $
-
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93219
-
-On RedHat EL 6 x86_64:
-
-> ../../../gcc-9.2.0/libgomp/affinity-fmt.c: In function 'gomp_print_string':
-> ../../../gcc-9.2.0/libgomp/affinity-fmt.c:43:3: error: ignoring return value of 'fwrite', declared with attribute warn_unused_result [-Werror=unused-result]
->    43 |   fwrite (str, 1, len, stderr);
->       |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
---- libgomp/affinity-fmt.c.orig	2019-01-01 12:31:55.000000000 +0000
-+++ libgomp/affinity-fmt.c
-@@ -40,7 +40,7 @@
- void
- gomp_print_string (const char *str, size_t len)
- {
--  fwrite (str, 1, len, stderr);
-+  (void)fwrite (str, 1, len, stderr);
- }
- 
- void