diff options
| author | Nick Hainke <vincent@systemli.org> | 2023-04-27 23:00:30 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-05 15:46:34 +0200 |
| commit | 1e88a16248601da03d78da7939d412588ad0ea52 (patch) | |
| tree | 420af8da5b1ec3453d2d17ca864db146fc9a92f4 /toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch | |
| parent | c6419d1946996aa859cef9df897a0c1c1f796d11 (diff) | |
| download | upstream-1e88a16248601da03d78da7939d412588ad0ea52.tar.gz upstream-1e88a16248601da03d78da7939d412588ad0ea52.tar.bz2 upstream-1e88a16248601da03d78da7939d412588ad0ea52.zip | |
toolchain: gcc: copy patches from 12.x to 13.x
This simplifies the gcc bump patch review.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch')
| -rw-r--r-- | toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch b/toolchain/gcc/patches-13.x/970-macos_arm64-building-fix.patch new file mode 100644 index 0000000000..86fa68e1b1 --- /dev/null +++ b/toolchain/gcc/patches-13.x/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 +@@ -1290,7 +1290,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.cc ++++ b/gcc/config/host-darwin.cc +@@ -23,6 +23,8 @@ + #include "options.h" + #include "diagnostic-core.h" + #include "config/host-darwin.h" ++#include "hosthooks.h" ++#include "hosthooks-def.h" + #include <errno.h> + + /* For Darwin (macOS only) platforms, without ASLR (PIE) enabled on the +@@ -181,3 +183,5 @@ darwin_gt_pch_use_address (void *&addr, + + return 1; + } ++ ++const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; |