Removed leading underscore.....

[deliverable/binutils-gdb.git] / bfd / coff-arm.c

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index b167764659fc57ddb25836f53f7b4919d70d0934..10c5ac0d926f46bf605ba4d79b7d13c79cc9c5c0 100644 (file)
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -152,7 +152,8 @@ coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
   return bfd_reloc_continue;
 }
 
-#define TARGET_UNDERSCORE '_'
+/* #define TARGET_UNDERSCORE '_' */
+#define TARGET_UNDERSCORE '\0'
 
 #ifndef PCRELOFFSET
 #define PCRELOFFSET true
@@ -726,10 +727,10 @@ arm_reloc_type_lookup(abfd,code)
 
 /* The set of global variables that mark the total size of each kind
    of glue required. */
-long int global_thumb_glue_size = 0;
-long int global_arm_glue_size = 0;
+static long int global_thumb_glue_size = 0;
+static long int global_arm_glue_size = 0;
 
-bfd* bfd_of_glue_owner = 0;
+static bfd * bfd_of_glue_owner = 0;
 
 /* some typedefs for holding instructions */
 typedef unsigned long int insn32;
@@ -1459,6 +1460,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
   return true;
 }
 
+#ifndef COFF_WITH_PE
 boolean
 arm_allocate_interworking_sections (info) 
      struct bfd_link_info *info;
@@ -1716,6 +1718,7 @@ arm_process_before_allocation (abfd, info)
 
   return true;
 }
+#endif /* not COFF_WITH_PE */
 
 #define coff_relocate_section coff_arm_relocate_section
 
@@ -1746,6 +1749,7 @@ coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
   return true;
 }
 
+#ifndef COFF_WITH_PE
 
 /* Called when merging the private data areas of two BFDs.
    This is important as it allows us to detect if we are
@@ -1762,13 +1766,12 @@ coff_arm_bfd_merge_private_bfd_data (ibfd, obfd)
   if (ibfd == obfd)
     return true;
 
-  /* If the two formats are different we cannot merge anything.  */
+  /* If the two formats are different we cannot merge anything.
+     This is not an error, since it is permissable to change the
+     input and output formats.  */
   if (ibfd->xvec != obfd->xvec)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
+    return true;
+  
   /* Verify that the APCS is the same for the two BFDs */
   if (APCS_SET (ibfd))
     {
@@ -1858,7 +1861,7 @@ coff_arm_bfd_print_private_bfd_data (abfd, ptr)
   
   BFD_ASSERT (abfd != NULL && ptr != NULL)
   
-  fprintf (file, "private flags = %x", coff_data( abfd )->flags);
+  fprintf (file, "private flags = %x", coff_data (abfd)->flags);
   
   if (APCS_SET (abfd))
     fprintf (file, ": [APCS-%d] [floats passed in %s registers] [%s]",
@@ -1969,11 +1972,12 @@ coff_arm_bfd_copy_private_bfd_data (src, dest)
 
   return true;
 }
+#endif /* not COFF_WITH_PE */
 
 /* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
  *must* match the definitions on gcc/config/arm/semi.h.  */
 #define LOCAL_LABEL_PREFIX "."
-#define USER_LABEL_PREFIX "_"
+#define USER_LABEL_PREFIX ""
 
 static boolean
 coff_arm_is_local_label_name (abfd, name)
@@ -2010,11 +2014,13 @@ coff_arm_is_local_label_name (abfd, name)
 
 #define coff_bfd_is_local_label_name           coff_arm_is_local_label_name
 #define coff_adjust_symndx                     coff_arm_adjust_symndx
+#ifndef COFF_WITH_PE
 #define coff_bfd_final_link                    coff_arm_bfd_final_link 
 #define coff_bfd_merge_private_bfd_data                coff_arm_bfd_merge_private_bfd_data
 #define coff_bfd_print_private_bfd_data                coff_arm_bfd_print_private_bfd_data
 #define coff_bfd_set_private_flags              coff_arm_bfd_set_private_flags
 #define coff_bfd_copy_private_bfd_data          coff_arm_bfd_copy_private_bfd_data
+#endif
 
 #include "coffcode.h"
 
@@ -2047,10 +2053,9 @@ arm_get_last()
 
 #define ARM_HACKS
 
-
 /* Do the final link step.  */
 
-boolean
+static boolean
 coff_arm_bfd_final_link (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -2334,8 +2339,8 @@ coff_arm_bfd_final_link (abfd, info)
       {
        if (! _bfd_coff_link_input_bfd (&finfo, last_one))
          goto error_return;
+       last_one->output_has_begun = true;
       }
-    last_one->output_has_begun = true;
   }
 #endif