More fixes for bfd_get_section_contents change

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

diff --git a/bfd/reloc.c b/bfd/reloc.c
index 593e7c71011a6c9fbbac61c3928d4a649f9feffe..024056f11816f7f6c504dff281fbdd7395bdbde6 100644 (file)
--- a/bfd/reloc.c
+++ b/bfd/reloc.c
@@ -1,5 +1,5 @@
 /* BFD support for handling relocation entries.
 /* BFD support for handling relocation entries.

-   Copyright (C) 1990-2015 Free Software Foundation, Inc.
+   Copyright (C) 1990-2017 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.


@@ -538,6 +538,22 @@ bfd_check_overflow (enum complain_overflow how,
   return flag;
 }
 
   return flag;
 }
 

+/* HOWTO describes a relocation, at offset OCTET.  Return whether the
+   relocation field is within SECTION of ABFD.  */
+
+static bfd_boolean
+reloc_offset_in_range (reloc_howto_type *howto, bfd *abfd,
+                      asection *section, bfd_size_type octet)
+{
+  bfd_size_type octet_end = bfd_get_section_limit_octets (abfd, section);
+  bfd_size_type reloc_size = bfd_get_reloc_size (howto);
+
+  /* The reloc field must be contained entirely within the section.
+     Allow zero length fields (marker relocs or NONE relocs where no
+     relocation will be performed) at the end of the section.  */
+  return octet <= octet_end && octet + reloc_size <= octet_end;
+}
+

 /*
 FUNCTION
        bfd_perform_relocation
 /*
 FUNCTION
        bfd_perform_relocation


@@ -586,16 +602,6 @@ bfd_perform_relocation (bfd *abfd,
   asymbol *symbol;
 
   symbol = *(reloc_entry->sym_ptr_ptr);
   asymbol *symbol;
 
   symbol = *(reloc_entry->sym_ptr_ptr);

-  if (bfd_is_abs_section (symbol->section)
-      && output_bfd != NULL)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* PR 17512: file: 0f67f69d.  */
-  if (howto == NULL)
-    return bfd_reloc_undefined;

 
   /* If we are not producing relocatable output, return an error if
      the symbol is not defined.  An undefined weak symbol is
 
   /* If we are not producing relocatable output, return an error if
      the symbol is not defined.  An undefined weak symbol is


@@ -608,7 +614,7 @@ bfd_perform_relocation (bfd *abfd,
   /* If there is a function supplied to handle this relocation type,
      call it.  It'll return `bfd_reloc_continue' if further processing
      can be done.  */
   /* If there is a function supplied to handle this relocation type,
      call it.  It'll return `bfd_reloc_continue' if further processing
      can be done.  */

-  if (howto->special_function)
+  if (howto && howto->special_function)

     {
       bfd_reloc_status_type cont;
       cont = howto->special_function (abfd, reloc_entry, symbol, data,
     {
       bfd_reloc_status_type cont;
       cont = howto->special_function (abfd, reloc_entry, symbol, data,


@@ -618,12 +624,20 @@ bfd_perform_relocation (bfd *abfd,
        return cont;
     }
 
        return cont;
     }
 

-  /* Is the address of the relocation really within the section?
-     Include the size of the reloc in the test for out of range addresses.
-     PR 17512: file: c146ab8b, 46dff27f, 38e53ebf.  */
+  if (bfd_is_abs_section (symbol->section)
+      && output_bfd != NULL)
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* PR 17512: file: 0f67f69d.  */
+  if (howto == NULL)
+    return bfd_reloc_undefined;
+
+  /* Is the address of the relocation really within the section?  */

   octets = reloc_entry->address * bfd_octets_per_byte (abfd);
   octets = reloc_entry->address * bfd_octets_per_byte (abfd);

-  if (octets + bfd_get_reloc_size (howto)
-      > bfd_get_section_limit_octets (abfd, input_section))
+  if (!reloc_offset_in_range (howto, abfd, input_section, octets))

     return bfd_reloc_outofrange;
 
   /* Work out which section the relocation is targeted at and the
     return bfd_reloc_outofrange;
 
   /* Work out which section the relocation is targeted at and the


@@ -981,16 +995,11 @@ bfd_install_relocation (bfd *abfd,
   bfd_byte *data;
 
   symbol = *(reloc_entry->sym_ptr_ptr);
   bfd_byte *data;
 
   symbol = *(reloc_entry->sym_ptr_ptr);

-  if (bfd_is_abs_section (symbol->section))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }

 
   /* If there is a function supplied to handle this relocation type,
      call it.  It'll return `bfd_reloc_continue' if further processing
      can be done.  */
 
   /* If there is a function supplied to handle this relocation type,
      call it.  It'll return `bfd_reloc_continue' if further processing
      can be done.  */

-  if (howto->special_function)
+  if (howto && howto->special_function)

     {
       bfd_reloc_status_type cont;
 
     {
       bfd_reloc_status_type cont;
 


@@ -1005,10 +1014,18 @@ bfd_install_relocation (bfd *abfd,
        return cont;
     }
 
        return cont;
     }
 

+  if (bfd_is_abs_section (symbol->section))
+    {
+      reloc_entry->address += input_section->output_offset;
+      return bfd_reloc_ok;
+    }
+
+  /* No need to check for howto != NULL if !bfd_is_abs_section as
+     it will have been checked in `bfd_perform_relocation already'.  */
+

   /* Is the address of the relocation really within the section?  */
   octets = reloc_entry->address * bfd_octets_per_byte (abfd);
   /* Is the address of the relocation really within the section?  */
   octets = reloc_entry->address * bfd_octets_per_byte (abfd);

-  if (octets + bfd_get_reloc_size (howto)
-      > bfd_get_section_limit_octets (abfd, input_section))
+  if (!reloc_offset_in_range (howto, abfd, input_section, octets))

     return bfd_reloc_outofrange;
 
   /* Work out which section the relocation is targeted at and the
     return bfd_reloc_outofrange;
 
   /* Work out which section the relocation is targeted at and the


@@ -1346,8 +1363,7 @@ _bfd_final_link_relocate (reloc_howto_type *howto,
   bfd_size_type octets = address * bfd_octets_per_byte (input_bfd);
 
   /* Sanity check the address.  */
   bfd_size_type octets = address * bfd_octets_per_byte (input_bfd);
 
   /* Sanity check the address.  */

-  if (octets + bfd_get_reloc_size (howto)
-      > bfd_get_section_limit_octets (input_bfd, input_section))
+  if (!reloc_offset_in_range (howto, input_bfd, input_section, octets))

     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


@@ -1375,7 +1391,8 @@ _bfd_final_link_relocate (reloc_howto_type *howto,
     }
 
   return _bfd_relocate_contents (howto, input_bfd, relocation,
     }
 
   return _bfd_relocate_contents (howto, input_bfd, relocation,

-                                contents + address);
+                                contents
+                                + address * bfd_octets_per_byte (input_bfd));

 }
 
 /* Relocate a given location using a given value and howto.  */
 }
 
 /* Relocate a given location using a given value and howto.  */


@@ -2303,6 +2320,11 @@ ENUMX
 ENUMDOC
   microMIPS PC-relative relocations.
 
 ENUMDOC
   microMIPS PC-relative relocations.
 

+ENUM
+  BFD_RELOC_MIPS16_16_PCREL_S1
+ENUMDOC
+  MIPS16 PC-relative relocation.
+

 ENUM
   BFD_RELOC_MIPS_21_PCREL_S2
 ENUMX
 ENUM
   BFD_RELOC_MIPS_21_PCREL_S2
 ENUMX


@@ -2889,6 +2911,8 @@ ENUMX
   BFD_RELOC_PPC_VLE_SDAREL_HA16A
 ENUMX
   BFD_RELOC_PPC_VLE_SDAREL_HA16D
   BFD_RELOC_PPC_VLE_SDAREL_HA16A
 ENUMX
   BFD_RELOC_PPC_VLE_SDAREL_HA16D

+ENUMX
+  BFD_RELOC_PPC_16DX_HA

 ENUMX
   BFD_RELOC_PPC_REL16DX_HA
 ENUMX
 ENUMX
   BFD_RELOC_PPC_REL16DX_HA
 ENUMX


@@ -3271,6 +3295,17 @@ ENUM
 ENUMDOC
   ARM support for STT_GNU_IFUNC.
 
 ENUMDOC
   ARM support for STT_GNU_IFUNC.
 

+ENUM
+  BFD_RELOC_ARM_THUMB_ALU_ABS_G0_NC
+ENUMX
+  BFD_RELOC_ARM_THUMB_ALU_ABS_G1_NC
+ENUMX
+  BFD_RELOC_ARM_THUMB_ALU_ABS_G2_NC
+ENUMX
+  BFD_RELOC_ARM_THUMB_ALU_ABS_G3_NC
+ENUMDOC
+  Thumb1 relocations to support execute-only code.
+

 ENUM
   BFD_RELOC_ARM_IMMEDIATE
 ENUMX
 ENUM
   BFD_RELOC_ARM_IMMEDIATE
 ENUMX


@@ -3591,11 +3626,11 @@ ENUMX
 ENUMX
   BFD_RELOC_AC_SECTOFF_U8_2
 ENUMX
 ENUMX
   BFD_RELOC_AC_SECTOFF_U8_2
 ENUMX

-  BFD_RELOC_AC_SECTFOFF_S9
+  BFD_RELOC_AC_SECTOFF_S9

 ENUMX
 ENUMX

-  BFD_RELOC_AC_SECTFOFF_S9_1
+  BFD_RELOC_AC_SECTOFF_S9_1

 ENUMX
 ENUMX

-  BFD_RELOC_AC_SECTFOFF_S9_2
+  BFD_RELOC_AC_SECTOFF_S9_2

 ENUMX
   BFD_RELOC_ARC_SECTOFF_ME_1
 ENUMX
 ENUMX
   BFD_RELOC_ARC_SECTOFF_ME_1
 ENUMX


@@ -3604,6 +3639,8 @@ ENUMX
   BFD_RELOC_ARC_SECTOFF_1
 ENUMX
   BFD_RELOC_ARC_SECTOFF_2
   BFD_RELOC_ARC_SECTOFF_1
 ENUMX
   BFD_RELOC_ARC_SECTOFF_2

+ENUMX
+  BFD_RELOC_ARC_SDA_12

 ENUMX
   BFD_RELOC_ARC_SDA16_ST2
 ENUMX
 ENUMX
   BFD_RELOC_ARC_SDA16_ST2
 ENUMX


@@ -3656,6 +3693,8 @@ ENUMX
   BFD_RELOC_ARC_S25W_PCREL_PLT
 ENUMX
   BFD_RELOC_ARC_S21H_PCREL_PLT
   BFD_RELOC_ARC_S25W_PCREL_PLT
 ENUMX
   BFD_RELOC_ARC_S21H_PCREL_PLT

+ENUMX
+  BFD_RELOC_ARC_NPS_CMEM16

 ENUMDOC
   ARC relocs.
 
 ENUMDOC
   ARC relocs.
 


@@ -5021,6 +5060,104 @@ ENUM
 ENUMDOC
   This is a 5 bit reloc for the AVR that stores an I/O register
   number for the SBIC, SBIS, SBI and CBI instructions
 ENUMDOC
   This is a 5 bit reloc for the AVR that stores an I/O register
   number for the SBIC, SBIS, SBI and CBI instructions

+
+ENUM
+  BFD_RELOC_RISCV_HI20
+ENUMX
+  BFD_RELOC_RISCV_PCREL_HI20
+ENUMX
+  BFD_RELOC_RISCV_PCREL_LO12_I
+ENUMX
+  BFD_RELOC_RISCV_PCREL_LO12_S
+ENUMX
+  BFD_RELOC_RISCV_LO12_I
+ENUMX
+  BFD_RELOC_RISCV_LO12_S
+ENUMX
+  BFD_RELOC_RISCV_GPREL12_I
+ENUMX
+  BFD_RELOC_RISCV_GPREL12_S
+ENUMX
+  BFD_RELOC_RISCV_TPREL_HI20
+ENUMX
+  BFD_RELOC_RISCV_TPREL_LO12_I
+ENUMX
+  BFD_RELOC_RISCV_TPREL_LO12_S
+ENUMX
+  BFD_RELOC_RISCV_TPREL_ADD
+ENUMX
+  BFD_RELOC_RISCV_CALL
+ENUMX
+  BFD_RELOC_RISCV_CALL_PLT
+ENUMX
+  BFD_RELOC_RISCV_ADD8
+ENUMX
+  BFD_RELOC_RISCV_ADD16
+ENUMX
+  BFD_RELOC_RISCV_ADD32
+ENUMX
+  BFD_RELOC_RISCV_ADD64
+ENUMX
+  BFD_RELOC_RISCV_SUB8
+ENUMX
+  BFD_RELOC_RISCV_SUB16
+ENUMX
+  BFD_RELOC_RISCV_SUB32
+ENUMX
+  BFD_RELOC_RISCV_SUB64
+ENUMX
+  BFD_RELOC_RISCV_GOT_HI20
+ENUMX
+  BFD_RELOC_RISCV_TLS_GOT_HI20
+ENUMX
+  BFD_RELOC_RISCV_TLS_GD_HI20
+ENUMX
+  BFD_RELOC_RISCV_JMP
+ENUMX
+  BFD_RELOC_RISCV_TLS_DTPMOD32
+ENUMX
+  BFD_RELOC_RISCV_TLS_DTPREL32
+ENUMX
+  BFD_RELOC_RISCV_TLS_DTPMOD64
+ENUMX
+  BFD_RELOC_RISCV_TLS_DTPREL64
+ENUMX
+  BFD_RELOC_RISCV_TLS_TPREL32
+ENUMX
+  BFD_RELOC_RISCV_TLS_TPREL64
+ENUMX
+  BFD_RELOC_RISCV_ALIGN
+ENUMX
+  BFD_RELOC_RISCV_RVC_BRANCH
+ENUMX
+  BFD_RELOC_RISCV_RVC_JUMP
+ENUMX
+  BFD_RELOC_RISCV_RVC_LUI
+ENUMX
+  BFD_RELOC_RISCV_GPREL_I
+ENUMX
+  BFD_RELOC_RISCV_GPREL_S
+ENUMX
+  BFD_RELOC_RISCV_TPREL_I
+ENUMX
+  BFD_RELOC_RISCV_TPREL_S
+ENUMX
+  BFD_RELOC_RISCV_RELAX
+ENUMX
+  BFD_RELOC_RISCV_CFA
+ENUMX
+  BFD_RELOC_RISCV_SUB6
+ENUMX
+  BFD_RELOC_RISCV_SET6
+ENUMX
+  BFD_RELOC_RISCV_SET8
+ENUMX
+  BFD_RELOC_RISCV_SET16
+ENUMX
+  BFD_RELOC_RISCV_SET32
+ENUMDOC
+  RISC-V relocations.
+

 ENUM
   BFD_RELOC_RL78_NEG8
 ENUMX
 ENUM
   BFD_RELOC_RL78_NEG8
 ENUMX


@@ -6392,6 +6529,54 @@ ENUMX
 ENUMDOC
   Relocations used by the Altera Nios II core.
 
 ENUMDOC
   Relocations used by the Altera Nios II core.
 

+ENUM
+  BFD_RELOC_PRU_U16
+ENUMDOC
+  PRU LDI 16-bit unsigned data-memory relocation.
+ENUM
+  BFD_RELOC_PRU_U16_PMEMIMM
+ENUMDOC
+  PRU LDI 16-bit unsigned instruction-memory relocation.
+ENUM
+  BFD_RELOC_PRU_LDI32
+ENUMDOC
+  PRU relocation for two consecutive LDI load instructions that load a
+  32 bit value into a register. If the higher bits are all zero, then
+  the second instruction may be relaxed.
+ENUM
+  BFD_RELOC_PRU_S10_PCREL
+ENUMDOC
+  PRU QBBx 10-bit signed PC-relative relocation.
+ENUM
+  BFD_RELOC_PRU_U8_PCREL
+ENUMDOC
+  PRU 8-bit unsigned relocation used for the LOOP instruction.
+ENUM
+  BFD_RELOC_PRU_32_PMEM
+ENUMX
+  BFD_RELOC_PRU_16_PMEM
+ENUMDOC
+  PRU Program Memory relocations.  Used to convert from byte addressing to
+  32-bit word addressing.
+ENUM
+  BFD_RELOC_PRU_GNU_DIFF8
+ENUMX
+  BFD_RELOC_PRU_GNU_DIFF16
+ENUMX
+  BFD_RELOC_PRU_GNU_DIFF32
+ENUMX
+  BFD_RELOC_PRU_GNU_DIFF16_PMEM
+ENUMX
+  BFD_RELOC_PRU_GNU_DIFF32_PMEM
+ENUMDOC
+  PRU relocations to mark the difference of two local symbols.
+  These are only needed to support linker relaxation and can be ignored
+  when not relaxing.  The field is set to the value of the difference
+  assuming no relaxation.  The relocation encodes the position of the
+  second symbol so the linker can determine whether to adjust the field
+  value. The PMEM variants encode the word difference, instead of byte
+  difference between symbols.
+

 ENUM
   BFD_RELOC_IQ2000_OFFSET_16
 ENUMX
 ENUM
   BFD_RELOC_IQ2000_OFFSET_16
 ENUMX


@@ -6761,6 +6946,10 @@ ENUMDOC
   relocation enumerators.  N.B. the order of the enumerators is
   important as several tables in the AArch64 bfd backend are indexed
   by these enumerators; make sure they are all synced.
   relocation enumerators.  N.B. the order of the enumerators is
   important as several tables in the AArch64 bfd backend are indexed
   by these enumerators; make sure they are all synced.

+ENUM
+  BFD_RELOC_AARCH64_NULL
+ENUMDOC
+  Deprecated AArch64 null relocation code.

 ENUM
   BFD_RELOC_AARCH64_NONE
 ENUMDOC
 ENUM
   BFD_RELOC_AARCH64_NONE
 ENUMDOC


@@ -6931,13 +7120,13 @@ ENUM
 ENUMDOC
   Unsigned 12 bit byte offset for 64 bit load/store from the page of
   the GOT entry for this symbol.  Used in conjunction with
 ENUMDOC
   Unsigned 12 bit byte offset for 64 bit load/store from the page of
   the GOT entry for this symbol.  Used in conjunction with

-  BFD_RELOC_AARCH64_ADR_GOTPAGE.  Valid in LP64 ABI only.
+  BFD_RELOC_AARCH64_ADR_GOT_PAGE.  Valid in LP64 ABI only.

 ENUM
   BFD_RELOC_AARCH64_LD32_GOT_LO12_NC
 ENUMDOC
   Unsigned 12 bit byte offset for 32 bit load/store from the page of
   the GOT entry for this symbol.  Used in conjunction with
 ENUM
   BFD_RELOC_AARCH64_LD32_GOT_LO12_NC
 ENUMDOC
   Unsigned 12 bit byte offset for 32 bit load/store from the page of
   the GOT entry for this symbol.  Used in conjunction with

-  BFD_RELOC_AARCH64_ADR_GOTPAGE.  Valid in ILP32 ABI only.
+  BFD_RELOC_AARCH64_ADR_GOT_PAGE.  Valid in ILP32 ABI only.

  ENUM
   BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC
 ENUMDOC
  ENUM
   BFD_RELOC_AARCH64_MOVW_GOTOFF_G0_NC
 ENUMDOC


@@ -7138,7 +7327,7 @@ ENUM
 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM
 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM

-  BFD_RELOC_AARCH64_TLSDESC_LD64_LO12_NC
+  BFD_RELOC_AARCH64_TLSDESC_LD64_LO12

 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM
 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM


@@ -7146,7 +7335,7 @@ ENUM
 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM
 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM

-  BFD_RELOC_AARCH64_TLSDESC_ADD_LO12_NC
+  BFD_RELOC_AARCH64_TLSDESC_ADD_LO12

 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM
 ENUMDOC
   AArch64 TLS DESC relocation.
 ENUM


@@ -7675,6 +7864,29 @@ ENUMX
 ENUMDOC
   Visium Relocations.
 
 ENUMDOC
   Visium Relocations.
 

+ENUM
+  BFD_RELOC_WASM32_LEB128
+ENUMX
+  BFD_RELOC_WASM32_LEB128_GOT
+ENUMX
+  BFD_RELOC_WASM32_LEB128_GOT_CODE
+ENUMX
+  BFD_RELOC_WASM32_LEB128_PLT
+ENUMX
+  BFD_RELOC_WASM32_PLT_INDEX
+ENUMX
+  BFD_RELOC_WASM32_ABS32_CODE
+ENUMX
+  BFD_RELOC_WASM32_COPY
+ENUMX
+  BFD_RELOC_WASM32_CODE_POINTER
+ENUMX
+  BFD_RELOC_WASM32_INDEX
+ENUMX
+  BFD_RELOC_WASM32_PLT_SIG
+ENUMDOC
+  WebAssembly relocations.
+

 ENDSENUM
   BFD_RELOC_UNUSED
 CODE_FRAGMENT
 ENDSENUM
   BFD_RELOC_UNUSED
 CODE_FRAGMENT


@@ -7740,13 +7952,16 @@ bfd_default_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code)
        {
        case 64:
          BFD_FAIL ();
        {
        case 64:
          BFD_FAIL ();

+         break;

        case 32:
          return &bfd_howto_32;
        case 16:
          BFD_FAIL ();
        case 32:
          return &bfd_howto_32;
        case 16:
          BFD_FAIL ();

+         break;

        default:
          BFD_FAIL ();
        }
        default:
          BFD_FAIL ();
        }

+      break;

     default:
       BFD_FAIL ();
     }
     default:
       BFD_FAIL ();
     }


@@ -7844,7 +8059,7 @@ bfd_generic_lookup_section_flags (struct bfd_link_info *info ATTRIBUTE_UNUSED,
 {
   if (flaginfo != NULL)
     {
 {
   if (flaginfo != NULL)
     {

-      (*_bfd_error_handler) (_("INPUT_SECTION_FLAGS are not supported.\n"));
+      _bfd_error_handler (_("INPUT_SECTION_FLAGS are not supported.\n"));

       return FALSE;
     }
   return TRUE;
       return FALSE;
     }
   return TRUE;


@@ -7911,6 +8126,9 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
   if (!bfd_get_full_section_contents (input_bfd, input_section, &data))
     return NULL;
 
   if (!bfd_get_full_section_contents (input_bfd, input_section, &data))
     return NULL;
 

+  if (data == NULL)
+    return NULL;
+

   if (reloc_size == 0)
     return data;
 
   if (reloc_size == 0)
     return data;
 


@@ -7928,6 +8146,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
   if (reloc_count > 0)
     {
       arelent **parent;
   if (reloc_count > 0)
     {
       arelent **parent;

+

       for (parent = reloc_vector; *parent != NULL; parent++)
        {
          char *error_message = NULL;
       for (parent = reloc_vector; *parent != NULL; parent++)
        {
          char *error_message = NULL;


@@ -7935,6 +8154,17 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
          bfd_reloc_status_type r;
 
          symbol = *(*parent)->sym_ptr_ptr;
          bfd_reloc_status_type r;
 
          symbol = *(*parent)->sym_ptr_ptr;

+         /* PR ld/19628: A specially crafted input file
+            can result in a NULL symbol pointer here.  */
+         if (symbol == NULL)
+           {
+             link_info->callbacks->einfo
+               /* xgettext:c-format */
+               (_("%X%P: %B(%A): error: relocation for offset %V has no value\n"),
+                abfd, input_section, (* parent)->address);
+             goto error_return;
+           }
+

          if (symbol->section && discarded_section (symbol->section))
            {
              bfd_byte *p;
          if (symbol->section && discarded_section (symbol->section))
            {
              bfd_byte *p;


@@ -7972,26 +8202,22 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
              switch (r)
                {
                case bfd_reloc_undefined:
              switch (r)
                {
                case bfd_reloc_undefined:

-                 if (!((*link_info->callbacks->undefined_symbol)
-                       (link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-                        input_bfd, input_section, (*parent)->address,
-                        TRUE)))
-                   goto error_return;
+                 (*link_info->callbacks->undefined_symbol)
+                   (link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+                    input_bfd, input_section, (*parent)->address, TRUE);

                  break;
                case bfd_reloc_dangerous:
                  BFD_ASSERT (error_message != NULL);
                  break;
                case bfd_reloc_dangerous:
                  BFD_ASSERT (error_message != NULL);

-                 if (!((*link_info->callbacks->reloc_dangerous)
-                       (link_info, error_message, input_bfd, input_section,
-                        (*parent)->address)))
-                   goto error_return;
+                 (*link_info->callbacks->reloc_dangerous)
+                   (link_info, error_message,
+                    input_bfd, input_section, (*parent)->address);

                  break;
                case bfd_reloc_overflow:
                  break;
                case bfd_reloc_overflow:

-                 if (!((*link_info->callbacks->reloc_overflow)
-                       (link_info, NULL,
-                        bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-                        (*parent)->howto->name, (*parent)->addend,
-                        input_bfd, input_section, (*parent)->address)))
-                   goto error_return;
+                 (*link_info->callbacks->reloc_overflow)
+                   (link_info, NULL,
+                    bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
+                    (*parent)->howto->name, (*parent)->addend,
+                    input_bfd, input_section, (*parent)->address);

                  break;
                case bfd_reloc_outofrange:
                  /* PR ld/13730:
                  break;
                case bfd_reloc_outofrange:
                  /* PR ld/13730:


@@ -7999,6 +8225,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
                     complete binaries.  Do not abort, but issue an error
                     message instead.  */
                  link_info->callbacks->einfo
                     complete binaries.  Do not abort, but issue an error
                     message instead.  */
                  link_info->callbacks->einfo

+                   /* xgettext:c-format */

                    (_("%X%P: %B(%A): relocation \"%R\" goes out of range\n"),
                     abfd, input_section, * parent);
                  goto error_return;
                    (_("%X%P: %B(%A): relocation \"%R\" goes out of range\n"),
                     abfd, input_section, * parent);
                  goto error_return;


@@ -8008,6 +8235,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
                     This error can result when processing a corrupt binary.
                     Do not abort.  Issue an error message instead.  */
                  link_info->callbacks->einfo
                     This error can result when processing a corrupt binary.
                     Do not abort.  Issue an error message instead.  */
                  link_info->callbacks->einfo

+                   /* xgettext:c-format */

                    (_("%X%P: %B(%A): relocation \"%R\" is not supported\n"),
                     abfd, input_section, * parent);
                  goto error_return;
                    (_("%X%P: %B(%A): relocation \"%R\" is not supported\n"),
                     abfd, input_section, * parent);
                  goto error_return;


@@ -8016,6 +8244,7 @@ bfd_generic_get_relocated_section_contents (bfd *abfd,
                  /* PR 17512; file: 90c2a92e.
                     Report unexpected results, without aborting.  */
                  link_info->callbacks->einfo
                  /* PR 17512; file: 90c2a92e.
                     Report unexpected results, without aborting.  */
                  link_info->callbacks->einfo

+                   /* xgettext:c-format */

                    (_("%X%P: %B(%A): relocation \"%R\" returns an unrecognized value %x\n"),
                     abfd, input_section, * parent, r);
                  break;
                    (_("%X%P: %B(%A): relocation \"%R\" returns an unrecognized value %x\n"),
                     abfd, input_section, * parent, r);
                  break;


@@ -8032,3 +8261,29 @@ error_return:
   free (reloc_vector);
   return NULL;
 }
   free (reloc_vector);
   return NULL;
 }

+
+/*
+INTERNAL_FUNCTION
+       _bfd_generic_set_reloc
+
+SYNOPSIS
+       void _bfd_generic_set_reloc
+         (bfd *abfd,
+          sec_ptr section,
+          arelent **relptr,
+          unsigned int count);
+
+DESCRIPTION
+       Installs a new set of internal relocations in SECTION.
+*/
+
+
+void _bfd_generic_set_reloc
+  (bfd *abfd ATTRIBUTE_UNUSED,
+   sec_ptr section,
+   arelent **relptr,
+   unsigned int count)
+{
+  section->orelocation = relptr;
+  section->reloc_count = count;
+}