diff --git a/0101-Deactivate-markdown-doc.patch b/0101-Deactivate-markdown-doc.patch index 603cb39..cbf4580 100644 --- a/0101-Deactivate-markdown-doc.patch +++ b/0101-Deactivate-markdown-doc.patch @@ -1,26 +1,13 @@ -diff -Naur a/llvm/docs/conf.py b/llvm/docs/conf.py ---- a/llvm/docs/conf.py 2020-09-15 09:12:24.318287611 +0000 -+++ b/llvm/docs/conf.py 2020-09-15 15:01:00.025893199 +0000 -@@ -36,21 +36,7 @@ - ".rst": "restructuredtext", - } +diff --git a/llvm/docs/conf.py b/llvm/docs/conf.py +index cf8a75980b53..b208ad138e89 100644 +--- a/llvm/docs/conf.py ++++ b/llvm/docs/conf.py +@@ -26,7 +26,7 @@ from datetime import date --try: -- import recommonmark --except ImportError: -- # manpages do not use any .md sources -- if not tags.has("builder-man"): -- raise --else: -- import sphinx -- -- if sphinx.version_info >= (3, 0): -- # This requires 0.5 or later. -- extensions.append("recommonmark") -- else: -- source_parsers = {".md": "recommonmark.parser.CommonMarkParser"} -- source_suffix[".md"] = "markdown" -+import sphinx + # Add any Sphinx extension module names here, as strings. They can be extensions + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +-extensions = ["myst_parser", "sphinx.ext.intersphinx", "sphinx.ext.todo"] ++extensions = ["sphinx.ext.intersphinx", "sphinx.ext.todo"] - # The encoding of source files. - # source_encoding = 'utf-8-sig' + # Add any paths that contain templates here, relative to this directory. + templates_path = ["_templates"] diff --git a/D156379.diff b/D156379.diff deleted file mode 100644 index 6d7aef1..0000000 --- a/D156379.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp b/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp ---- a/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp -+++ b/llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp -@@ -1152,6 +1152,11 @@ - } - } - -+ // Type legalization (via getNumberOfParts) can't handle structs -+ if (TLI->getValueType(DL, Src, true) == MVT::Other) -+ return BaseT::getMemoryOpCost(Opcode, Src, Alignment, AddressSpace, -+ CostKind); -+ - unsigned NumOps = - (Src->isVectorTy() ? getNumVectorRegs(Src) : getNumberOfParts(Src)); - -diff --git a/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll b/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll -new file mode 100644 ---- /dev/null -+++ b/llvm/test/Analysis/CostModel/SystemZ/struct-cost-crash.ll -@@ -0,0 +1,25 @@ -+; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --version 2 -+; RUN: opt -passes="print" 2>&1 -disable-output < %s | FileCheck %s -+; -+; Check that SystemZTTIImpl::getMemoryOpCost doesn't try to legalize structs, -+; which was failing llvm_unreachable in MVT::getVT. -+ -+target datalayout = "E-m:e-i1:8:16-i8:8:16-i64:64-f128:64-v128:64-a:8:16-n32:64" -+target triple = "s390x-unknown-linux-gnu" -+ -+declare { i64, i32 } @bar() -+ -+define i8 @foo() { -+; CHECK-LABEL: 'foo' -+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: br label %1 -+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: %2 = call { i64, i32 } @bar() -+; CHECK-NEXT: Cost Model: Found an estimated cost of 4 for instruction: store { i64, i32 } %2, ptr inttoptr (i64 16 to ptr), align 16 -+; CHECK-NEXT: Cost Model: Found an estimated cost of 1 for instruction: br label %1 -+; -+ br label %1 -+ -+1: ; preds = %1, %0 -+ %2 = call { i64, i32 } @bar() -+ store { i64, i32 } %2, ptr inttoptr (i64 16 to ptr), align 16 -+ br label %1 -+} - diff --git a/llvm.spec b/llvm.spec index 19e4606..0de6e4d 100644 --- a/llvm.spec +++ b/llvm.spec @@ -34,10 +34,10 @@ %bcond_without lto_build %endif -%global maj_ver 17 -%global min_ver 0 -%global patch_ver 6 -#global rc_ver 4 +%global maj_ver 18 +%global min_ver 1 +%global patch_ver 0 +%global rc_ver 3 %if %{with snapshot_build} %undefine rc_ver @@ -93,7 +93,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}} -Release: 6%{?dist} +Release: 1%{?dist} Summary: The Low Level Virtual Machine License: Apache-2.0 WITH LLVM-exception OR NCSA @@ -113,10 +113,7 @@ Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve Source6: release-keys.asc %endif -# Backport of https://reviews.llvm.org/D156485 for rhbz#2262260. -Patch0: 0001-PEI-Don-t-zero-out-noreg-operands.patch - -# RHEL-specific patch to avoid unwanted recommonmark dep +# RHEL-specific patch to avoid unwanted python3-myst-parser dep Patch101: 0101-Deactivate-markdown-doc.patch BuildRequires: gcc @@ -130,7 +127,7 @@ BuildRequires: ncurses-devel BuildRequires: python3-psutil BuildRequires: python3-sphinx %if %{undefined rhel} -BuildRequires: python3-recommonmark +BuildRequires: python3-myst-parser %endif BuildRequires: multilib-rpm-config %if %{with gold} @@ -443,7 +440,6 @@ mkdir -p %{buildroot}%{pkg_datadir}/llvm/cmake cp -Rv ../cmake/* %{buildroot}%{pkg_datadir}/llvm/cmake %check - # non reproducible errors rm test/tools/dsymutil/X86/swift-interface.test @@ -519,7 +515,8 @@ fi %{_libdir}/bfd-plugins/LLVMgold.so %endif %endif -%{install_libdir}/libLLVM-%{maj_ver}.%{min_ver}*.so +%{install_libdir}/libLLVM-%{maj_ver}.so +%{install_libdir}/libLLVM.so.%{maj_ver}.%{min_ver} %{install_libdir}/libLTO.so* %{install_libdir}/libRemarks.so* %if %{with compat_build} @@ -576,6 +573,11 @@ fi %changelog +%{?llvm_snapshot_changelog_entry} + +* Tue Feb 20 2024 Tom Stellard - 18.1.0~rc3-1 +- 18.1.0-rc3 Release + * Thu Feb 01 2024 Nikita Popov - 17.0.6-6 - Fix crash with -fzero-call-used-regs (rhbz#2262260) @@ -588,8 +590,6 @@ fi * Sun Jan 21 2024 Fedora Release Engineering - 17.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -%{?llvm_snapshot_changelog_entry} - * Thu Nov 30 2023 Tulio Magno Quites Machado Filho - 17.0.6-2 - Fix rhbz #2248872 diff --git a/sources b/sources index f4607c7..44067ff 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (llvm-17.0.6.src.tar.xz) = bf9b04d0d45c67168b195c550cd8326e3a01176f92776705846aad3956a494bcb7a053b0b0bde19abd68dc0068e5c97ef99dee7eadfdb727bc0d758b2684f3bd -SHA512 (llvm-17.0.6.src.tar.xz.sig) = 904066c34ec0adf5b9e789af640329cadc7919b111aca77fa3ce26450696bace20e299e2592251f96ee33fb83da603423cc0ca63a67ad627916fcab0bed59689 -SHA512 (cmake-17.0.6.src.tar.xz) = b2c5e404ca36542d44e1a7f2801bbcecbcf5f1e8c63b793bb2308228483406bdfe002720aadb913c0228cd2bbe5998465eaadc4a49fad6a5eb6ff907fa5fd45a -SHA512 (cmake-17.0.6.src.tar.xz.sig) = fad2d91fc3e499dbd1b8c4acbc48ef748c106a04f7529232ea95abf3d006c4494e495643f77e653b1c96f7a0b79fe0706c5cdedd4f7dc4cbbab0ee5cf749c8ce -SHA512 (third-party-17.0.6.src.tar.xz) = 242dada4800c5e558f5f243e6aa0905d90ca3f82cc81baf14c60de543a7e737d4c2f3471122f2c641dc4f0724e4ebf5cf137761a231b34aab2a12f1cfc902c53 -SHA512 (third-party-17.0.6.src.tar.xz.sig) = 6b72379b70a359a77f4d7d0922b0e80ff2a44d65178389b25edbc4a72029a91d50b3eb39a1185fac50dbba0a1972572eaadc7d82bb8e87d26f4e42c2bf676b75 +SHA512 (cmake-18.1.0rc3.src.tar.xz) = 3fbc113ac92e3cb4154026c33bdeb70935bea86aab3ea5bc5ebd96dd5742dd913bbb518c0b759e5b1a38de3a53dcb7f39edda7696c505b21c7968b1f3599d0fe +SHA512 (cmake-18.1.0rc3.src.tar.xz.sig) = 1df268964a176b1d33294399ffc3ed4c6e008ba427f18a482b3d02c93b9205af0d20ceb7879ebfc070ed87b1b310d056a1ddf039c8336d9e9b5d35929b13c5ef +SHA512 (llvm-18.1.0rc3.src.tar.xz) = a46ec97113653ebd84d59791c2f590a415b7c3969a7303019a558b30d67e23f979444629a96f7a048427aaf5c5f2b8d44e614c5c2432805ad65e998496ab90c1 +SHA512 (llvm-18.1.0rc3.src.tar.xz.sig) = b777b3478bfd5372779e0fe7e1a09949e7c7e4277c9ea7e6831cd6cc35e4d9928685e8daf47d2f02e2ca5b8175bfedccd2faa5130b6503e42a5800083b9bdfcd +SHA512 (third-party-18.1.0rc3.src.tar.xz) = d7e80729e46a8e0ff6b73446b5140e730d46fe4750c12093f00ba750f001cc898762f6c0fe1e060a71a4b73844e4ecc1e64d7f5b3ec93cf35fce4176b8724983 +SHA512 (third-party-18.1.0rc3.src.tar.xz.sig) = 4cf5a0d6ccb846eee31fc8a54824aa2ce51e7b9c823386b1a78865c40d8dc8a5a1555285bb63512e8653b40f7482a394d34f6f5f20bd6fd353f3b876b804f6e8