summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <drow@false.org>2006-04-11 15:54:53 +0000
committerDaniel Jacobowitz <drow@false.org>2006-04-11 15:54:53 +0000
commit149bc8fb26b9ddf918a95a700b2080e4e4d2177c (patch)
treefe178040076cc2eda089e2aa4125969d08b82f53
parent658a5be135fcce052b115ddb77000ae72a16462c (diff)
downloadbinutils-gdb-149bc8fb26b9ddf918a95a700b2080e4e4d2177c.tar.gz
Backport:
2006-03-09 Paul Brook <paul@codesourcery.com> * bfd/cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional mapping symbols.
-rw-r--r--ChangeLog.csl7
-rw-r--r--bfd/cpu-arm.c7
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index 0d1484b768e..482adb08632 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-04-11 Daniel Jacobowitz <dan@codesourcery.com>
+
+ Backport:
+ 2006-03-09 Paul Brook <paul@codesourcery.com>
+ * bfd/cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional
+ mapping symbols.
+
2006-04-02 Daniel Jacobowitz <dan@codesourcery.com>
* Makefile.def (host_modules, dependencies): Add expat.
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index 3f56e8f9a62..a28a1f9e8fc 100644
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -404,9 +404,12 @@ bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section)
bfd_boolean
bfd_is_arm_mapping_symbol_name (const char * name)
{
+ /* The ARM compiler outputs several obsolete forms. Recognize them
+ in addition to the standard $a, $t and $d. */
return (name != NULL)
&& (name[0] == '$')
- && ((name[1] == 'a') || (name[1] == 't') || (name[1] == 'd'))
- && (name[2] == 0);
+ && ((name[1] == 'a') || (name[1] == 't') || (name[1] == 'd')
+ || (name[1] == 'm') || (name[1] == 'f') || (name[1] == 'p'))
+ && (name[2] == 0 || name[2] == '.');
}