Merge "Fix X86 flags" am: f4449451b5

am: 173aad1a97

* commit '173aad1a97316948a1eec80e7ffd74dcd41bb11d':
  Fix X86 flags

Change-Id: I42e3e4fa2814ceef6ca29b70bfa19e7da7c01420

cc/x86_64_device.go

@@ -219,6 +219,10 @@ func (t *toolchainX86_64) ClangTriple() string {
 	return "${x86_64GccTriple}"
 }
 
+func (t *toolchainX86_64) ToolchainClangLdflags() string {
+	return "${x86_64ToolchainLdflags}"
+}
+
 func (t *toolchainX86_64) ToolchainClangCflags() string {
 	return t.toolchainClangCflags
 }

cc/x86_device.go

@@ -46,6 +46,15 @@ var (
 		"-fno-strict-aliasing",
 	}
 
+	x86ClangCflags = append(x86Cflags, []string{
+		"-msse3",
+
+		// -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.
+		"-mstackrealign",
+	}...)
+
 	x86Cppflags = []string{}
 
 	x86Ldflags = []string{
@@ -157,7 +166,7 @@ func init() {
 	}, " "))
 
 	// Clang cflags
-	pctx.StaticVariable("x86ClangCflags", strings.Join(clangFilterUnknownCflags(x86Cflags), " "))
+	pctx.StaticVariable("x86ClangCflags", strings.Join(clangFilterUnknownCflags(x86ClangCflags), " "))
 	pctx.StaticVariable("x86ClangLdflags", strings.Join(clangFilterUnknownCflags(x86Ldflags), " "))
 	pctx.StaticVariable("x86ClangCppflags", strings.Join(clangFilterUnknownCflags(x86Cppflags), " "))
 
@@ -217,7 +226,11 @@ func (t *toolchainX86) IncludeFlags() string {
 }
 
 func (t *toolchainX86) ClangTriple() string {
-	return "${x86GccTriple}"
+	return "i686-linux-android"
+}
+
+func (t *toolchainX86) ToolchainClangLdflags() string {
+	return "${x86ToolchainLdflags}"
 }
 
 func (t *toolchainX86) ToolchainClangCflags() string {