Remove support for the (deprecated) openrisc and or32 configurations and replace

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

diff --git a/bfd/targets.c b/bfd/targets.c
index 058ab7778124274038c49ac6d38bc9b02559a2a9..d3b585b4b314d4b946bc5a906ceb24b3dbe3f737 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -677,8 +677,7 @@ extern const bfd_target bfd_elf32_nds32be_vec;
 extern const bfd_target bfd_elf32_nds32le_vec;
 extern const bfd_target bfd_elf32_nds32belin_vec;
 extern const bfd_target bfd_elf32_nds32lelin_vec;
-extern const bfd_target bfd_elf32_openrisc_vec;
-extern const bfd_target bfd_elf32_or32_big_vec;
+extern const bfd_target bfd_elf32_or1k_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;
@@ -844,7 +843,6 @@ extern const bfd_target nlm32_i386_vec;
 extern const bfd_target nlm32_powerpc_vec;
 extern const bfd_target nlm32_sparc_vec;
 extern const bfd_target oasys_vec;
-extern const bfd_target or32coff_big_vec;
 extern const bfd_target pc532machaout_vec;
 extern const bfd_target pc532netbsd_vec;
 extern const bfd_target pdp11_aout_vec;
@@ -1070,8 +1068,7 @@ static const bfd_target * const _bfd_target_vector[] =
        &bfd_elf32_nds32le_vec,
        &bfd_elf32_nds32belin_vec,
        &bfd_elf32_nds32lelin_vec,
-       &bfd_elf32_openrisc_vec,
-       &bfd_elf32_or32_big_vec,
+       &bfd_elf32_or1k_vec,
        &bfd_elf32_pj_vec,
        &bfd_elf32_pjl_vec,
        &bfd_elf32_powerpc_vec,
@@ -1282,8 +1279,6 @@ static const bfd_target * const _bfd_target_vector[] =
           can be annoying target mis-matches.  */
        &oasys_vec,
 #endif
-       /* Entry for the OpenRISC family.  */
-       &or32coff_big_vec,
 
        &pc532machaout_vec,
        &pc532netbsd_vec,