From 296b9e7654fb6a42d0ea5160aee0e0d25c332ea6 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Sat, 12 Oct 2019 11:27:21 +0200
Subject: [PATCH] rebase of the patches

---
 debian/patches/openmp/openmp-mips-affinity.patch | 10 +++++-----
 debian/patches/test-keep-alive.diff              |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/openmp/openmp-mips-affinity.patch b/debian/patches/openmp/openmp-mips-affinity.patch
index b8785873..954712e5 100644
--- a/debian/patches/openmp/openmp-mips-affinity.patch
+++ b/debian/patches/openmp/openmp-mips-affinity.patch
@@ -1,8 +1,8 @@
-Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_affinity.h
+Index: llvm-toolchain-snapshot_10~svn374603/openmp/runtime/src/kmp_affinity.h
 ===================================================================
---- llvm-toolchain-snapshot_10~svn370025.orig/openmp/runtime/src/kmp_affinity.h
-+++ llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_affinity.h
-@@ -210,28 +210,29 @@ public:
+--- llvm-toolchain-snapshot_10~svn374603.orig/openmp/runtime/src/kmp_affinity.h
++++ llvm-toolchain-snapshot_10~svn374603/openmp/runtime/src/kmp_affinity.h
+@@ -211,28 +211,29 @@ public:
  #elif __NR_sched_getaffinity != 223
  #error Wrong code for getaffinity system call.
  #endif /* __NR_sched_getaffinity */
@@ -53,4 +53,4 @@ Index: llvm-toolchain-snapshot_10~svn370025/openmp/runtime/src/kmp_affinity.h
 +# else
  #error Unknown or unsupported architecture
  #endif /* KMP_ARCH_* */
- class KMPNativeAffinity : public KMPAffinity {
+ #elif KMP_OS_FREEBSD
diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff
index f22c66f7..8225f36e 100644
--- a/debian/patches/test-keep-alive.diff
+++ b/debian/patches/test-keep-alive.diff
@@ -1,14 +1,14 @@
-Index: llvm-toolchain-5.0-5.0.1~+rc1/utils/lit/lit/ProgressBar.py
+Index: llvm-toolchain-snapshot_10~svn374603/utils/lit/lit/ProgressBar.py
 ===================================================================
---- llvm-toolchain-5.0-5.0.1~+rc1.orig/utils/lit/lit/ProgressBar.py
-+++ llvm-toolchain-5.0-5.0.1~+rc1/utils/lit/lit/ProgressBar.py
+--- llvm-toolchain-snapshot_10~svn374603.orig/utils/lit/lit/ProgressBar.py
++++ llvm-toolchain-snapshot_10~svn374603/utils/lit/lit/ProgressBar.py
 @@ -189,15 +189,7 @@ class SimpleProgressBar:
              return
  
          for i in range(self.atIndex, next):
 -            idx = i % 5
 -            if idx == 0:
--                sys.stdout.write('%-2d' % (i*2))
+-                sys.stdout.write('%2d' % (i*2))
 -            elif idx == 1:
 -                pass # Skip second char
 -            elif idx < 4: