From 7257ece418469b284ae3cf1d9ba6617a62bdfc4f Mon Sep 17 00:00:00 2001 From: David Srbecky Date: Sat, 20 Jun 2015 05:01:22 +0100 Subject: [PATCH] Use signed encoding when using relative CFI addresses. This is required for gdb to work. libunwind works with either encoding. (cherry picked from commit 17065880693d1b15ffeb60b9955a2d092839977f) Bug: 21924613 Change-Id: I4e4f1cf9c65d48fa885a5993eeeed0253a3f2579 --- compiler/dwarf/headers.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/compiler/dwarf/headers.h b/compiler/dwarf/headers.h index ad315ee35..ae57755f4 100644 --- a/compiler/dwarf/headers.h +++ b/compiler/dwarf/headers.h @@ -54,9 +54,19 @@ void WriteDebugFrameCIE(bool is64bit, writer.PushUleb128(return_address_register.num()); // ubyte in DWARF2. writer.PushUleb128(1); // z: Augmentation data size. if (is64bit) { - writer.PushUint8(address_type | DW_EH_PE_udata8); // R: Pointer encoding. + if (address_type == DW_EH_PE_pcrel) { + writer.PushUint8(DW_EH_PE_pcrel | DW_EH_PE_sdata8); // R: Pointer encoding. + } else { + DCHECK(address_type == DW_EH_PE_absptr); + writer.PushUint8(DW_EH_PE_absptr | DW_EH_PE_udata8); // R: Pointer encoding. + } } else { - writer.PushUint8(address_type | DW_EH_PE_udata4); // R: Pointer encoding. + if (address_type == DW_EH_PE_pcrel) { + writer.PushUint8(DW_EH_PE_pcrel | DW_EH_PE_sdata4); // R: Pointer encoding. + } else { + DCHECK(address_type == DW_EH_PE_absptr); + writer.PushUint8(DW_EH_PE_absptr | DW_EH_PE_udata4); // R: Pointer encoding. + } } writer.PushData(opcodes.data()); writer.Pad(is64bit ? 8 : 4); -- 2.11.0