Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
This addresses an issue that is triggered by Numba 0.57 - see
numba/numba#8738

Cherry-Picked-By: H. Vetinari <[email protected]>
  • Loading branch information
gmarkall authored and h-vetinari committed May 2, 2023
1 parent 391f974 commit 5eef016
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 3 deletions.
1 change: 1 addition & 0 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ source:
- patches/0001-pass-through-QEMU_LD_PREFIX-SDKROOT.patch
- patches/0002-Always-copy-on-windows.patch
- patches/0003-Fixes-vectorizer-and-extends-SVML-support.patch
- patches/0004-RuntimeDyld-RuntimeDyldELF-Clear-GOTOffsetMap-when-r.patch

build:
number: 2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From e1ad26b0a967a41b000373af7c25b5ab62b87d4d Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Tue, 4 Aug 2020 21:06:30 -0500
Subject: [PATCH 1/3] pass through QEMU_LD_PREFIX & SDKROOT
Subject: [PATCH 1/4] pass through QEMU_LD_PREFIX & SDKROOT

---
llvm/utils/lit/lit/TestingConfig.py | 2 +-
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0002-Always-copy-on-windows.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 3369987c6c4d085692e9a8de8df3e689ba0b453a Mon Sep 17 00:00:00 2001
From: Isuru Fernando <[email protected]>
Date: Tue, 8 Nov 2022 13:34:20 -0600
Subject: [PATCH 2/3] Always copy on windows
Subject: [PATCH 2/4] Always copy on windows

The conda package build machine may have permissions to
create symlinks, but conda doesn't handle symlinks on windows
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From be23454d9f55ad069d65aaf9d94c8816a544c5a0 Mon Sep 17 00:00:00 2001
From: Ivan Butygin <[email protected]>
Date: Sun, 24 Jul 2022 20:31:29 +0200
Subject: [PATCH 3/3] Fixes vectorizer and extends SVML support
Subject: [PATCH 3/4] Fixes vectorizer and extends SVML support

Patch was updated to fix SVML calling convention issues uncovered by llvm 10.
In previous versions of patch SVML calling convention was selected based on
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From 76ff6a6c9851c3ad20dc427d4b2eb684edf3c828 Mon Sep 17 00:00:00 2001
From: Graham Markall <[email protected]>
Date: Mon, 3 Apr 2023 11:15:36 -0700
Subject: [PATCH 4/4] [RuntimeDyld] RuntimeDyldELF: Clear GOTOffsetMap when
resetting GOT section.

When the GOT section ID is reset, the GOTOffsetMap must also be cleared,
otherwise spurious matches can be located when handling GOT relocations
in subsequently-linked objects.

Fixes Issue #61402 - see https://github.com/llvm/llvm-project/issues/61402.

Reviewed By: lhames

Differential Revision: https://reviews.llvm.org/D146938
---
llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp | 1 +
1 file changed, 1 insertion(+)

diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
index f92618afdf..eb3c27a940 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp
@@ -2345,6 +2345,7 @@ Error RuntimeDyldELF::finalizeLoad(const ObjectFile &Obj,
}
}

+ GOTOffsetMap.clear();
GOTSectionID = 0;
CurrentGOTIndex = 0;

0 comments on commit 5eef016

Please sign in to comment.