From 1b2069e6b72f475bd6c3609667732ea8efdfdf84 Mon Sep 17 00:00:00 2001
From: Hitesh Sondhi <hiteshsondhi88@gmail.com>
Date: Fri, 19 Sep 2014 16:03:21 +0530
Subject: [PATCH] Updated scripts, fixed a bug which was causing Illegal
 Instruction error in some arm devices

---
 abi_settings.sh |   3 +--
 ffmpeg_build.sh |   4 ++--
 libpng_build.sh | Bin 439 -> 436 bytes
 x264_build.sh   |   1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/abi_settings.sh b/abi_settings.sh
index 8900011..766634a 100755
--- a/abi_settings.sh
+++ b/abi_settings.sh
@@ -9,13 +9,12 @@ case $1 in
     NDK_ABI='arm'
     NDK_TOOLCHAIN_ABI='arm-linux-androideabi'
     NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}"
-    CFLAGS="$CFLAGS -march=armv7-a"
   ;;
   armeabi-v7a-neon)
     NDK_ABI='arm'
     NDK_TOOLCHAIN_ABI='arm-linux-androideabi'
     NDK_CROSS_PREFIX="${NDK_TOOLCHAIN_ABI}"
-    CFLAGS="$CFLAGS -march=armv7-a -mfpu=neon"
+    CFLAGS="${CFLAGS} -mfpu=neon"
   ;;
   x86)
     NDK_ABI='x86'
diff --git a/ffmpeg_build.sh b/ffmpeg_build.sh
index 07fd796..5ef3a90 100755
--- a/ffmpeg_build.sh
+++ b/ffmpeg_build.sh
@@ -5,8 +5,8 @@
 pushd ffmpeg
 
 case $1 in
-  armeabi-v7a | armeabi-v7a-neon )
-    CPU='armv7-a'
+  armeabi-v7a | armeabi-v7a-neon)
+    CPU='cortex-a8'
   ;;
   x86)
     CPU='i686'
diff --git a/libpng_build.sh b/libpng_build.sh
index 63b414b0d58f10b2bf7d26260ea06f0f35e56c25..58840a590da4ec5afcccf13047cc91f1f514c81b 100755
GIT binary patch
delta 7
OcmdnayoGtg7DfOJBLdd|

delta 11
ScmdnOyq$T&7Di?U1}*>>j{@WX

diff --git a/x264_build.sh b/x264_build.sh
index 59ccae1..5922bd7 100755
--- a/x264_build.sh
+++ b/x264_build.sh
@@ -22,6 +22,7 @@ echo $CFLAGS
   --sysroot="$NDK_SYSROOT" \
   --host="$HOST" \
   --enable-pic \
+  --disable-asm \
   --enable-static \
   --disable-shared \
   --prefix="${TOOLCHAIN_PREFIX}" \