From a0889a8c3299b1950e0a2dfa1d1656e5aa60f193 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 24 Feb 2012 16:22:39 +0000 Subject: [PATCH] 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 --- runtime/compiler-rt/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index a1a48a08c8..a1e6f090d5 100644 --- 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 -- 2.50.1