aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2009-01-26 15:52:55 +0000
committerNick Clifton <nickc@redhat.com>2009-01-26 15:52:55 +0000
commit2c2ce03fbdd1cfa56210d39289357472fcf8b07b (patch)
tree6b56741fa5efe2feae972537692eeec57c55b3bd /binutils
parent9bc4e62bdc0fdb16a98730b9bc038b2cea6b39e4 (diff)
downloadfsf-binutils-gdb-2c2ce03fbdd1cfa56210d39289357472fcf8b07b.zip
fsf-binutils-gdb-2c2ce03fbdd1cfa56210d39289357472fcf8b07b.tar.gz
fsf-binutils-gdb-2c2ce03fbdd1cfa56210d39289357472fcf8b07b.tar.bz2
PR 9766
* dlltool.c (xlate): When strip text after the @ sign, look for the last one not the first one.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/dlltool.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c549b9f..ececdb0 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 2c3aa6d..a24a552 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;