From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 08 Sep 2023 10:17:27 +0200
Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1qeWgC-0081aq-Ns
	for lore@lore.pengutronix.de; Fri, 08 Sep 2023 10:17:27 +0200
Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de)
	by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1qeWgB-00046Y-3N; Fri, 08 Sep 2023 10:17:27 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.whiteo.stw.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1qeWfq-00045g-3s; Fri, 08 Sep 2023 10:17:06 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1qeWfp-004q4l-No; Fri, 08 Sep 2023 10:17:05 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1qeWfp-00Aab0-1A;
 Fri, 08 Sep 2023 10:17:05 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri,  8 Sep 2023 10:17:05 +0200
Message-Id: <20230908081705.2523947-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230904093952.370935-1-p.zabel@pengutronix.de>
References: <20230904093952.370935-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] ptxd_make_cmake_toolchain: set correct
 CMAKE_SYSTEM_PROCESSOR for x86, aarch64 and riscv64
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false

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}")" \