From 1c8bae09259b9c851a1bdaf5a23579fdf1a712e7 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Mon, 20 Jul 2015 20:17:35 +0200 Subject: [PATCH] Compile with -mstackrealign on Android-x86, "fixing" mystery crashes on Zenfone. This is really just a workaround, I have no idea what is misaligning the stack. But it doesn't feel like it's us. This has a small performance penalty but x86-Android is pretty rare, and it's better than crashing. --- android/jni/Locals.mk | 2 +- native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/jni/Locals.mk b/android/jni/Locals.mk index 359f5aa71..377a6a5f7 100644 --- a/android/jni/Locals.mk +++ b/android/jni/Locals.mk @@ -46,7 +46,7 @@ ifeq ($(TARGET_ARCH_ABI),x86) LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/x86/lib/libavutil.a LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../ffmpeg/android/x86/include - LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 + LOCAL_CFLAGS := $(LOCAL_CFLAGS) -D_ARCH_32 -D_M_IX86 -fomit-frame-pointer -mtune=atom -mfpmath=sse -mssse3 -mstackrealign endif ifeq ($(TARGET_ARCH_ABI),arm64-v8a) LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/arm64/lib/libavformat.a diff --git a/native b/native index 477568b34..a9cefe2f3 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 477568b3485e9921ede59c26b266c762b1fbd066 +Subproject commit a9cefe2f3ad5c9f9af6e19af06e54e082cbbb9d5