From e81bc4ecf9c77fc67496d526e481f325d6419e14 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Wed, 23 Aug 2023 14:23:44 -0300 Subject: [PATCH] Update to LLVM 17.0.0 RC3 --- 0001-Fix-regression-of-D157680.patch | 32 ++++++++++++++++++++++++++++ 0001-Produce-DWARF4-by-default.patch | 4 ++-- clang.spec | 8 ++++++- sources | 8 +++---- 4 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 0001-Fix-regression-of-D157680.patch diff --git a/0001-Fix-regression-of-D157680.patch b/0001-Fix-regression-of-D157680.patch new file mode 100644 index 0000000..bfc96c9 --- /dev/null +++ b/0001-Fix-regression-of-D157680.patch @@ -0,0 +1,32 @@ +From b7cf9bbfde5e623e16fe8669e18aa34cbb3afafa Mon Sep 17 00:00:00 2001 +From: XinWang10 +Date: Fri, 18 Aug 2023 00:08:01 -0700 +Subject: [PATCH] Fix regression of D157680 + +Test cases in D157680 should be target specific, but miss some limit, add them back to make buildbot pass. + +Reviewed By: skan, Hahnfeld + +Differential Revision: https://reviews.llvm.org/D158252 +--- + +diff --git a/clang/test/Driver/x86-no-gather-no-scatter.cpp b/clang/test/Driver/x86-no-gather-no-scatter.cpp +index 7efcc55787c4..2e8f4615b846 100644 +--- a/clang/test/Driver/x86-no-gather-no-scatter.cpp ++++ b/clang/test/Driver/x86-no-gather-no-scatter.cpp +@@ -1,8 +1,8 @@ + /// Tests -mno-gather and -mno-scatter +-// RUN: %clang -c -mno-gather -### %s 2>&1 | FileCheck --check-prefix=NOGATHER %s +-// RUN: %clang_cl -c /Qgather- -### %s 2>&1 | FileCheck --check-prefix=NOGATHER %s ++// RUN: %clang -target x86_64-unknown-linux-gnu -c -mno-gather -### %s 2>&1 | FileCheck --check-prefix=NOGATHER %s ++// RUN: %clang_cl --target=x86_64-windows -c /Qgather- -### %s 2>&1 | FileCheck --check-prefix=NOGATHER %s + // NOGATHER: "-target-feature" "+prefer-no-gather" + +-// RUN: %clang -c -mno-scatter -### %s 2>&1 | FileCheck --check-prefix=NOSCATTER %s +-// RUN: %clang_cl -c /Qscatter- -### %s 2>&1 | FileCheck --check-prefix=NOSCATTER %s ++// RUN: %clang -target x86_64-unknown-linux-gnu -c -mno-scatter -### %s 2>&1 | FileCheck --check-prefix=NOSCATTER %s ++// RUN: %clang_cl --target=x86_64-windows -c /Qscatter- -### %s 2>&1 | FileCheck --check-prefix=NOSCATTER %s + // NOSCATTER: "-target-feature" "+prefer-no-scatter" +-- +2.41.0 + diff --git a/0001-Produce-DWARF4-by-default.patch b/0001-Produce-DWARF4-by-default.patch index 649a70e..9b5b46b 100644 --- a/0001-Produce-DWARF4-by-default.patch +++ b/0001-Produce-DWARF4-by-default.patch @@ -73,8 +73,8 @@ index 6d929b19e7e2..373905c2e0fc 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -569,7 +569,7 @@ - // RUN: %clang_cl -gdwarf /Z7 /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s - // Z7_gdwarf-NOT: "-gcodeview" + // RUN: %clang_cl /Z7 -gdwarf /c -### -- %s 2>&1 | FileCheck -check-prefix=Z7_gdwarf %s + // Z7_gdwarf: "-gcodeview" // Z7_gdwarf: "-debug-info-kind=constructor" -// Z7_gdwarf: "-dwarf-version= +// Z7_gdwarf: "-dwarf-version=4 diff --git a/clang.spec b/clang.spec index 4c9d217..9673a8f 100644 --- a/clang.spec +++ b/clang.spec @@ -16,7 +16,7 @@ %global maj_ver 17 %global min_ver 0 %global patch_ver 0 -%global rc_ver 2 +%global rc_ver 3 %if %{with snapshot_build} %undefine rc_ver @@ -85,6 +85,9 @@ Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch # Drop the following patch after debugedit adds support to DWARF-5: # https://sourceware.org/bugzilla/show_bug.cgi?id=28728 Patch4: 0001-Produce-DWARF4-by-default.patch +# Backport https://reviews.llvm.org/D158252 from LLVM 18 +Patch5: 0001-Fix-regression-of-D157680.patch + # RHEL specific patches # Avoid unwanted dependency on python-recommonmark @@ -635,6 +638,9 @@ false %changelog %{?llvm_snapshot_changelog_entry} +* Wed Aug 23 2023 Tulio Magno Quites Machado Filho - 17.0.0~rc3-1 +- Update to LLVM 17.0.0 RC3 + * Mon Aug 21 2023 Tulio Magno Quites Machado Filho - 17.0.0~rc2-1 - Update to LLVM 17.0.0 RC2 diff --git a/sources b/sources index 63028fc..707b717 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (clang-17.0.0rc2.src.tar.xz) = 47b2d25dd053b1e2336422cbda8429fb0a1bb0688cd8de2059304ea5224a6e1e8f80aa42baa45c44b3058a2a3b5dd5bb0179f4a2b8e6da3aaac5259dbcfee7b1 -SHA512 (clang-17.0.0rc2.src.tar.xz.sig) = 2f155b700acd79a49fcad28202f50b64d2083206d6bc1446ddf85ae17eb9f7ed3748239048a65af7be6cd646c89c904a5ae176b2ca1c879feb9acf9dde2380ef -SHA512 (clang-tools-extra-17.0.0rc2.src.tar.xz) = d3fe4f55020720a3373d48189c9cfe8972340bc56f4b51dc5eb5fc3111f841365e5ab0e0a61880e01a3c027cb52e888ab5d8de0b9775cb9d3c653c0066b3b009 -SHA512 (clang-tools-extra-17.0.0rc2.src.tar.xz.sig) = 5c060b843e3df9c75cce732a111b383c63199ddd61885fe411ed44f703b3533f55e22ccf044a1ac3e634f8b7153cbc794391f41d8e6796c691969018269a3df4 +SHA512 (clang-17.0.0rc3.src.tar.xz) = eb04e044f1fb4d10d6c46ead77bbb78b08a1d9a4144c4c24dd8fdaa634a493ead312d17ca8dfc1870673f80739204ec7ba2069f7704fc7ef37584b445a52097c +SHA512 (clang-17.0.0rc3.src.tar.xz.sig) = ed4c292e735c473908bdbe13dfa91a57ae8cf01759fb6c11be57c0b0661ea16df67fa29a4f51342ab6750a3e54191f96ea37b0e3b39a9854f60c72a4af652001 +SHA512 (clang-tools-extra-17.0.0rc3.src.tar.xz) = 3134d1ff29e900d2701d9cef388a4f04f65246a0366584666b8848c465b7e876eb607c6f0c3ab60067e73e9371aa9b73baf54d313642542acd78c6b8c1cd64a7 +SHA512 (clang-tools-extra-17.0.0rc3.src.tar.xz.sig) = 4ca473857bd00aba13015d35a776fb5b20848c79aa2e53e51a1f4c98eb088501dc87f4ae59b82e53ae9521c5ece4a92591ac8c14014d0a7af4e5cb8b355bf64f