[ptxdist] [PATCH v2] vulkan-loader: enable assembly on aarch64 and x86_64

[ptxdist] [PATCH v2] vulkan-loader: enable assembly on aarch64 and x86_64

[Philipp Zabel]

Fixes the following CMake warning during prepare:

  Assembly sources have been disabled

  The build will fall back on building with C code

  Note that this may be unsafe, as the C code requires tail-call
  optimizations to remove the stack frame for certain calls.  If the compiler
  does not do this, then unknown device extensions will suffer from a
  corrupted stack.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
v2: move VULKAN_LOADER_USE_GAS above VULKAN_LOADER_CONF_OPT
---
 rules/vulkan-loader.make | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
index d09a78778ffe..7e4e4df2ad5d 100644
--- a/rules/vulkan-loader.make
+++ b/rules/vulkan-loader.make
@@ -29,6 +29,15 @@ VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee428
 # ----------------------------------------------------------------------------
 
 VULKAN_LOADER_CONF_TOOL	:= cmake
+
+VULKAN_LOADER_USE_GAS := OFF
+ifdef PTXCONF_ARCH_ARM64
+VULKAN_LOADER_USE_GAS := ON
+endif
+ifdef PTXCONF_ARCH_X86_64
+VULKAN_LOADER_USE_GAS := ON
+endif
+
 VULKAN_LOADER_CONF_OPT	:= \
 	$(CROSS_CMAKE_USR) \
 	-DCMAKE_BUILD_TYPE=Release \
@@ -45,7 +54,7 @@ VULKAN_LOADER_CONF_OPT	:= \
 	-DLOADER_ENABLE_THREAD_SANITIZER=OFF \
 	-DSYSCONFDIR= \
 	-DUPDATE_DEPS=OFF \
-	-DUSE_GAS=OFF
+	-DUSE_GAS=$(VULKAN_LOADER_USE_GAS)
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.39.2

Re: [ptxdist] [APPLIED] vulkan-loader: enable assembly on aarch64 and x86_64

[Michael Olbrich]

Thanks, applied as 7ab096984be7cf0c977fbc899b2021d3af8aa9d2.

Michael

[sent from post-receive hook]

On Wed, 21 Jun 2023 10:51:05 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Fixes the following CMake warning during prepare:
> 
>   Assembly sources have been disabled
> 
>   The build will fall back on building with C code
> 
>   Note that this may be unsafe, as the C code requires tail-call
>   optimizations to remove the stack frame for certain calls.  If the compiler
>   does not do this, then unknown device extensions will suffer from a
>   corrupted stack.
> 
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20230606070201.619752-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
> index d09a78778ffe..7e4e4df2ad5d 100644
> --- a/rules/vulkan-loader.make
> +++ b/rules/vulkan-loader.make
> @@ -29,6 +29,15 @@ VULKAN_LOADER_LICENSE_FILES := file://LICENSE.txt;md5=7dbefed23242760aa3475ee428
>  # ----------------------------------------------------------------------------
>  
>  VULKAN_LOADER_CONF_TOOL	:= cmake
> +
> +VULKAN_LOADER_USE_GAS := OFF
> +ifdef PTXCONF_ARCH_ARM64
> +VULKAN_LOADER_USE_GAS := ON
> +endif
> +ifdef PTXCONF_ARCH_X86_64
> +VULKAN_LOADER_USE_GAS := ON
> +endif
> +
>  VULKAN_LOADER_CONF_OPT	:= \
>  	$(CROSS_CMAKE_USR) \
>  	-DCMAKE_BUILD_TYPE=Release \
> @@ -45,7 +54,7 @@ VULKAN_LOADER_CONF_OPT	:= \
>  	-DLOADER_ENABLE_THREAD_SANITIZER=OFF \
>  	-DSYSCONFDIR= \
>  	-DUPDATE_DEPS=OFF \
> -	-DUSE_GAS=OFF
> +	-DUSE_GAS=$(VULKAN_LOADER_USE_GAS)
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install