From eea6e989581e0336875e2f5a76dac5bc3cff50cb Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Wed, 15 Apr 2015 07:48:59 +0000
Subject: [PATCH] Ignore elfdump warnings in scripts/extract_symvers.pl

	* scripts/extract_symvers.pl: Ignore elfdump error output.

From-SVN: r222117
---
 libstdc++-v3/ChangeLog                  | 4 ++++
 libstdc++-v3/scripts/extract_symvers.pl | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 22b434ea5be..22113d597da 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-04-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* scripts/extract_symvers.pl: Ignore elfdump error output.
+
 2015-04-14  Marc Glisse  <marc.glisse@inria.fr>
 
 	PR libstdc++/61347
diff --git a/libstdc++-v3/scripts/extract_symvers.pl b/libstdc++-v3/scripts/extract_symvers.pl
index dadf1802ae1..9d8be3a2c7d 100644
--- a/libstdc++-v3/scripts/extract_symvers.pl
+++ b/libstdc++-v3/scripts/extract_symvers.pl
@@ -82,7 +82,10 @@ while (<PVS>) {
 close PVS or die "pvs error";
 
 # Only look at .dynsym table, like readelf in extract_symvers.
-open ELFDUMP, "/usr/ccs/bin/elfdump -s -N .dynsym $lib |" or die $!;
+# Ignore error output to avoid getting confused by
+# .gnu.version_r: zero sh_entsize information, expected 0x1
+# warning with Solaris 11 elfdump on gld-produced shared objects.
+open ELFDUMP, "/usr/ccs/bin/elfdump -s -N .dynsym $lib 2>/dev/null |" or die $!;
 while (<ELFDUMP>) {
     chomp;
 
-- 
2.30.2