Index: bfd/targets.c |
diff --git a/bfd/targets.c b/bfd/targets.c |
index cfa91a8fb824b0a5a62562306438975068d23cbe..b117bfe634cfeef64e9adee791ba73a1d76c6c7f 100644 |
--- a/bfd/targets.c |
+++ b/bfd/targets.c |
@@ -1,7 +1,5 @@ |
/* Generic target-file-type support for the BFD library. |
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
- 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
- Free Software Foundation, Inc. |
+ Copyright 1990-2013 Free Software Foundation, Inc. |
Written by Cygnus Support. |
This file is part of BFD, the Binary File Descriptor library. |
@@ -369,6 +367,7 @@ BFD_JUMP_TABLE macros. |
. NAME##_bfd_is_target_special_symbol, \ |
. NAME##_get_lineno, \ |
. NAME##_find_nearest_line, \ |
+. _bfd_generic_find_nearest_line_discriminator, \ |
. _bfd_generic_find_line, \ |
. NAME##_find_inliner_info, \ |
. NAME##_bfd_make_debug_symbol, \ |
@@ -392,6 +391,9 @@ BFD_JUMP_TABLE macros. |
. bfd_boolean (*_bfd_find_nearest_line) |
. (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, |
. const char **, const char **, unsigned int *); |
+. bfd_boolean (*_bfd_find_nearest_line_discriminator) |
+. (bfd *, struct bfd_section *, struct bfd_symbol **, bfd_vma, |
+. const char **, const char **, unsigned int *, unsigned int *); |
. bfd_boolean (*_bfd_find_line) |
. (bfd *, struct bfd_symbol **, struct bfd_symbol *, |
. const char **, unsigned int *); |
@@ -602,6 +604,8 @@ extern const bfd_target bfd_elf32_bigarm_symbian_vec; |
extern const bfd_target bfd_elf32_bigarm_vxworks_vec; |
extern const bfd_target bfd_elf32_bigmips_vec; |
extern const bfd_target bfd_elf32_bigmips_vxworks_vec; |
+extern const bfd_target bfd_elf32_bigmoxie_vec; |
+extern const bfd_target bfd_elf32_bignios2_vec; |
extern const bfd_target bfd_elf32_cr16_vec; |
extern const bfd_target bfd_elf32_cr16c_vec; |
extern const bfd_target bfd_elf32_cris_vec; |
@@ -613,7 +617,6 @@ extern const bfd_target bfd_elf32_epiphany_vec; |
extern const bfd_target bfd_elf32_fr30_vec; |
extern const bfd_target bfd_elf32_frv_vec; |
extern const bfd_target bfd_elf32_frvfdpic_vec; |
-extern const bfd_target bfd_elf32_moxie_vec; |
extern const bfd_target bfd_elf32_h8300_vec; |
extern const bfd_target bfd_elf32_hppa_linux_vec; |
extern const bfd_target bfd_elf32_hppa_nbsd_vec; |
@@ -641,6 +644,8 @@ extern const bfd_target bfd_elf32_littlearm_symbian_vec; |
extern const bfd_target bfd_elf32_littlearm_vxworks_vec; |
extern const bfd_target bfd_elf32_littlemips_vec; |
extern const bfd_target bfd_elf32_littlemips_vxworks_vec; |
+extern const bfd_target bfd_elf32_littlemoxie_vec; |
+extern const bfd_target bfd_elf32_littlenios2_vec; |
extern const bfd_target bfd_elf32_m32c_vec; |
extern const bfd_target bfd_elf32_m32r_vec; |
extern const bfd_target bfd_elf32_m32rle_vec; |
@@ -654,11 +659,14 @@ extern const bfd_target bfd_elf32_mcore_big_vec; |
extern const bfd_target bfd_elf32_mcore_little_vec; |
extern const bfd_target bfd_elf32_mep_vec; |
extern const bfd_target bfd_elf32_mep_little_vec; |
+extern const bfd_target bfd_elf32_metag_vec; |
+extern const bfd_target bfd_elf32_microblazeel_vec; |
extern const bfd_target bfd_elf32_microblaze_vec; |
extern const bfd_target bfd_elf32_mn10200_vec; |
extern const bfd_target bfd_elf32_mn10300_vec; |
extern const bfd_target bfd_elf32_mt_vec; |
extern const bfd_target bfd_elf32_msp430_vec; |
+extern const bfd_target bfd_elf32_msp430_ti_vec; |
extern const bfd_target bfd_elf32_nbigmips_vec; |
extern const bfd_target bfd_elf32_nlittlemips_vec; |
extern const bfd_target bfd_elf32_ntradbigmips_vec; |
@@ -716,6 +724,7 @@ extern const bfd_target bfd_elf32_tradbigmips_freebsd_vec; |
extern const bfd_target bfd_elf32_tradlittlemips_freebsd_vec; |
extern const bfd_target bfd_elf32_us_cris_vec; |
extern const bfd_target bfd_elf32_v850_vec; |
+extern const bfd_target bfd_elf32_v850_rh850_vec; |
extern const bfd_target bfd_elf32_vax_vec; |
extern const bfd_target bfd_elf32_xc16x_vec; |
extern const bfd_target bfd_elf32_xgate_vec; |
@@ -726,6 +735,8 @@ extern const bfd_target bfd_elf64_alpha_freebsd_vec; |
extern const bfd_target bfd_elf64_alpha_vec; |
extern const bfd_target bfd_elf64_big_generic_vec; |
extern const bfd_target bfd_elf64_bigmips_vec; |
+extern const bfd_target bfd_elf64_bigaarch64_vec; |
+extern const bfd_target bfd_elf32_bigaarch64_vec; |
extern const bfd_target bfd_elf64_hppa_linux_vec; |
extern const bfd_target bfd_elf64_hppa_vec; |
extern const bfd_target bfd_elf64_ia64_big_vec; |
@@ -734,6 +745,8 @@ extern const bfd_target bfd_elf64_ia64_little_vec; |
extern const bfd_target bfd_elf64_ia64_vms_vec; |
extern const bfd_target bfd_elf64_little_generic_vec; |
extern const bfd_target bfd_elf64_littlemips_vec; |
+extern const bfd_target bfd_elf64_littleaarch64_vec; |
+extern const bfd_target bfd_elf32_littleaarch64_vec; |
extern const bfd_target bfd_elf64_mmix_vec; |
extern const bfd_target bfd_elf64_powerpc_vec; |
extern const bfd_target bfd_elf64_powerpcle_vec; |
@@ -971,8 +984,12 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf32_bigarm_vec, |
&bfd_elf32_bigarm_symbian_vec, |
&bfd_elf32_bigarm_vxworks_vec, |
+#ifdef BFD64 |
&bfd_elf32_bigmips_vec, |
&bfd_elf32_bigmips_vxworks_vec, |
+#endif |
+ &bfd_elf32_bigmoxie_vec, |
+ &bfd_elf32_bignios2_vec, |
&bfd_elf32_cr16_vec, |
&bfd_elf32_cr16c_vec, |
&bfd_elf32_cris_vec, |
@@ -984,7 +1001,6 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf32_fr30_vec, |
&bfd_elf32_frv_vec, |
&bfd_elf32_frvfdpic_vec, |
- &bfd_elf32_moxie_vec, |
&bfd_elf32_h8300_vec, |
&bfd_elf32_hppa_linux_vec, |
&bfd_elf32_hppa_nbsd_vec, |
@@ -1012,8 +1028,12 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf32_littlearm_vec, |
&bfd_elf32_littlearm_symbian_vec, |
&bfd_elf32_littlearm_vxworks_vec, |
+#ifdef BFD64 |
&bfd_elf32_littlemips_vec, |
&bfd_elf32_littlemips_vxworks_vec, |
+#endif |
+ &bfd_elf32_littlemoxie_vec, |
+ &bfd_elf32_littlenios2_vec, |
&bfd_elf32_m32c_vec, |
&bfd_elf32_m32r_vec, |
&bfd_elf32_m32rle_vec, |
@@ -1026,11 +1046,13 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf32_mcore_big_vec, |
&bfd_elf32_mcore_little_vec, |
&bfd_elf32_mep_vec, |
+ &bfd_elf32_metag_vec, |
&bfd_elf32_microblaze_vec, |
&bfd_elf32_mn10200_vec, |
&bfd_elf32_mn10300_vec, |
&bfd_elf32_mt_vec, |
&bfd_elf32_msp430_vec, |
+ &bfd_elf32_msp430_ti_vec, |
#ifdef BFD64 |
&bfd_elf32_nbigmips_vec, |
&bfd_elf32_nlittlemips_vec, |
@@ -1084,12 +1106,15 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf32_tilegx_be_vec, |
&bfd_elf32_tilegx_le_vec, |
&bfd_elf32_tilepro_vec, |
+#ifdef BFD64 |
&bfd_elf32_tradbigmips_vec, |
&bfd_elf32_tradlittlemips_vec, |
&bfd_elf32_tradbigmips_freebsd_vec, |
&bfd_elf32_tradlittlemips_freebsd_vec, |
+#endif |
&bfd_elf32_us_cris_vec, |
&bfd_elf32_v850_vec, |
+ &bfd_elf32_v850_rh850_vec, |
&bfd_elf32_vax_vec, |
&bfd_elf32_xc16x_vec, |
&bfd_elf32_xgate_vec, |
@@ -1101,6 +1126,8 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf64_alpha_vec, |
&bfd_elf64_big_generic_vec, |
&bfd_elf64_bigmips_vec, |
+ &bfd_elf64_bigaarch64_vec, |
+ &bfd_elf32_bigaarch64_vec, |
&bfd_elf64_hppa_linux_vec, |
&bfd_elf64_hppa_vec, |
&bfd_elf64_ia64_big_vec, |
@@ -1109,6 +1136,8 @@ static const bfd_target * const _bfd_target_vector[] = |
&bfd_elf64_ia64_vms_vec, |
&bfd_elf64_little_generic_vec, |
&bfd_elf64_littlemips_vec, |
+ &bfd_elf64_littleaarch64_vec, |
+ &bfd_elf32_littleaarch64_vec, |
&bfd_elf64_mmix_vec, |
&bfd_elf64_powerpc_vec, |
&bfd_elf64_powerpcle_vec, |