diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-02-24 16:22:39 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-02-24 16:22:39 +0000 |
| commit | a0889a8c3299b1950e0a2dfa1d1656e5aa60f193 (patch) | |
| tree | e90054467035a26c97fdd104367e7d19584b08b5 /runtime | |
| parent | 0fd7f4db69ea75bde3d5fd7365165c6f43d78be5 (diff) | |
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
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/compiler-rt/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
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 |