From bb5a83a8e3ae32c0e0d7f9184f504bd10adb1aff Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Dec 2018 07:49:48 +0100 Subject: [PATCH] remove patches applied upstream --- ...ild-if-status-bugs-is-passed-don-t-f.patch | 46 ----------------- debian/patches/mips-rdhwr.diff | 50 ------------------- debian/patches/series | 2 - debian/unpack.sh | 2 +- 4 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 debian/patches/0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch delete mode 100644 debian/patches/mips-rdhwr.diff diff --git a/debian/patches/0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch b/debian/patches/0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch deleted file mode 100644 index e8a65a55..00000000 --- a/debian/patches/0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 564f50e7536dab9dec5ed73f811b0b2d9d3aed14 Mon Sep 17 00:00:00 2001 -From: Roman Lebedev -Date: Wed, 26 Sep 2018 13:08:44 +0000 -Subject: [PATCH] [analyzer] scan-build: if --status-bugs is passed, don't - forget about the exit status of the actual build - -Summary: -This has been bothering me for a while, but only now i have actually looked into this. -I'm using one CI job for static analysis - clang static analyzers as compilers + clang-tidy via cmake. -And i'd like for the build to fail if at least one of those finds issues. -If clang-tidy finds issues, it will fail the build since the warnings-as-errors is set. -If static analyzer finds anything, since --status-bugs is set, it will fail the build. -But if clang-tidy find anything, but static analyzer does not, the build succeeds :/ - -Reviewers: sylvestre.ledru, alexfh, jroelofs, ygribov, george.karpenkov, krememek - -Reviewed By: jroelofs - -Subscribers: xazax.hun, szepet, a.sidorin, mikhail.ramalho, Szelethus, cfe-commits - -Differential Revision: https://reviews.llvm.org/D52530 - -git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@343105 91177308-0d34-0410-b5e6-96231b3b80d8 - -Index: llvm-toolchain-7-7/clang/tools/scan-build/bin/scan-build -=================================================================== ---- llvm-toolchain-7-7.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-7-7/clang/tools/scan-build/bin/scan-build -@@ -1192,7 +1192,7 @@ OPTIONS: - - By default, the exit status of scan-build is the same as the executed build - command. Specifying this option causes the exit status of scan-build to be 1 -- if it found potential bugs and 0 otherwise. -+ if it found potential bugs and the exit status of the build itself otherwise. - - --use-cc [compiler path] - --use-cc=[compiler path] -@@ -1878,7 +1878,7 @@ if (defined $Options{OutputFormat}) { - - if ($Options{ExitStatusFoundBugs}) { - exit 1 if ($NumBugs > 0); -- exit 0; -+ exit $ExitStatus; - } - } - } diff --git a/debian/patches/mips-rdhwr.diff b/debian/patches/mips-rdhwr.diff deleted file mode 100644 index f7eef110..00000000 --- a/debian/patches/mips-rdhwr.diff +++ /dev/null @@ -1,50 +0,0 @@ -Index: llvm-toolchain-7-7/lib/Target/Mips/Mips64InstrInfo.td -=================================================================== ---- llvm-toolchain-7-7.orig/lib/Target/Mips/Mips64InstrInfo.td -+++ llvm-toolchain-7-7/lib/Target/Mips/Mips64InstrInfo.td -@@ -1139,3 +1139,6 @@ def SLTUImm64 : MipsAsmPseudoInst<(outs - "sltu\t$rs, $rt, $imm">, GPR_64; - def : MipsInstAlias<"sltu\t$rs, $imm", (SLTUImm64 GPR64Opnd:$rs, GPR64Opnd:$rs, - imm64:$imm)>, GPR_64; -+ -+def : MipsInstAlias<"rdhwr $rt, $rs", -+ (RDHWR64 GPR64Opnd:$rt, HWRegsOpnd:$rs, 0), 1>, GPR_64; -Index: llvm-toolchain-7-7/test/CodeGen/Mips/tls.ll -=================================================================== ---- llvm-toolchain-7-7.orig/test/CodeGen/Mips/tls.ll -+++ llvm-toolchain-7-7/test/CodeGen/Mips/tls.ll -@@ -48,14 +48,14 @@ entry: - ; STATIC32-LABEL: f1: - ; STATIC32: lui $[[R0:[0-9]+]], %tprel_hi(t1) - ; STATIC32: addiu $[[R1:[0-9]+]], $[[R0]], %tprel_lo(t1) --; STATIC32: rdhwr $3, $29 -+; STATIC32: rdhwr $3, $29{{$}} - ; STATIC32: addu $[[R2:[0-9]+]], $3, $[[R1]] - ; STATIC32: lw $2, 0($[[R2]]) - - ; STATIC64-LABEL: f1: - ; STATIC64: lui $[[R0:[0-9]+]], %tprel_hi(t1) - ; STATIC64: daddiu $[[R1:[0-9]+]], $[[R0]], %tprel_lo(t1) --; STATIC64: rdhwr $3, $29, 0 -+; STATIC64: rdhwr $3, $29{{$}} - ; STATIC64: daddu $[[R2:[0-9]+]], $3, $[[R0]] - ; STATIC64: lw $2, 0($[[R2]]) - } -@@ -101,7 +101,7 @@ entry: - ; STATIC32-LABEL: f2: - ; STATIC32: lui $[[R0:[0-9]+]], %hi(__gnu_local_gp) - ; STATIC32: addiu $[[GP:[0-9]+]], $[[R0]], %lo(__gnu_local_gp) --; STATIC32: rdhwr $3, $29 -+; STATIC32: rdhwr $3, $29{{$}} - ; STATIC32: lw $[[R0:[0-9]+]], %gottprel(t2)($[[GP]]) - ; STATIC32: addu $[[R1:[0-9]+]], $3, $[[R0]] - ; STATIC32: lw $2, 0($[[R1]]) -@@ -109,7 +109,7 @@ entry: - ; STATIC64-LABEL: f2: - ; STATIC64: lui $[[R0:[0-9]+]], %hi(%neg(%gp_rel(f2))) - ; STATIC64: daddiu $[[GP:[0-9]+]], $[[R0]], %lo(%neg(%gp_rel(f2))) --; STATIC64: rdhwr $3, $29 -+; STATIC64: rdhwr $3, $29{{$}} - ; STATIC64: ld $[[R0:[0-9]+]], %gottprel(t2)($[[GP]]) - ; STATIC64: daddu $[[R1:[0-9]+]], $3, $[[R0]] - ; STATIC64: lw $2, 0($[[R1]]) diff --git a/debian/patches/series b/debian/patches/series index 64c921f6..d6c51b17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -76,7 +76,6 @@ D51108-rust-powerpc.diff disable-sse2-old-x86.diff scan-build-clang-X.diff -0001-analyzer-scan-build-if-status-bugs-is-passed-don-t-f.patch bootstrap-fix-include-next.diff bootstrap-with-openmp-version-export-missing.diff @@ -101,7 +100,6 @@ hurd-cxx-paths.diff D53557-hurd-self-exe-realpath.diff # mips -mips-rdhwr.diff strip-ignore-deterministic-archives.diff # powerpcspe diff --git a/debian/unpack.sh b/debian/unpack.sh index dc28ee56..0922c29a 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -4,7 +4,7 @@ MAJOR_VERSION=7.0.1 SVN_REV=`ls -1 *$MAJOR_VERSION*svn*bz2 | tail -1|perl -ne 'print "$1\n" if /svn(\d+)/;' | sort -ru` SVN_REV=347285 VERSION=svn$SVN_REV -#VERSION=+rc1 +VERSION=+rc3 tar jxvf llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig.tar.bz2 cd llvm-toolchain-7_$MAJOR_VERSION~$VERSION/ || ( echo "Bad SVN_REV:\"$SVN_REV\"" && exit 1 ) for f in ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-clang.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-clang-tools-extra.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-compiler-rt.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-lldb.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-polly.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-libcxxabi.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-libcxx.tar.bz2 ../llvm-toolchain-7_$MAJOR_VERSION~$VERSION.orig-openmp.tar.bz2; do