commit 43d5e1bbc494e62d0d31097fe400f4aaed4f56f1
author Tim Murray <timmurray@google.com> Thu Apr 03 16:06:59 2014 -0700
committer Tim Murray <timmurray@google.com> Thu Apr 24 13:14:32 2014 -0700
tree 74ea141726e0f4fd12dcda0e48ca66be4d93983b
parent 847fd0311f6c82b8ac90d970cfc68aafd9913471

Build changes necessary for LLVM 3.5 switch.

Change-Id: Icb6065daada7cb1d7425206830a4ef9e23454c03

Conflicts:
	core/clang/arm.mk

core/clang/x86_common.mk

diff --git a/core/clang/x86_common.mk b/core/clang/x86_common.mk
index aaee62e..0bb565f 100644
--- a/core/clang/x86_common.mk
+++ b/core/clang/x86_common.mk
@@ -3,13 +3,14 @@
 endif
 
 ifeq ($(HOST_OS),linux)
-
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
   --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
-  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot
+  --sysroot=$(HOST_TOOLCHAIN_FOR_CLANG)/sysroot \
+  -no-integrated-as
 
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
   --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
+  -no-integrated-as
 
 ifneq ($(strip $(BUILD_HOST_64bit)),)
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \
@@ -18,6 +19,7 @@
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \
+  -no-integrated-as
 
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
   --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
@@ -25,7 +27,8 @@
   -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
   -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \
   -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6 \
-  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/
+  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib64/ \
+  -no-integrated-as
 else
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS :=   \
   --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
@@ -33,6 +36,7 @@
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6 \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/x86_64-linux/32 \
   -isystem $(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/include/c++/4.6/backward \
+  -no-integrated-as
 
 CLANG_CONFIG_x86_LINUX_HOST_EXTRA_LDFLAGS := \
   --gcc-toolchain=$(HOST_TOOLCHAIN_FOR_CLANG) \
@@ -40,7 +44,8 @@
   -B$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/bin \
   -B$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \
   -L$(HOST_TOOLCHAIN_FOR_CLANG)/lib/gcc/x86_64-linux/4.6/32 \
-  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/
+  -L$(HOST_TOOLCHAIN_FOR_CLANG)/x86_64-linux/lib32/ \
+  -no-integrated-as
 endif
 endif