[ptxdist] [PATCH] ptxd_make_cmake_toolchain: set correct CMAKE_SYSTEM_PROCESSOR for x86, aarch64 and riscv64

[ptxdist] [PATCH] ptxd_make_cmake_toolchain: set correct CMAKE_SYSTEM_PROCESSOR for x86, aarch64 and riscv64

[Philipp Zabel]

Follow commit 2523af9c557f ("ptxd_make_meson_cross_file: set corect
meson architecture for x86, aarch64 and riscv64"). This fixes the
aarch64 build of vulkan-loader with assembly enabled, which expects
CMAKE_SYSTEM_PROCESSOR to be 'aarch64' [1].

[1] https://github.com/KhronosGroup/Vulkan-Loader/blob/afdd025ead2b63b2c73d900ab128a2d3b512cdf0/scripts/parse_asm_values.py#L73

Fixes: 03cf8ff9c4b9 ("vulkan-loader: version bump 1.3.261.0 -> 1.3.261.1")
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 scripts/lib/ptxd_make_cmake_toolchain.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh
index 3d2482e87718..78975ca98652 100644
--- a/scripts/lib/ptxd_make_cmake_toolchain.sh
+++ b/scripts/lib/ptxd_make_cmake_toolchain.sh
@@ -25,6 +25,11 @@ export PTXDIST_CMAKE_TOOLCHAIN_CROSS
 ptxd_make_cmake_toolchain_target() {
     local sysroot_prefix="${PTXDIST_PATH_SYSROOT_PREFIX}:"
 
+    case "${PTXCONF_ARCH_STRING}" in
+	i386) PTXCONF_ARCH_STRING=x86 ;;
+	arm64) PTXCONF_ARCH_STRING=aarch64 ;;
+	riscv) PTXCONF_ARCH_STRING=riscv64 ;;
+    esac
     SYSTEM_NAME="Linux" \
 	SYSTEM_VERSION="1" \
 	\
-- 
2.39.2

Re: [ptxdist] [APPLIED] ptxd_make_cmake_toolchain: set correct CMAKE_SYSTEM_PROCESSOR for x86, aarch64 and riscv64

[Michael Olbrich]

Thanks, applied as 504897b8cdc8c37d20097d7d0c99bf53feaf3a9a.

Michael

[sent from post-receive hook]

On Fri, 08 Sep 2023 10:17:05 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Follow commit 2523af9c557f ("ptxd_make_meson_cross_file: set corect
> meson architecture for x86, aarch64 and riscv64"). This fixes the
> aarch64 build of vulkan-loader with assembly enabled, which expects
> CMAKE_SYSTEM_PROCESSOR to be 'aarch64' [1].
> 
> [1] https://github.com/KhronosGroup/Vulkan-Loader/blob/afdd025ead2b63b2c73d900ab128a2d3b512cdf0/scripts/parse_asm_values.py#L73
> 
> Fixes: 03cf8ff9c4b9 ("vulkan-loader: version bump 1.3.261.0 -> 1.3.261.1")
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230904093952.370935-1-p.zabel@pengutronix.de>
> [mol: use new variable instead of overwriting PTXCONF_ARCH_STRING]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/scripts/lib/ptxd_make_cmake_toolchain.sh b/scripts/lib/ptxd_make_cmake_toolchain.sh
> index 3d2482e87718..379a30bd2ebe 100644
> --- a/scripts/lib/ptxd_make_cmake_toolchain.sh
> +++ b/scripts/lib/ptxd_make_cmake_toolchain.sh
> @@ -25,10 +25,16 @@ export PTXDIST_CMAKE_TOOLCHAIN_CROSS
>  ptxd_make_cmake_toolchain_target() {
>      local sysroot_prefix="${PTXDIST_PATH_SYSROOT_PREFIX}:"
>  
> +    case "${PTXCONF_ARCH_STRING}" in
> +	i386) CMAKE_ARCH_STRING=x86 ;;
> +	arm64) CMAKE_ARCH_STRING=aarch64 ;;
> +	riscv) CMAKE_ARCH_STRING=riscv64 ;;
> +	*) CMAKE_ARCH_STRING=${PTXCONF_ARCH_STRING} ;;
> +    esac
>      SYSTEM_NAME="Linux" \
>  	SYSTEM_VERSION="1" \
>  	\
> -	SYSTEM_PROCESSOR="${PTXCONF_ARCH_STRING}" \
> +	SYSTEM_PROCESSOR="${CMAKE_ARCH_STRING}" \
>  	\
>  	CC="$(which "${CC}")" \
>  	CXX="$(which "${CXX}")" \