* bfd-in.h (bfd_arm_allocate_interworking_sections): Static

        if COFF_IMAGE_WITH_PE.
        (bfd_arm_process_before_allocation): Likewise.
        (bfd_arm_get_bfd_for_interworking): Likewise.
        * coff-arm.c: Likewise.
        * bfd-in2.h: Regenerate.
        * configure.in (armpe_little_vec): Remove coff-arm.lo.
        (armpe_big_vec): Likewise.
        * configure: Rebuild.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 75cba37037bd01dafc36684646cbce3a282d30e6..f2f3c3c9d1a6d12996cd5706409b448b54a3ffd2 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,15 @@
+1999-05-10  Catherine Moore  <clm@cygnus.com>
+
+        * bfd-in.h (bfd_arm_allocate_interworking_sections):  Static
+        if COFF_IMAGE_WITH_PE.
+        (bfd_arm_process_before_allocation): Likewise.
+        (bfd_arm_get_bfd_for_interworking): Likewise.
+        * coff-arm.c: Likewise.
+        * bfd-in2.h: Regenerate.
+        * configure.in (armpe_little_vec): Remove coff-arm.lo.
+        (armpe_big_vec): Likewise.
+        * configure: Rebuild.
+
 1999-05-10  Nick Clifton  <nickc@cygnus.com>
 
        * elf.c (elf_fake_sections): Check for .rel. as start of rel

diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 8bdbf80f1b17396e9da6c9e2a322b4e5a958cd6b..46085d0e412aea6fe22f86cb403581b66aef3d7a 100644 (file)
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -705,12 +705,21 @@ extern boolean bfd_coff_set_symbol_class
   PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int));
 
 /* ARM Interworking support.  Called from linker.  */
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 extern boolean bfd_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 extern boolean bfd_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 extern boolean bfd_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 8e86304d953629b1eda1f85db8d95bd6bf740247..860ca3551be78b5315a68a7489cd6be06b690e54 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -705,12 +705,21 @@ extern boolean bfd_coff_set_symbol_class
   PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int));
 
 /* ARM Interworking support.  Called from linker.  */
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 extern boolean bfd_arm_allocate_interworking_sections
   PARAMS ((struct bfd_link_info *));
 
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 extern boolean bfd_arm_process_before_allocation
   PARAMS ((bfd *, struct bfd_link_info *, int));
 
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 extern boolean bfd_arm_get_bfd_for_interworking
   PARAMS ((bfd *, struct bfd_link_info *));
 

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index 32051175b7255b747a2f2e65e0423126d2565ab7..4b9ee8420a087cb1d3571c62c6dc5c5967b7b2aa 100644 (file)
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -1610,7 +1610,9 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
   return true;
 }
 
-#ifndef COFF_WITH_PE
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 boolean
 bfd_arm_allocate_interworking_sections (info) 
      struct bfd_link_info * info;
@@ -1797,6 +1799,9 @@ record_thumb_to_arm_glue (info, h)
 /* Select a BFD to be used to hold the sections used by the glue code.
    This function is called from the linker scripts in ld/emultempl/
    {armcoff/pe}.em  */
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 boolean
 bfd_arm_get_bfd_for_interworking (abfd, info)
      bfd *                 abfd;
@@ -1852,6 +1857,9 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
   return true;
 }
 
+#ifdef COFF_IMAGE_WITH_PE
+static
+#endif
 boolean
 bfd_arm_process_before_allocation (abfd, info, support_old_code)
      bfd *                   abfd;
@@ -1959,8 +1967,6 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
   return true;
 }
 
-#endif /* ! COFF_WITH_PE */
-
 #define coff_bfd_reloc_type_lookup             coff_arm_reloc_type_lookup
 #define coff_relocate_section                  coff_arm_relocate_section
 #define coff_bfd_is_local_label_name           coff_arm_is_local_label_name

diff --git a/bfd/configure b/bfd/configure
index f6ca66fae6986ff6ec14e9e8de5f2c01d9396d5f..17b5a8faa0cb83d24e0154e8f0ade2108416b3ba 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -5002,8 +5002,8 @@ do
     a_out_adobe_vec)           tb="$tb aout-adobe.lo aout32.lo" ;;
     armcoff_little_vec)                tb="$tb coff-arm.lo cofflink.lo " ;;
     armcoff_big_vec)           tb="$tb coff-arm.lo cofflink.lo " ;;
-    armpe_little_vec)          tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
-    armpe_big_vec)             tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
+    armpe_little_vec)          tb="$tb pe-arm.lo cofflink.lo " ;;
+    armpe_big_vec)             tb="$tb pe-arm.lo cofflink.lo " ;;
     armpei_little_vec)         tb="$tb pei-arm.lo cofflink.lo " ;;
     armpei_big_vec)            tb="$tb pei-arm.lo cofflink.lo " ;;
     arm_epoc_pe_little_vec)    tb="$tb epoc-pe-arm.lo cofflink.lo " ;;

diff --git a/bfd/configure.in b/bfd/configure.in
index 3a3e36f1b661222ba61a5b2b436817ef884d0322..80eeb01e9ca0fa1a3633a0201f9a3470c344fcb9 100644 (file)
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -414,8 +414,8 @@ do
     a_out_adobe_vec)           tb="$tb aout-adobe.lo aout32.lo" ;;
     armcoff_little_vec)                tb="$tb coff-arm.lo cofflink.lo " ;;
     armcoff_big_vec)           tb="$tb coff-arm.lo cofflink.lo " ;;
-    armpe_little_vec)          tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
-    armpe_big_vec)             tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
+    armpe_little_vec)          tb="$tb pe-arm.lo cofflink.lo " ;;
+    armpe_big_vec)             tb="$tb pe-arm.lo cofflink.lo " ;;
     armpei_little_vec)         tb="$tb pei-arm.lo cofflink.lo " ;;
     armpei_big_vec)            tb="$tb pei-arm.lo cofflink.lo " ;;
     arm_epoc_pe_little_vec)    tb="$tb epoc-pe-arm.lo cofflink.lo " ;;