[vlc-devel] [PATCH] contrib: Fix ARMv6 compilation

[Edward Wang]

The contrib flags got messed up in d61052a0987d751ecda0b763c900f834f3358612. This led to VFP instructions being used on non-NEON devices, which led to many painful days of the following nonsense:

I/DEBUG   (  954): signal 4 (SIGILL), fault addr 42387d94
---
 The vlc-android counterpart is already made and will land soon, after some issues are resolved.

 This might look like a small fix but please do not underestimate the amount of debugging needed to get here.

 contrib/src/main.mak |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index efdc426..5bb45ab 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -111,7 +111,7 @@ ifdef HAVE_TEGRA2
     ANDROID_CPU_FLAGS = -mfpu=vfpv3-d16 -mcpu=cortex-a9
 else
     ANDROID_ABI = armeabi
-    ANDROID_CPU_FLAGS = -mcpu=arm1136jf-s -mfpu=vfp
+    ANDROID_CPU_FLAGS = -march=armv6j -mtune=arm1136j-s -msoft-float
 endif
 endif
 EXTRA_CFLAGS += -I$(ANDROID_NDK)/sources/cxx-stl/gnu-libstdc++/include
-- 
1.7.5.4