From 05f51cb18d65fbe5d7fc0f6bcf74e75895a3d0c7 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 8 Oct 2012 19:57:45 +0200
Subject: [PATCH] Remove NO_NEON code

---
 compile.sh   | 9 +--------
 configure.sh | 8 +-------
 gen-env.sh   | 1 -
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/compile.sh b/compile.sh
index aad6d4a72..1771c4cac 100755
--- a/compile.sh
+++ b/compile.sh
@@ -37,8 +37,6 @@ export CXXSTL
 
 # XXX : important!
 cat << EOF
-For an ARMv7-A device without NEON, you need a build without NEON:
-$ export NO_NEON=1
 For an ARMv6 device without FPU, you need a build without FPU:
 $ export NO_FPU=1
 For an ARMv5 device or the Android emulator, you need an ARMv5 build:
@@ -127,14 +125,9 @@ EOF
 fi
 
 if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
-    if test -z "${NO_NEON}" ; then
-        EXTRA_CFLAGS="-mfpu=neon -mcpu=cortex-a8"
-    else
-        EXTRA_CFLAGS="-mfpu=vfpv3-d16 -mcpu=cortex-a9"
-    fi
+    EXTRA_CFLAGS="-mfpu=vfpv3-d16 -mcpu=cortex-a8"
     EXTRA_CFLAGS="${EXTRA_CFLAGS} -mthumb -mfloat-abi=softfp"
 elif [ ${ANDROID_ABI} = "armeabi" ] ; then
-    export NO_NEON=1
     if [ -n "${NO_ARMV6}" ]; then
         EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float"
     else
diff --git a/configure.sh b/configure.sh
index 222399d5e..c1e30b6fd 100755
--- a/configure.sh
+++ b/configure.sh
@@ -20,13 +20,7 @@ fi
 LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined"
 
 if [ -n "$HAVE_ARM" ]; then
-    if [ -z "$NO_NEON" ]; then
-        NO_NEON=0
-    fi
-
-    if [ $NO_NEON -gt 0 ]; then
-        EXTRA_PARAMS=" --disable-neon"
-    else
+    if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
         EXTRA_PARAMS=" --enable-neon"
         LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8"
     fi
diff --git a/gen-env.sh b/gen-env.sh
index ff806ad64..73574344c 100755
--- a/gen-env.sh
+++ b/gen-env.sh
@@ -16,6 +16,5 @@ function optional_var {
 
 rm -f $ENVTXT
 echo -e "ANDROID_ABI=$ANDROID_ABI" >> $ENVTXT
-optional_var "NO_NEON"
 optional_var "NO_FPU"
 optional_var "NO_ARMV6"