summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2012-02-24 16:22:39 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2012-02-24 16:22:39 +0000
commit1a16f4985848c6ad8291883dfbe44cdb9be08b56 (patch)
treee7f014c4494a5cfcec45b9f4b9cd4d164c1b9e90 /clang
parent0f9c9a53327e8e68b5865c204b9fb20390a53f57 (diff)
downloadbcm5719-llvm-1a16f4985848c6ad8291883dfbe44cdb9be08b56.tar.gz
bcm5719-llvm-1a16f4985848c6ad8291883dfbe44cdb9be08b56.zip
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. llvm-svn: 151367
Diffstat (limited to 'clang')
-rw-r--r--clang/runtime/compiler-rt/Makefile5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile
index a1a48a08c89..a1e6f090d52 100644
--- a/clang/runtime/compiler-rt/Makefile
+++ b/clang/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
OpenPOWER on IntegriCloud