* thread-db.c (enable_thread_event_reporting): Correct warning

[deliverable/binutils-gdb.git] / bfd / targets.c

diff --git a/bfd/targets.c b/bfd/targets.c
index 598f40e7de42bb4c0338031550c8def6c6936f16..c46ecc34108e57c9287c27439f8302d340ae7c4d 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -1,5 +1,6 @@
 /* Generic target-file-type support for the BFD library.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -415,7 +416,8 @@ BFD_JUMP_TABLE macros.
 .CAT(NAME,_bfd_link_add_symbols),\
 .CAT(NAME,_bfd_final_link),\
 .CAT(NAME,_bfd_link_split_section),\
-.CAT(NAME,_bfd_gc_sections)
+.CAT(NAME,_bfd_gc_sections),\
+.CAT(NAME,_bfd_merge_sections)
 .  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
 .  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
 .                    struct bfd_link_info *, struct bfd_link_order *,
@@ -442,6 +444,9 @@ BFD_JUMP_TABLE macros.
 .  {* Remove sections that are not referenced from the output.  *}
 .  boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
 .
+.  {* Attempt to merge SEC_MERGE sections.  *}
+.  boolean (*_bfd_merge_sections) PARAMS ((bfd *, struct bfd_link_info *));
+.
 .  {* Routines to handle dynamic symbols and relocs.  *}
 .#define BFD_JUMP_TABLE_DYNAMIC(NAME)\
 .CAT(NAME,_get_dynamic_symtab_upper_bound),\
@@ -538,6 +543,7 @@ extern const bfd_target bfd_elf32_mcore_big_vec;
 extern const bfd_target bfd_elf32_mcore_little_vec;
 extern const bfd_target bfd_elf32_mn10200_vec;
 extern const bfd_target bfd_elf32_mn10300_vec;
+extern const bfd_target bfd_elf32_openrisc_vec;
 extern const bfd_target bfd_elf32_pj_vec;
 extern const bfd_target bfd_elf32_pjl_vec;
 extern const bfd_target bfd_elf32_powerpc_vec;
@@ -563,6 +569,8 @@ extern const bfd_target bfd_elf64_ia64_big_vec;
 extern const bfd_target bfd_elf64_ia64_little_vec;
 extern const bfd_target bfd_elf64_little_generic_vec;
 extern const bfd_target bfd_elf64_littlemips_vec;
+extern const bfd_target bfd_elf64_tradbigmips_vec;
+extern const bfd_target bfd_elf64_tradlittlemips_vec;
 extern const bfd_target bfd_elf64_s390_vec;
 extern const bfd_target bfd_elf64_sparc_vec;
 extern const bfd_target bfd_elf64_x86_64_vec;
@@ -769,18 +777,22 @@ static const bfd_target * const _bfd_target_vector[] = {
        &bfd_elf32_m68hc12_vec,
        &bfd_elf32_m68k_vec,
        &bfd_elf32_m88k_vec,
-       &bfd_elf32_sparc_vec,
+       &bfd_elf32_openrisc_vec,
        &bfd_elf32_pj_vec,
        &bfd_elf32_pjl_vec,
        &bfd_elf32_powerpc_vec,
        &bfd_elf32_powerpcle_vec,
+       &bfd_elf32_sparc_vec,
        &bfd_elf32_v850_vec,
        &bfd_elf32_fr30_vec,
        &bfd_elf32_mcore_big_vec,
        &bfd_elf32_mcore_little_vec,
        &bfd_elf32_tradbigmips_vec,
        &bfd_elf32_tradlittlemips_vec,
-#ifdef BFD64                   /* No one seems to use this.  */
+#ifdef BFD64
+       &bfd_elf64_tradbigmips_vec,
+       &bfd_elf64_tradlittlemips_vec,
+       /* No one seems to use this.  */
        &bfd_elf64_big_generic_vec,
        &bfd_elf64_little_generic_vec,
 #endif
@@ -997,7 +1009,7 @@ const bfd_target *bfd_default_vector[] = {
 /* When there is an ambiguous match, bfd_check_format_matches puts the
    names of the matching targets in an array.  This variable is the maximum
    number of entries that the array could possibly need.  */
-const size_t _bfd_target_vector_entries = sizeof (bfd_target_vector)/sizeof (*bfd_target_vector);
+const size_t _bfd_target_vector_entries = sizeof (_bfd_target_vector)/sizeof (*_bfd_target_vector);
 \f
 /* This array maps configuration triplets onto BFD vectors.  */