From 7a0d2bce7fc861afa250012c4cd4f4da3a2f048a Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 28 Nov 2016 21:27:47 +0000
Subject: [PATCH] re PR target/74748 (libgcc_s.so.1 isn't created correctly for
 Blackfin FDPIC)

	PR gcc/74748
	* libgcc/mkmap-symver.awk: add support for skip_underscore

From-SVN: r242933
---
 libgcc/ChangeLog        | 5 +++++
 libgcc/mkmap-symver.awk | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index e65c71da3a4..41c52e77010 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-28  Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+	PR gcc/74748
+	* libgcc/mkmap-symver.awk: add support for skip_underscore
+
 2016-11-27  Iain Sandoe  <iain@codesourcery.com>
 	    Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk
index 266832ae41c..0a57d312533 100644
--- a/libgcc/mkmap-symver.awk
+++ b/libgcc/mkmap-symver.awk
@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") {
 
 state == "nm" && NF == 3 {
   split ($3, s, "@")
-  def[s[1]] = 1;
+  if (skip_underscore && substr(s[1], 1, 1) == "_")
+      symname = substr(s[1], 2);
+  else
+      symname = s[1];
+  def[symname] = 1;
   sawsymbol = 1;
   next;
 }
-- 
2.30.2