From 81a48d47d1a6960169fa39edfaa710ffa687721f Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 15 Jul 2014 20:13:05 +0900
Subject: [PATCH] Add -mstackrealign to avoid crashes with SSE instructions on
 pre-K x86 devices.

bug: 16213554
Change-Id: Icd67ed4fd57fcc5f5bf8039b7892d0d446210247
---
 native/jni/Android.mk | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/native/jni/Android.mk b/native/jni/Android.mk
index 72f8f87e4..8be4d78b6 100644
--- a/native/jni/Android.mk
+++ b/native/jni/Android.mk
@@ -34,6 +34,12 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali
 # To suppress compiler warnings for unused variables/functions used for debug features etc.
 LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function
 
+# HACK: -mstackrealign is required for x86 builds running on pre-KitKat devices to avoid crashes
+# with SSE instructions.
+ifeq ($(TARGET_ARCH), x86)
+    LOCAL_CFLAGS += -mstackrealign
+endif # x86
+
 include $(LOCAL_PATH)/NativeFileList.mk
 
 LOCAL_SRC_FILES := \