Use function view when iterating over block symbols

[binutils-gdb.git] / bfd / elf32-or1k.c

diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 192e83aa7bc59ae67585f602d685b7566158c4a4..2a06b3e19e6c54067adb7e9c582b9949a10571ad 100644 (file)
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] =
         false),                /* pcrel_offset */
 };
 
+/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16
+   relocations when we know we can ignore overflows.  */
+static reloc_howto_type or1k_elf_got16_no_overflow_howto =
+  HOWTO (R_OR1K_GOT16,         /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_dont, /* complain_on_overflow */
+        bfd_elf_generic_reloc, /* special_function */
+        "R_OR1K_GOT16",        /* name */
+        false,                 /* partial_inplace */
+        0,                     /* src_mask */
+        0xffff,                /* dst_mask */
+        false);                /* pcrel_offset */
+
 /* Map BFD reloc types to Or1k ELF reloc types.  */
 
 struct or1k_reloc_map
@@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd,
            if (r_type == R_OR1K_GOT_AHI16)
              saw_gotha = true;
 
-           /* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16
+           /* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16
               relocation we assume the code is doing the right thing to avoid
-              overflows.  Here we mask the lower 16-bit of the relocation to
-              avoid overflow validation failures.  */
+              overflows.  */
            if (r_type == R_OR1K_GOT16 && saw_gotha)
-             relocation &= 0xffff;
+             howto = &or1k_elf_got16_no_overflow_howto;
 
          /* Addend should be zero.  */
          if (rel->r_addend != 0)