From 353cec5eba93633652a7acff2ee2c5691e80e3a5 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Thu, 17 Jul 2014 23:11:30 +0000 Subject: [PATCH] [MCJIT] Fix the alignment requirements for ARM and AArch64 which were mistakenly relaxed in the big RuntimeDyldMachO cleanup of r213293. No test case yet - this was found via inspection and there's no easy way to test GOT alignment in RuntimeDyldChecker at the moment. I'm working on adding support for this now, and hope to have a test case for this soon. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@213331 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h | 2 +- lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h b/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h index c9fcedec50f..9f48e4439a5 100644 --- a/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h +++ b/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOAArch64.h @@ -24,7 +24,7 @@ public: unsigned getMaxStubSize() override { return 8; } - unsigned getStubAlignment() override { return 1; } + unsigned getStubAlignment() override { return 8; } relocation_iterator processRelocationRef(unsigned SectionID, relocation_iterator RelI, diff --git a/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h b/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h index 7e14992996a..1de99421982 100644 --- a/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h +++ b/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldMachOARM.h @@ -23,7 +23,7 @@ public: unsigned getMaxStubSize() override { return 8; } - unsigned getStubAlignment() override { return 1; } + unsigned getStubAlignment() override { return 4; } relocation_iterator processRelocationRef(unsigned SectionID, relocation_iterator RelI, -- 2.34.1