Changeset 1973 for binutils/trunk/bfd/coff-sh.c

Timestamp:

Feb 6, 2017, 1:00:00 PM (8 years ago)

Author:

Silvan Scherrer

Message:

binutils: update trunk to version 2.27

Location:

binutils/trunk

Files:

• . (modified) (1 prop)
• bfd/coff-sh.c (modified) (6 diffs)

binutils/trunk/bfd/coff-sh.c ¶

@@ -1 +1 @@
 /* BFD back-end for Renesas Super-H COFF binaries.
-   Copyright (C) 1993-2014 Free Software Foundation, Inc.
+   Copyright (C) 1993-2016 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
@@ -531 +531 @@
 /* This is the same as the macro in coffcode.h, except that it copies
    r_offset into reloc_entry->addend for some relocs.  */
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
-  {                                                             \
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
-      coffsym = (obj_symbols (abfd)                             \
-                 + (cache_ptr->sym_ptr_ptr - symbols));         \
-    else if (ptr)                                               \
-      coffsym = coff_symbol_from (abfd, ptr);                   \
-    if (coffsym != (coff_symbol_type *) NULL                    \
-        && coffsym->native->u.syment.n_scnum == 0)              \
-      cache_ptr->addend = 0;                                    \
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
-             && ptr->section != (asection *) NULL)              \
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
-    else                                                        \
-      cache_ptr->addend = 0;                                    \
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
+  {                                                             \
+    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
+      coffsym = (obj_symbols (abfd)                             \
+                 + (cache_ptr->sym_ptr_ptr - symbols));         \
+    else if (ptr)                                               \
+      coffsym = coff_symbol_from (ptr);                         \
+    if (coffsym != (coff_symbol_type *) NULL                    \
+        && coffsym->native->u.syment.n_scnum == 0)              \
+      cache_ptr->addend = 0;                                    \
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
+             && ptr->section != (asection *) NULL)              \
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
+    else                                                        \
+      cache_ptr->addend = 0;                                    \
     if ((reloc).r_type == R_SH_SWITCH8                          \
         || (reloc).r_type == R_SH_SWITCH16                      \
@@ -715 +715 @@
   *again = FALSE;
 
-  if (link_info->relocatable
+  if (bfd_link_relocatable (link_info)
       || (sec->flags & SEC_RELOC) == 0
       || sec->reloc_count == 0)
@@ -2330 +2330 @@
     {
       sh_opcodes[0xf].minor_opcodes = sh_dsp_opcodef;
-      sh_opcodes[0xf].count = sizeof sh_dsp_opcodef / sizeof sh_dsp_opcodef;
+      sh_opcodes[0xf].count = sizeof sh_dsp_opcodef / sizeof sh_dsp_opcodef [0];
     }
 
@@ -2840 +2840 @@
                      + sec->output_offset);
             }
-          else if (! info->relocatable)
-            {
-              if (! ((*info->callbacks->undefined_symbol)
-                     (info, h->root.root.string, input_bfd, input_section,
-                      rel->r_vaddr - input_section->vma, TRUE)))
-                return FALSE;
-            }
+          else if (! bfd_link_relocatable (info))
+            (*info->callbacks->undefined_symbol)
+              (info, h->root.root.string, input_bfd, input_section,
+               rel->r_vaddr - input_section->vma, TRUE);
         }
 
@@ -2879 +2876 @@
               }
 
-            if (! ((*info->callbacks->reloc_overflow)
-                   (info, (h ? &h->root : NULL), name, howto->name,
-                    (bfd_vma) 0, input_bfd, input_section,
-                    rel->r_vaddr - input_section->vma)))
-              return FALSE;
+            (*info->callbacks->reloc_overflow)
+              (info, (h ? &h->root : NULL), name, howto->name,
+               (bfd_vma) 0, input_bfd, input_section,
+               rel->r_vaddr - input_section->vma);
           }
         }