X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fcoff-m68k.c;h=f6aa094692a4d91e36d7aaf61b6ac674399c191b;hb=2a1d8bb3471a074ce35eb8ab9d8eb2093a5ecdb5;hp=eb6f3701f8786cadd92d59c59894aca8bd6f9a55;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/coff-m68k.c b/bfd/coff-m68k.c
index eb6f3701f8..f6aa094692 100644
--- a/bfd/coff-m68k.c
+++ b/bfd/coff-m68k.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Motorola 68000 COFF binaries.
-   Copyright (C) 1990-2014 Free Software Foundation, Inc.
+   Copyright (C) 1990-2016 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -30,7 +30,7 @@
    variants.  The following macros control its behaviour:
 
    TARGET_SYM
-     The C name of the BFD target vector.  The default is m68kcoff_vec.
+     The C name of the BFD target vector.  The default is m68k_coff_vec.
    TARGET_NAME
      The user visible target name.  The default is "coff-m68k".
    NAMES_HAVE_UNDERSCORE
@@ -143,6 +143,7 @@ m68k_rtype2howto (arelent *internal, int relocentry)
     case R_PCRWORD:	internal->howto = m68kcoff_howto_table + 4; break;
     case R_PCRLONG:	internal->howto = m68kcoff_howto_table + 5; break;
     case R_RELLONG_NEG:	internal->howto = m68kcoff_howto_table + 6; break;
+    default:            internal->howto = NULL; break;
     }
 }
 
@@ -359,7 +360,7 @@ m68kcoff_common_addend_special_fn (bfd *abfd,
       coffsym = (obj_symbols (abfd)				\
 	         + (cache_ptr->sym_ptr_ptr - symbols));		\
     else if (ptr)						\
-      coffsym = coff_symbol_from (abfd, ptr);			\
+      coffsym = coff_symbol_from (ptr);				\
     if (coffsym != (coff_symbol_type *) NULL			\
 	&& coffsym->native->u.syment.n_scnum == 0)		\
       cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
@@ -445,7 +446,7 @@ bfd_m68k_coff_create_embedded_relocs (bfd *abfd,
   bfd_byte *p;
   bfd_size_type amt;
 
-  BFD_ASSERT (! info->relocatable);
+  BFD_ASSERT (! bfd_link_relocatable (info));
 
   *errmsg = NULL;
 
@@ -528,7 +529,7 @@ bfd_m68k_coff_create_embedded_relocs (bfd *abfd,
 #include "coffcode.h"
 
 #ifndef TARGET_SYM
-#define TARGET_SYM m68kcoff_vec
+#define TARGET_SYM m68k_coff_vec
 #endif
 
 #ifndef TARGET_NAME