[gentoo-commits] repo/proj/prefix:master commit in: scripts/, eclass/

[Fabian Groffen]

commit:     f7c2abfe111975e6890adc77d916d274300be539
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 17:50:10 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb  7 17:50:10 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=f7c2abfe

toolchain-funcs.eclass: handle arm64-macos in tc-tuple-is-softfloat

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 eclass/toolchain-funcs.eclass |  2 ++
 scripts/bootstrap-prefix.sh   | 10 +++++++---
 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