compiler-rt-i586

===================================================================

Gbp-Pq: Name compiler-rt-i586.diff

diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile
index 55642a6f0cc53f18984500ab275a177f636abef5..b8a191b5b53a9346952ebba4fb001b79036500e7 100644 (file)
--- a/clang/runtime/compiler-rt/Makefile
+++ b/clang/runtime/compiler-rt/Makefile
@@ -161,6 +161,7 @@ BuildRuntimeLibraries:
          ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
          ProjObjRoot=$(PROJ_OBJ_DIR) \
          CC="$(ToolDir)/clang" \
+         LD_LIBRARY_PATH=../build-llvm/Release/lib \
          VERBOSE=$(VERBOSE) \
          $(RuntimeDirs:%=clang_%)
 .PHONY: BuildRuntimeLibraries

diff --git a/compiler-rt/make/platform/clang_linux.mk b/compiler-rt/make/platform/clang_linux.mk
index 0a47ac7a24a96814d9949f93c93c850d57b2372e..d64d4fc9747d53600226f05a0cd6e7357181d291 100644 (file)
--- a/compiler-rt/make/platform/clang_linux.mk
+++ b/compiler-rt/make/platform/clang_linux.mk
@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTargetTriple)),)
 
 # Define configs only if arch in triple is i386 or x86_64
 CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
-ifeq ($(call contains,i386 x86_64,$(CompilerTargetArch)),true)
+ifeq ($(call contains,i386 x86_64 i586 i686,$(CompilerTargetArch)),true)
 
 # TryCompile compiler source flags
 # Returns exit code of running a compiler invocation.
@@ -35,7 +35,7 @@ TryCompile = \
     echo $$?)
 
 test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c
-ifeq ($(CompilerTargetArch),i386)
+ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686))
   SupportedArches := i386
   ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
     SupportedArches += x86_64