From 21edec140263ec8b92b8fd11005d2d79fe8fc3d8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 21 Jan 2017 09:45:12 +0000 Subject: [PATCH] rebase of the patch --- debian/patches/silent-gold-utils.diff | 98 +++++++++++++-------------- 1 file changed, 48 insertions(+), 50 deletions(-) diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff index c56212c8..b3c78e49 100644 --- a/debian/patches/silent-gold-utils.diff +++ b/debian/patches/silent-gold-utils.diff @@ -15,10 +15,10 @@ test/tools/gold/X86/visibility.ll | 1 + 14 files changed, 19 insertions(+), 2 deletions(-) -Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/common_thinlto.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/common_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/common_thinlto.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/common_thinlto.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/common_thinlto.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/common_thinlto.ll @@ -17,6 +17,7 @@ ; RUN: llvm-nm %t3 | FileCheck %s --check-prefix=NM @@ -27,10 +27,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/common_thinlto. source_filename = "common1.c" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/emit-llvm.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/emit-llvm.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/emit-llvm.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/emit-llvm.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/emit-llvm.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/emit-llvm.ll @@ -21,6 +21,8 @@ ; RUN: not test -a %t4.o @@ -40,10 +40,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/emit-llvm.ll 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~svn290969/test/tools/gold/X86/parallel.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/parallel.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/parallel.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/parallel.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/parallel.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/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 @@ -52,10 +52,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/parallel.ll 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~svn290969/test/tools/gold/X86/pr19901_thinlto.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/pr19901_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/pr19901_thinlto.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/pr19901_thinlto.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/pr19901_thinlto.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/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 @@ -64,10 +64,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/pr19901_thinlto ; CHECK: Symbol { ; CHECK: Name: f -Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/slp-vectorize.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/slp-vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/slp-vectorize.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/slp-vectorize.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/slp-vectorize.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/slp-vectorize.ll @@ -7,6 +7,7 @@ ; test that the vectorizer is run. @@ -76,10 +76,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/slp-vectorize.l 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~svn290969/test/tools/gold/X86/strip_names.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/strip_names.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/strip_names.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/strip_names.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/strip_names.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/strip_names.ll @@ -25,6 +25,7 @@ ; NONAME: %2 = load i32, i32* @GlobalValueName ; NONAME: %3 = add i32 %0, %2 @@ -88,10 +88,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/strip_names.ll 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~svn290969/test/tools/gold/X86/thinlto.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/thinlto.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/thinlto.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto.ll @@ -125,6 +125,8 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" @@ -101,10 +101,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto.ll declare void @g(...) define void @f() { -Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_archive.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_archive.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/thinlto_archive.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_archive.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/thinlto_archive.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_archive.ll @@ -15,6 +15,7 @@ ; RUN: --plugin-opt=jobs=1 \ ; RUN: -shared %t.o %t.a -o %t4 2>&1 | FileCheck %s @@ -113,10 +113,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_archive 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~svn290969/test/tools/gold/X86/thinlto_internalize.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_internalize.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/thinlto_internalize.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_internalize.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/thinlto_internalize.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/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. @@ -126,10 +126,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_interna 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~svn290969/test/tools/gold/X86/thinlto_linkonceresolution.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_linkonceresolution.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_linkonceresolution.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_linkonceresolution.ll @@ -23,6 +23,8 @@ ; OPT-NOT: @f() ; OPT2: define weak_odr hidden void @f() @@ -139,24 +139,22 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/thinlto_linkonc 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~svn290969/test/tools/gold/X86/thinlto_weak_resolution.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_weak_resolution.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/thinlto_weak_resolution.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/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 +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/thinlto_weak_resolution.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/thinlto_weak_resolution.ll +@@ -9,6 +9,7 @@ + ; RUN: --plugin-opt=save-temps \ + ; RUN: -shared \ + ; RUN: -o %t3.o %t.o %t2.o +; 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~svn290969/test/tools/gold/X86/type-merge2.ll + ; RUN: llvm-nm %t3.o | FileCheck %s + ; CHECK: weakfunc +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/type-merge2.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/type-merge2.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/type-merge2.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/type-merge2.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/type-merge2.ll @@ -6,6 +6,8 @@ ; RUN: -shared %t.o %t2.o -o %t3.o ; RUN: llvm-dis %t3.o.0.2.internalize.bc -o - | FileCheck %s @@ -166,10 +164,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/type-merge2.ll 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~svn290969/test/tools/gold/X86/vectorize.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/vectorize.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/vectorize.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/vectorize.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/vectorize.ll @@ -7,6 +7,7 @@ ; test that the vectorizer is run. @@ -178,10 +176,10 @@ Index: llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/vectorize.ll 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~svn290969/test/tools/gold/X86/visibility.ll +Index: llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/visibility.ll =================================================================== ---- llvm-toolchain-snapshot_4.0~svn290969.orig/test/tools/gold/X86/visibility.ll -+++ llvm-toolchain-snapshot_4.0~svn290969/test/tools/gold/X86/visibility.ll +--- llvm-toolchain-snapshot_5.0~svn292714.orig/test/tools/gold/X86/visibility.ll ++++ llvm-toolchain-snapshot_5.0~svn292714/test/tools/gold/X86/visibility.ll @@ -16,6 +16,7 @@ ; CHECK-NEXT: Other [ ; CHECK-NEXT: STV_PROTECTED