From ed88e04306999218e49452a0b98021cde760d1ca Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Fri, 14 Feb 2020 09:43:22 +0000
Subject: [PATCH] 10.0.0 rc4

---
 .gitignore       |  6 ++++++
 99b03c1c18.patch | 39 +++++++++++++++++++++++++++++++++++++++
 libomp.spec      |  8 ++++++--
 sources          |  4 ++--
 4 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 99b03c1c18.patch

diff --git a/.gitignore b/.gitignore
index f010749..1a9b313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,9 @@
 /openmp-9.0.1.src.tar.xz
 /openmp-10.0.0rc1.src.tar.xz
 /openmp-10.0.0rc1.src.tar.xz.sig
+/openmp-10.0.0rc2.src.tar.xz
+/openmp-10.0.0rc2.src.tar.xz.sig
+/openmp-10.0.0rc3.src.tar.xz
+/openmp-10.0.0rc3.src.tar.xz.sig
+/openmp-10.0.0rc4.src.tar.xz
+/openmp-10.0.0rc4.src.tar.xz.sig
diff --git a/99b03c1c18.patch b/99b03c1c18.patch
new file mode 100644
index 0000000..2de5faf
--- /dev/null
+++ b/99b03c1c18.patch
@@ -0,0 +1,39 @@
+diff --git a/runtime/test/lit.cfg b/runtime/test/lit.cfg
+index 8ff668a..8e15a38 100644
+--- a/runtime/test/lit.cfg
++++ b/runtime/test/lit.cfg
+@@ -100,6 +100,13 @@ if config.operating_system == 'NetBSD':
+ if config.operating_system in ['Linux', 'Windows']:
+     config.available_features.add('affinity')
+ 
++import multiprocessing
++try:
++    if multiprocessing.cpu_count() > 1:
++        config.available_features.add('multicpu')
++except NotImplementedError:
++    pass
++
+ # to run with icc INTEL_LICENSE_FILE must be set
+ if 'INTEL_LICENSE_FILE' in os.environ:
+     config.environment['INTEL_LICENSE_FILE'] = os.environ['INTEL_LICENSE_FILE']
+diff --git a/runtime/test/ompt/teams/parallel_team.c b/runtime/test/ompt/teams/parallel_team.c
+index 15d9b6c..96ce0d5 100644
+--- a/runtime/test/ompt/teams/parallel_team.c
++++ b/runtime/test/ompt/teams/parallel_team.c
+@@ -1,5 +1,5 @@
+ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s
+-// REQUIRES: ompt
++// REQUIRES: ompt, multicpu
+ // UNSUPPORTED: gcc
+ #include "callback.h"
+ 
+diff --git a/runtime/test/ompt/teams/serial_teams.c b/runtime/test/ompt/teams/serial_teams.c
+index 64d0c89..abd3db5 100644
+--- a/runtime/test/ompt/teams/serial_teams.c
++++ b/runtime/test/ompt/teams/serial_teams.c
+@@ -1,5 +1,5 @@
+ // RUN: %libomp-compile-and-run | %sort-threads | FileCheck %s
+-// REQUIRES: ompt
++// REQUIRES: ompt, multicpu
+ // UNSUPPORTED: gcc
+ #include "callback.h"
diff --git a/libomp.spec b/libomp.spec
index d97cbe0..64fc1b5 100644
--- a/libomp.spec
+++ b/libomp.spec
@@ -1,5 +1,5 @@
-%global rc_ver 1
-%global baserelease 0.1
+%global rc_ver 4
+%global baserelease 0.2
 %global libomp_srcdir openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src
 
 
@@ -23,6 +23,7 @@ Source3: https://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver
 Source4: https://prereleases.llvm.org/%{version}/hans-gpg-key.asc
 
 Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch
+Patch1: 99b03c1c18.patch
 
 BuildRequires: cmake
 BuildRequires: elfutils-libelf-devel
@@ -131,6 +132,9 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libexecdir}/tests/libomp/
 
 %changelog
+* Sun Mar 15 2020 sguelton@redhat.com - 10.0.0-0.2.rc4
+- 10.0.0 rc4
+
 * Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1
 - 10.0.0 rc1
 
diff --git a/sources b/sources
index 70f94b9..c7cdd17 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openmp-10.0.0rc1.src.tar.xz) = c364e04354bb3ba429ae4a9628fe06f1451901c29581dd94e861bafb53570172ea4ba093594f5adccdc219dce2c7b6500f795766f4e63f158fa90ebaa4e32167
-SHA512 (openmp-10.0.0rc1.src.tar.xz.sig) = 5e9cd0a847d1c6c9f4055fa5c84b468bc42416e6697106de94384c10ec12bc34139363da1a7f03ac5c2c303dd7d8b09c383adbb541f190ceb36c13c54430e8af
+SHA512 (openmp-10.0.0rc4.src.tar.xz) = 8662ced531f22bd10f06ccb0f2221d173b02e367297b2d7e01faa1e387fb6467e37c50b9ac2630e07b7226509769331aa0aa8c1f4b19966db61ca0ea0e417b86
+SHA512 (openmp-10.0.0rc4.src.tar.xz.sig) = 407d05978be62e1b4e56a56208f78e1eb036e4e793f9f002fdaba21e9feac476f1ed0aa332b82f797cd6bfad8c5d8b1b64fa33776eb70de47c0416a0024d3b6a