Remove use of _WIN32_WCE

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

diff --git a/bfd/reloc16.c b/bfd/reloc16.c
index b4087cbd58abd09e3609ff03abc1a2e45233184d..5a80eb64115d70ae2643d19ed7c3df8ba7b0df12 100644 (file)
--- a/bfd/reloc16.c
+++ b/bfd/reloc16.c
@@ -1,6 +1,5 @@
 /* 8 and 16 bit COFF relocation functions, for BFD.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
-   2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1990-2021 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
@@ -23,8 +22,7 @@
 
 /* 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
@@ -43,10 +41,9 @@
 #include "libcoff.h"
 
 bfd_vma
-bfd_coff_reloc16_get_value (reloc, link_info, input_section)
-     arelent *reloc;
-     struct bfd_link_info *link_info;
-     asection *input_section;
+bfd_coff_reloc16_get_value (arelent *reloc,
+                           struct bfd_link_info *link_info,
+                           asection *input_section)
 {
   bfd_vma value;
   asymbol *symbol = *(reloc->sym_ptr_ptr);
@@ -66,7 +63,7 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
         the generic symbols.  */
       h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
                                        bfd_asymbol_name (symbol),
-                                       FALSE, FALSE, TRUE);
+                                       false, false, true);
       if (h != (struct bfd_link_hash_entry *) NULL
          && (h->type == bfd_link_hash_defined
              || h->type == bfd_link_hash_defweak))
@@ -82,11 +79,9 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
        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;
        }
     }
@@ -104,11 +99,10 @@ bfd_coff_reloc16_get_value (reloc, link_info, input_section)
 }
 
 void
-bfd_perform_slip (abfd, slip, input_section, value)
-     bfd *abfd;
-     unsigned int slip;
-     asection *input_section;
-     bfd_vma value;
+bfd_perform_slip (bfd *abfd,
+                 unsigned int slip,
+                 asection *input_section,
+                 bfd_vma value)
 {
   asymbol **s;
 
@@ -142,12 +136,11 @@ bfd_perform_slip (abfd, slip, input_section, value)
     }
 }
 
-bfd_boolean
-bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
-     bfd *abfd;
-     asection *input_section;
-     struct bfd_link_info *link_info;
-     bfd_boolean *again;
+bool
+bfd_coff_reloc16_relax_section (bfd *abfd,
+                               asection *input_section,
+                               struct bfd_link_info *link_info,
+                               bool *again)
 {
   /* Get enough memory to hold the stuff.  */
   bfd *input_bfd = input_section->owner;
@@ -157,16 +150,20 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
   arelent **reloc_vector = NULL;
   long reloc_count;
 
+  if (bfd_link_relocatable (link_info))
+    (*link_info->callbacks->einfo)
+      (_("%P%F: --relax and -r may not be used together\n"));
+
   /* We only do global relaxation once.  It is not safe to do it multiple
      times (see discussion of the "shrinks" array below).  */
-  *again = FALSE;
+  *again = false;
 
   if (reloc_size < 0)
-    return FALSE;
+    return false;
 
   reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
   if (!reloc_vector && reloc_size > 0)
-    return FALSE;
+    return false;
 
   /* Get the relocs and think about them.  */
   reloc_count =
@@ -175,7 +172,7 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
   if (reloc_count < 0)
     {
       free (reloc_vector);
-      return FALSE;
+      return false;
     }
 
   /* The reloc16.c and related relaxing code is very simple, the price
@@ -239,22 +236,17 @@ bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
   input_section->rawsize = input_section->size;
   input_section->size -= shrink;
   free ((char *) reloc_vector);
-  return TRUE;
+  return true;
 }
 
 bfd_byte *
-bfd_coff_reloc16_get_relocated_section_contents (in_abfd,
-                                                link_info,
-                                                link_order,
-                                                data,
-                                                relocatable,
-                                                symbols)
-     bfd *in_abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     bfd_boolean relocatable;
-     asymbol **symbols;
+bfd_coff_reloc16_get_relocated_section_contents
+  (bfd *in_abfd,
+   struct bfd_link_info *link_info,
+   struct bfd_link_order *link_order,
+   bfd_byte *data,
+   bool relocatable,
+   asymbol **symbols)
 {
   /* Get enough memory to hold the stuff.  */
   bfd *input_bfd = link_order->u.indirect.section->owner;