⛏️ index : buildtools.git

author Przemysław Buczkowski <prem@prem.moe> 2021-08-16 13:16:21.0 +01:00:00
committer Adrien Destugues <pulkomandy@gmail.com> 2021-08-23 18:31:22.0 +00:00:00
commit
9c6e71079b46ad5433165feaa2001450f2017b56 [patch]
tree
ca20ae695ab33744b59d87dabfeb31bbfcca8891
parent
4ab0fe4d95a13d203733d2dac3895c014ba7d293
download
9c6e71079b46ad5433165feaa2001450f2017b56.tar.gz

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>

Diff

 gcc/gcc/config/host-darwin.c     | 4 ++++
 gcc/gcc/config/aarch64/aarch64.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/gcc/config/host-darwin.c b/gcc/gcc/config/host-darwin.c
index 8f700ee..b737abc 100644
--- a/gcc/gcc/config/host-darwin.c
+++ a/gcc/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.  */
static char pch_address_space[1024*1024*1024] __attribute__((aligned (4096)));
@@ -75,3 +77,5 @@

  return ret;
}

const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
diff --git a/gcc/gcc/config/aarch64/aarch64.h b/gcc/gcc/config/aarch64/aarch64.h
index 976f9af..736b83f 100644
--- a/gcc/gcc/config/aarch64/aarch64.h
+++ a/gcc/gcc/config/aarch64/aarch64.h
@@ -1000,7 +1000,7 @@
#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						\