diff options
| author | Bill Wendling <isanbard@gmail.com> | 2010-02-16 00:58:02 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2010-02-16 00:58:02 +0000 |
| commit | 89ee706b6b64aaef7227e2e232b4de9c473632a2 (patch) | |
| tree | 5d41f2381d1a1ddd2030afe0f055e66506c0e80b | |
| parent | 2e2b4382426f3c918bf8f6d5a417884058b4375e (diff) | |
| download | external_llvm-89ee706b6b64aaef7227e2e232b4de9c473632a2.zip external_llvm-89ee706b6b64aaef7227e2e232b4de9c473632a2.tar.gz external_llvm-89ee706b6b64aaef7227e2e232b4de9c473632a2.tar.bz2 | |
Apply patch from http://llvm.org/bugs/attachment.cgi?id=4136 now that PR5004 is
finished.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@96304 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp b/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp index c1051a9..946351b 100644 --- a/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp +++ b/lib/ExecutionEngine/JIT/JITDwarfEmitter.cpp @@ -522,7 +522,11 @@ JITDwarfEmitter::EmitCommonEHFrame(const Function* Personality) const { JCE->emitInt64(((intptr_t)Jit.getPointerToGlobal(Personality))); } - JCE->emitULEB128Bytes(dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4); + // LSDA encoding: This must match the encoding used in EmitEHFrame () + if (PointerSize == 4) + JCE->emitULEB128Bytes(dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4); + else + JCE->emitULEB128Bytes(dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata8); JCE->emitULEB128Bytes(dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4); } else { JCE->emitULEB128Bytes(1); |