Commit 05f51cb1 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove NO_NEON code

parent 30b09250
...@@ -37,8 +37,6 @@ export CXXSTL ...@@ -37,8 +37,6 @@ export CXXSTL
# XXX : important! # XXX : important!
cat << EOF 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: For an ARMv6 device without FPU, you need a build without FPU:
$ export NO_FPU=1 $ export NO_FPU=1
For an ARMv5 device or the Android emulator, you need an ARMv5 build: For an ARMv5 device or the Android emulator, you need an ARMv5 build:
...@@ -127,14 +125,9 @@ EOF ...@@ -127,14 +125,9 @@ EOF
fi fi
if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then if [ ${ANDROID_ABI} = "armeabi-v7a" ] ; then
if test -z "${NO_NEON}" ; then EXTRA_CFLAGS="-mfpu=vfpv3-d16 -mcpu=cortex-a8"
EXTRA_CFLAGS="-mfpu=neon -mcpu=cortex-a8"
else
EXTRA_CFLAGS="-mfpu=vfpv3-d16 -mcpu=cortex-a9"
fi
EXTRA_CFLAGS="${EXTRA_CFLAGS} -mthumb -mfloat-abi=softfp" EXTRA_CFLAGS="${EXTRA_CFLAGS} -mthumb -mfloat-abi=softfp"
elif [ ${ANDROID_ABI} = "armeabi" ] ; then elif [ ${ANDROID_ABI} = "armeabi" ] ; then
export NO_NEON=1
if [ -n "${NO_ARMV6}" ]; then if [ -n "${NO_ARMV6}" ]; then
EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float" EXTRA_CFLAGS="-march=armv5te -mtune=arm9tdmi -msoft-float"
else else
......
...@@ -20,13 +20,7 @@ fi ...@@ -20,13 +20,7 @@ fi
LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined" LDFLAGS="-Wl,-Bdynamic,-dynamic-linker=/system/bin/linker -Wl,--no-undefined"
if [ -n "$HAVE_ARM" ]; then if [ -n "$HAVE_ARM" ]; then
if [ -z "$NO_NEON" ]; then if [ ${ANDROID_ABI} = "armeabi-v7a" ]; then
NO_NEON=0
fi
if [ $NO_NEON -gt 0 ]; then
EXTRA_PARAMS=" --disable-neon"
else
EXTRA_PARAMS=" --enable-neon" EXTRA_PARAMS=" --enable-neon"
LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8" LDFLAGS="$LDFLAGS -Wl,--fix-cortex-a8"
fi fi
......
...@@ -16,6 +16,5 @@ function optional_var { ...@@ -16,6 +16,5 @@ function optional_var {
rm -f $ENVTXT rm -f $ENVTXT
echo -e "ANDROID_ABI=$ANDROID_ABI" >> $ENVTXT echo -e "ANDROID_ABI=$ANDROID_ABI" >> $ENVTXT
optional_var "NO_NEON"
optional_var "NO_FPU" optional_var "NO_FPU"
optional_var "NO_ARMV6" optional_var "NO_ARMV6"
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