[Android] Workaround for broken NDK r10 on x86

Felix Abecassis git at videolan.org
Mon Sep 1 18:41:09 CEST 2014


vlc-ports/android | branch: master | Felix Abecassis <felix.abecassis at gmail.com> | Mon Sep  1 18:33:21 2014 +0200| [ea2758a660781d1bc95da784ccd5ad1257e6f36d] | committer: Felix Abecassis

Workaround for broken NDK r10 on x86

See https://code.google.com/p/android/issues/detail?id=73843
gcc was generating the popcnt instruction, resulting in a SIGILL on
older devices.

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=ea2758a660781d1bc95da784ccd5ad1257e6f36d
---

 compile.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index af07c5c..790ddb2 100755
--- a/compile.sh
+++ b/compile.sh
@@ -149,7 +149,7 @@ elif [ ${ANDROID_ABI} = "armeabi" ] ; then
         fi
     fi
 elif [ ${ANDROID_ABI} = "x86" ] ; then
-    EXTRA_CFLAGS="-march=pentium"
+    EXTRA_CFLAGS="-march=pentium -m32"
 elif [ ${ANDROID_ABI} = "mips" ] ; then
     EXTRA_CFLAGS="-march=mips32 -mtune=mips32r2 -mhard-float"
     # All MIPS Linux kernels since 2.4.4 will trap any unimplemented FPU



More information about the Android mailing list