From 483767a333faed7ac25783459c0c9b0be4800932 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sat, 12 Aug 2017 16:27:29 +0930 Subject: [PATCH] Collision between NT_GNU_BUILD_ATTRIBUTE_OPEN and NT_PPC_VMX * readelf.c (process_note): Qualify NT_GNU_BUILD_ATTRIBUTE notes by name data. --- binutils/ChangeLog | 5 +++++ binutils/readelf.c | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index fa2b3674f7d..1208754d593 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-08-08 Nick Clifton PR 21909 diff --git a/binutils/readelf.c b/binutils/readelf.c index 2b15f0f2cb2..0fc65625836 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -17477,8 +17477,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); @@ -17496,8 +17499,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) -- 2.30.2