domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

toolchain/gcc: refresh gcc-11.2.0 patch

Browse Source 
Run make toolchain/gcc/minimal/refresh (with glibc, with musl
toolchain/gcc/{initial,final}/refresh don't work)

Fixes: ab241e0937 ("toolchain/gcc: fix build on MacOS arm64")

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
This commit is contained in:
Ilya Lipnitskiy
2021-12-07 17:28:23 -08:00
committed by Hauke Mehrtens
parent 0dca1060fd
commit f30e6d98fa
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
toolchain/gcc/patches/11.2.0/970-macos_arm64-building-fix.patch
View File

@@ -15,11 +15,9 @@ Date: Mon Aug 16 13:16:21 2021 +0100
Reviewed-by: John Scipione <jscipione@gmail.com> Reviewed-by: John Scipione <jscipione@gmail.com>
Reviewed-by: Adrien Destugues <pulkomandy@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 --- a/gcc/config/aarch64/aarch64.h
+++ b/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 \ #define MCPU_TO_MARCH_SPEC_FUNCTIONS \
{ "rewrite_mcpu", aarch64_rewrite_mcpu }, { "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); extern const char *host_detect_local_cpu (int argc, const char **argv);
#define HAVE_LOCAL_CPU_DETECT #define HAVE_LOCAL_CPU_DETECT
# define EXTRA_SPEC_FUNCTIONS \ # 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 --- a/gcc/config/host-darwin.c
+++ b/gcc/config/host-darwin.c +++ b/gcc/config/host-darwin.c
@@ -22,6 +22,8 @@ @@ -22,6 +22,8 @@
@@ -40,8 +36,8 @@ index 8f700eec85..b737abc006 100644
+#include "hosthooks-def.h" +#include "hosthooks-def.h"
/* Yes, this is really supposed to work. */ /* Yes, this is really supposed to work. */
static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096))); /* This allows for a pagesize of 16384, which we have on Darwin20, but should
@@ -75,3 +77,5 @@ darwin_gt_pch_use_address (void *addr, size_t sz, int fd, size_t off) @@ -79,3 +81,5 @@ darwin_gt_pch_use_address (void *addr, s
return ret; return ret;
} }