diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index e65c71da3a4c2..41c52e77010b6 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 266832ae41cae..0a57d31253304 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;
 }