From: Alan Modra Date: Sat, 12 Aug 2017 06:57:29 +0000 (+0930) Subject: Collision between NT_GNU_BUILD_ATTRIBUTE_OPEN and NT_PPC_VMX X-Git-Tag: binutils-2_29_1~60 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=325696767d54f24172b46ab6e296f3abd458aa14;p=thirdparty%2Fbinutils-gdb.git Collision between NT_GNU_BUILD_ATTRIBUTE_OPEN and NT_PPC_VMX * readelf.c (process_note): Qualify NT_GNU_BUILD_ATTRIBUTE notes by name data. --- diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 35c9a61d053..7c9b86f950b 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2017-08-12 Alan Modra + + * readelf.c (process_note): Qualify NT_GNU_BUILD_ATTRIBUTE notes + by name data. + 2017-07-24 Tristan Gingold * configure: Regenerate. diff --git a/binutils/readelf.c b/binutils/readelf.c index b2f75c0048b..9bbfc957e4d 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -17465,8 +17465,11 @@ process_note (Elf_Internal_Note * pnote, printf (" "); - if (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN - || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC) + if (((const_strneq (pnote->namedata, "GA") + && strchr ("*$!+", pnote->namedata[2]) != NULL) + || strchr ("*$!+", pnote->namedata[0]) != NULL) + && (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN + || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC)) print_gnu_build_attribute_name (pnote); else print_symbol (-20, name); @@ -17484,8 +17487,11 @@ process_note (Elf_Internal_Note * pnote, return print_stapsdt_note (pnote); else if (const_strneq (pnote->namedata, "CORE")) return print_core_note (pnote); - else if (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN - || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC) + else if (((const_strneq (pnote->namedata, "GA") + && strchr ("*$!+", pnote->namedata[2]) != NULL) + || strchr ("*$!+", pnote->namedata[0]) != NULL) + && (pnote->type == NT_GNU_BUILD_ATTRIBUTE_OPEN + || pnote->type == NT_GNU_BUILD_ATTRIBUTE_FUNC)) return print_gnu_build_attribute_description (pnote, file); if (pnote->descsz)