[src/trunk]: src/external/gpl3/gcc/dist/gcc/config Fix build on macOS 11.6 ar...

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

details:   https://anonhg.NetBSD.org/src/rev/b5903c22cc7d
branches:  trunk
changeset: 986295:b5903c22cc7d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Sep 18 10:45:11 2021 +0000

description:
Fix build on macOS 11.6 arm64 hosts.

diffstat:

 external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h |  2 +-
 external/gpl3/gcc/dist/gcc/config/host-darwin.c     |  4 ++++
 2 files changed, 5 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r a8b16f1532ac -r b5903c22cc7d external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h
--- a/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h       Sat Sep 18 09:49:57 2021 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h       Sat Sep 18 10:45:11 2021 +0000
@@ -1200,7 +1200,7 @@
 #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
   { "rewrite_mcpu", aarch64_rewrite_mcpu },
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) && defined(__linux__)
 extern const char *host_detect_local_cpu (int argc, const char **argv);
 #define HAVE_LOCAL_CPU_DETECT
 # define EXTRA_SPEC_FUNCTIONS                                          \
diff -r a8b16f1532ac -r b5903c22cc7d external/gpl3/gcc/dist/gcc/config/host-darwin.c
--- a/external/gpl3/gcc/dist/gcc/config/host-darwin.c   Sat Sep 18 09:49:57 2021 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/host-darwin.c   Sat Sep 18 10:45:11 2021 +0000
@@ -22,6 +22,8 @@
 #include "coretypes.h"
 #include "diagnostic-core.h"
 #include "config/host-darwin.h"
+#include "hosthooks.h"
+#include "hosthooks-def.h"
 
 /* Yes, this is really supposed to work.  */
 /* This allows for a pagesize of 16384, which we have on Darwin20, but should
@@ -78,3 +80,5 @@
 
   return ret;
 }
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;