gcc10: update to 10.4

GCC 10.4

60 bug reports were fixed.

  Target Specific Changes

    x86-64

     * The x86-64 ABI of passing and returning structures with a 64-bit
       integer vector changed in GCC 10.1 when MMX is disabled. Disabling
       MMX no longer changes how they are passed nor returned. This ABI
       change is now diagnosed with -Wpsabi.

6 files changed, 11 insertions, 37 deletions

diff --git a/lang/gcc10-libs/Makefile b/lang/gcc10-libs/Makefile
index 953a56d716b..0046af79856 100644
--- a/lang/gcc10-libs/Makefile
+++ b/lang/gcc10-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/10 00:50:46 gutteridge Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/03 15:59:17 wiz Exp $
 
 GCC_PKGNAME=	gcc10
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC10_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc10 package so that with the dependence pattern
 ## '{gcc10,gcc10-libs}>=10.2.*' pkg_add will choose gcc10-libs over gcc10.
-PKGREVISION=	2
+PKGREVISION=	1
 
 CATEGORIES=	lang
 MASTER_SITES=	# empty
diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile
index 66d11de8cc4..fcfe97e6c2f 100644
--- a/lang/gcc10/Makefile
+++ b/lang/gcc10/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2022/06/28 11:34:10 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2022/07/03 15:59:17 wiz Exp $
 
 GCC_PKGNAME=		gcc10
-PKGREVISION=		2
 .include		"version.mk"
 
 DISTNAME=	gcc-${GCC10_DIST_VERSION}
diff --git a/lang/gcc10/distinfo b/lang/gcc10/distinfo
index 5e2a57e0dda..ed533fc35d3 100644
--- a/lang/gcc10/distinfo
+++ b/lang/gcc10/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.13 2022/02/02 22:07:28 mrg Exp $
+$NetBSD: distinfo,v 1.14 2022/07/03 15:59:17 wiz Exp $
 
-BLAKE2s (gcc-10.3.0.tar.xz) = 6d7c42f9386e5e32a3148122471cb207e5f65d7b5f53b3c9adba2d45a4f28715
-SHA512 (gcc-10.3.0.tar.xz) = 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
-Size (gcc-10.3.0.tar.xz) = 76692288 bytes
+BLAKE2s (gcc-10.4.0.tar.xz) = e033158e7c950ad52645d85003a37d3ab04dbdb7cf825a62881dc5b942a9f5d9
+SHA512 (gcc-10.4.0.tar.xz) = 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
+Size (gcc-10.4.0.tar.xz) = 75018092 bytes
 BLAKE2s (isl-0.16.1.tar.bz2) = 01c3fc657326e81414986eb7ede6f73e540b97009745ced125cdf7f4a8d80f61
 SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
 Size (isl-0.16.1.tar.bz2) = 1626446 bytes
 SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
-SHA1 (patch-gcc_config.gcc) = 310b306e58a1a3ec11b5081c6b8de5f75024e281
+SHA1 (patch-gcc_config.gcc) = 8729fc44778fb94856cd3861a440cfdf9c962214
 SHA1 (patch-gcc_config.host) = 8920ce841f6088b365c9b590e3ea9535bd880b40
 SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 87185f5c2e2dbe4195cb19fe6213d2d616d5519b
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827
@@ -19,7 +19,6 @@ SHA1 (patch-gcc_config_arm_bpabi.h) = 0b0de5ad95442e34397cb46739ef6e36048d6f45
 SHA1 (patch-gcc_config_arm_elf.h) = 57748157084319cb92d892f2ea5b2f3355567551
 SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab35903dae
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 367d83c808fd7b5b1989d0490b532ad06b425b31
-SHA1 (patch-gcc_config_darwin-driver.c) = fd57dcca96ce5ddc330e7c7b3b811f64856d7611
 SHA1 (patch-gcc_config_sparc_sparc.c) = e9cb956f3769642bcd0ba4a477d16c73dea46014
 SHA1 (patch-gcc_configure) = 6a2d8eeeed2bf08c3c81291178e669dc91c913ce
 SHA1 (patch-gcc_ggc-common.c) = 3e325767922ab7d2079fdb9a3d6b6aa531a2fea5
diff --git a/lang/gcc10/patches/patch-gcc_config.gcc b/lang/gcc10/patches/patch-gcc_config.gcc
index 8edf411b2d1..d8a661887c0 100644
--- a/lang/gcc10/patches/patch-gcc_config.gcc
+++ b/lang/gcc10/patches/patch-gcc_config.gcc
@@ -1,4 +1,4 @@
-$NetBSD: patch-gcc_config.gcc,v 1.3 2022/02/02 22:07:28 mrg Exp $
+$NetBSD: patch-gcc_config.gcc,v 1.4 2022/07/03 15:59:17 wiz Exp $
 
 Match what is in NetBSD src. Fixes at least aarch64eb, and
 probably several others.
@@ -24,15 +24,6 @@ Allow builds on Darwin 21.
  m68k-*-*)
  	extra_headers=math-68881.h
  	extra_options="${extra_options} m68k/m68k-tables.opt"
-@@ -691,7 +701,7 @@
-       *-*-darwin[4-9]* | *-*-darwin1[0-9]*)
-         macos_min=`expr $darwin_maj - 4`
-         ;;
--      *-*-darwin20*)
-+      *-*-darwin2[01]*)
-         # Darwin 20 corresponds to macOS 11.
-         macos_maj=11
-         def_ld64=609.0
 @@ -877,6 +887,11 @@
    case ${enable_threads} in
      "" | yes | posix) thread_file='posix' ;;
diff --git a/lang/gcc10/patches/patch-gcc_config_darwin-driver.c b/lang/gcc10/patches/patch-gcc_config_darwin-driver.c
deleted file mode 100644
index 3b27d791c35..00000000000
--- a/lang/gcc10/patches/patch-gcc_config_darwin-driver.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-gcc_config_darwin-driver.c,v 1.1 2021/10/13 12:38:52 adam Exp $
-
-Allow macOS 12.
-
---- gcc/config/darwin-driver.c.orig	2021-10-13 11:50:13.000000000 +0000
-+++ gcc/config/darwin-driver.c
-@@ -64,7 +64,7 @@ validate_macosx_version_min (const char 
- 
-   major = strtoul (version_str, &end, 10);
- 
--  if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */
-+  if (major < 10 || major > 12 ) /* MacOS 10 and 11 and 12 are known. */
-     return NULL;
- 
-   /* Skip a separating period, if there's one.  */
diff --git a/lang/gcc10/version.mk b/lang/gcc10/version.mk
index e52673e8383..7c05ed01483 100644
--- a/lang/gcc10/version.mk
+++ b/lang/gcc10/version.mk
@@ -1,2 +1,2 @@
-# $NetBSD: version.mk,v 1.3 2021/04/16 15:03:42 ryoon Exp $
-GCC10_DIST_VERSION:=	10.3.0
+# $NetBSD: version.mk,v 1.4 2022/07/03 15:59:17 wiz Exp $
+GCC10_DIST_VERSION:=	10.4.0