diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-11-28 23:40:21 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-11-28 23:44:16 -0600 |
| commit | 2ca2069f91c77a186e098c0ae391b379cab594cc (patch) | |
| tree | ccb7df3b200b4cfea490780974f6a736878ea4a0 /user/llvm14/macho32.patch | |
| parent | e78459be10169c4bd2499648a23e2935873a3e13 (diff) | |
| download | packages-2ca2069f91c77a186e098c0ae391b379cab594cc.tar.gz packages-2ca2069f91c77a186e098c0ae391b379cab594cc.tar.bz2 packages-2ca2069f91c77a186e098c0ae391b379cab594cc.tar.xz packages-2ca2069f91c77a186e098c0ae391b379cab594cc.zip | |
user/llvm14: Fix tests on 32-bit machines
* DWARF info patch fixes issue seen on ARMv7 and PPC.
* Dyld patch fixes OrcJIT on PPC (also needed for mesa).
* MachO fix is being sent upstream and affects all 32-bit CPUs.
* PPC test fix is already upstream, backported to 14 branch.
Fixes: #846
Diffstat (limited to 'user/llvm14/macho32.patch')
| -rw-r--r-- | user/llvm14/macho32.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/user/llvm14/macho32.patch b/user/llvm14/macho32.patch new file mode 100644 index 000000000..31279d502 --- /dev/null +++ b/user/llvm14/macho32.patch @@ -0,0 +1,17 @@ +Use integer offset math instead of pointer math to determine load +command bounds. + +Upstream-URL: https://github.com/llvm/llvm-project/issues/56746 + +--- llvm-14.0.6.src/lib/Object/MachOObjectFile.cpp.old 2022-06-22 16:46:24.000000000 +0000 ++++ llvm-14.0.6.src/lib/Object/MachOObjectFile.cpp 2022-11-28 04:21:02.730211841 +0000 +@@ -190,7 +190,8 @@ + getLoadCommandInfo(const MachOObjectFile &Obj, const char *Ptr, + uint32_t LoadCommandIndex) { + if (auto CmdOrErr = getStructOrErr<MachO::load_command>(Obj, Ptr)) { +- if (CmdOrErr->cmdsize + Ptr > Obj.getData().end()) ++ uint64_t Offset = Ptr - Obj.getData().begin(); ++ if (CmdOrErr->cmdsize + Offset > Obj.getData().size()) + return malformedError("load command " + Twine(LoadCommandIndex) + + " extends past end of file"); + if (CmdOrErr->cmdsize < 8) |