From: Alan Modra <amodra@gmail.com>
Date: Fri, 20 Feb 2015 04:53:28 +0000 (+1030)
Subject: Fix localplt test breakage with new readelf
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf161d39113047a81f969f277707b9d1679ecf69;p=thirdparty%2Fglibc.git

Fix localplt test breakage with new readelf

Since 2014-11-24 binutils git commit bb4d2ac2, readelf has appended
the symbol version to symbols shown in reloc dumps.

	[BZ #16512]
	* scripts/localplt.awk: Strip off symbol version.
	* NEWS: Mention bug fix.
---

diff --git a/ChangeLog b/ChangeLog
index 54ff9f8e17b..b31754382b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-03  Alan Modra  <amodra@gmail.com>
+
+	[BZ #16512]
+	* scripts/localplt.awk: Strip off symbol version.
+	* NEWS: Mention bug fix.
+
 2016-08-26  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #20432]
diff --git a/NEWS b/NEWS
index f6f868595b3..e0ed68d90f3 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,8 @@ Version 2.21.1
 
 * The following bugs are resolved with this release:
 
-  17090, 17269, 17620, 17621, 17628, 17905, 17949, 18007, 18032, 18080,
-  18240, 18287, 18508, 18694, 18887, 18985, 19048, 19682.
+  16512, 17090, 17269, 17620, 17621, 17628, 17905, 17949, 18007, 18032,
+  18080, 18240, 18287, 18508, 18694, 18887, 18985, 19048, 19682.
 
 * A stack-based buffer overflow was found in libresolv when invoked from
   libnss_dns, allowing specially crafted DNS responses to seize control
diff --git a/scripts/localplt.awk b/scripts/localplt.awk
index f55c41a0373..84c94d10241 100644
--- a/scripts/localplt.awk
+++ b/scripts/localplt.awk
@@ -35,11 +35,11 @@ in_relocs && relocs_offset == jmprel_offset && NF >= 5 {
   # Relocations against GNU_IFUNC symbols are not shown as an hexadecimal
   # value, but rather as the resolver symbol followed by ().
   if ($4 ~ /\(\)/) {
-    print whatfile, $5
+    print whatfile, gensub(/@.*/, "", "g", $5)
   } else {
     symval = strtonum("0x" $4);
     if (symval != 0)
-      print whatfile, $5
+      print whatfile, gensub(/@.*/, "", "g", $5)
   }
 }