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 c549b9f978ce46535647bd134362c0625932b538..ececdb058dd9e8aaf7b91abda4408a717129e2d3 100644 (file)
--- 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 2c3aa6dc2f1d477e2cbd16076cfb4179bada1183..a24a55255ff6ec496874f8ee1fe9db5933d5da51 100644 (file)
--- 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;