[pkgsrc/trunk]: pkgsrc/lang/gcc10 gcc10: allow builds on Darwin 21

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef545b10d0a9
branches:  trunk
changeset: 458901:ef545b10d0a9
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Sep 23 09:53:21 2021 +0000

description:
gcc10: allow builds on Darwin 21

diffstat:

 lang/gcc10/distinfo                     |   4 +-
 lang/gcc10/patches/patch-gcc_config.gcc |  45 ++++++++++++++++++++------------
 2 files changed, 30 insertions(+), 19 deletions(-)

diffs (157 lines):

diff -r 8d71a88efdeb -r ef545b10d0a9 lang/gcc10/distinfo
--- a/lang/gcc10/distinfo       Thu Sep 23 07:39:31 2021 +0000
+++ b/lang/gcc10/distinfo       Thu Sep 23 09:53:21 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2021/04/24 09:35:31 mrg Exp $
+$NetBSD: distinfo,v 1.9 2021/09/23 09:53:21 adam Exp $
 
 SHA1 (gcc-10.3.0.tar.xz) = fb51ed1660c065898c75951fb38e1ebad7d49feb
 RMD160 (gcc-10.3.0.tar.xz) = 8edb715cf1159fd8de773d0d5208d2e83ca36402
@@ -11,7 +11,7 @@
 SHA1 (patch-contrib_download__prerequisites) = 9cdcde21ab174052911447d20762ddfd40aa8791
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
-SHA1 (patch-gcc_config.gcc) = 6523fd234687e13abd54009a770f1c0acbcd62c7
+SHA1 (patch-gcc_config.gcc) = 4bf07441b6893e9b510f9ad775b4b95aa23e9791
 SHA1 (patch-gcc_config.host) = 8920ce841f6088b365c9b590e3ea9535bd880b40
 SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 87185f5c2e2dbe4195cb19fe6213d2d616d5519b
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827
diff -r 8d71a88efdeb -r ef545b10d0a9 lang/gcc10/patches/patch-gcc_config.gcc
--- a/lang/gcc10/patches/patch-gcc_config.gcc   Thu Sep 23 07:39:31 2021 +0000
+++ b/lang/gcc10/patches/patch-gcc_config.gcc   Thu Sep 23 09:53:21 2021 +0000
@@ -1,11 +1,13 @@
-$NetBSD: patch-gcc_config.gcc,v 1.1 2021/04/24 09:35:31 mrg Exp $
+$NetBSD: patch-gcc_config.gcc,v 1.2 2021/09/23 09:53:21 adam Exp $
 
-Match what is in NetBSD src.  Fixes at least aarch64eb, and
+Match what is in NetBSD src. Fixes at least aarch64eb, and
 probably several others.
 
---- gcc/config.gcc.orig        2021-04-08 04:56:28.033740243 -0700
-+++ gcc/config.gcc     2021-04-24 00:16:20.082096330 -0700
-@@ -462,6 +462,16 @@
+Allow builds on Darwin 21.
+
+--- gcc/config.gcc.orig        2021-04-08 11:56:28.000000000 +0000
++++ gcc/config.gcc
+@@ -462,6 +462,16 @@ m32r*-*-*)
          cpu_type=m32r
        extra_options="${extra_options} g.opt"
          ;;
@@ -22,7 +24,16 @@
  m68k-*-*)
        extra_headers=math-68881.h
        extra_options="${extra_options} m68k/m68k-tables.opt"
-@@ -877,6 +887,11 @@
+@@ -691,7 +701,7 @@ case ${target} in
+       *-*-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 ${target} in
    case ${enable_threads} in
      "" | yes | posix) thread_file='posix' ;;
    esac
@@ -34,7 +45,7 @@
    nbsd_tm_file="netbsd.h netbsd-stdint.h netbsd-elf.h"
    default_use_cxa_atexit=yes
    target_has_targetdm=yes
-@@ -1111,6 +1126,11 @@
+@@ -1111,6 +1126,11 @@ aarch64*-*-netbsd*)
        tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-errata.h aarch64/aarch64-netbsd.h"
        tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-netbsd"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
@@ -46,7 +57,7 @@
        ;;
  aarch64*-*-linux*)
        tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h"
-@@ -1252,7 +1272,6 @@
+@@ -1252,7 +1272,6 @@ arm*-*-freebsd*)                # ARM Fr
        with_tls=${with_tls:-gnu}
        ;;
  arm*-*-netbsdelf*)
@@ -54,7 +65,7 @@
        tmake_file="${tmake_file} arm/t-arm"
        tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-@@ -1261,26 +1280,33 @@
+@@ -1261,26 +1280,33 @@ arm*-*-netbsdelf*)
        esac
        case ${target} in
        arm*-*-netbsdelf-*eabi*)
@@ -95,7 +106,7 @@
        ;;
  arm*-*-linux-* | arm*-*-uclinuxfdpiceabi)
        tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
-@@ -1928,6 +1954,7 @@
+@@ -1928,6 +1954,7 @@ i[34567]86-*-netbsdelf*)
        ;;
  x86_64-*-netbsd*)
        tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${nbsd_tm_file} i386/x86-64.h i386/netbsd64.h"
@@ -103,7 +114,7 @@
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        ;;
  i[34567]86-*-openbsd*)
-@@ -2250,6 +2277,16 @@
+@@ -2250,6 +2277,16 @@ ia64*-*-elf*)
                target_cpu_default="${target_cpu_default}|MASK_GNU_LD"
        fi
        ;;
@@ -120,7 +131,7 @@
  ia64*-*-freebsd*)
        tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} ia64/sysv4.h ia64/freebsd.h"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
-@@ -2362,8 +2399,25 @@
+@@ -2362,8 +2399,25 @@ m68k-*-elf* | fido-*-elf*)
                ;;
        esac
        ;;
@@ -147,7 +158,7 @@
        default_cf_cpu=5475
        tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} m68k/netbsd-elf.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-@@ -2503,6 +2557,26 @@
+@@ -2503,6 +2557,26 @@ riscv*-*-freebsd*)
        # automatically detect that GAS supports it, yet we require it.
        gcc_cv_initfini_array=yes
        ;;
@@ -174,7 +185,7 @@
  mips*-*-netbsd*)                      # NetBSD/mips, either endian.
        target_cpu_default="MASK_ABICALLS"
        tm_file="elfos.h ${tm_file} mips/elf.h ${nbsd_tm_file} mips/netbsd.h"
-@@ -2918,11 +2992,24 @@
+@@ -2918,11 +2992,24 @@ powerpc*-*-freebsd*)
                ;;
        esac
        ;;
@@ -203,7 +214,7 @@
        ;;
  powerpc-*-eabisimaltivec*)
        tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h rs6000/eabialtivec.h"
-@@ -3394,9 +3481,11 @@
+@@ -3394,9 +3481,11 @@ sparc64-*-freebsd*|ultrasparc-*-freebsd*
  sparc64-*-netbsd*)
        tm_file="sparc/biarch64.h ${tm_file}"
        tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h ${nbsd_tm_file} sparc/netbsd-elf.h"
@@ -215,7 +226,7 @@
        ;;
  sparc64-*-openbsd*)
        tm_file="sparc/openbsd1-64.h ${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp64-elf.h"
-@@ -3911,6 +4000,9 @@
+@@ -3911,6 +4000,9 @@ if test x$with_cpu = x ; then
      frv550-*-*linux*)
        with_cpu=fr550
        ;;
@@ -225,7 +236,7 @@
      m68k*-*-*)
        case "$with_arch" in
        "cf")
-@@ -4421,7 +4513,7 @@
+@@ -4421,7 +4513,7 @@ case "${target}" in
                esac
                ;;