From 44a0ad0a658e95c683427cdf4ef3ab604f12c8cf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 1 May 2019 14:29:37 +0200 Subject: [PATCH 1/2] rebase of the patches --- debian/patches/hurd/impl-path-hurd.diff | 10 +-- debian/patches/silent-amd-tet.diff | 8 +-- debian/patches/silent-gold-test.diff | 14 ++-- debian/patches/silent-gold-utils.diff | 86 ++++++++++++------------- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/debian/patches/hurd/impl-path-hurd.diff b/debian/patches/hurd/impl-path-hurd.diff index 43cc64b0..4dcb4427 100644 --- a/debian/patches/hurd/impl-path-hurd.diff +++ b/debian/patches/hurd/impl-path-hurd.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc +Index: llvm-toolchain-snapshot_9~svn359674/lib/Support/Unix/Path.inc =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/lib/Support/Unix/Path.inc -+++ llvm-toolchain-snapshot_9~svn358740/lib/Support/Unix/Path.inc -@@ -189,7 +189,7 @@ std::string getMainExecutable(const char - +--- llvm-toolchain-snapshot_9~svn359674.orig/lib/Support/Unix/Path.inc ++++ llvm-toolchain-snapshot_9~svn359674/lib/Support/Unix/Path.inc +@@ -202,7 +202,7 @@ std::string getMainExecutable(const char + // If we don't have procfs mounted, fall back to argv[0] if (getprogpath(exe_path, argv0) != NULL) return exe_path; -#elif defined(__linux__) || defined(__CYGWIN__) diff --git a/debian/patches/silent-amd-tet.diff b/debian/patches/silent-amd-tet.diff index d756561d..4c297862 100644 --- a/debian/patches/silent-amd-tet.diff +++ b/debian/patches/silent-amd-tet.diff @@ -1,10 +1,10 @@ -Index: llvm-toolchain-snapshot_8~svn347135/test/MC/AMDGPU/hsa.s +Index: llvm-toolchain-snapshot_9~svn359674/test/MC/AMDGPU/hsa.s =================================================================== ---- llvm-toolchain-snapshot_8~svn347135.orig/test/MC/AMDGPU/hsa.s -+++ llvm-toolchain-snapshot_8~svn347135/test/MC/AMDGPU/hsa.s +--- llvm-toolchain-snapshot_9~svn359674.orig/test/MC/AMDGPU/hsa.s ++++ llvm-toolchain-snapshot_9~svn359674/test/MC/AMDGPU/hsa.s @@ -1,5 +1,6 @@ // RUN: llvm-mc -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | FileCheck %s --check-prefix=ASM - // RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj -symbols -s -sd | FileCheck %s --check-prefix=ELF + // RUN: llvm-mc -filetype=obj -triple amdgcn--amdhsa -mcpu=kaveri -mattr=-code-object-v3 -show-encoding %s | llvm-readobj --symbols -S --sd | FileCheck %s --check-prefix=ELF +// XFAIL: * // ELF: Section { diff --git a/debian/patches/silent-gold-test.diff b/debian/patches/silent-gold-test.diff index 5cf60a2a..28561597 100644 --- a/debian/patches/silent-gold-test.diff +++ b/debian/patches/silent-gold-test.diff @@ -12,10 +12,10 @@ Description: fails on debian unstable amd64 ^ -Index: llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/start-lib-common.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/start-lib-common.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn323434.orig/test/tools/gold/X86/start-lib-common.ll -+++ llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/start-lib-common.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/start-lib-common.ll ++++ llvm-toolchain-snapshot_9~svn359674/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 @@ -24,14 +24,14 @@ Index: llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/start-lib-common. target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" @x = common global i32 0, align 4 -Index: llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/comdat.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/comdat.ll =================================================================== ---- llvm-toolchain-snapshot_7~svn323434.orig/test/tools/gold/X86/comdat.ll -+++ llvm-toolchain-snapshot_7~svn323434/test/tools/gold/X86/comdat.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/comdat.ll ++++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/comdat.ll @@ -5,6 +5,7 @@ ; RUN: -plugin-opt=save-temps ; RUN: FileCheck --check-prefix=RES %s < %t3.o.resolution.txt - ; RUN: llvm-readobj -t %t3.o | FileCheck --check-prefix=OBJ %s + ; RUN: llvm-readobj --symbols %t3.o | FileCheck --check-prefix=OBJ %s +; XFAIL: * target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/debian/patches/silent-gold-utils.diff b/debian/patches/silent-gold-utils.diff index 26cdc2f6..1cdcb769 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_8~svn349138/test/tools/gold/X86/common_thinlto.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/common_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/common_thinlto.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/common_thinlto.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/common_thinlto.ll ++++ llvm-toolchain-snapshot_9~svn359674/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_8~svn349138/test/tools/gold/X86/common_thinlto.ll source_filename = "common1.c" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" -Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/emit-llvm.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/emit-llvm.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/emit-llvm.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/emit-llvm.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/emit-llvm.ll ++++ llvm-toolchain-snapshot_9~svn359674/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_8~svn349138/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_8~svn349138/test/tools/gold/X86/parallel.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/parallel.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/parallel.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/parallel.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/parallel.ll ++++ llvm-toolchain-snapshot_9~svn359674/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.o | FileCheck --check-prefix=CHECK0 %s @@ -52,22 +52,22 @@ Index: llvm-toolchain-snapshot_8~svn349138/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_8~svn349138/test/tools/gold/X86/pr19901_thinlto.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/pr19901_thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/pr19901_thinlto.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/pr19901_thinlto.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/pr19901_thinlto.ll ++++ llvm-toolchain-snapshot_9~svn359674/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 - ; RUN: llvm-readobj -t %t.so | FileCheck %s + ; RUN: llvm-readobj --symbols %t.so | FileCheck %s +; XFAIL: i686, i386 ; CHECK: Symbol { ; CHECK: Name: f -Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/slp-vectorize.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/slp-vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/slp-vectorize.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/slp-vectorize.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/slp-vectorize.ll ++++ llvm-toolchain-snapshot_9~svn359674/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_8~svn349138/test/tools/gold/X86/slp-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_8~svn349138/test/tools/gold/X86/strip_names.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/strip_names.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/strip_names.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/strip_names.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/strip_names.ll ++++ llvm-toolchain-snapshot_9~svn359674/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_8~svn349138/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_8~svn349138/test/tools/gold/X86/thinlto.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto.ll ++++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto.ll @@ -141,6 +141,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_8~svn349138/test/tools/gold/X86/thinlto.ll declare void @g(...) define void @f() { -Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_archive.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_archive.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_archive.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_archive.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_archive.ll ++++ llvm-toolchain-snapshot_9~svn359674/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_8~svn349138/test/tools/gold/X86/thinlto_archive.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_8~svn349138/test/tools/gold/X86/thinlto_internalize.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_internalize.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_internalize.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_internalize.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_internalize.ll ++++ llvm-toolchain-snapshot_9~svn359674/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_8~svn349138/test/tools/gold/X86/thinlto_internali 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_8~svn349138/test/tools/gold/X86/thinlto_linkonceresolution.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_linkonceresolution.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_linkonceresolution.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_linkonceresolution.ll ++++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_linkonceresolution.ll @@ -23,6 +23,8 @@ ; OPT-NOT: @f() ; OPT2: define weak_odr hidden void @f() @@ -139,10 +139,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_linkoncer 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_8~svn349138/test/tools/gold/X86/thinlto_weak_resolution.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_weak_resolution.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/thinlto_weak_resolution.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_weak_resolution.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/thinlto_weak_resolution.ll ++++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/thinlto_weak_resolution.ll @@ -9,6 +9,7 @@ ; RUN: --plugin-opt=save-temps \ ; RUN: -shared \ @@ -151,10 +151,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/thinlto_weak_reso ; RUN: llvm-nm %t3.o | FileCheck %s ; CHECK: weakfunc -Index: llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/type-merge2.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/type-merge2.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/type-merge2.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/type-merge2.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/type-merge2.ll ++++ llvm-toolchain-snapshot_9~svn359674/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 @@ -164,10 +164,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/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_8~svn349138/test/tools/gold/X86/vectorize.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/vectorize.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/vectorize.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/vectorize.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/vectorize.ll ++++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/vectorize.ll @@ -7,6 +7,7 @@ ; test that the vectorizer is run. @@ -176,10 +176,10 @@ Index: llvm-toolchain-snapshot_8~svn349138/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_8~svn349138/test/tools/gold/X86/visibility.ll +Index: llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/visibility.ll =================================================================== ---- llvm-toolchain-snapshot_8~svn349138.orig/test/tools/gold/X86/visibility.ll -+++ llvm-toolchain-snapshot_8~svn349138/test/tools/gold/X86/visibility.ll +--- llvm-toolchain-snapshot_9~svn359674.orig/test/tools/gold/X86/visibility.ll ++++ llvm-toolchain-snapshot_9~svn359674/test/tools/gold/X86/visibility.ll @@ -16,6 +16,7 @@ ; CHECK-NEXT: Other [ ; CHECK-NEXT: STV_PROTECTED From 80db32058e1703c4e1152d30f095abf630988fa8 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 2 May 2019 08:56:35 +0200 Subject: [PATCH 2/2] refresh of the patches --- .../kfreebsd-libcxx-threads-detection.diff | 10 ++--- debian/patches/kfreebsd/kfreebsd-openmp.diff | 40 +++++++++---------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff index a0939398..9645ad38 100644 --- a/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff +++ b/debian/patches/kfreebsd/kfreebsd-libcxx-threads-detection.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-snapshot_9~svn358740/libcxx/include/__config +Index: llvm-toolchain-snapshot_9~svn359759/libcxx/include/__config =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/libcxx/include/__config -+++ llvm-toolchain-snapshot_9~svn358740/libcxx/include/__config -@@ -1155,6 +1155,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit +--- llvm-toolchain-snapshot_9~svn359759.orig/libcxx/include/__config ++++ llvm-toolchain-snapshot_9~svn359759/libcxx/include/__config +@@ -1132,6 +1132,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit !defined(_LIBCPP_HAS_THREAD_API_WIN32) && \ !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL) # if defined(__FreeBSD__) || \ + defined(__FreeBSD_kernel__) || \ defined(__Fuchsia__) || \ + defined(__wasi__) || \ defined(__NetBSD__) || \ - defined(__linux__) || \ diff --git a/debian/patches/kfreebsd/kfreebsd-openmp.diff b/debian/patches/kfreebsd/kfreebsd-openmp.diff index 0802800d..6946bb39 100644 --- a/debian/patches/kfreebsd/kfreebsd-openmp.diff +++ b/debian/patches/kfreebsd/kfreebsd-openmp.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp.h +Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp.h =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp.h -+++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp.h -@@ -1135,6 +1135,10 @@ extern kmp_uint64 __kmp_now_nsec(); +--- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp.h ++++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp.h +@@ -1177,6 +1177,10 @@ extern kmp_uint64 __kmp_now_nsec(); /* TODO: tune for KMP_OS_OPENBSD */ #define KMP_INIT_WAIT 1024U /* initial number of spin-tests */ #define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */ @@ -13,10 +13,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp.h #endif #if KMP_ARCH_X86 || KMP_ARCH_X86_64 -Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_ftn_entry.h +Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_ftn_entry.h =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp_ftn_entry.h -+++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_ftn_entry.h +--- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp_ftn_entry.h ++++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_ftn_entry.h @@ -535,7 +535,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_ int gtid; @@ -26,10 +26,10 @@ Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_ftn_entry.h gtid = __kmp_entry_gtid(); #elif KMP_OS_WINDOWS if (!__kmp_init_parallel || -Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_platform.h +Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_platform.h =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp_platform.h -+++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_platform.h +--- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp_platform.h ++++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_platform.h @@ -18,6 +18,7 @@ #define KMP_OS_LINUX 0 #define KMP_OS_DRAGONFLY 0 @@ -65,11 +65,11 @@ Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_platform.h #undef KMP_OS_UNIX #define KMP_OS_UNIX 1 #endif -Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_runtime.cpp +Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_runtime.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/kmp_runtime.cpp -+++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_runtime.cpp -@@ -8211,7 +8211,7 @@ __kmp_determine_reduction_method( +--- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/kmp_runtime.cpp ++++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/kmp_runtime.cpp +@@ -8228,7 +8228,7 @@ __kmp_determine_reduction_method( #if KMP_ARCH_X86_64 || KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 #if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \ @@ -78,19 +78,19 @@ Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/kmp_runtime.cpp int teamsize_cutoff = 4; -@@ -8239,7 +8239,7 @@ __kmp_determine_reduction_method( +@@ -8256,7 +8256,7 @@ __kmp_determine_reduction_method( #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS --#if KMP_OS_LINUX || KMP_OS_WINDOWS || KMP_OS_HURD -+#if KMP_OS_LINUX || KMP_OS_WINDOWS || KMP_OS_HURD || KMP_OS_KFREEBSD +-#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS || KMP_OS_HURD ++#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS || KMP_OS_HURD || KMP_OS_KFREEBSD // basic tuning -Index: llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/z_Linux_util.cpp +Index: llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/z_Linux_util.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn358740.orig/openmp/runtime/src/z_Linux_util.cpp -+++ llvm-toolchain-snapshot_9~svn358740/openmp/runtime/src/z_Linux_util.cpp +--- llvm-toolchain-snapshot_9~svn359759.orig/openmp/runtime/src/z_Linux_util.cpp ++++ llvm-toolchain-snapshot_9~svn359759/openmp/runtime/src/z_Linux_util.cpp @@ -447,7 +447,7 @@ void __kmp_terminate_thread(int gtid) { static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) { int stack_data;