From 217a763bb274771d7fe6c4444a7e3f030169e6f2 Mon Sep 17 00:00:00 2001
From: Pavel Labath <labath@google.com>
Date: Thu, 29 Jun 2017 14:32:23 +0000
Subject: [PATCH] Android.rules: build x86 tests with -mstackrealign

All android builds systems have switched to -mstackrealign for building
x86 binaries, so follow their cue with our mini build system.

This presently breaks just one test (TestReturnValue), and this is due
to a compiler bug, which has already been fixed in clang, but it hasn't
made it yet into the official NDK compiler. While I'm touching that
test, I also remove an android-specific XFAIL, which is not relevant
anymore.

llvm-svn: 306683
---
 .../return-value/TestReturnValue.py                | 14 ++------------
 .../Python/lldbsuite/test/make/Android.rules       |  4 ++++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
index e476c48d1844..cf435a4aae91 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
@@ -31,12 +31,8 @@ class ReturnValueTestCase(TestBase):
             "<=",
             "3.6"],
         archs=["i386"])
-    @expectedFailureAll(
-        bugnumber="llvm.org/pr25785",
-        hostoslist=["windows"],
-        compiler="gcc",
-        archs=["i386"],
-        triple='.*-android')
+    @expectedFailureAll(compiler="clang", compiler_version=["<=", "5.0.300080"],
+            triple='.*-android', archs=["i386"])
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     @add_test_categories(['pyapi'])
     def test_with_python(self):
@@ -185,12 +181,6 @@ class ReturnValueTestCase(TestBase):
             "<=",
             "3.6"],
         archs=["i386"])
-    @expectedFailureAll(
-        bugnumber="llvm.org/pr25785",
-        hostoslist=["windows"],
-        compiler="gcc",
-        archs=["i386"],
-        triple='.*-android')
     @expectedFailureAll(compiler=["gcc"], archs=["x86_64", "i386"])
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24778")
     def test_vector_values(self):
diff --git a/lldb/packages/Python/lldbsuite/test/make/Android.rules b/lldb/packages/Python/lldbsuite/test/make/Android.rules
index 058401f425ad..0a725494d354 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Android.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Android.rules
@@ -90,3 +90,7 @@ else
 
 	ARCH_LDFLAGS += $(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.9/libs/$(STL_ARCH)/libgnustl_static.a
 endif
+
+ifeq "$(ARCH)" "i386"
+	ARCH_CFLAGS += -mstackrealign
+endif