Use -no-integrated-as only on ARM. The X86 and X86-64 integrated as have been

the default for clang for some time now and can handle compiler-rt.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151367 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile
index a1a48a08c8946c222dd290ba3020713b4e390069..a1e6f090d52d3d0894a990027c7549522105d90d 100644 (file)
--- a/runtime/compiler-rt/Makefile
+++ b/runtime/compiler-rt/Makefile
@@ -29,7 +29,10 @@ PROJ_resources_lib := $(PROJ_resources)/lib
 COMPILERRT_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/compiler-rt
 
 # Additional flags to pass to Clang.
-CLANG_CCFLAGS := -no-integrated-as
+CLANG_CCFLAGS :=
+ifeq ($(ARCH), arm)
+CLANG_CCFLAGS += -no-integrated-as
+endif
 
 # We don't currently support building runtime libraries when we are
 # cross-compiling. The issue is that we really want to be set up so that the