Commit ba8533b6 authored by Eric Anholt's avatar Eric Anholt

configure.ac: Introduce HAVE_ARM_ASM/HAVE_AARCH64_ASM and the -D flags.

I've been trying to get away without these conditionals in vc4's NEON
code, but it meant compiling extra unused code on x86, and build failing
on ARMv6.

v2: Use the _arm/_arm64 flags to simplify detection (suggested by Rob),
    but hide the _arm version under ARCH_ARM_HAVE_NEON to keep from trying
    to build this stuff for armv5te.
Tested-by: Rob Herring's avatarRob Herring <robh@kernel.org>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
parent b94ddc18
...@@ -88,6 +88,10 @@ LOCAL_CFLAGS += \ ...@@ -88,6 +88,10 @@ LOCAL_CFLAGS += \
endif endif
endif endif
ifeq ($(ARCH_ARM_HAVE_NEON),true)
LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
endif
LOCAL_CFLAGS_arm64 += -DUSE_AARCH64_ASM
ifneq ($(LOCAL_IS_HOST_MODULE),true) ifneq ($(LOCAL_IS_HOST_MODULE),true)
LOCAL_CFLAGS += -DHAVE_LIBDRM LOCAL_CFLAGS += -DHAVE_LIBDRM
......
...@@ -773,6 +773,20 @@ if test "x$enable_asm" = xyes; then ...@@ -773,6 +773,20 @@ if test "x$enable_asm" = xyes; then
;; ;;
esac esac
;; ;;
aarch64)
case "$host_os" in
linux*)
asm_arch=aarch64
;;
esac
;;
arm)
case "$host_os" in
linux*)
asm_arch=arm
;;
esac
;;
esac esac
case "$asm_arch" in case "$asm_arch" in
...@@ -792,6 +806,14 @@ if test "x$enable_asm" = xyes; then ...@@ -792,6 +806,14 @@ if test "x$enable_asm" = xyes; then
DEFINES="$DEFINES -DUSE_PPC64LE_ASM" DEFINES="$DEFINES -DUSE_PPC64LE_ASM"
AC_MSG_RESULT([yes, ppc64le]) AC_MSG_RESULT([yes, ppc64le])
;; ;;
aarch64)
DEFINES="$DEFINES -DUSE_AARCH64_ASM"
AC_MSG_RESULT([yes, aarch64])
;;
arm)
DEFINES="$DEFINES -DUSE_ARM_ASM"
AC_MSG_RESULT([yes, arm])
;;
*) *)
AC_MSG_RESULT([no, platform not supported]) AC_MSG_RESULT([no, platform not supported])
;; ;;
...@@ -2731,6 +2753,8 @@ AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64) ...@@ -2731,6 +2753,8 @@ AM_CONDITIONAL(HAVE_X86_ASM, test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64)
AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64) AM_CONDITIONAL(HAVE_X86_64_ASM, test "x$asm_arch" = xx86_64)
AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc) AM_CONDITIONAL(HAVE_SPARC_ASM, test "x$asm_arch" = xsparc)
AM_CONDITIONAL(HAVE_PPC64LE_ASM, test "x$asm_arch" = xppc64le) AM_CONDITIONAL(HAVE_PPC64LE_ASM, test "x$asm_arch" = xppc64le)
AM_CONDITIONAL(HAVE_AARCH64_ASM, test "x$asm_arch" = xaarch64)
AM_CONDITIONAL(HAVE_ARM_ASM, test "x$asm_arch" = xarm)
AC_SUBST([NINE_MAJOR], 1) AC_SUBST([NINE_MAJOR], 1)
AC_SUBST([NINE_MINOR], 0) AC_SUBST([NINE_MINOR], 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment