ld dtags

[platform/upstream/binutils.git] / bfd / cpu-ns32k.c

diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c
index acc081a..55ee030 100644 (file)
--- a/bfd/cpu-ns32k.c
+++ b/bfd/cpu-ns32k.c
@@ -1,6 +1,5 @@
 /* BFD support for the ns32k architecture.
 /* BFD support for the ns32k architecture.

-   Copyright 1990, 1991, 1994, 1995, 1998, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2014 Free Software Foundation, Inc.

    Almost totally rewritten by Ian Dall from initial work
    by Andrew Cagney.
 
    Almost totally rewritten by Ian Dall from initial work
    by Andrew Cagney.
 


@@ -8,7 +7,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,34 +17,28 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "ns32k.h"
 
 #define N(machine, printable, d, next)  \
 #include "libbfd.h"
 #include "ns32k.h"
 
 #define N(machine, printable, d, next)  \

-{  32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d,bfd_default_compatible,bfd_default_scan, next, }
+{  32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d, \
+   bfd_default_compatible,bfd_default_scan,bfd_arch_default_fill,next, }

 
 static const bfd_arch_info_type arch_info_struct[] =
 {
 
 static const bfd_arch_info_type arch_info_struct[] =
 {

-  N(32532,"ns32k:32532",true, 0), /* The word ns32k will match this too.  */
+  N(32532,"ns32k:32532",TRUE, 0), /* The word ns32k will match this too.  */

 };
 
 const bfd_arch_info_type bfd_ns32k_arch =
 };
 
 const bfd_arch_info_type bfd_ns32k_arch =

-  N(32032,"ns32k:32032",false, &arch_info_struct[0]);
-
-static bfd_reloc_status_type do_ns32k_reloc
-  PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR, asection *,
-          bfd *, char **,
-          bfd_vma (*) (bfd_byte *, int),
-          void (*) (bfd_vma, bfd_byte *, int)));
+  N(32032,"ns32k:32032",FALSE, &arch_info_struct[0]);

 
 bfd_vma
 
 bfd_vma

-_bfd_ns32k_get_displacement (buffer, size)
-     bfd_byte *buffer;
-     int size;
+_bfd_ns32k_get_displacement (bfd_byte *buffer, int size)

 {
   bfd_signed_vma value;
 
 {
   bfd_signed_vma value;
 


@@ -76,10 +69,7 @@ _bfd_ns32k_get_displacement (buffer, size)
 }
 
 void
 }
 
 void

-_bfd_ns32k_put_displacement (value, buffer, size)
-     bfd_vma value;
-     bfd_byte *buffer;
-     int size;
+_bfd_ns32k_put_displacement (bfd_vma value, bfd_byte *buffer, int size)

 {
   switch (size)
     {
 {
   switch (size)
     {


@@ -107,9 +97,7 @@ _bfd_ns32k_put_displacement (value, buffer, size)
 }
 
 bfd_vma
 }
 
 bfd_vma

-_bfd_ns32k_get_immediate (buffer, size)
-     bfd_byte *buffer;
-     int size;
+_bfd_ns32k_get_immediate (bfd_byte *buffer, int size)

 {
   bfd_vma value = 0;
 
 {
   bfd_vma value = 0;
 


@@ -130,10 +118,7 @@ _bfd_ns32k_get_immediate (buffer, size)
 }
 
 void
 }
 
 void

-_bfd_ns32k_put_immediate (value, buffer, size)
-     bfd_vma value;
-     bfd_byte *buffer;
-     int size;
+_bfd_ns32k_put_immediate (bfd_vma value, bfd_byte *buffer, int size)

 {
   buffer += size - 1;
   switch (size)
 {
   buffer += size - 1;
   switch (size)


@@ -154,17 +139,15 @@ _bfd_ns32k_put_immediate (value, buffer, size)
    needs to be!  */
 
 static bfd_reloc_status_type
    needs to be!  */
 
 static bfd_reloc_status_type

-do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-               error_message, get_data, put_data)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
-     bfd_vma (*get_data) PARAMS ((bfd_byte *, int));
-     void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int));
+do_ns32k_reloc (bfd *      abfd,
+               arelent *  reloc_entry,
+               struct bfd_symbol * symbol,
+               void *     data,
+               asection * input_section,
+               bfd *      output_bfd,
+               char **    error_message ATTRIBUTE_UNUSED,
+               bfd_vma (* get_data) (bfd_byte *, int),
+               void (*    put_data) (bfd_vma, bfd_byte *, int))

 {
   int overflow = 0;
   bfd_vma relocation;
 {
   int overflow = 0;
   bfd_vma relocation;


@@ -175,26 +158,26 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
   asection *reloc_target_output_section;
   bfd_byte *location;
 
   asection *reloc_target_output_section;
   bfd_byte *location;
 

-  if ((symbol->section == &bfd_abs_section)
+  if (bfd_is_abs_section (symbol->section)

       && output_bfd != (bfd *) NULL)
     {
       reloc_entry->address += input_section->output_offset;
       return bfd_reloc_ok;
     }
 
       && output_bfd != (bfd *) NULL)
     {
       reloc_entry->address += input_section->output_offset;
       return bfd_reloc_ok;
     }
 

-  /* If we are not producing relocateable output, return an error if
+  /* If we are not producing relocatable output, return an error if

      the symbol is not defined.  An undefined weak symbol is
      considered to have a value of zero (SVR4 ABI, p. 4-27).  */
      the symbol is not defined.  An undefined weak symbol is
      considered to have a value of zero (SVR4 ABI, p. 4-27).  */

-  if (symbol->section == &bfd_und_section
+  if (bfd_is_und_section (symbol->section)

       && (symbol->flags & BSF_WEAK) == 0
       && output_bfd == (bfd *) NULL)
     flag = bfd_reloc_undefined;
 
   /* Is the address of the relocation really within the section?  */
       && (symbol->flags & BSF_WEAK) == 0
       && output_bfd == (bfd *) NULL)
     flag = bfd_reloc_undefined;
 
   /* Is the address of the relocation really within the section?  */

-  if (reloc_entry->address > input_section->_cooked_size)
+  if (reloc_entry->address > bfd_get_section_limit (abfd, input_section))

     return bfd_reloc_outofrange;
 
     return bfd_reloc_outofrange;
 

-  /* Work out which section the relocation is targetted at and the
+  /* Work out which section the relocation is targeted at and the

      initial relocation command value.  */
 
   /* Get symbol value.  (Common symbols are special.)  */
      initial relocation command value.  */
 
   /* Get symbol value.  (Common symbols are special.)  */


@@ -232,20 +215,20 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
         of the location within the section.  Some targets arrange for
         the addend to be the negative of the position of the location
         within the section; for example, i386-aout does this.  For
         of the location within the section.  Some targets arrange for
         the addend to be the negative of the position of the location
         within the section; for example, i386-aout does this.  For

-        i386-aout, pcrel_offset is false.  Some other targets do not
+        i386-aout, pcrel_offset is FALSE.  Some other targets do not

         include the position of the location; for example, m88kbcs,
         include the position of the location; for example, m88kbcs,

-        or ELF.  For those targets, pcrel_offset is true.
+        or ELF.  For those targets, pcrel_offset is TRUE.

 
 

-        If we are producing relocateable output, then we must ensure
+        If we are producing relocatable output, then we must ensure

         that this reloc will be correctly computed when the final
         that this reloc will be correctly computed when the final

-        relocation is done.  If pcrel_offset is false we want to wind
+        relocation is done.  If pcrel_offset is FALSE we want to wind

         up with the negative of the location within the section,
         which means we must adjust the existing addend by the change
         up with the negative of the location within the section,
         which means we must adjust the existing addend by the change

-        in the location within the section.  If pcrel_offset is true
+        in the location within the section.  If pcrel_offset is TRUE

         we do not want to adjust the existing addend at all.
 
         FIXME: This seems logical to me, but for the case of
         we do not want to adjust the existing addend at all.
 
         FIXME: This seems logical to me, but for the case of

-        producing relocateable output it is not what the code
+        producing relocatable output it is not what the code

         actually does.  I don't want to change it, because it seems
         far too likely that something will break.  */
       relocation -=
         actually does.  I don't want to change it, because it seems
         far too likely that something will break.  */
       relocation -=


@@ -279,7 +262,6 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
          /* WTF?? */
          if (abfd->xvec->flavour == bfd_target_coff_flavour)
            {
          /* WTF?? */
          if (abfd->xvec->flavour == bfd_target_coff_flavour)
            {

-#if 1

              /* For m68k-coff, the addend was being subtracted twice during
                 relocation with -r.  Removing the line below this comment
                 fixes that problem; see PR 2953.
              /* For m68k-coff, the addend was being subtracted twice during
                 relocation with -r.  Removing the line below this comment
                 fixes that problem; see PR 2953.


@@ -297,7 +279,7 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
                 should not have any tests that depend upon the flavour.  It's
                 seem like entirely the wrong place for such a thing.  The
                 second obvious point is that the current code ignores the
                 should not have any tests that depend upon the flavour.  It's
                 seem like entirely the wrong place for such a thing.  The
                 second obvious point is that the current code ignores the

-                reloc addend when producing relocateable output for COFF.
+                reloc addend when producing relocatable output for COFF.

                 That's peculiar.  In fact, I really have no idea what the
                 point of the line you want to remove is.
 
                 That's peculiar.  In fact, I really have no idea what the
                 point of the line you want to remove is.
 


@@ -315,10 +297,10 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
                 (coff-i386 does subtract the old value, to be compatible with
                 existing coff-i386 targets, like SCO).
 
                 (coff-i386 does subtract the old value, to be compatible with
                 existing coff-i386 targets, like SCO).
 

-                So everything works fine when not producing relocateable
-                output.  When we are producing relocateable output, logically
+                So everything works fine when not producing relocatable
+                output.  When we are producing relocatable output, logically

                 we should do exactly what we do when not producing
                 we should do exactly what we do when not producing

-                relocateable output.  Therefore, your patch is correct.  In
+                relocatable output.  Therefore, your patch is correct.  In

                 fact, it should probably always just set reloc_entry->addend
                 to 0 for all cases, since it is, in fact, going to add the
                 value into the object file.  This won't hurt the COFF code,
                 fact, it should probably always just set reloc_entry->addend
                 to 0 for all cases, since it is, in fact, going to add the
                 value into the object file.  This won't hurt the COFF code,


@@ -326,7 +308,7 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
                 to other formats (the thing to check for would be whether
                 any formats both use the addend and set partial_inplace).
 
                 to other formats (the thing to check for would be whether
                 any formats both use the addend and set partial_inplace).
 

-                When I wanted to make coff-i386 produce relocateable output,
+                When I wanted to make coff-i386 produce relocatable output,

                 I ran into the problem that you are running into: I wanted
                 to remove that line.  Rather than risk it, I made the
                 coff-i386 relocs use a special function; it's coff_i386_reloc
                 I ran into the problem that you are running into: I wanted
                 to remove that line.  Rather than risk it, I made the
                 coff-i386 relocs use a special function; it's coff_i386_reloc


@@ -355,7 +337,6 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
                   7) if they are different you have to figure out which
                      version is right.  */
              relocation -= reloc_entry->addend;
                   7) if they are different you have to figure out which
                      version is right.  */
              relocation -= reloc_entry->addend;

-#endif

              reloc_entry->addend = 0;
            }
          else
              reloc_entry->addend = 0;
            }
          else


@@ -583,18 +564,16 @@ do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 /* Relocate a given location using a given value and howto.  */
 
 bfd_reloc_status_type
 /* Relocate a given location using a given value and howto.  */
 
 bfd_reloc_status_type

-_bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
-                             get_data, put_data)
-     reloc_howto_type *howto;
-     bfd *input_bfd ATTRIBUTE_UNUSED;
-     bfd_vma relocation;
-     bfd_byte *location;
-     bfd_vma (*get_data) PARAMS ((bfd_byte *, int));
-     void (*put_data) PARAMS ((bfd_vma, bfd_byte *, int));
+_bfd_do_ns32k_reloc_contents (reloc_howto_type *howto,
+                             bfd *input_bfd ATTRIBUTE_UNUSED,
+                             bfd_vma relocation,
+                             bfd_byte *location,
+                             bfd_vma (*get_data) (bfd_byte *, int),
+                             void (*put_data) (bfd_vma, bfd_byte *, int))

 {
   int size;
   bfd_vma x;
 {
   int size;
   bfd_vma x;

-  boolean overflow;
+  bfd_boolean overflow;

 
   /* If the size is negative, negate RELOCATION.  This isn't very
      general.  */
 
   /* If the size is negative, negate RELOCATION.  This isn't very
      general.  */


@@ -622,7 +601,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
      which we don't check for.  We must either check at every single
      operation, which would be tedious, or we must do the computations
      in a type larger than bfd_vma, which would be inefficient.  */
      which we don't check for.  We must either check at every single
      operation, which would be tedious, or we must do the computations
      in a type larger than bfd_vma, which would be inefficient.  */

-  overflow = false;
+  overflow = FALSE;

   if (howto->complain_on_overflow != complain_overflow_dont)
     {
       bfd_vma check;
   if (howto->complain_on_overflow != complain_overflow_dont)
     {
       bfd_vma check;


@@ -678,7 +657,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 
          /* For the signed case we use ADD, rather than SIGNED_ADD,
             to avoid warnings from SVR4 cc.  This is OK since we
 
          /* For the signed case we use ADD, rather than SIGNED_ADD,
             to avoid warnings from SVR4 cc.  This is OK since we

-            explictly handle the sign bits.  */
+            explicitly handle the sign bits.  */

          if (signed_add >= 0)
            signed_check += add >> howto->bitpos;
          else
          if (signed_add >= 0)
            signed_check += add >> howto->bitpos;
          else


@@ -697,7 +676,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 
            if (signed_check > reloc_signed_max
                || signed_check < reloc_signed_min)
 
            if (signed_check > reloc_signed_max
                || signed_check < reloc_signed_min)

-             overflow = true;
+             overflow = TRUE;

          }
          break;
        case complain_overflow_unsigned:
          }
          break;
        case complain_overflow_unsigned:


@@ -709,7 +688,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
            (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
 
            if (check > reloc_unsigned_max)
            (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
 
            if (check > reloc_unsigned_max)

-             overflow = true;
+             overflow = TRUE;

          }
          break;
        case complain_overflow_bitfield:
          }
          break;
        case complain_overflow_bitfield:


@@ -722,7 +701,7 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
            if ((check & ~reloc_bits) != 0
                && (((bfd_vma) signed_check & ~reloc_bits)
                    != (-(bfd_vma) 1 & ~reloc_bits)))
            if ((check & ~reloc_bits) != 0
                && (((bfd_vma) signed_check & ~reloc_bits)
                    != (-(bfd_vma) 1 & ~reloc_bits)))

-             overflow = true;
+             overflow = TRUE;

          }
          break;
        default:
          }
          break;
        default:


@@ -758,15 +737,13 @@ _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation, location,
 }
 
 bfd_reloc_status_type
 }
 
 bfd_reloc_status_type

-_bfd_ns32k_reloc_disp (abfd, reloc_entry, symbol, data, input_section,
-                      output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+_bfd_ns32k_reloc_disp (bfd *abfd,
+                      arelent *reloc_entry,
+                      struct bfd_symbol *symbol,
+                      void * data,
+                      asection *input_section,
+                      bfd *output_bfd,
+                      char **error_message)

 {
   return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
                         output_bfd, error_message,
 {
   return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
                         output_bfd, error_message,


@@ -775,15 +752,13 @@ _bfd_ns32k_reloc_disp (abfd, reloc_entry, symbol, data, input_section,
 }
 
 bfd_reloc_status_type
 }
 
 bfd_reloc_status_type

-_bfd_ns32k_reloc_imm (abfd, reloc_entry, symbol, data, input_section,
-                     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+_bfd_ns32k_reloc_imm (bfd *abfd,
+                     arelent *reloc_entry,
+                     struct bfd_symbol *symbol,
+                     void * data,
+                     asection *input_section,
+                     bfd *output_bfd,
+                     char **error_message)

 {
   return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
                         output_bfd, error_message, _bfd_ns32k_get_immediate,
 {
   return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
                         output_bfd, error_message, _bfd_ns32k_get_immediate,


@@ -791,20 +766,18 @@ _bfd_ns32k_reloc_imm (abfd, reloc_entry, symbol, data, input_section,
 }
 
 bfd_reloc_status_type
 }
 
 bfd_reloc_status_type

-_bfd_ns32k_final_link_relocate (howto, input_bfd, input_section, contents,
-                               address, value, addend)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma address;
-     bfd_vma value;
-     bfd_vma addend;
+_bfd_ns32k_final_link_relocate (reloc_howto_type *howto,
+                               bfd *input_bfd,
+                               asection *input_section,
+                               bfd_byte *contents,
+                               bfd_vma address,
+                               bfd_vma value,
+                               bfd_vma addend)

 {
   bfd_vma relocation;
 
   /* Sanity check the address.  */
 {
   bfd_vma relocation;
 
   /* Sanity check the address.  */

-  if (address > input_section->_cooked_size)
+  if (address > bfd_get_section_limit (input_bfd, input_section))

     return bfd_reloc_outofrange;
 
   /* This function assumes that we are dealing with a basic relocation
     return bfd_reloc_outofrange;
 
   /* This function assumes that we are dealing with a basic relocation


@@ -818,9 +791,9 @@ _bfd_ns32k_final_link_relocate (howto, input_bfd, input_section, contents,
      location we are relocating.  Some targets (e.g., i386-aout)
      arrange for the contents of the section to be the negative of the
      offset of the location within the section; for such targets
      location we are relocating.  Some targets (e.g., i386-aout)
      arrange for the contents of the section to be the negative of the
      offset of the location within the section; for such targets

-     pcrel_offset is false.  Other targets (e.g., m88kbcs or ELF)
+     pcrel_offset is FALSE.  Other targets (e.g., m88kbcs or ELF)

      simply leave the contents of the section as zero; for such
      simply leave the contents of the section as zero; for such

-     targets pcrel_offset is true.  If pcrel_offset is false we do not
+     targets pcrel_offset is TRUE.  If pcrel_offset is FALSE we do not

      need to subtract out the offset of the location within the
      section (which is just ADDRESS).  */
   if (howto->pc_relative)
      need to subtract out the offset of the location within the
      section (which is just ADDRESS).  */
   if (howto->pc_relative)