proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 06:31:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ubuntu Wily is now showing i686 as version for i386, update the compiler-rt support

Browse Source
This commit is contained in:
Sylvestre Ledru 2015-10-12 14:31:23 +00:00
parent 0c1dd1c9b3
commit 3b143738ae
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
debian/patches/compiler-rt-i586.diff vendored
View File

@ -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.8~svn249990.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/compiler-rt/make/platform/clang_linux.mk
@@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa @@ -21,7 +21,7 @@ ifneq ($(findstring -linux-,$(CompilerTa
# Define configs only if arch in triple is i386 or x86_64 # Define configs only if arch in triple is i386 or x86_64
CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple))) CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
-ifeq ($(call contains,i386 x86_64,$(CompilerTargetArch)),true) -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 # TryCompile compiler source flags
# Returns exit code of running a compiler invocation. # 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 test_source = $(ProjSrcRoot)/make/platform/clang_linux_test_input.c
-ifeq ($(CompilerTargetArch),i386) -ifeq ($(CompilerTargetArch),i386)
+ifneq (,$(filter $(CompilerTargetArch),i386 i586)) +ifneq (,$(filter $(CompilerTargetArch),i386 i586 i686))
SupportedArches := i386 SupportedArches := i386
ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0) ifeq ($(call TryCompile,$(CC),$(test_source),-m64),0)
SupportedArches += x86_64 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.8~svn249990.orig/clang/runtime/compiler-rt/Makefile
+++ llvm-toolchain-snapshot_3.7~svn242297/clang/runtime/compiler-rt/Makefile +++ llvm-toolchain-snapshot-3.8~svn249990/clang/runtime/compiler-rt/Makefile
@@ -159,6 +159,7 @@ BuildRuntimeLibraries: @@ -161,6 +161,7 @@ BuildRuntimeLibraries:
ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \ ProjSrcRoot=$(COMPILERRT_SRC_ROOT) \
ProjObjRoot=$(PROJ_OBJ_DIR) \ ProjObjRoot=$(PROJ_OBJ_DIR) \
CC="$(ToolDir)/clang" \ CC="$(ToolDir)/clang" \