rebase of the patches

This commit is contained in:
Sylvestre Ledru 2019-10-12 11:27:21 +02:00
parent 71f33d366c
commit 296b9e7654
2 changed files with 9 additions and 9 deletions

View File

@ -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

View File

@ -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: