diff --git a/D145763.diff b/D145763.diff deleted file mode 100644 index 79de2d734796cd6c8a8cafc658c0df165abccb49..0000000000000000000000000000000000000000 --- a/D145763.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg ---- a/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg -+++ b/llvm/test/tools/llvm-exegesis/PowerPC/lit.local.cfg -@@ -1,3 +1,6 @@ - if not ('PowerPC' in config.root.targets): - # We need support for PowerPC. - config.unsupported = True -+elif not ('powerpc' in config.root.host_triple): -+ # We need to be running on an PPC host. -+ config.unsupported = True -diff --git a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg ---- a/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg -+++ b/llvm/test/tools/llvm-exegesis/X86/lit.local.cfg -@@ -1,3 +1,6 @@ - if not ('X86' in config.root.targets): - # We need support for X86. - config.unsupported = True -+elif not ('x86_64' in config.root.host_triple): -+ # We need to be running on an X86 host. -+ config.unsupported = True - diff --git a/cmake-16.0.1.src.tar.xz b/cmake-16.0.1.src.tar.xz deleted file mode 100644 index ee563132336eac9571bda9c89e77153ecee46e8c..0000000000000000000000000000000000000000 Binary files a/cmake-16.0.1.src.tar.xz and /dev/null differ diff --git a/cmake-16.0.4.src.tar.xz b/cmake-16.0.4.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..c0e494c5c1430fa8cbd077261c45fe56913ce39b Binary files /dev/null and b/cmake-16.0.4.src.tar.xz differ diff --git a/llvm-16.0.1.src.tar.xz b/llvm-16.0.4.src.tar.xz similarity index 80% rename from llvm-16.0.1.src.tar.xz rename to llvm-16.0.4.src.tar.xz index 6f61771312440e3416b9f3abe0fc0cd8d15d7364..630aa4a16a5e1a1e1090d9170b1fae18c428b254 100644 Binary files a/llvm-16.0.1.src.tar.xz and b/llvm-16.0.4.src.tar.xz differ diff --git a/llvm.spec b/llvm.spec index 34fb6912a3b67da864bcc8a1ef896f69a00788de..a5e9b00c15bf19d2ae41a48d70fd3ebf6f67b1a9 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 1 %global toolchain clang @@ -26,7 +26,7 @@ %global third_party_srcdir third-party-%{maj_ver}.%{min_ver}.%{patch_ver}.src %global cmake_srcdir cmake-%{maj_ver}.%{min_ver}.%{patch_ver}.src %global llvm_srcdir llvm-%{maj_ver}.%{min_ver}.%{patch_ver}.src -%global patch_ver 1 +%global patch_ver 4 %global min_ver 0 %global maj_ver 16 @@ -63,8 +63,6 @@ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve Source2: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}/%{cmake_srcdir}.tar.xz Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}/%{third_party_srcdir}.tar.xz -Patch0: D145763.diff - Patch2: 0001-llvm-Add-install-targets-for-gtest.patch Patch201: 0201-third-party-Add-install-targets-for-gtest.patch @@ -486,6 +484,9 @@ fi %endif %changelog +* Wed May 17 2023 Funda Wang - 16.0.4-1 +- New version 16.0.4 + * Thu Apr 13 2023 Zhongling - 16.0.1-3 - Refactor rpm spec diff --git a/third-party-16.0.1.src.tar.xz b/third-party-16.0.1.src.tar.xz deleted file mode 100644 index 837181c4c845519128438be7359d40fefe38c2d2..0000000000000000000000000000000000000000 Binary files a/third-party-16.0.1.src.tar.xz and /dev/null differ diff --git a/third-party-16.0.4.src.tar.xz b/third-party-16.0.4.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..2a86e33d84f082b94d14ce7916835ca4964caeb2 Binary files /dev/null and b/third-party-16.0.4.src.tar.xz differ