diff options
| author | Eric Anholt <[email protected]> | 2017-07-31 15:15:14 -0700 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-08-19 02:57:19 +0100 |
| commit | 833f12abdfa17c1e9e60f1705fc18ca13a3b7f34 (patch) | |
| tree | 8267182df955c57b9bee7b7afcda314a963a7b2e | |
| parent | 1fc44a3ba0a64afff69da927a03b19f74b819f5b (diff) | |
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 <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
(cherry picked from commit ba8533b6ea6a3e0121da4ab73be1dd18580b4d9b)
| -rw-r--r-- | Android.common.mk | 4 | ||||
| -rw-r--r-- | configure.ac | 24 |
2 files changed, 28 insertions, 0 deletions
diff --git a/Android.common.mk b/Android.common.mk index 6bd30816bc4..e5416c4e383 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -88,6 +88,10 @@ LOCAL_CFLAGS += \ 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) LOCAL_CFLAGS += -DHAVE_LIBDRM diff --git a/configure.ac b/configure.ac index 8d6c9671e78..0bd96500c9c 100644 --- a/configure.ac +++ b/configure.ac @@ -773,6 +773,20 @@ if test "x$enable_asm" = xyes; then ;; esac ;; + aarch64) + case "$host_os" in + linux*) + asm_arch=aarch64 + ;; + esac + ;; + arm) + case "$host_os" in + linux*) + asm_arch=arm + ;; + esac + ;; esac case "$asm_arch" in @@ -792,6 +806,14 @@ if test "x$enable_asm" = xyes; then DEFINES="$DEFINES -DUSE_PPC64LE_ASM" 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]) ;; @@ -2735,6 +2757,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_SPARC_ASM, test "x$asm_arch" = xsparc) 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_MINOR], 0) |