From 149bc8fb26b9ddf918a95a700b2080e4e4d2177c Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 11 Apr 2006 15:54:53 +0000 Subject: Backport: 2006-03-09 Paul Brook * bfd/cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional mapping symbols. --- ChangeLog.csl | 7 +++++++ bfd/cpu-arm.c | 7 +++++-- 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 + + Backport: + 2006-03-09 Paul Brook + * bfd/cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional + mapping symbols. + 2006-04-02 Daniel Jacobowitz * 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] == '.'); } -- cgit v1.2.1