import UBI libomp-17.0.6-1.module+el8.10.0+20808+e12784c0

.gitignore

@@ -1 +1,2 @@
-SOURCES/openmp-7.0.1.src.tar.xz
+SOURCES/openmp-17.0.6.src.tar.xz
+SOURCES/openmp-17.0.6.src.tar.xz.sig

.libomp.metadata

@@ -1 +1,2 @@
-3b931dcafbe6e621c9d99617235fd63f222c2ba2 SOURCES/openmp-7.0.1.src.tar.xz
+d633a8e324689c7bf20528c99b3130ba1796fe1d SOURCES/openmp-17.0.6.src.tar.xz
+8354a371042267a121f2b4e27c03f74f9eeff994 SOURCES/openmp-17.0.6.src.tar.xz.sig

SOURCES/0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch

@@ -1,29 +0,0 @@
-From 156a23f5d91c35edd888091b3d6416b755fa134d Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Tue, 16 May 2017 11:52:19 -0400
-Subject: [PATCH] CMake: Make LIBOMP_HEADERS_INSTALL_PATH a cache variable when
- bulding standalone
-
-This way it can be overriden on the command line.
----
- runtime/src/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/runtime/src/CMakeLists.txt b/runtime/src/CMakeLists.txt
-index f9e63f4..2bf6796 100644
---- a/runtime/src/CMakeLists.txt
-+++ b/runtime/src/CMakeLists.txt
-@@ -282,8 +282,8 @@ add_dependencies(libomp-micro-tests libomp-test-deps)
- # Install rules
- # We want to install libomp in DESTDIR/CMAKE_INSTALL_PREFIX/lib
- # We want to install headers in DESTDIR/CMAKE_INSTALL_PREFIX/include
--if(${OPENMP_STANDALONE_BUILD})
--  set(LIBOMP_HEADERS_INSTALL_PATH include)
-+if(${OPENMP_STANDALONE_BUILD})
-+  set(LIBOMP_HEADERS_INSTALL_PATH include CACHE PATH "Install path for OpenMP headers")
- else()
-   string(REGEX MATCH "[0-9]+\\.[0-9]+(\\.[0-9]+)?" CLANG_VERSION ${PACKAGE_VERSION})
-   set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include")
--- 
-1.8.3.1
-

SOURCES/0001-Fix-for-https-bugs.llvm.org-show_bug.cgi-id-39970.patch

@@ -1,195 +0,0 @@
-From ce4337afad70fcf57f6b9afc84203497586f91b8 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Wed, 12 Dec 2018 10:12:57 -0800
-Subject: [PATCH] Fix for https://bugs.llvm.org/show_bug.cgi?id=39970
-
-Summary:
-Some tests require more than 1 thread to pass. The patch checks max threads, and if iti is 1 then sets number of threads to more than one.
-
-Exceptions:
-ompt/misc/api_calls_places.c - broke the standard requirement, fixed this;
-worksharing/for/omp_doacross.c - could not reproduce the failure, increased the number of threads just in case.
-
-Reviewers: jlpeyton, hbae, tlwilmar
-
-Subscribers: openmp-commits, tstellar
-
-Differential Revision: https://reviews.llvm.org/D55598
----
- runtime/test/api/omp_in_parallel.c                         | 5 +++++
- runtime/test/flush/omp_flush.c                             | 5 +++++
- runtime/test/ompt/misc/api_calls_places.c                  | 2 +-
- runtime/test/parallel/omp_nested.c                         | 2 ++
- runtime/test/tasking/omp_task.c                            | 3 +++
- runtime/test/tasking/omp_taskyield.c                       | 3 +++
- runtime/test/worksharing/for/kmp_sch_simd_runtime_api.c    | 3 ++-
- runtime/test/worksharing/for/kmp_sch_simd_runtime_guided.c | 3 ++-
- runtime/test/worksharing/for/kmp_sch_simd_runtime_static.c | 3 ++-
- runtime/test/worksharing/for/omp_doacross.c                | 2 ++
- 10 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/runtime/test/api/omp_in_parallel.c b/runtime/test/api/omp_in_parallel.c
-index d09313e..5e9e635 100644
---- a/runtime/test/api/omp_in_parallel.c
-+++ b/runtime/test/api/omp_in_parallel.c
-@@ -30,6 +30,11 @@ int main()
-   int i;
-   int num_failed=0;
- 
-+  // the test requires more than 1 thread to pass
-+  omp_set_dynamic(0); // disable dynamic adjustment of threads
-+  if (omp_get_max_threads() == 1)
-+    omp_set_num_threads(2); // set 2 threads if no HW resources available
-+
-   for(i = 0; i < REPETITIONS; i++) {
-     if(!test_omp_in_parallel()) {
-       num_failed++;
-diff --git a/runtime/test/flush/omp_flush.c b/runtime/test/flush/omp_flush.c
-index 3fd3cdf..95a406d 100644
---- a/runtime/test/flush/omp_flush.c
-+++ b/runtime/test/flush/omp_flush.c
-@@ -36,6 +36,11 @@ int main()
-   int i;
-   int num_failed=0;
- 
-+  // the test requires more than 1 thread to pass
-+  omp_set_dynamic(0); // disable dynamic adjustment of threads
-+  if (omp_get_max_threads() == 1)
-+    omp_set_num_threads(2); // set 2 threads if no HW resources available
-+
-   for (i = 0; i < REPETITIONS; i++) {
-     if(!test_omp_flush()) {
-       num_failed++;
-diff --git a/runtime/test/ompt/misc/api_calls_places.c b/runtime/test/ompt/misc/api_calls_places.c
-index ad338a7..3385c9c 100644
---- a/runtime/test/ompt/misc/api_calls_places.c
-+++ b/runtime/test/ompt/misc/api_calls_places.c
-@@ -42,7 +42,7 @@ int main() {
-     int omp_nums[omp_nums_size];
-     omp_get_partition_place_nums(omp_nums);
-     print_list("omp_get_partition_place_nums", omp_nums_size, omp_nums);
--    int ompt_nums_size = ompt_get_partition_place_nums(0, NULL);
-+    int ompt_nums_size = ompt_get_partition_place_nums(0, omp_nums);
-     int ompt_nums[ompt_nums_size];
-     ompt_get_partition_place_nums(ompt_nums_size, ompt_nums);
-     print_list("ompt_get_partition_place_nums", ompt_nums_size, ompt_nums);
-diff --git a/runtime/test/parallel/omp_nested.c b/runtime/test/parallel/omp_nested.c
-index 8b78088..d2d5b08 100644
---- a/runtime/test/parallel/omp_nested.c
-+++ b/runtime/test/parallel/omp_nested.c
-@@ -12,6 +12,8 @@ int test_omp_nested()
- #ifdef _OPENMP
-   if (omp_get_max_threads() > 4)
-     omp_set_num_threads(4);
-+  if (omp_get_max_threads() < 2)
-+    omp_set_num_threads(2);
- #endif
- 
-   int counter = 0;
-diff --git a/runtime/test/tasking/omp_task.c b/runtime/test/tasking/omp_task.c
-index c534abe..5703225 100644
---- a/runtime/test/tasking/omp_task.c
-+++ b/runtime/test/tasking/omp_task.c
-@@ -43,6 +43,9 @@ int main()
-   int i;
-   int num_failed=0;
- 
-+  if (omp_get_max_threads() < 2)
-+    omp_set_num_threads(8);
-+
-   for(i = 0; i < REPETITIONS; i++) {
-     if(!test_omp_task()) {
-       num_failed++;
-diff --git a/runtime/test/tasking/omp_taskyield.c b/runtime/test/tasking/omp_taskyield.c
-index 5bb6984..7f85413 100644
---- a/runtime/test/tasking/omp_taskyield.c
-+++ b/runtime/test/tasking/omp_taskyield.c
-@@ -49,6 +49,9 @@ int main()
-   int i;
-   int num_failed=0;
- 
-+  if (omp_get_max_threads() < 2)
-+    omp_set_num_threads(8);
-+
-   for(i = 0; i < REPETITIONS; i++) {
-     if(!test_omp_taskyield()) {
-       num_failed++;
-diff --git a/runtime/test/worksharing/for/kmp_sch_simd_runtime_api.c b/runtime/test/worksharing/for/kmp_sch_simd_runtime_api.c
-index bb538d1..987a5c0 100644
---- a/runtime/test/worksharing/for/kmp_sch_simd_runtime_api.c
-+++ b/runtime/test/worksharing/for/kmp_sch_simd_runtime_api.c
-@@ -66,6 +66,7 @@ run_loop(
-   int ub;   // Chunk upper bound.
-   int st;   // Chunk stride.
-   int rc;
-+  int nthreads = omp_get_num_threads();
-   int tid = omp_get_thread_num();
-   int gtid = __kmpc_global_thread_num(&loc);
-   int last;
-@@ -134,7 +135,7 @@ run_loop(
-         printf("Error with iter %d, %d, err %d\n", cur, max, ++err);
-       // Update maximum for the next chunk.
-       if (last) {
--        if (!no_chunk && cur > ch)
-+        if (!no_chunk && cur > ch && nthreads > 1)
-           printf("Error: too big last chunk %d (%d), tid %d, err %d\n",
-                  (int)cur, ch, tid, ++err);
-       } else {
-diff --git a/runtime/test/worksharing/for/kmp_sch_simd_runtime_guided.c b/runtime/test/worksharing/for/kmp_sch_simd_runtime_guided.c
-index d137831..5dfaf24 100644
---- a/runtime/test/worksharing/for/kmp_sch_simd_runtime_guided.c
-+++ b/runtime/test/worksharing/for/kmp_sch_simd_runtime_guided.c
-@@ -74,6 +74,7 @@ run_loop(
-   int ub;   // Chunk upper bound.
-   int st;   // Chunk stride.
-   int rc;
-+  int nthreads = omp_get_num_threads();
-   int tid = omp_get_thread_num();
-   int gtid = __kmpc_global_thread_num(&loc);
-   int last;
-@@ -144,7 +145,7 @@ run_loop(
-       if (!last && cur % ch)
-         printf("Error with chunk %d, %d, ch %d, tid %d, err %d\n",
-                chunk, (int)cur, ch, tid, ++err);
--      if (last && !no_chunk && cur > ch)
-+      if (last && !no_chunk && cur > ch && nthreads > 1)
-         printf("Error: too big last chunk %d (%d), tid %d, err %d\n",
-                (int)cur, ch, tid, ++err);
-       if (cur < max)
-diff --git a/runtime/test/worksharing/for/kmp_sch_simd_runtime_static.c b/runtime/test/worksharing/for/kmp_sch_simd_runtime_static.c
-index 4cb15d6..d76046b 100644
---- a/runtime/test/worksharing/for/kmp_sch_simd_runtime_static.c
-+++ b/runtime/test/worksharing/for/kmp_sch_simd_runtime_static.c
-@@ -67,6 +67,7 @@ run_loop(
-   int ub;   // Chunk upper bound.
-   int st;   // Chunk stride.
-   int rc;
-+  int nthreads = omp_get_num_threads();
-   int tid = omp_get_thread_num();
-   int gtid = __kmpc_global_thread_num(&loc);
-   int last;
-@@ -135,7 +136,7 @@ run_loop(
-         printf("Error with iter %d, %d, err %d\n", cur, max, ++err);
-       // Update maximum for the next chunk.
-       if (last) {
--        if (!no_chunk && cur > ch)
-+        if (!no_chunk && cur > ch && nthreads > 1)
-           printf("Error: too big last chunk %d (%d), tid %d, err %d\n",
-                  (int)cur, ch, tid, ++err);
-       } else {
-diff --git a/runtime/test/worksharing/for/omp_doacross.c b/runtime/test/worksharing/for/omp_doacross.c
-index 4187112..3644306 100644
---- a/runtime/test/worksharing/for/omp_doacross.c
-+++ b/runtime/test/worksharing/for/omp_doacross.c
-@@ -51,6 +51,8 @@ int test_doacross() {
- int main(int argc, char **argv) {
-   int i;
-   int num_failed = 0;
-+  if (omp_get_max_threads() < 2)
-+    omp_set_num_threads(4);
-   for (i = 0; i < REPETITIONS; i++) {
-     if (!test_doacross()) {
-       num_failed++;
--- 
-1.8.3.1
-

SOURCES/release-keys.asc

@@ -0,0 +1,104 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+9RmlwZlOTFGcWBYl/cfRONn9qi9a6w==
+=Lvw+
+-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=tMzl
+-----END PGP PUBLIC KEY BLOCK-----

SOURCES/runtest.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "usage: `basename $0` [OPTIONS]"
-    echo "  --threads NUM       The number of threads to use for running tests."
-}
-
-
-threads_arg=''
-
-while [ $# -gt 0 ]; do
-    case $1 in
-	--threads)
-            shift
-            threads_arg="--threads $1"
-            ;;
-        * )
-            echo "unknown option: $1"
-            echo ""
-            usage
-            exit 1
-            ;;
-    esac
-    shift
-done
-
-
-set -x
-
-lit $threads_arg -v --config-prefix clang /usr/share/libomp/src/runtime/test
-fail=$?
-lit $threads_arg -v --config-prefix gcc /usr/share/libomp/src/runtime/test
-exit $fail || $?

SPECS/libomp.spec

@@ -1,35 +1,73 @@
+%bcond_with snapshot_build
+
+%if %{with snapshot_build}
+# Unlock LLVM Snapshot LUA functions
+%{llvm_sb}
+%endif
+
+%global maj_ver 17
+%global libomp_version %{maj_ver}.0.6
+#global rc_ver 4
+%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
+%global so_suffix %{maj_ver}
+
+%if %{with snapshot_build}
+%undefine rc_ver
+%global maj_ver %{llvm_snapshot_version_major}
+%global libomp_version %{llvm_snapshot_version}
+%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
+%endif
+
+# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
+# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
+%undefine _include_frame_pointers
+
 %ifarch ppc64le
 %global libomp_arch ppc64
 %else
 %global libomp_arch %{_arch}
 %endif
 
-%ifnarch i686
-%global enable_test_pkg 1
-%endif
-
 Name: libomp
-Version: 7.0.1
+Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
 Release: 1%{?dist}
 Summary: OpenMP runtime for clang
 
 License: NCSA
-URL: http://openmp.llvm.org	
-Source0: http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz
-Source1: runtest.sh
-
-Patch0: 0001-CMake-Make-LIBOMP_HEADERS_INSTALL_PATH-a-cache-varia.patch
-Patch1: 0001-Fix-for-https-bugs.llvm.org-show_bug.cgi-id-39970.patch
+URL: http://openmp.llvm.org
+%if %{with snapshot_build}
+Source0: %{llvm_snapshot_source_prefix}openmp-%{llvm_snapshot_yyyymmdd}.src.tar.xz
+%{llvm_snapshot_extra_source_tags}
+%else
+Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz
+Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig
+Source2: release-keys.asc
+%endif
 
+BuildRequires: clang >= %{maj_ver}
+# For clang-offload-packager
+BuildRequires: clang-tools-extra
 BuildRequires: cmake
+BuildRequires: ninja-build
 BuildRequires: elfutils-libelf-devel
 BuildRequires: perl
 BuildRequires: perl-Data-Dumper
 BuildRequires: perl-Encode
 BuildRequires: libffi-devel
+# RHEL specific: libomp requires libterminfo
+BuildRequires: ncurses-devel
+
+# For gpg source verification
+BuildRequires:	gnupg2
+
+# libomptarget needs the llvm cmake files
+BuildRequires: llvm-devel
+BuildRequires: llvm-cmake-utils
 
 Requires: elfutils-libelf%{?isa}
 
+Obsoletes: libomp-test < 17.0.3
+
 # libomp does not support s390x.
 ExcludeArch: s390x
 
@@ -38,112 +76,166 @@ OpenMP runtime for clang.
 
 %package devel
 Summary: OpenMP header files
-Requires: clang-devel%{?isa} = %{version}
+Requires: %{name}%{?isa} = %{version}-%{release}
+Requires: clang-resource-filesystem%{?isa} = %{version}
 
 %description devel
 OpenMP header files.
 
-%if 0%{?enable_test_pkg}
-
-%package test
-Summary: OpenMP regression tests
-Requires: libomp%{?isa} = %{version}
-Requires: libomp-devel%{?isa} = %{version}
-Requires: clang
-Requires: llvm
-Requires: gcc
-Requires: gcc-c++
-Requires: python3-lit
-
-%description test
-OpenMP regression tests
-
-%endif
-
 %prep
-%autosetup -n openmp-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1
+%if %{without snapshot_build}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%endif
+%autosetup -n %{libomp_srcdir} -p2
 
 %build
-mkdir -p _build
-cd _build
+%undefine __cmake_in_source_build
 
-%cmake .. \
+# LTO causes build failures in this package.  Disable LTO for now
+# https://bugzilla.redhat.com/show_bug.cgi?id=1988155
+%define _lto_cflags %{nil}
+
+%cmake -GNinja \
 	-DLIBOMP_INSTALL_ALIASES=OFF \
-	-DLIBOMP_HEADERS_INSTALL_PATH:PATH=%{_libdir}/clang/%{version}/include \
+	-DCMAKE_MODULE_PATH=%{_datadir}/llvm/cmake/Modules \
+	-DLLVM_DIR=%{_libdir}/cmake/llvm \
+	-DCMAKE_INSTALL_INCLUDEDIR=%{_prefix}/lib/clang/%{maj_ver}/include \
 %if 0%{?__isa_bits} == 64
 	-DOPENMP_LIBDIR_SUFFIX=64 \
 %else
 	-DOPENMP_LIBDIR_SUFFIX= \
 %endif
+%if %{with snapshot_build}
+	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
+%endif
+	-DCMAKE_SKIP_RPATH:BOOL=ON
 
-%make_build
+%cmake_build
 
 
 %install
-%make_install -C _build
+%cmake_install
 
-%if 0%{?enable_test_pkg}
+# Remove static libraries with equivalent shared libraries
+rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 
-# Test package setup
-%global libomp_srcdir %{_datadir}/libomp/src/
-%global libomp_testdir %{libomp_srcdir}/runtime/test/
-%global gcc_lit_cfg %{buildroot}%{libomp_testdir}/gcc.site.cfg
-%global clang_lit_cfg %{buildroot}%{libomp_testdir}/clang.site.cfg
-
-install -d %{buildroot}%{libomp_srcdir}/runtime
-cp -R runtime/test  %{buildroot}%{libomp_srcdir}/runtime
-cp -R runtime/src  %{buildroot}%{libomp_srcdir}/runtime
-
-# Add symlinks to the libomp headers/library so gcc can find them.
-ln -s %{_libdir}/clang/%{version}/include/omp.h %{buildroot}%{libomp_testdir}/omp.h
-ln -s %{_libdir}/clang/%{version}/include/ompt.h %{buildroot}%{libomp_testdir}/ompt.h
-ln -s %{_libdir}/libomp.so %{buildroot}%{libomp_testdir}/libgomp.so
-
-# Generic test config
-echo "import tempfile" > %{gcc_lit_cfg}
-cat _build/runtime/test/lit.site.cfg >> %{gcc_lit_cfg}
-sed -i 's~\(config.test_filecheck = \)""~\1"%{_libdir}/llvm/FileCheck"~' %{gcc_lit_cfg}
-sed -i 's~\(config.omp_header_directory = \)"[^"]\+"~\1"%{_includedir}"~' %{gcc_lit_cfg}
-sed -i 's~\(config.libomp_obj_root = \)"[^"]\+"~\1tempfile.mkdtemp()[1]~' %{gcc_lit_cfg}
-sed -i 's~\(lit_config.load_config(config, \)"[^"]\+"~\1"%{libomp_testdir}/lit.cfg"~' %{gcc_lit_cfg}
-
-# GCC config
-# test_compiler_features was already populated with gcc information if gcc was used
-# to compile libomp.
-sed -i 's~\(config.test_c_compiler = \)"[^"]\+"~\1"%{_bindir}/gcc"~' %{gcc_lit_cfg}
-sed -i 's~\(config.test_cxx_compiler = \)"[^"]\+"~\1"%{_bindir}/g++"~' %{gcc_lit_cfg}
-sed -i 's~\(config.library_dir = \)"[^"]\+"~\1"%{libomp_testdir}"~' %{gcc_lit_cfg}
-
-# Clang config
-cp %{gcc_lit_cfg} %{clang_lit_cfg}
-sed -i 's~\(config.test_compiler_features = \)\[[^\[]\+]~\1["clang"]~' %{clang_lit_cfg}
-sed -i 's~\(config.test_c_compiler = \)"[^"]\+"~\1"%{_bindir}/clang"~' %{clang_lit_cfg}
-sed -i 's~\(config.test_cxx_compiler = \)"[^"]\+"~\1"%{_bindir}/clang++"~' %{clang_lit_cfg}
-sed -i 's~\(config.library_dir = \)"[^"]\+"~\1"%{_libdir}"~' %{clang_lit_cfg}
-
-install -m 0755 %{SOURCE1} %{buildroot}%{_datadir}/libomp
-
-%endif
+%check
+%cmake_build --target check-openmp || true
 
 %files
+%license LICENSE.TXT
 %{_libdir}/libomp.so
-%{_libdir}/libomptarget.so
-%ifnarch %{arm} %{ix86}
-%{_libdir}/libomptarget.rtl.%{libomp_arch}.so
+%{_libdir}/libompd.so
+%ifnarch %{arm}
+%{_libdir}/libarcher.so
+%endif
+%ifnarch %{ix86} %{arm}
+# libomptarget is not supported on 32-bit systems.
+%{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
+%{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
+%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix}
+%{_libdir}/libomptarget.so.%{so_suffix}
 %endif
 
 %files devel
-%{_libdir}/clang/%{version}/include/omp.h
+%{_prefix}/lib/clang/%{maj_ver}/include/omp.h
 %ifnarch %{arm}
-%{_libdir}/clang/%{version}/include/ompt.h
+%{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
+%{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
+%{_prefix}/lib/clang/%{maj_ver}/include/ompt-multiplex.h
 %endif
-
-%if 0%{?enable_test_pkg}
-%files test
-%{_datadir}/libomp
+%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
+%ifnarch %{ix86} %{arm}
+# libomptarget is not supported on 32-bit systems.
+%{_libdir}/libomptarget.rtl.amdgpu.so
+%{_libdir}/libomptarget.rtl.cuda.so
+%{_libdir}/libomptarget.rtl.%{libomp_arch}.so
+%{_libdir}/libomptarget.devicertl.a
+%{_libdir}/libomptarget-amdgpu-*.bc
+%{_libdir}/libomptarget-nvptx-*.bc
+%{_libdir}/libomptarget.so
 %endif
 
 %changelog
+* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
+- Update to LLVM 17.0.6
+
+* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
+- Update to LLVM 17.0.2
+
+* Sat Jul 15 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-3
+- Remove duplicated installed binaries
+
+* Wed Jul 05 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-2
+- Add explict libomp requres to libomp-devel
+
+* Fri Jun 23 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
+- 16.0.6 Release
+
+* Fri Apr 28 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-1
+- Release 16.0.0
+
+* Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
+- Update to LLVM 15.0.7
+
+* Tue Sep 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.0-1
+- Update to LLVM 15.0.0
+
+* Wed Aug 10 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-2
+- Drop -test sub-package on i686
+
+* Tue Jun 28 2022 Tom Stellard <tstellar@redhat.com> - 14.0.6-1
+- 14.0.6 Release
+
+* Wed May 18 2022 Timm Bäder <tbaeder@redhat.com> - 14.00-2
+- Backport 40d3a0ba4d9e5452c0a68cfdaa8e88eb8ed5c63d to
+  fix a strict aliasing issue.
+
+* Thu Apr 07 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.0-1
+- Update to 14.0.0
+
+* Thu Feb 03 2022 Tom Stellard <tstellar@redhat.com> - 13.0.1-1
+- 13.0.1 Release
+
+* Fri Oct 15 2021 Tom Stellard <tstellar@redhat.com> - 13.0.0-1
+- 13.0.0 Release
+
+* Fri Jul 16 2021 sguelton@redhat.com - 12.0.1-1
+- 12.0.1 release
+
+* Thu May 6 2021 sguelton@redhat.com - 12.0.0-1
+- 12.0.0 release
+
+* Thu Oct 29 2020 sguelton@redhat.com - 11.0.0-1
+- 11.0.0 final release
+
+* Mon Sep 21 2020 sguelton@redhat.com - 11.0.0-0.1.rc2
+- 11.0.0-rc2 Release
+
+* Fri Jul 24 2020 sguelton@redhat.com - 10.0.1-1
+- 10.0.1 final
+
+* Mon Jun 15 2020 sguelton@redhat.com - 10.0.0-2
+- Better dependency specification, see rhbz#1841180
+
+* Thu Apr 9 2020 sguelton@redhat.com - 10.0.0-1
+- 10.0.0 final
+
+* Thu Dec 19 2019 Tom Stellard <tstellar@redhat.com> - 9.0.1-1
+- 9.0.1 Release
+
+* Fri Sep 27 2019 Tom Stellard <tstellar@redhat.com> - 9.0.0-1
+- 9.0.0 Release
+
+* Thu Aug 1 2019 sguelton@redhat.com - 8.0.1-1
+- 8.0.1 release
+
+* Thu Jun 13 2019 sguelton@redhat.com - 8.0.1-0.1.rc2
+- 8.0.1rc2 Release
+
+* Mon Apr 29 2019 sguelton@redhat.com - 8.0.0-1
+- 8.0.0 Release
+
 * Fri Dec 14 2018 Tom Stellard <tstellar@redhat.com> - 7.0.1-1
 - 7.0.1 Release