* elf64-alpha.c (elf64_alpha_relocate_section): Soft fail

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

diff --git a/bfd/tekhex.c b/bfd/tekhex.c
index ccfe7d882085318e2443c3b0bad1e24f74005b56..943992bf766673ce5ea129ec51bb2dc12f665b38 100644 (file)
--- a/bfd/tekhex.c
+++ b/bfd/tekhex.c
@@ -957,8 +957,8 @@ tekhex_get_symbol_info (ignore_abfd, symbol, ret)
 }
 
 static void
-tekhex_print_symbol (ignore_abfd, filep, symbol, how)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
+tekhex_print_symbol (abfd, filep, symbol, how)
+     bfd *abfd;
      PTR filep;
      asymbol *symbol;
      bfd_print_symbol_type how;
@@ -977,7 +977,7 @@ tekhex_print_symbol (ignore_abfd, filep, symbol, how)
       {
        CONST char *section_name = symbol->section->name;
 
-       bfd_print_symbol_vandf ((PTR) file, symbol);
+       bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
 
        fprintf (file, " %-5s %s",
                 section_name,
@@ -1001,6 +1001,7 @@ tekhex_print_symbol (ignore_abfd, filep, symbol, how)
   bfd_generic_get_relocated_section_contents
 #define tekhex_bfd_relax_section bfd_generic_relax_section
 #define tekhex_bfd_gc_sections bfd_generic_gc_sections
+#define tekhex_bfd_merge_sections bfd_generic_merge_sections
 #define tekhex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
 #define tekhex_bfd_link_add_symbols _bfd_generic_link_add_symbols
 #define tekhex_bfd_final_link _bfd_generic_final_link