From 4da55b8bb654f6d8dde5a544822311778a973de5 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Mar 2023 23:52:06 +0000 Subject: [PATCH] Revert "Add JITLink patch to fix clang failures on aarch64 with libgcc-13" This reverts commit 34236f71a58b01dde121dd94d0d8ec7d69e8d158. This patch has been committed upstream. --- ...ing-EHFrame-NULL-terminator-on-aarch.patch | 30 ------------------- llvm.spec | 3 -- 2 files changed, 33 deletions(-) delete mode 100644 0001-JITLink-Add-missing-EHFrame-NULL-terminator-on-aarch.patch diff --git a/0001-JITLink-Add-missing-EHFrame-NULL-terminator-on-aarch.patch b/0001-JITLink-Add-missing-EHFrame-NULL-terminator-on-aarch.patch deleted file mode 100644 index aa35075..0000000 --- a/0001-JITLink-Add-missing-EHFrame-NULL-terminator-on-aarch.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a95a465154273e59a32e406678ea0ebda6596fce Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Tue, 14 Mar 2023 13:11:52 -0400 -Subject: [PATCH] JITLink: Add missing EHFrame NULL terminator on aarch64/ELF - -This fixes test failures on AArch64 with libgcc-13: - -Clang :: Interpreter/global-dtor.cpp -Clang-Unit :: Interpreter/./ClangReplInterpreterTests/2/4 - -Differential Revision: https://reviews.llvm.org/D146067 ---- - llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp -index 5b9553ec8b11..3eb7e1bccde7 100644 ---- a/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp -+++ b/llvm/lib/ExecutionEngine/JITLink/ELF_aarch64.cpp -@@ -552,6 +552,7 @@ void link_ELF_aarch64(std::unique_ptr G, - Config.PrePrunePasses.push_back(EHFrameEdgeFixer( - ".eh_frame", 8, aarch64::Pointer32, aarch64::Pointer64, - aarch64::Delta32, aarch64::Delta64, aarch64::NegDelta32)); -+ Config.PrePrunePasses.push_back(EHFrameNullTerminator(".eh_frame")); - - // Add a mark-live pass. - if (auto MarkLive = Ctx->getMarkLivePass(TT)) --- -2.31.1 - diff --git a/llvm.spec b/llvm.spec index 8963803..6de759f 100644 --- a/llvm.spec +++ b/llvm.spec @@ -128,9 +128,6 @@ Source6: release-keys.asc # RHEL-specific patch to avoid unwanted python3-myst-parser dep Patch101: 0101-Deactivate-markdown-doc.patch -# https://reviews.llvm.org/D146067 -Patch0: 0001-JITLink-Add-missing-EHFrame-NULL-terminator-on-aarch.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: clang