From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sun, 12 Mar 2017 08:49:18 +0000 (+0000)
Subject: compiler-rt-i586
X-Git-Tag: archive/raspbian/1%3.8.1-18+rpi1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0c2ba15256dd2302c30d65aed887d5a6d1bdaee9;p=llvm-toolchain-3.8.git

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 55642a6f..b8a191b5 100644
--- 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 0a47ac7a..d64d4fc9 100644
--- 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