From 3b143738ae532f30e22e157ed5eb0d45a9512c5d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 12 Oct 2015 14:31:23 +0000 Subject: [PATCH] Ubuntu Wily is now showing i686 as version for i386, update the compiler-rt support --- debian/patches/compiler-rt-i586.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/compiler-rt-i586.diff b/debian/patches/compiler-rt-i586.diff index 79d782c5..d2c754a3 100644 --- a/debian/patches/compiler-rt-i586.diff +++ b/debian/patches/compiler-rt-i586.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_3.7~svn242297/compiler-rt/make/platform/clang_linux.mk +Index: llvm-toolchain-snapshot-3.8~svn249990/compiler-rt/make/platform/clang_linux.mk =================================================================== ---- llvm-toolchain-snapshot_3.7~svn242297.orig/compiler-rt/make/platform/clang_linux.mk -+++ llvm-toolchain-snapshot_3.7~svn242297/compiler-rt/make/platform/clang_linux.mk +--- llvm-toolchain-snapshot-3.8~svn249990.orig/compiler-rt/make/platform/clang_linux.mk ++++ llvm-toolchain-snapshot-3.8~svn249990/compiler-rt/make/platform/clang_linux.mk @@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa # 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,$(CompilerTargetArch)),true) ++ifeq ($(call contains,i386 x86_64 i586 i686,$(CompilerTargetArch)),true) # TryCompile compiler source flags # Returns exit code of running a compiler invocation. @@ -16,15 +16,15 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/compiler-rt/make/platform/clang_lin test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c -ifeq ($(CompilerTargetArch),i386) -+ifneq (,$(filter $(CompilerTargetArch),i386 i586)) ++ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686)) SupportedArches := i386 ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0) SupportedArches += x86_64 -Index: llvm-toolchain-snapshot_3.7~svn242297/clang/runtime/compiler-rt/Makefile +Index: llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile =================================================================== ---- llvm-toolchain-snapshot_3.7~svn242297.orig/clang/runtime/compiler-rt/Makefile -+++ llvm-toolchain-snapshot_3.7~svn242297/clang/runtime/compiler-rt/Makefile -@@ -159,6 +159,7 @@ BuildRuntimeLibraries: +--- llvm-toolchain-snapshot-3.8~svn249990.orig/clang/runtime/compiler-rt/Makefile ++++ llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile +@@ -161,6 +161,7 @@ BuildRuntimeLibraries: ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \ ProjObjRoot=$(PROJ_OBJ_DIR) \ CC="$(ToolDir)/clang" \