summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2021-09-08 15:45:24 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2021-09-08 15:45:24 +0200
commit8a2b1ac5e9a945b43d7adf161f8edff8703f42e1 (patch)
treeba80054042e782113428991391b5ebac99053012
parent9b8635b36fddaa44ca72595593f8ce5f2251cbb4 (diff)
downloadptxdist-8a2b1ac5e9a945b43d7adf161f8edff8703f42e1.tar.gz
ptxdist-8a2b1ac5e9a945b43d7adf161f8edff8703f42e1.tar.xz
mesalib: fix building on ARM without NEON
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/mesalib.make11
1 files changed, 10 insertions, 1 deletions
diff --git a/rules/mesalib.make b/rules/mesalib.make
index 945b7c523..1310aee72 100644
--- a/rules/mesalib.make
+++ b/rules/mesalib.make
@@ -93,8 +93,10 @@ ifdef PTXCONF_ARCH_X86
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel
endif
-ifdef PTXCONF_ARCH_ARM
+ifdef PTXCONF_ARCH_ARM_NEON
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_BROADCOM) += broadcom
+endif
+ifdef PTXCONF_ARCH_ARM
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_FREEDRENO) += freedreno
MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_PANFROST) += panfrost
endif
@@ -200,6 +202,13 @@ MESALIB_CONF_OPT := \
# Compile
# ----------------------------------------------------------------------------
+ifdef PTXCONF_ARCH_ARM
+ifndef PTXCONF_ARCH_ARM_NEON
+# don't try to build NEON code on platforms that don't have NEON
+MESALIB_CFLAGS := -DNO_FORMAT_ASM
+endif
+endif
+
$(STATEDIR)/mesalib.compile:
@$(call targetinfo)
cp $(PTXDIST_SYSROOT_HOST)/bin/mesa/glsl_compiler $(MESALIB_DIR)/src/compiler/