diff --git a/0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch b/0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch deleted file mode 100644 index 36f6a20..0000000 --- a/0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6dd25eb3ca3d8a6847fab029946d15f223b1a551 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Mon, 31 Jan 2022 10:33:27 +0100 -Subject: [PATCH] Disable CrashRecoveryTest.DumpStackCleanup test on aarch64 - -Produces a non-reproducible failure on aarch64: -https://bugzilla.redhat.com/show_bug.cgi?id=2048440 ---- - llvm/unittests/Support/CrashRecoveryTest.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/llvm/unittests/Support/CrashRecoveryTest.cpp b/llvm/unittests/Support/CrashRecoveryTest.cpp -index d942c9d..28efedd 100644 ---- a/llvm/unittests/Support/CrashRecoveryTest.cpp -+++ b/llvm/unittests/Support/CrashRecoveryTest.cpp -@@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) { - llvm::CrashRecoveryContext::Disable(); - } - -+#ifndef __aarch64__ - TEST(CrashRecoveryTest, DumpStackCleanup) { - SmallString<128> Filename; - std::error_code EC = sys::fs::createTemporaryFile("crash", "test", Filename); -@@ -101,6 +102,7 @@ TEST(CrashRecoveryTest, DumpStackCleanup) { - EXPECT_EQ(GlobalInt, 1); - llvm::CrashRecoveryContext::Disable(); - } -+#endif - - TEST(CrashRecoveryTest, LimitedStackTrace) { - // FIXME: Handle "Depth" parameter in PrintStackTrace() function --- -1.8.3.1 - diff --git a/llvm.spec b/llvm.spec index 9df5dde..2fde2bc 100644 --- a/llvm.spec +++ b/llvm.spec @@ -70,7 +70,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Low Level Virtual Machine License: NCSA @@ -86,7 +86,6 @@ Source5: run-lit-tests Source6: lit.fedora.cfg.py %endif -Patch1: 0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch Patch2: 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch # Needed to export clang-tblgen during the clang build, needed by the flang docs build. @@ -550,6 +549,9 @@ fi %endif %changelog +* Mon Dec 19 2022 Nikita Popov - 15.0.6-2 +- Remove workaround for rbhz#2048440 + * Mon Dec 05 2022 Nikita Popov - 15.0.6-1 - Update to LLVM 15.0.6