packaging: Enable testing infrastructure

[external/binutils.git] / bfd / reloc16.c

diff --git a/bfd/reloc16.c b/bfd/reloc16.c
index 27d153e..cd27fe9 100644 (file)
--- a/bfd/reloc16.c
+++ b/bfd/reloc16.c
@@ -1,5 +1,5 @@
 /* 8 and 16 bit COFF relocation functions, for BFD.
 /* 8 and 16 bit COFF relocation functions, for BFD.

-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2019 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -22,8 +22,7 @@
 
 /* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.  */
 
 
 /* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.  */
 

-/* These routines are used by coff-h8300 and coff-z8k to do
-   relocation.
+/* These routines are used by coff-z8k to do relocation.

 
    FIXME: This code should be rewritten to support the new COFF
    linker.  Basically, they need to deal with COFF relocs rather than
 
    FIXME: This code should be rewritten to support the new COFF
    linker.  Basically, they need to deal with COFF relocs rather than


@@ -80,11 +79,9 @@ bfd_coff_reloc16_get_value (arelent *reloc,
        value = 0;
       else
        {
        value = 0;
       else
        {

-         if (!((*link_info->callbacks->undefined_symbol)
-               (link_info, bfd_asymbol_name (symbol),
-                input_section->owner, input_section, reloc->address,
-                TRUE)))
-           abort ();
+         (*link_info->callbacks->undefined_symbol)
+           (link_info, bfd_asymbol_name (symbol),
+            input_section->owner, input_section, reloc->address, TRUE);

          value = 0;
        }
     }
          value = 0;
        }
     }


@@ -153,7 +150,7 @@ bfd_coff_reloc16_relax_section (bfd *abfd,
   arelent **reloc_vector = NULL;
   long reloc_count;
 
   arelent **reloc_vector = NULL;
   long reloc_count;
 

-  if (link_info->relocatable)
+  if (bfd_link_relocatable (link_info))

     (*link_info->callbacks->einfo)
       (_("%P%F: --relax and -r may not be used together\n"));
 
     (*link_info->callbacks->einfo)
       (_("%P%F: --relax and -r may not be used together\n"));