* bfd/bfd-in.h (bfd_is_arm_mapping_symbol_name): Rename from

	bfd_elf32_is_arm_mapping_symbol_name.
	* bfd/bfd-in2.h: Regenerate.
	* bfd/cpu-arm.c (bfd_is_arm_mapping_symbol_name): Rename from
	bfd_elf32_is_arm_mapping_symbol_name.
	* bfd/elf32-arm.c (elf32_arm_is_target_special_symbol): Rename
	bfd_elf32_is_arm_mapping_symbol_name to bfd_is_arm_mapping_symbol_name.
	(arm_elf_find_function): Likewise.
	(elf32_arm_output_symbol_hook): Likewise.
	* gas/config/tc-arm.c (arm_adjust_symtab): Likewise.

7 files changed, 24 insertions, 7 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f4c20a6..2e89516 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,17 @@
 2005-03-30  Julian Brown  <julian@codesourcery.com>
 
+	* bfd-in.h (bfd_is_arm_mapping_symbol_name): Rename from
+	bfd_elf32_is_arm_mapping_symbol_name.
+	* bfd-in2.h: Regenerate.
+	* cpu-arm.c (bfd_is_arm_mapping_symbol_name): Rename from
+	bfd_elf32_is_arm_mapping_symbol_name.
+	* elf32-arm.c (elf32_arm_is_target_special_symbol): Rename
+	bfd_elf32_is_arm_mapping_symbol_name to bfd_is_arm_mapping_symbol_name.
+	(arm_elf_find_function): Likewise.
+	(elf32_arm_output_symbol_hook): Likewise.
+
+2005-03-30  Julian Brown  <julian@codesourcery.com>
+
 	* bfd-in.h (bfd_elf32_is_arm_mapping_symbol_name): Add prototype.
 	* bfd-in2.h: Regenerate.
 	* elf32-arm.c (elf32_arm_is_target_special_symbol): Rename call to
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 29c2780..a3dedb5 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -825,7 +825,7 @@ extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
   (bfd *, struct bfd_link_info *);
 
 /* ELF ARM mapping symbol support */
-extern bfd_boolean bfd_elf32_is_arm_mapping_symbol_name
+extern bfd_boolean bfd_is_arm_mapping_symbol_name
   (const char * name);
 
 /* ARM Note section processing.  */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 2d40f43..6266420 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -832,7 +832,7 @@ extern bfd_boolean bfd_elf32_arm_add_glue_sections_to_bfd
   (bfd *, struct bfd_link_info *);
 
 /* ELF ARM mapping symbol support */
-extern bfd_boolean bfd_elf32_is_arm_mapping_symbol_name
+extern bfd_boolean bfd_is_arm_mapping_symbol_name
   (const char * name);
 
 /* ARM Note section processing.  */
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
index cd09ed2..8cc52e5 100644
--- a/bfd/cpu-arm.c
+++ b/bfd/cpu-arm.c
@@ -402,7 +402,7 @@ bfd_arm_get_mach_from_notes (bfd *abfd, const char *note_section)
 }
 
 bfd_boolean
-bfd_elf32_is_arm_mapping_symbol_name (const char * name)
+bfd_is_arm_mapping_symbol_name (const char * name)
 {
   return (name != NULL)
     && (name[0] == '$')
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index fb46d7c..9245bd9 100644
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -4710,7 +4710,7 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
 static bfd_boolean
 elf32_arm_is_target_special_symbol (bfd * abfd ATTRIBUTE_UNUSED, asymbol * sym)
 {
-  return bfd_elf32_is_arm_mapping_symbol_name (sym->name);
+  return bfd_is_arm_mapping_symbol_name (sym->name);
 }
 
 /* This is a copy of elf_find_function() from elf.c except that
@@ -4748,7 +4748,7 @@ arm_elf_find_function (bfd *         abfd ATTRIBUTE_UNUSED,
 	case STT_NOTYPE:
 	  /* Skip $a and $t symbols.  */
 	  if ((q->symbol.flags & BSF_LOCAL)
-	      && bfd_elf32_is_arm_mapping_symbol_name (q->symbol.name))
+	      && bfd_is_arm_mapping_symbol_name (q->symbol.name))
 	    continue;
 	  /* Fall through.  */
 	  if (bfd_get_section (&q->symbol) == section
@@ -6077,7 +6077,7 @@ elf32_arm_output_symbol_hook (struct bfd_link_info *info,
     return TRUE;
 
   /* We only want mapping symbols.  */
-  if (! bfd_elf32_is_arm_mapping_symbol_name (name))
+  if (! bfd_is_arm_mapping_symbol_name (name))
     return TRUE;
 
   mapcount = ++(elf32_arm_section_data (input_sec)->mapcount);
diff --git a/gas/ChangeLog b/gas/ChangeLog
index e29a646..237da37 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,10 @@
 2005-03-30  Julian Brown  <julian@codesourcery.com>
 
+	* config/tc-arm.c (arm_adjust_symtab): Rename
+	bfd_elf32_is_arm_mapping_symbol_name to bfd_is_arm_mapping_symbol_name.
+
+2005-03-30  Julian Brown  <julian@codesourcery.com>
+
 	* config/tc-arm.c (mapping_state): Change documentation in function
 	comment to cross-reference spec instead. Change type of mapping symbols
 	to BSF_NO_TYPE.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 83b0b21..298468f 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -13669,7 +13669,7 @@ arm_adjust_symtab (void)
 	  elf_sym = elf_symbol (symbol_get_bfdsym (sym));
 	  bind = ELF_ST_BIND (elf_sym->internal_elf_sym.st_info);
 
-	  if (! bfd_elf32_is_arm_mapping_symbol_name (elf_sym->symbol.name))
+	  if (! bfd_is_arm_mapping_symbol_name (elf_sym->symbol.name))
 	    { 
 	      /* If it's a .thumb_func, declare it as so,
 		 otherwise tag label as .code 16.  */