* config/tc-i370.c: Fix typo in last change.

[deliverable/binutils-gdb.git] / bfd / xcoff-target.h

diff --git a/bfd/xcoff-target.h b/bfd/xcoff-target.h
index a103ac9c8a697abaea2d6e14e6001562dd90bbd5..0787b8de3e26289e6acb7eda08c43f094f10dfc2 100644 (file)
--- a/bfd/xcoff-target.h
+++ b/bfd/xcoff-target.h
@@ -1,5 +1,5 @@
 /* Common definitions for backends based on IBM RS/6000 "XCOFF64" files.
-   Copyright 2000
+   Copyright 2000, 2001
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
 
@@ -57,7 +57,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #undef CORE_FILE_P
 #define CORE_FILE_P rs6000coff_core_p
 extern const bfd_target * rs6000coff_core_p ();
-extern boolean rs6000coff_get_section_contents ();
 extern boolean rs6000coff_core_file_matches_executable_p ();
 
 #undef coff_core_file_matches_executable_p
@@ -71,9 +70,6 @@ extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd));
 extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
 #undef coff_core_file_failing_signal
 #define coff_core_file_failing_signal rs6000coff_core_file_failing_signal
-
-#undef coff_get_section_contents
-#define        coff_get_section_contents       rs6000coff_get_section_contents
 #endif /* AIX_CORE */
 
 #ifdef LYNX_CORE
@@ -101,6 +97,7 @@ extern int lynx_core_file_failing_signal PARAMS ((bfd *abfd));
   coff_bfd_get_relocated_section_contents
 #define _bfd_xcoff_bfd_relax_section coff_bfd_relax_section
 #define _bfd_xcoff_bfd_gc_sections coff_bfd_gc_sections
+#define _bfd_xcoff_bfd_merge_sections coff_bfd_merge_sections
 #define _bfd_xcoff_bfd_link_split_section coff_bfd_link_split_section
 
 /* XCOFF archives do not have anything which corresponds to an
@@ -150,12 +147,12 @@ extern unsigned int _bfd_xcoff_swap_aux_out PARAMS ((bfd *, PTR, int, int, int,
 
 #include "coffcode.h"
 
-/* The transfer vector that leads the outside world to all of the above. */
+/* The transfer vector that leads the outside world to all of the above.  */
 
 const bfd_target TARGET_SYM =
 {
   TARGET_NAME,
-  bfd_target_coff_flavour,
+  bfd_target_xcoff_flavour,
   BFD_ENDIAN_BIG,              /* data byte order is big */
   BFD_ENDIAN_BIG,              /* header byte order is big */
 
@@ -193,6 +190,6 @@ const bfd_target TARGET_SYM =
      BFD_JUMP_TABLE_DYNAMIC (_bfd_xcoff),
 
   NULL,
-  
+
   COFF_SWAP_TABLE
 };