Contrib: support Tegra2 CPUs on Android

Cortex-a9 but no NEON? Seriously?

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 907b705736e0e79a136da793f9bbe3c3176f31ec..df3dd85c9c061d60e3ede42fedbf4200e9b83c84 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -178,6 +178,7 @@ check_android_sdk()
        [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
        test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON"
+       test -n "${TEGRA2}" && add_make_enabled "HAVE_TEGRA2"
 }
 
 test -z "$PREFIX" || add_make "PREFIX := $PREFIX"

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6c13589c7e4e39affc424ee30cab57f69ec3e16b..4de50a29a3afb7fb7a7489321a53ab27173890cc 100644 (file)
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -105,10 +105,15 @@ CXX := $(HOST)-g++ --sysroot=$(ANDROID_NDK)/platforms/android-9/arch-arm
 ifdef HAVE_NEON
     ANDROID_ABI = armeabi-v7a
     ANDROID_CPU_FLAGS = -mfpu=neon -mcpu=cortex-a8
+else
+ifdef HAVE_TEGRA2
+    ANDROID_ABI = armeabi-v7a
+    ANDROID_CPU_FLAGS = -mfpu=vfpv3-d16 -mcpu=cortex-a9
 else
     ANDROID_ABI = armeabi
     ANDROID_CPU_FLAGS = -mcpu=arm1136jf-s -mfpu=vfp
 endif
+endif
 EXTRA_CFLAGS += -D__STDC_VERSION__=199901L -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
 EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/libs/$(ANDROID_ABI)/include
 EXTRA_CFLAGS += -mfloat-abi=softfp $(ANDROID_CPU_FLAGS)