[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     4e6cda39ebb1616565206c8e492e319bfd07309c
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 08:07:16 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 08:07:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e6cda39

profiles/prefix/macos/arch/arm64: drop forcing cpu_flags_arm_thumb*

arm64 doesn't support thumb.

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

 profiles/prefix/darwin/macos/arch/arm64/use.force | 2 --
 profiles/prefix/darwin/macos/arch/arm64/use.mask  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
index 952fb5bdafa3..1dc3e267bfe2 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -17,8 +17,6 @@ cpu_flags_arm_neon
 cpu_flags_arm_edsp
 cpu_flags_arm_sha1
 cpu_flags_arm_sha2
-cpu_flags_arm_thumb
-cpu_flags_arm_thumb2
 cpu_flags_arm_vfp
 cpu_flags_arm_vfpv3
 cpu_flags_arm_vfpv4

diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
index 2de1511d28c2..7658bb04d353 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -18,8 +18,6 @@
 -cpu_flags_arm_edsp
 -cpu_flags_arm_sha1
 -cpu_flags_arm_sha2
--cpu_flags_arm_thumb
--cpu_flags_arm_thumb2
 -cpu_flags_arm_vfp
 -cpu_flags_arm_vfpv3
 -cpu_flags_arm_vfpv4

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     d1a165d1db099c58561f3c815183cb48c40fc85e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 19:03:12 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 19:07:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1a165d1

prefix/darwin/arm64: set default cpu_flags_arm

M1 is v8 + custom stuff, so enable all v8 stuff, so things like ffmpeg
can compile

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

 profiles/prefix/darwin/macos/arch/arm64/use.force | 23 ++++++++++++++++++++--
 profiles/prefix/darwin/macos/arch/arm64/use.mask  | 24 +++++++++++++++++++++--
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
index 3055521d22e8..952fb5bdafa3 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -1,6 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force the flag corresponding to the default ABI
-x64-macos
 arm64-macos
+
+# Instruction sets that are always available on M1
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+cpu_flags_arm_v7
+cpu_flags_arm_v8
+
+cpu_flags_arm_aes
+cpu_flags_arm_crc32
+cpu_flags_arm_neon
+cpu_flags_arm_edsp
+cpu_flags_arm_sha1
+cpu_flags_arm_sha2
+cpu_flags_arm_thumb
+cpu_flags_arm_thumb2
+cpu_flags_arm_vfp
+cpu_flags_arm_vfpv3
+cpu_flags_arm_vfpv4
+cpu_flags_arm_vfp-d32

diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
index 1460af56464c..2de1511d28c2 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -1,6 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag corresponding to the default ABI
--x64-macos
 -arm64-macos
+
+# Unmask arm specific USE flags, M1 is v8 + custom stuff
+-cpu_flags_arm_v4
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+-cpu_flags_arm_v6
+-cpu_flags_arm_v7
+-cpu_flags_arm_v8
+
+-cpu_flags_arm_aes
+-cpu_flags_arm_crc32
+-cpu_flags_arm_neon
+-cpu_flags_arm_edsp
+-cpu_flags_arm_sha1
+-cpu_flags_arm_sha2
+-cpu_flags_arm_thumb
+-cpu_flags_arm_thumb2
+-cpu_flags_arm_vfp
+-cpu_flags_arm_vfpv3
+-cpu_flags_arm_vfpv4
+-cpu_flags_arm_vfp-d32

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     22fec2d6f125a398305f113f2460bb15befb24eb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 20 13:41:55 2023 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Feb 20 13:41:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fec2d6

profiles/prefix/darwin/macos/arch/arm64/make.defaults: don't hijack keyword

As discussed in bug #895524 with QA, remove hack that should've never
been committed to be honestly.  M1 macOS users will have to temp add
this on their configs, while I sort out which packages can be keyworded.

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

 profiles/prefix/darwin/macos/arch/arm64/make.defaults | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/make.defaults b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
index 3ceab05d32e1..4bd8a3ab9cb6 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/arm64/make.defaults
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="arm64-macos"
-ACCEPT_KEYWORDS="~x64-macos"  # this is a hack whilst we don't have full system
+ACCEPT_KEYWORDS="~arm64-macos"
 
 # multilib build stuff, single ABI (no multilib)
 ABI="arm64"

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Sam James]

commit:     7ef68af1ef637e90f9ffdda8f8fceacf394e1c6b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 10:54:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 10:55:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef68af1

profiles/prefix/darwin/macos/arch/arm64: mask <dev-libs/gmp-6.2.2[cpudetection] too

We have IUSE="+cpudetection" and REQUIRED_USE="cpudetection? ( asm )" and asm
is masked.

Bug: https://archives.gentoo.org/gentoo-alt/message/9b57b9dfac47cfd5a8ec9d0489e25cf7
Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/prefix/darwin/macos/arch/arm64/package.use.mask | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
index 6cc70f2fb18a..5ccad25049d5 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-11-09)
 # Older GMP releases have a bug in their arm64 Darwin ASM
 # 6.2.2 isn't released but this will catch any releases we know are broken
 # like 6.2.1, and it's already fixed in git upstream.
-<dev-libs/gmp-6.2.2 asm
+<dev-libs/gmp-6.2.2 asm cpudetection

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     ef78854564d1927cd8c44099287446049fe7521f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 10:52:25 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 10:54:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef788545

prefix/darwin/macos/arch/arm64: force -O1 where necessary as workaround

The GCC toolchain seems somewhat funky for certain packages, producing
objects that the (host) linker doesn't agree with, so for the time being
force -O1 as workaround for these few packages.

Bug: https://bugs.gentoo.org/778014
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .../prefix/darwin/macos/arch/arm64/profile.bashrc  | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
index 6bfe36915c9d..314c9a7e4f99 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
+++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pre_src_configure() {
@@ -11,13 +11,23 @@ pre_src_configure() {
 	# triplets, so patch that for various versions of autoconf
 	# This bit should be kept in sync with fix_config_sub in
 	# bootstrap-prefix.sh
-	if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
-		# Apple Silicon doesn't use aarch64, but arm64
-		find . -name "config.sub" | \
-			xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
-		find . -name "config.sub" | \
-			xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
-	fi
+	# Apple Silicon doesn't use aarch64, but arm64
+	find . -name "config.sub" | \
+		${XARGS} sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
+	find . -name "config.sub" | \
+		${XARGS} sed -i -e 's/ aarch64 / aarch64 | arm64 /'
+
+	# currently the toolchain appears to be a bit funky, and generates
+	# code the (host) linker thinks is invalid with -O2 and up:
+	# ld: in section __TEXT,__text reloc 442: symbol index out of range
+	# file 'src/preproc/refer/refer-label.o' for architecture arm64
+	case ${CATEGORY}/${PN} in
+		sys-apps/groff |\
+		app-editors/vim)
+			[[ ${CFLAGS}   == *-O[23456789]* ]] &&   CFLAGS="${CFLAGS} -O1"
+			[[ ${CXXFLAGS} == *-O[23456789]* ]] && CXXFLAGS="${CFLAGS} -O1"
+		;;
+	esac
 
 	popd > /dev/null
 }

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Sam James]

commit:     0d0831c4b691c9bb0863183e7a7b0e141109bfdc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 06:14:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 06:14:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d0831c4

profiles/prefix/darwin/macos/arch/arm64: mask gcc-11.2.0

About to add it to ::prefix and don't want to disrupt
arm64 M1 prefix bootstrapping which needs gcc-11_pre...
atm.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/prefix/darwin/macos/arch/arm64/package.mask | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.mask b/profiles/prefix/darwin/macos/arch/arm64/package.mask
new file mode 100644
index 00000000000..b642037494e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.mask
@@ -0,0 +1,6 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2021-11-09)
+# Doesn't support arm64. Fall back to snapshot in ::prefix for now.
+=sys-devel/gcc-11.2.0

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Sam James]

commit:     1c6df0bc56429a3eb644c38cce882e5d4548ee6c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  9 06:10:25 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov  9 06:11:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c6df0bc

profiles/prefix/darwin/macos/arch/arm64: mask dev-libs/gmp[asm] for now

Known broken. From gmplib.org:
```
Issues with GMP 6.2.1:
	While we added support for Apple's new Arm based computers, our support has a problem.
	The problem is that Apple reserves CPU register x18, but GMP's mpn/arm64 assembly code uses that register.
	While GMP runs fine in our tests, we expect things to go awry in some execution situation.
	(Apple has not been kind enough to specify how they use x18. Therefore, we don't know what the consequences of using x18 might be.)
```

Signed-off-by: Sam James <sam <AT> gentoo.org>

 profiles/prefix/darwin/macos/arch/arm64/package.use.mask | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.mask b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
new file mode 100644
index 00000000000..6cc70f2fb18
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2021-11-09)
+# Older GMP releases have a bug in their arm64 Darwin ASM
+# 6.2.2 isn't released but this will catch any releases we know are broken
+# like 6.2.1, and it's already fixed in git upstream.
+<dev-libs/gmp-6.2.2 asm

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     e87aca1f77e6097a1324165793b74f1c62bba5ca
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 18:21:02 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 18:22:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e87aca1f

profiles/prefix/darwin/macos/arch/arm64: force correct llvm target

without it, it is so hard to compile code for the host

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

 profiles/prefix/darwin/macos/arch/arm64/package.use.force | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/package.use.force b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
new file mode 100644
index 00000000000..70cf505126a
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/package.use.force
@@ -0,0 +1,8 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Fabian Groffen <grobian@gentoo.org> (2020-12-31)
+# Force the host target to avoid dependency hell
+dev-ml/llvm-ocaml llvm_targets_AArch64
+sys-devel/clang llvm_targets_AArch64
+sys-devel/llvm llvm_targets_AArch64

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     fa4fe2456b2523f3fbbf3997c33eee494904ef57
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 12:52:09 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 12:52:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa4fe245

profiles/prefix/darwin/macos/arch/arm64: fix pre_src_configure hook

apparently this is executed without any guards or anything, so make sure
we restore the original working directory

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

 profiles/prefix/darwin/macos/arch/arm64/profile.bashrc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
index 821237e6587..6bfe36915c9 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
+++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
@@ -3,7 +3,7 @@
 
 pre_src_configure() {
 	# catch when multiple pkgs are in one ebuild
-	cd "${WORKDIR}"
+	pushd "${WORKDIR}" > /dev/null
 
 	# macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64),
 	# which config.sub currently doesn't understand about.  It is,
@@ -18,4 +18,6 @@ pre_src_configure() {
 		find . -name "config.sub" | \
 			xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
 	fi
+
+	popd > /dev/null
 }

[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/darwin/macos/arch/arm64/

[Fabian Groffen]

commit:     47cbf56a1f5867442c9ec17db89c00bab5fefc79
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 12:46:37 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 12:48:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47cbf56a

profiles/prefix/darwin/macos/11.0/arm64: add workaround for config.sub

amd64-darwin is too new to be an established configuration, so patch in
recognition for it

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

 .../prefix/darwin/macos/arch/arm64/profile.bashrc   | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
new file mode 100644
index 00000000000..821237e6587
--- /dev/null
+++ b/profiles/prefix/darwin/macos/arch/arm64/profile.bashrc
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pre_src_configure() {
+	# catch when multiple pkgs are in one ebuild
+	cd "${WORKDIR}"
+
+	# macOS Big Sur (11.x, darwin20) supports Apple Silicon (arm64),
+	# which config.sub currently doesn't understand about.  It is,
+	# however, Apple who seem to use arm64-apple-darwin20 CHOST
+	# triplets, so patch that for various versions of autoconf
+	# This bit should be kept in sync with fix_config_sub in
+	# bootstrap-prefix.sh
+	if [[ ${CHOST} == arm64-apple-darwin* ]] ; then
+		# Apple Silicon doesn't use aarch64, but arm64
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ arm\(-\*\)* / arm\1 | arm64\1 /'
+		find . -name "config.sub" | \
+			xargs sed -i -e 's/ aarch64 / aarch64 | arm64 /'
+	fi
+}