summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2021-02-07 18:50:10 +0100
committerFabian Groffen <grobian@gentoo.org>2021-02-07 18:50:10 +0100
commitf7c2abfe111975e6890adc77d916d274300be539 (patch)
treeba5c2938fe29cf735c9ec80e4090873a82355a58
parentsys-devel/gcc: add special 11 pre-release for Apple SI (arm64) (diff)
downloadprefix-f7c2abfe111975e6890adc77d916d274300be539.tar.gz
prefix-f7c2abfe111975e6890adc77d916d274300be539.tar.bz2
prefix-f7c2abfe111975e6890adc77d916d274300be539.zip
toolchain-funcs.eclass: handle arm64-macos in tc-tuple-is-softfloat
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rw-r--r--eclass/toolchain-funcs.eclass2
-rwxr-xr-xscripts/bootstrap-prefix.sh10
2 files changed, 9 insertions, 3 deletions
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index e8541f25b2..c2ac4a5d15 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -273,6 +273,8 @@ tc-tuple-is-softfloat() {
# bare-metal targets have their defaults. bug #666896
*-newlib|*-elf|*-eabi)
echo "no" ;;
+ arm64-apple-darwin*)
+ echo "no" ;;
arm*)
echo "yes" ;;
*)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 056aa72d78..bba4e97fe2 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -470,6 +470,10 @@ bootstrap_setup() {
sys-devel/native-cctools
EOF
+ cat >> "${ROOT}"/etc/portage/package.accept_keywords <<-EOF
+ sys-devel/gcc-11_pre20200206 **
+ EOF
+
# Strange enough, -cxx causes wrong libtool config on Cygwin,
# but we require a C++ compiler there anyway - so just use it.
[[ ${CHOST} == *-cygwin* ]] ||
@@ -3070,9 +3074,9 @@ case ${CHOST} in
powerpc-*darwin*)
DARWIN_USE_GCC=1 # must use GCC, Clang is impossible
;;
- arm64-*darwin*)
- DARWIN_USE_GCC=0 # cannot use GCC yet (needs silicon support)
- ;;
+# arm64-*darwin*)
+# DARWIN_USE_GCC=0 # cannot use GCC yet (needs silicon support)
+# ;;
*-darwin*)
# normalise value of DARWIN_USE_GCC
case ${DARWIN_USE_GCC} in