aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-04-28 22:44:40 +0100
committerPaul Spooren <mail@aparcar.org>2022-06-01 13:46:31 +0200
commitf4cdef2191e1d8df6c37806ce5161135629e87de (patch)
tree416bfac1eb1132d574c58f9326ca16fad9d85953 /toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
parent7f998088f01baf0da24a9fd20de5d5389023361a (diff)
downloadupstream-f4cdef2191e1d8df6c37806ce5161135629e87de.tar.gz
upstream-f4cdef2191e1d8df6c37806ce5161135629e87de.tar.bz2
upstream-f4cdef2191e1d8df6c37806ce5161135629e87de.zip
toolchain: bump GCC 11 to 11.3.0
Remove an upstreamed patch and rebase all remaining patches. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch')
-rw-r--r--toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch b/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
new file mode 100644
index 0000000000..424899eb9c
--- /dev/null
+++ b/toolchain/gcc/patches/11.3.0/970-macos_arm64-building-fix.patch
@@ -0,0 +1,45 @@
+commit 9c6e71079b46ad5433165feaa2001450f2017b56
+Author: Przemysław Buczkowski <prem@prem.moe>
+Date: Mon Aug 16 13:16:21 2021 +0100
+
+ GCC: Patch for Apple Silicon compatibility
+
+ This patch fixes a linker error occuring when compiling
+ the cross-compiler on macOS and ARM64 architecture.
+
+ Adapted from:
+ https://github.com/richfelker/musl-cross-make/issues/116#issuecomment-823612404
+
+ Change-Id: Ia3ee98a163bbb62689f42e2da83a5ef36beb0913
+ Reviewed-on: https://review.haiku-os.org/c/buildtools/+/4329
+ Reviewed-by: John Scipione <jscipione@gmail.com>
+ Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
+
+--- a/gcc/config/aarch64/aarch64.h
++++ b/gcc/config/aarch64/aarch64.h
+@@ -1236,7 +1236,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(__APPLE__)
+ extern const char *host_detect_local_cpu (int argc, const char **argv);
+ #define HAVE_LOCAL_CPU_DETECT
+ # define EXTRA_SPEC_FUNCTIONS \
+--- a/gcc/config/host-darwin.c
++++ b/gcc/config/host-darwin.c
+@@ -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
+@@ -79,3 +81,5 @@ darwin_gt_pch_use_address (void *addr, s
+
+ return ret;
+ }
++
++const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;