From 212b606321592738fa63c2b70616932c50e00a6b Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Wed, 27 Jul 2011 16:40:59 +0000 Subject: [PATCH] binutils/ * dwarf.c (read_and_display_attr_value): Recognize DW_FORM_data4 and DW_FORM_data8 as location list pointers only for DWARF < 4. --- binutils/ChangeLog | 5 +++++ binutils/dwarf.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 44d41bf0042..e26bb64c61b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2011-07-27 Jan Kratochvil + + * dwarf.c (read_and_display_attr_value): Recognize DW_FORM_data4 and + DW_FORM_data8 as location list pointers only for DWARF < 4. + 2011-07-26 Jakub Jelinek * NEWS: Mention .debug_macro support. diff --git a/binutils/dwarf.c b/binutils/dwarf.c index ae1cd809dee..776f775421b 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -1485,8 +1485,8 @@ read_and_display_attr_value (unsigned long attribute, case DW_AT_GNU_call_site_data_value: case DW_AT_GNU_call_site_target: case DW_AT_GNU_call_site_target_clobbered: - if (form == DW_FORM_data4 - || form == DW_FORM_data8 + if ((dwarf_version < 4 + && (form == DW_FORM_data4 || form == DW_FORM_data8)) || form == DW_FORM_sec_offset) { /* Process location list. */ @@ -1516,8 +1516,8 @@ read_and_display_attr_value (unsigned long attribute, break; case DW_AT_ranges: - if (form == DW_FORM_data4 - || form == DW_FORM_data8 + if ((dwarf_version < 4 + && (form == DW_FORM_data4 || form == DW_FORM_data8)) || form == DW_FORM_sec_offset) { /* Process range list. */ @@ -1734,8 +1734,8 @@ read_and_display_attr_value (unsigned long attribute, case DW_AT_GNU_call_site_data_value: case DW_AT_GNU_call_site_target: case DW_AT_GNU_call_site_target_clobbered: - if (form == DW_FORM_data4 - || form == DW_FORM_data8 + if ((dwarf_version < 4 + && (form == DW_FORM_data4 || form == DW_FORM_data8)) || form == DW_FORM_sec_offset) printf (_("(location list)")); /* Fall through. */ -- 2.30.2