commit 69792a41327f067cfaa2b25b0010535f42001ffe
author Chih-Hung Hsieh <chh@google.com> Tue Mar 03 01:58:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 03 01:58:54 2015 +0000
tree 9eeda2a904866c54be133a8bc55550f4ec32a124
parent adc7e8315ca58f1386f1b14c87af1efba15c83c6
parent d40a53b4940660aa0181e4bbd118fc2bbf5373b2

am d40a53b4: am 9a75b4ec: am d408e607: Merge "Disable tail call optimization and use -mstackrealign to boot up on fugu."

* commit 'd40a53b4940660aa0181e4bbd118fc2bbf5373b2':
  Disable tail call optimization and use -mstackrealign to boot up on fugu.

core/clang/TARGET_x86.mk

diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk
index a6b2a6f..3ba34ae 100644
--- a/core/clang/TARGET_x86.mk
+++ b/core/clang/TARGET_x86.mk
@@ -18,7 +18,15 @@
   $(CLANG_CONFIG_EXTRA_CFLAGS) \
   $(CLANG_CONFIG_TARGET_EXTRA_CFLAGS) \
   $(CLANG_CONFIG_x86_EXTRA_CFLAGS) \
-  $(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS)
+  $(CLANG_CONFIG_x86_TARGET_EXTRA_ASFLAGS) \
+  -fno-optimize-sibling-calls \
+  -mstackrealign
+
+# http://llvm.org/bugs/show_bug.cgi?id=15086,
+# llvm tail call optimization is wrong for x86.
+# -mstackrealign is needed to realign stack in native code
+# that could be called from JNI, so that movaps instruction
+# will work on assumed stack aligned local variables.
 
 CLANG_CONFIG_x86_TARGET_EXTRA_CONLYFLAGS := \
   $(CLANG_CONFIG_EXTRA_CONLYFLAGS) \