Module Name: src
Committed By: jmcneill
Date: Sat Sep 18 10:45:11 UTC 2021
Modified Files:
src/external/gpl3/gcc/dist/gcc/config: host-darwin.c
src/external/gpl3/gcc/dist/gcc/config/aarch64: aarch64.h
Log Message:
Fix build on macOS 11.6 arm64 hosts.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.10 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/host-darwin.c
cvs rdiff -u -r1.1.1.13 -r1.2 \
src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h
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/host-darwin.c
diff -u src/external/gpl3/gcc/dist/gcc/config/host-darwin.c:1.1.1.10 src/external/gpl3/gcc/dist/gcc/config/host-darwin.c:1.2
--- src/external/gpl3/gcc/dist/gcc/config/host-darwin.c:1.1.1.10 Sat Apr 10 22:09:44 2021
+++ src/external/gpl3/gcc/dist/gcc/config/host-darwin.c Sat Sep 18 10:45:11 2021
@@ -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 @@ darwin_gt_pch_use_address (void *addr, s
return ret;
}
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
Index: src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h
diff -u src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h:1.1.1.13 src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h:1.1.1.13 Sat Apr 10 22:09:46 2021
+++ src/external/gpl3/gcc/dist/gcc/config/aarch64/aarch64.h Sat Sep 18 10:45:11 2021
@@ -1200,7 +1200,7 @@ extern const char *aarch64_rewrite_mcpu
#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 \
