diff --git a/0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch b/0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch index 389ffde..5b692f5 100644 --- a/0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch +++ b/0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch @@ -1,8 +1,8 @@ -From 9c27c5d86fc0bfc3e5e19b23343463a9b3b40b72 Mon Sep 17 00:00:00 2001 +From 79a99a76c0f63777ece3a636a733424e242041cb Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Tue, 27 Apr 2021 14:41:57 +0200 -Subject: [PATCH 1/3] [PATCH][llvm] Make source-interleave-prefix test case - compatible with llvm-test +Subject: [PATCH][llvm] Make source-interleave-prefix test case compatible with + llvm-test llvm-test runs test from a directory that's not the upstream one, and that leads to some false positive. Workaround this by forcing the current working @@ -25,5 +25,5 @@ index 746add22f96e..8b28b877e372 100644 ; CHECK-BROKEN-PREFIX: warning: '[[FILE]]': failed to find source [[PREFIX]][[COMPDIR]]{{[/\\]}}source-interleave-x86_64.c -- -2.31.1 +2.34.1 diff --git a/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch b/0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch similarity index 87% rename from 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch rename to 0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch index 1ddfb0c..ba2f75e 100644 --- a/0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch +++ b/0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch @@ -1,7 +1,7 @@ -From 3df079ae29426b4bee3ca11681a41958d72b983a Mon Sep 17 00:00:00 2001 +From 19d0e00380d7960acf2acf69986c4f66ab911553 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 +Subject: Disable CrashRecoveryTest.DumpStackCleanup test on aarch64 Produces a non-reproducible failure on aarch64: https://bugzilla.redhat.com/show_bug.cgi?id=2048440 @@ -16,7 +16,7 @@ index e95513eb2841..afb1d3a1f6a2 100644 @@ -76,6 +76,7 @@ TEST(CrashRecoveryTest, Cleanup) { llvm::CrashRecoveryContext::Disable(); } - + +#ifndef __aarch64__ TEST(CrashRecoveryTest, DumpStackCleanup) { SmallString<128> Filename; @@ -26,10 +26,9 @@ index e95513eb2841..afb1d3a1f6a2 100644 llvm::CrashRecoveryContext::Disable(); } +#endif - + TEST(CrashRecoveryTest, LimitedStackTrace) { std::string Res; --- +-- 2.34.1 - diff --git a/0002-PATCH-XFAIL-missing-abstract-variable.ll-test-on-ppc.patch b/0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch similarity index 78% rename from 0002-PATCH-XFAIL-missing-abstract-variable.ll-test-on-ppc.patch rename to 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch index 18d71e3..9d1507a 100644 --- a/0002-PATCH-XFAIL-missing-abstract-variable.ll-test-on-ppc.patch +++ b/0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch @@ -1,8 +1,7 @@ -From ba4abd3a8f7b10ce43dd40943f5efaebb9c0f5b8 Mon Sep 17 00:00:00 2001 +From ebf357018f390739a96abcd39aae5916844c2300 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 9 Nov 2021 15:05:07 +0100 -Subject: [PATCH 2/3] [PATCH] XFAIL missing-abstract-variable.ll test on - ppc64le +Subject: XFAIL missing-abstract-variable.ll test on ppc64le It's seems the strategy with this test is to XFAIL it on all architectures that it fails on. I wonder if we should be passing @@ -17,18 +16,18 @@ Differential Revision: https://reviews.llvm.org/D109806 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll -index 13fe09276534..53463505b521 100644 +index 8f8d404b0e56..07a8778d82a8 100644 --- a/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll +++ b/llvm/test/DebugInfo/Generic/missing-abstract-variable.ll @@ -4,7 +4,7 @@ ; powerpc64 (and on x86_64 at at least -O2). Presumably this is a SelectionDAG ; issue. ; FIXME: arm64 is an alias for aarch64 on macs, apparently? --; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv -+; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, ppc64le +-; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, sparc ++; XFAIL: powerpc64, aarch64, arm64, hexagon, riscv, sparc, ppc64le ; Build from the following source with clang -O2. -- -2.31.1 +2.34.1 diff --git a/llvm.spec b/llvm.spec index c7a9236..7e65a0b 100644 --- a/llvm.spec +++ b/llvm.spec @@ -102,9 +102,9 @@ Source3: run-lit-tests Source4: lit.fedora.cfg.py %endif -Patch1: 0002-PATCH-XFAIL-missing-abstract-variable.ll-test-on-ppc.patch -Patch2: 0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch -Patch3: 0001-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch +Patch1: 0001-PATCH-llvm-Make-source-interleave-prefix-test-case-c.patch +Patch2: 0002-Disable-CrashRecoveryTest.DumpStackCleanup-test-on-a.patch +Patch3: 0003-XFAIL-missing-abstract-variable.ll-test-on-ppc64le.patch BuildRequires: gcc BuildRequires: gcc-c++