From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Jun 2023 09:02:10 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) 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 ) id 1q6Qhn-00CkDS-Eb for lore@lore.pengutronix.de; Tue, 06 Jun 2023 09:02:10 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q6Qhk-0006nk-I9; Tue, 06 Jun 2023 09:02:08 +0200 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1q6Qhd-0006nT-Qx; Tue, 06 Jun 2023 09:02:01 +0200 From: Philipp Zabel To: ptxdist@pengutronix.de Date: Tue, 6 Jun 2023 09:02:01 +0200 Message-Id: <20230606070201.619752-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2] vulkan-loader: enable assembly on aarch64 and x86_64 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" 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.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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