aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorIlya Lipnitskiy <ilya.lipnitskiy@gmail.com>2021-12-07 17:28:23 -0800
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 15:10:22 +0100
commitf30e6d98fae79eb84af7acd497da4be862ee2b8f (patch)
treeb68b3a42f9fd2f18f520f5c48ff11218d291ab33 /toolchain
parent0dca1060fd48d261f4ffead6efebd16170014ee3 (diff)
downloadupstream-f30e6d98fae79eb84af7acd497da4be862ee2b8f.tar.gz
upstream-f30e6d98fae79eb84af7acd497da4be862ee2b8f.tar.bz2
upstream-f30e6d98fae79eb84af7acd497da4be862ee2b8f.zip
toolchain/gcc: refresh gcc-11.2.0 patch
Run make toolchain/gcc/minimal/refresh (with glibc, with musl toolchain/gcc/{initial,final}/refresh don't work) Fixes: ab241e0937c9 ("toolchain/gcc: fix build on MacOS arm64") Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/patches/11.2.0/970-macos_arm64-building-fix.patch10
1 files changed, 3 insertions, 7 deletions
diff --git a/toolchain/gcc/patches/11.2.0/970-macos_arm64-building-fix.patch b/toolchain/gcc/patches/11.2.0/970-macos_arm64-building-fix.patch
index 6572b8e559..424899eb9c 100644
--- a/toolchain/gcc/patches/11.2.0/970-macos_arm64-building-fix.patch
+++ b/toolchain/gcc/patches/11.2.0/970-macos_arm64-building-fix.patch
@@ -15,11 +15,9 @@ Date: Mon Aug 16 13:16:21 2021 +0100
Reviewed-by: John Scipione <jscipione@gmail.com>
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
-diff --git a/gcc/config/aarch64/aarch64.h b/gcc/config/aarch64/aarch64.h
-index 976f9afae5..736b83ff0b 100644
--- a/gcc/config/aarch64/aarch64.h
+++ b/gcc/config/aarch64/aarch64.h
-@@ -1000,7 +1000,7 @@ extern const char *aarch64_rewrite_mcpu (int argc, const char **argv);
+@@ -1236,7 +1236,7 @@ extern const char *aarch64_rewrite_mcpu
#define MCPU_TO_MARCH_SPEC_FUNCTIONS \
{ "rewrite_mcpu", aarch64_rewrite_mcpu },
@@ -28,8 +26,6 @@ index 976f9afae5..736b83ff0b 100644
extern const char *host_detect_local_cpu (int argc, const char **argv);
#define HAVE_LOCAL_CPU_DETECT
# define EXTRA_SPEC_FUNCTIONS \
-diff --git a/gcc/config/host-darwin.c b/gcc/config/host-darwin.c
-index 8f700eec85..b737abc006 100644
--- a/gcc/config/host-darwin.c
+++ b/gcc/config/host-darwin.c
@@ -22,6 +22,8 @@
@@ -40,8 +36,8 @@ index 8f700eec85..b737abc006 100644
+#include "hosthooks-def.h"
/* Yes, this is really supposed to work. */
- static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096)));
-@@ -75,3 +77,5 @@ darwin_gt_pch_use_address (void *addr, size_t sz, int fd, size_t off)
+ /* 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;
}