Work around llvm bug with -mno-stackrealign.
BUG: 25435766
Change-Id: Ic030ba43d299a7702490f872bf4523748fa7ba8c
diff --git a/Android.mk b/Android.mk
index a3cc6fa..5554b5b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,12 +48,9 @@
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_C_INCLUDES)
-ifeq ($(TARGET_ARCH),x86)
-# Temporarily build without clang, until b/25435766 fixes core2md segfault.
-LOCAL_CLANG := false
-else
+# Work around b/25435766 core2md segfault.
+LOCAL_CLANG_CFLAGS_x86 += -mno-stackrealign
LOCAL_CLANG := true
-endif
include $(BUILD_STATIC_LIBRARY)
@@ -69,12 +66,9 @@
LOCAL_STATIC_LIBRARIES := breakpad_client
-ifeq ($(TARGET_ARCH),x86)
-# Temporarily build without clang, until b/25435766 fixes core2md segfault.
-LOCAL_CLANG := false
-else
+# Work around b/25435766 core2md segfault.
+LOCAL_CLANG_CFLAGS_x86 += -mno-stackrealign
LOCAL_CLANG := true
-endif
include $(BUILD_EXECUTABLE)
@@ -108,4 +102,4 @@
src/common/linux/linux_libc_support.cc \
src/common/linux/memory_mapped_file.cc \
src/tools/linux/dump_syms/dump_syms.cc
-include $(BUILD_HOST_EXECUTABLE)
\ No newline at end of file
+include $(BUILD_HOST_EXECUTABLE)
