[gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/

["Sam James" <sam@gentoo.org>]

commit:     e54a05e27512a039417cbaf448a998dbf700585d
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sat Jan 18 17:19:16 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  3 19:26:27 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54a05e2

zig-utils.eclass: fix translating `-march=unset` and `-march=native` on ARM

Reported on IRC.

Reported-by: sin-ack <sin-ack <AT> protonmail.com>
Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/tests/zig-utils.sh |  8 +++++++-
 eclass/zig-utils.eclass   | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/eclass/tests/zig-utils.sh b/eclass/tests/zig-utils.sh
index 14af1d2105e3..3c98134b9006 100755
--- a/eclass/tests/zig-utils.sh
+++ b/eclass/tests/zig-utils.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -197,6 +197,8 @@ c_to_zig_map=(
 
 	# https://bugs.gentoo.org/924920
 	["-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"]=generic+v7a+vfp3d16-soft_float
+
+	["-march=armv7-a -march=unset"]="generic-soft_float"
 )
 test-convert_c_env_to_zig_cpu c_to_zig_map "${CHOST}"
 tend ${?}
@@ -210,6 +212,10 @@ c_to_zig_map=(
 
 	["-march=armv8.3-a"]="generic+v8_3a"
 	["-mcpu=cortex-a78 -march=armv8.3-a"]="cortex_a78+v8_3a"
+
+	["-march=native"]="native"
+	["-march=native -mtune=native"]="generic"
+	["-mcpu=cortex-a78 -march=native"]="cortex_a78"
 )
 test-convert_c_env_to_zig_cpu c_to_zig_map "${CHOST}"
 tend ${?}

diff --git a/eclass/zig-utils.eclass b/eclass/zig-utils.eclass
index d92fd0724b17..e9d91b8f5f52 100644
--- a/eclass/zig-utils.eclass
+++ b/eclass/zig-utils.eclass
@@ -313,6 +313,7 @@ zig-utils_c_env_to_zig_cpu() {
 	local c_flags_march="$(_get-c-option march)"
 	local c_flags_mcpu="$(_get-c-option mcpu)"
 	local c_flags_mfpu="$(_get-c-option mfpu)"
+	local c_flags_mtune="$(_get-c-option mtune)"
 
 	local base_cpu features=""
 
@@ -332,13 +333,28 @@ zig-utils_c_env_to_zig_cpu() {
 			esac
 
 			case "${c_flags_march}" in
-				"") ;;
+				"" | unset) ;;
 				armv*)
 					local c_arm_family="${c_flags_march##arm}"
 					c_arm_family="${c_arm_family//./_}"
 					c_arm_family="${c_arm_family//-/}"
 					features+="+${c_arm_family}"
 					;;
+				native)
+					# GCC docs: This option has no effect if
+					# the compiler is unable to recognize the
+					# architecture of the host system.
+					#
+					# When -march=native is given and no other
+					# -mcpu or -mtune is given then ... -march=native
+					# is treated as -mcpu=native.
+					if [[ -z "${c_flags_mcpu}${c_flags_mtune}" ]]; then
+						base_cpu=native
+					else
+						: # Zig can not detect CPU features (architecture
+						# in our case) separately from model, so we ignore it.
+					fi
+					;;
 				*) features+="+${c_flags_march}";;
 			esac