2006-03-09 Paul Brook <paul@codesourcery.com>

bfd/
	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional
	mapping symbols.
gas/testsuite/
	* gas/arm/nomapping.d: New test.
	* gas/arm/nomapping.s: New test.

bfd/ChangeLog

@@ -1,3 +1,8 @@
+2006-03-09  Paul Brook  <paul@codesourcery.com>
+
+	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Recognise additional
+	mapping symbols.
+
 2006-03-09  Khem Raj  <khem@mvista.com>
 
 	* elf32-arm.c(elf32_arm_finish_dynamic_sections): Use unsigned

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[1] == 'a') || (name[1] == 't') || (name[1] == 'd')
-    && (name[2] == 0);
+	|| (name[1] == 'm') || (name[1] == 'f') || (name[1] == 'p'))
+    && (name[2] == 0 || name[2] == '.');
 }
 

gas/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2006-03-09  Paul Brook  <paul@codesourcery.com>
+
+	* gas/arm/nomapping.d: New test.
+	* gas/arm/nomapping.s: New test.
+
 2006-03-07  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR binutils/2428

gas/testsuite/gas/arm/nomapping.d

@@ -0,0 +1,8 @@
+#nm: -n
+#name: ARM Mapping Symbols Ignored
+# This test is only valid on ELF based ports.
+#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix*
+
+# Check ARM ELF Mapping Symbols are ignored properly
+0+0 t sym1
+0+c t sym2

gas/testsuite/gas/arm/nomapping.s

@@ -0,0 +1,19 @@
+	.text
+	.arm
+sym1:
+	nop
+	.thumb
+	nop
+	nop
+$a.foo:
+$t.foo:
+$d.foo:
+@ Obsolete mapping symbols generated by armcc.
+$m:
+$m.foo:
+$f:
+$f.foo:
+$p:
+$p.foo:
+	.word 0
+sym2: