diff options
Diffstat (limited to 'binutils-2.25/bfd/som.c')
| -rw-r--r-- | binutils-2.25/bfd/som.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/binutils-2.25/bfd/som.c b/binutils-2.25/bfd/som.c index 0ddbb6f0..513e4fa6 100644 --- a/binutils-2.25/bfd/som.c +++ b/binutils-2.25/bfd/som.c @@ -1,7 +1,5 @@ /* bfd back-end for HP PA-RISC SOM objects. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, - 2012, 2013 Free Software Foundation, Inc. + Copyright (C) 1990-2014 Free Software Foundation, Inc. Contributed by the Center for Software Science at the University of Utah. @@ -5351,7 +5349,7 @@ som_canonicalize_reloc (bfd *abfd, return section->reloc_count; } -extern const bfd_target som_vec; +extern const bfd_target hppa_som_vec; /* A hook to set up object file dependent section information. */ @@ -5717,18 +5715,22 @@ som_set_arch_mach (bfd *abfd, static bfd_boolean som_find_nearest_line (bfd *abfd, - asection *section, asymbol **symbols, + asection *section, bfd_vma offset, const char **filename_ptr, const char **functionname_ptr, - unsigned int *line_ptr) + unsigned int *line_ptr, + unsigned int *discriminator_ptr) { bfd_boolean found; asymbol *func; bfd_vma low_func; asymbol **p; + if (discriminator_ptr) + *discriminator_ptr = 0; + if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, & found, filename_ptr, functionname_ptr, line_ptr, @@ -6715,6 +6717,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) return som_is_subspace (sec) && sec->size > 240000; } +#define som_find_line _bfd_nosymbols_find_line #define som_close_and_cleanup som_bfd_free_cached_info #define som_read_ar_hdr _bfd_generic_read_ar_hdr #define som_write_ar_hdr _bfd_generic_write_ar_hdr @@ -6734,7 +6737,6 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) #define som_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents #define som_bfd_relax_section bfd_generic_relax_section #define som_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define som_bfd_link_hash_table_free _bfd_generic_link_hash_table_free #define som_bfd_link_add_symbols _bfd_generic_link_add_symbols #define som_bfd_link_just_syms _bfd_generic_link_just_syms #define som_bfd_copy_link_hash_symbol_type \ @@ -6752,7 +6754,7 @@ som_bfd_link_split_section (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) #define som_bfd_set_private_flags _bfd_generic_bfd_set_private_flags #define som_find_inliner_info _bfd_nosymbols_find_inliner_info -const bfd_target som_vec = +const bfd_target hppa_som_vec = { "som", /* Name. */ bfd_target_som_flavour, |