From 629b256d2a534ea48e17db16ca1cf7c51009a259 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 29 Jul 2012 14:05:20 +0200 Subject: [PATCH] readelf: Use DW_LANG_ObjC and known[op]. Not all patches from the dwarfstrings branch were applied, causing compile failures. --- src/ChangeLog | 5 +++++ src/readelf.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 78b9a0b67..aa7e2a5a8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-29 Mark Wielaard + + * readelf.c (dwarf_lang_string): Use DW_LANG_ObjC, not DW_LANG_Objc. + (print_ops): Use known[op], not op_name, for DW_OP_GNU_parameter_ref. + 2012-07-19 Mark Wielaard * readelf.c (print_ops): Handle DW_OP_GNU_parameter_ref. diff --git a/src/readelf.c b/src/readelf.c index 93f56c3b6..3a27f8f06 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -3683,7 +3683,7 @@ dwarf_lang_string (unsigned int lang) [DW_LANG_Ada95] = "Ada95", [DW_LANG_Fortran95] = "Fortran95", [DW_LANG_PL1] = "PL1", - [DW_LANG_Objc] = "Objective C", + [DW_LANG_ObjC] = "Objective C", [DW_LANG_ObjC_plus_plus] = "Objective C++", [DW_LANG_UPC] = "UPC", [DW_LANG_D] = "D", @@ -4408,7 +4408,7 @@ print_ops (Dwfl_Module *dwflmod, Dwarf *dbg, int indent, int indentrest, DW_TAG_formal_parameter. */ NEED (4); printf ("%*s[%4" PRIuMAX "] %s [%6" PRIxMAX "]\n", - indent, "", (uintmax_t) offset, op_name, + indent, "", (uintmax_t) offset, known[op], (uintmax_t) read_4ubyte_unaligned (dbg, data)); CONSUME (4); data += 4; -- 2.47.2