From: Nick Clifton <nickc@redhat.com>
Date: Mon, 26 Jan 2009 15:52:55 +0000 (+0000)
Subject:         PR 9766
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2c2ce03fbdd1cfa56210d39289357472fcf8b07b;p=binutils-gdb.git

    PR 9766
        * dlltool.c (xlate): When strip text after the @ sign, look for
        the last one not the first one.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c549b9f978c..ececdb058dd 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-26  Nick Clifton  <nickc@redhat.com>
+
+	PR 9766
+	* dlltool.c (xlate): When strip text after the @ sign, look for
+	the last one not the first one.
+
 2009-01-16  Alan Modra  <amodra@bigpond.net.au>
 
 	* configure.in (commonbfdlib): Delete.
diff --git a/binutils/dlltool.c b/binutils/dlltool.c
index 2c3aa6dc2f1..a24a55255ff 100644
--- a/binutils/dlltool.c
+++ b/binutils/dlltool.c
@@ -2131,8 +2131,9 @@ xlate (const char *name)
       char *p;
 
       name += lead_at;
-      p = strchr (name, '@');
-      if (p)
+      /* PR 9766: Look for the last @ sign in the name.  */
+      p = strrchr (name, '@');
+      if (p && ISDIGIT (p[1]))
 	*p = 0;
     }
   return name;