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

rebase of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2016-12-15 17:48:44 +00:00
parent 274ff52b19
commit 47709a8d34
3 changed files with 142 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/fix-llvm-config-obj-src-root.patch vendored
View File

@ -2,9 +2,11 @@
tools/llvm-config/llvm-config.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tools/llvm-config/llvm-config.cpp
+++ b/tools/llvm-config/llvm-config.cpp
@@ -538,9 +538,9 @@ int main(int argc, char **argv) {
Index: llvm-toolchain-snapshot_4.0~svn289826/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/tools/llvm-config/llvm-config.cpp
+++ llvm-toolchain-snapshot_4.0~svn289826/tools/llvm-config/llvm-config.cpp
@@ -547,9 +547,9 @@ int main(int argc, char **argv) {
} else if (Arg == "--shared-mode") {
PrintSharedMode = true;
} else if (Arg == "--obj-root") {
@ -13,6 +15,6 @@
} else if (Arg == "--src-root") {
- OS << LLVM_SRC_ROOT << '\n';
+ OS << ActivePrefix << "/build/" << '\n';
} else if (Arg == "--link-shared") {
LinkMode = LinkModeShared;
} else if (Arg == "--link-static") {
} else if (Arg == "--ignore-libllvm") {
LinkDyLib = false;
LinkMode = BuiltSharedLibs ? LinkModeShared : LinkModeAuto;

13
debian/patches/silent-gold-test.diff vendored
View File

@ -12,16 +12,15 @@ Description: fails on debian unstable amd64
^
Index: llvm-toolchain-snapshot_4.0~svn279916/test/tools/gold/X86/start-lib-common.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/start-lib-common.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn279916.orig/test/tools/gold/X86/start-lib-common.ll
+++ llvm-toolchain-snapshot_4.0~svn279916/test/tools/gold/X86/start-lib-common.ll
@@ -8,7 +8,7 @@
; RUN: --plugin-opt=emit-llvm \
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/start-lib-common.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/start-lib-common.ll
@@ -9,6 +9,7 @@
; RUN: -shared %t1.o --start-lib %t2.o --end-lib -o %t3.o
; RUN: llvm-dis %t3.o -o - | FileCheck %s
-
+; XFAIL: *
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
@x = common global i32 0, align 4
; ToT gold (as of 03/2016) honors --start-lib/--end-lib, drops %t2.o and ends up

228
debian/patches/silent-gold-utils.diff vendored
View File

@ -15,8 +15,10 @@
test/tools/gold/X86/visibility.ll | 1 +
14 files changed, 19 insertions(+), 2 deletions(-)
--- a/test/tools/gold/X86/common_thinlto.ll
+++ b/test/tools/gold/X86/common_thinlto.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/common_thinlto.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/common_thinlto.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/common_thinlto.ll
@@ -17,6 +17,7 @@
; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM
@ -25,8 +27,10 @@
source_filename = "common1.c"
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
--- a/test/tools/gold/X86/emit-llvm.ll
+++ b/test/tools/gold/X86/emit-llvm.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/emit-llvm.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/emit-llvm.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/emit-llvm.ll
@@ -21,6 +21,8 @@
; RUN: not test -a %t4.o
@ -34,20 +38,24 @@
+; XFAIL: *
+
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
--- a/test/tools/gold/X86/parallel.ll
+++ b/test/tools/gold/X86/parallel.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/parallel.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/parallel.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/parallel.ll
@@ -5,6 +5,7 @@
; RUN: llvm-dis %t.1.5.precodegen.bc -o - | FileCheck --check-prefix=CHECK-BC1 %s
; RUN: llvm-nm %t.o0 | FileCheck --check-prefix=CHECK0 %s
; RUN: llvm-nm %t.o1 | FileCheck --check-prefix=CHECK1 %s
+; XFAIL: *
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
--- a/test/tools/gold/X86/pr19901_thinlto.ll
+++ b/test/tools/gold/X86/pr19901_thinlto.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/pr19901_thinlto.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/pr19901_thinlto.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/pr19901_thinlto.ll
@@ -4,6 +4,7 @@
; RUN: --plugin-opt=thinlto \
; RUN: -shared -m elf_x86_64 -o %t.so %t2.o %t.o
@ -56,94 +64,10 @@
; CHECK: Symbol {
; CHECK: Name: f
--- a/test/tools/gold/X86/slp-vectorize.ll
+++ b/test/tools/gold/X86/slp-vectorize.ll
@@ -7,6 +7,7 @@
; test that the vectorizer is run.
; CHECK: fadd <4 x float>
+; XFAIL: *
target triple = "x86_64-unknown-linux-gnu"
--- a/test/tools/gold/X86/strip_names.ll
+++ b/test/tools/gold/X86/strip_names.ll
@@ -23,6 +23,7 @@
; NONAME: %2 = load i32, i32* @GlobalValueName
; NONAME: %3 = add i32 %0, %2
; NONAME: ret i32 %3
+; XFAIL: *
@GlobalValueName = global i32 0
--- a/test/tools/gold/X86/thinlto.ll
+++ b/test/tools/gold/X86/thinlto.ll
@@ -115,6 +115,8 @@
; COMBINED-NEXT: <COMBINED_ENTRY abbrevid={{[0-9]+}} op0={{1|2}} op1={{-3706093650706652785|-5300342847281564238}}
; COMBINED-NEXT: </VALUE_SYMTAB
+; XFAIL: i686, i386
+
declare void @g(...)
define void @f() {
--- a/test/tools/gold/X86/thinlto_archive.ll
+++ b/test/tools/gold/X86/thinlto_archive.ll
@@ -14,6 +14,7 @@
; RUN: --plugin-opt=jobs=1 \
; RUN: -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
+; XFAIL: i686, i386
; CHECK-DAG: Import g
declare void @g(...)
--- a/test/tools/gold/X86/thinlto_internalize.ll
+++ b/test/tools/gold/X86/thinlto_internalize.ll
@@ -14,6 +14,8 @@
; h() should be internalized after promotion, and eliminated after inlining
; CHECK-NOT: @h.llvm.
+; XFAIL: i686, i386
+
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
call void @f()
--- a/test/tools/gold/X86/thinlto_linkonceresolution.ll
+++ b/test/tools/gold/X86/thinlto_linkonceresolution.ll
@@ -23,6 +23,8 @@
; OPT-NOT: @f()
; OPT2: define weak_odr hidden void @f()
+; XFAIL: i686, i386
+
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
call void @f()
--- a/test/tools/gold/X86/thinlto_weak_resolution.ll
+++ b/test/tools/gold/X86/thinlto_weak_resolution.ll
@@ -24,7 +24,8 @@
; OPT2-NOT: @
; RUN: llvm-dis %t.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT %s
-; RUN llvm-dis %t2.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT2 %s
+; RUN: llvm-dis %t2.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT2 %s
+; XFAIL: i686, i386
target triple = "x86_64-unknown-linux-gnu"
--- a/test/tools/gold/X86/type-merge2.ll
+++ b/test/tools/gold/X86/type-merge2.ll
@@ -4,7 +4,7 @@
; RUN: --plugin-opt=save-temps \
; RUN: -shared %t.o %t2.o -o %t3.o
; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
-
+; XFAIL: *
%zed = type { i8 }
define void @foo() {
call void @bar(%zed* null)
--- a/test/tools/gold/X86/vectorize.ll
+++ b/test/tools/gold/X86/vectorize.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/slp-vectorize.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/slp-vectorize.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/slp-vectorize.ll
@@ -7,6 +7,7 @@
; test that the vectorizer is run.
@ -152,8 +76,112 @@
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
--- a/test/tools/gold/X86/visibility.ll
+++ b/test/tools/gold/X86/visibility.ll
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/strip_names.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/strip_names.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/strip_names.ll
@@ -23,6 +23,7 @@
; NONAME: %2 = load i32, i32* @GlobalValueName
; NONAME: %3 = add i32 %0, %2
; NONAME: ret i32 %3
+; XFAIL: *
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/thinlto.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto.ll
@@ -117,6 +117,8 @@
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+; XFAIL: i686, i386
+
declare void @g(...)
define void @f() {
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_archive.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/thinlto_archive.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_archive.ll
@@ -14,6 +14,7 @@
; RUN: --plugin-opt=jobs=1 \
; RUN: -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s
; RUN: llvm-nm %t4 | FileCheck %s --check-prefix=NM
+; XFAIL: i686, i386
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_internalize.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/thinlto_internalize.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_internalize.ll
@@ -14,6 +14,8 @@
; h() should be internalized after promotion, and eliminated after inlining
; CHECK-NOT: @h.llvm.
+; XFAIL: i686, i386
+
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_linkonceresolution.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_linkonceresolution.ll
@@ -23,6 +23,8 @@
; OPT-NOT: @f()
; OPT2: define weak_odr hidden void @f()
+; XFAIL: i686, i386
+
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define i32 @g() {
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_weak_resolution.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/thinlto_weak_resolution.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/thinlto_weak_resolution.ll
@@ -24,7 +24,8 @@
; OPT2-NOT: @
; RUN: llvm-dis %t.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT %s
-; RUN llvm-dis %t2.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT2 %s
+; RUN: llvm-dis %t2.o.3.import.bc -o - | FileCheck --check-prefix=IMPORT2 %s
+; XFAIL: i686, i386
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/type-merge2.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/type-merge2.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/type-merge2.ll
@@ -5,6 +5,8 @@
; RUN: -shared %t.o %t2.o -o %t3.o
; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s
+; XFAIL: *
+
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
%zed = type { i8 }
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/vectorize.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/vectorize.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/vectorize.ll
@@ -7,6 +7,7 @@
; test that the vectorizer is run.
; CHECK: fadd <4 x float>
+; XFAIL: *
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Index: llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/visibility.ll
===================================================================
--- llvm-toolchain-snapshot_4.0~svn289826.orig/test/tools/gold/X86/visibility.ll
+++ llvm-toolchain-snapshot_4.0~svn289826/test/tools/gold/X86/visibility.ll
@@ -15,6 +15,7 @@
; CHECK-NEXT: Other [
; CHECK-NEXT: STV_PROTECTED