diff options
| author | Mark Wielaard <[email protected]> | 2018-07-04 00:31:46 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2018-07-04 00:31:46 +0200 |
| commit | 94c975eefdfbfa9319b7bab69600c76fe6be7910 (patch) | |
| tree | e29e208499440fdbaac2a867bcd7029f12e89a7a /libdw/dwarf_lowpc.c | |
| parent | 766df1e15c1e8f8bc9890e7538eb2ef15a6516dc (diff) | |
| parent | aa36de0335e3ce12898954985a208f6336731289 (diff) | |
Merge tag 'elfutils-0.173' into mjw/RH-DTSdts-0.173
elfutils 0.173 release
Removed riscv backend for now.
Removed new arm32 tests.
Added various new files to libdw_static_pic.a to support split dwarf.
Diffstat (limited to 'libdw/dwarf_lowpc.c')
| -rw-r--r-- | libdw/dwarf_lowpc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libdw/dwarf_lowpc.c b/libdw/dwarf_lowpc.c index b3be2b0e..4d743a72 100644 --- a/libdw/dwarf_lowpc.c +++ b/libdw/dwarf_lowpc.c @@ -1,7 +1,6 @@ /* Return low PC attribute of DIE. - Copyright (C) 2003, 2005 Red Hat, Inc. + Copyright (C) 2003, 2005, 2018 Red Hat, Inc. This file is part of elfutils. - Written by Ulrich Drepper <[email protected]>, 2003. This file is free software; you can redistribute it and/or modify it under the terms of either @@ -38,10 +37,12 @@ int dwarf_lowpc (Dwarf_Die *die, Dwarf_Addr *return_addr) { - Dwarf_Attribute attr_mem; - - return INTUSE(dwarf_formaddr) (INTUSE(dwarf_attr) (die, DW_AT_low_pc, - &attr_mem), - return_addr); + Dwarf_Attribute attr_mem, *attr; + /* Split compile DIEs inherit low_pc from their skeleton DIE. */ + if (is_cudie (die) && die->cu->unit_type == DW_UT_split_compile) + attr = INTUSE(dwarf_attr_integrate) (die, DW_AT_low_pc, &attr_mem); + else + attr = INTUSE(dwarf_attr) (die, DW_AT_low_pc, &attr_mem); + return INTUSE(dwarf_formaddr) (attr, return_addr); } INTDEF(dwarf_lowpc) |