From 65c8f981317a27e69b3bfe111df5b723c231cce1 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Mar 14 2023 20:36:00 +0000 Subject: Revert "Add fix for test failures on AArch64/f38+rawhide" This reverts commit 04dd5d73da24e84027e3bfbf68599218f6ec6679. The patch was actually for llvm and not clang. --- 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/clang.spec b/clang.spec index 0ee15b1..9321cca 100644 --- a/clang.spec +++ b/clang.spec @@ -85,8 +85,6 @@ Patch2: 0003-PATCH-clang-Don-t-install-static-libraries.patch Patch3: 0001-Driver-Add-a-gcc-equivalent-triple-to-the-list-of-tr.patch Patch4: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch Patch5: 0001-Produce-DWARF4-by-default.patch -# https://reviews.llvm.org/D146067 -Patch6: 0001-JITLink-Add-missing-EHFrame-NULL-terminator-on-aarch.patch # Temporary patches to add back -fno-openmp-implicit-rpath until we can get the