#define COFF_WITH_peAArch64
#endif
-/* Note we have to make sure not to include headers twice.
- Not all headers are wrapped in #ifdef guards, so we define
- PEI_HEADERS to prevent double including here. */
-#ifndef PEI_HEADERS
#include "sysdep.h"
#include "bfd.h"
#include "libbfd.h"
#include "coff/pe.h"
#include "libcoff.h"
#include "libiberty.h"
-#endif
-#include "libcoff.h"
+/* For these howto special functions,
+ output_bfd == NULL => final link, or objdump -W and other calls to
+ bfd_simple_get_relocated_section_contents
+ output_bfd != NULL && output_bfd != abfd => ld -r
+ output_bfd != NULL && output_bfd == abfd => gas.
+ FIXME: ld -r is punted to bfd_perform_relocation. This won't be
+ correct for cases where the addend needs to be adjusted, eg. for
+ relocations against section symbols, and the field is split because
+ bfd_perform_relocation can't write addends to split relocation fields. */
static bfd_reloc_status_type
-coff_aarch64_rel21_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+coff_aarch64_rel21_reloc (bfd *abfd,
arelent *reloc_entry,
- asymbol *symbol ATTRIBUTE_UNUSED,
+ asymbol *symbol,
void *data,
- asection *input_section ATTRIBUTE_UNUSED,
- bfd *output_bfd ATTRIBUTE_UNUSED,
+ asection *input_section,
+ bfd *output_bfd,
char **error_message ATTRIBUTE_UNUSED)
{
- uint32_t op;
- int32_t param;
+ if (output_bfd != NULL && output_bfd != abfd)
+ return bfd_reloc_continue;
- op = bfd_getl32 (data + reloc_entry->address);
- param = reloc_entry->addend;
+ if (!bfd_reloc_offset_in_range (reloc_entry->howto, abfd,
+ input_section, reloc_entry->address))
+ return bfd_reloc_outofrange;
- if (param > 0xfffff || param < -0x100000)
- return bfd_reloc_overflow;
+ uint32_t op = bfd_getl32 (data + reloc_entry->address);
+ bfd_vma relocation = reloc_entry->addend;
+ bfd_reloc_status_type ret = bfd_reloc_ok;
+ if (output_bfd == NULL)
+ {
+ if (bfd_is_und_section (symbol->section))
+ {
+ if ((symbol->flags & BSF_WEAK) == 0)
+ ret = bfd_reloc_undefined;
+ }
+ else if (!bfd_is_com_section (symbol->section))
+ relocation += (symbol->value
+ + symbol->section->output_offset
+ + symbol->section->output_section->vma);
+ bfd_vma addend = ((op >> 3) & 0x1ffffc) | ((op >> 29) & 0x3);
+ addend = (addend ^ 0x100000) - 0x100000;
+ relocation += addend;
+ relocation -= (reloc_entry->address
+ + input_section->output_offset
+ + input_section->output_section->vma);
+ relocation = (bfd_signed_vma) relocation >> reloc_entry->howto->rightshift;
+ }
+ if (relocation + 0x100000 > 0x1fffff)
+ ret = bfd_reloc_overflow;
op &= 0x9f00001f;
- op |= (param & 0x1ffffc) << 3;
- op |= (param & 0x3) << 29;
+ op |= (relocation & 0x1ffffc) << 3;
+ op |= (relocation & 0x3) << 29;
bfd_putl32 (op, data + reloc_entry->address);
- return bfd_reloc_ok;
+ return ret;
}
static bfd_reloc_status_type
-coff_aarch64_po12l_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+coff_aarch64_po12l_reloc (bfd *abfd,
arelent *reloc_entry,
asymbol *symbol ATTRIBUTE_UNUSED,
void *data,
- asection *input_section ATTRIBUTE_UNUSED,
- bfd *output_bfd ATTRIBUTE_UNUSED,
+ asection *input_section,
+ bfd *output_bfd,
char **error_message ATTRIBUTE_UNUSED)
{
- uint32_t op;
- int32_t param;
- uint8_t shift;
+ if (output_bfd != NULL && output_bfd != abfd)
+ return bfd_reloc_continue;
+
+ if (!bfd_reloc_offset_in_range (reloc_entry->howto, abfd,
+ input_section, reloc_entry->address))
+ return bfd_reloc_outofrange;
- op = bfd_getl32 (data + reloc_entry->address);
- param = reloc_entry->addend & 0xfff;
+ uint32_t op = bfd_getl32 (data + reloc_entry->address);
+ bfd_vma relocation = reloc_entry->addend & 0xfff;
+ int shift;
if ((op & 0xff800000) == 0x3d800000)
{
shift = op >> 30;
}
- if (param & ((1 << shift) - 1))
- return bfd_reloc_overflow;
+ bfd_reloc_status_type ret = bfd_reloc_ok;
+ if (output_bfd == NULL)
+ {
+ if (bfd_is_und_section (symbol->section))
+ {
+ if ((symbol->flags & BSF_WEAK) == 0)
+ ret = bfd_reloc_undefined;
+ }
+ else if (!bfd_is_com_section (symbol->section))
+ relocation += (symbol->value
+ + symbol->section->output_offset
+ + symbol->section->output_section->vma);
+ bfd_vma addend = (op >> 10) & 0xfff;
+ addend <<= shift;
+ relocation += addend;
+ }
- param >>= shift;
+ if (relocation & ((1 << shift) - 1))
+ ret = bfd_reloc_overflow;
op &= 0xffc003ff;
- op |= param << 10;
+ op |= (relocation >> shift << 10) & 0x3ffc00;
bfd_putl32 (op, data + reloc_entry->address);
- return bfd_reloc_ok;
+ return ret;
}
static bfd_reloc_status_type
-coff_aarch64_addr32nb_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+coff_aarch64_addr32nb_reloc (bfd *abfd,
arelent *reloc_entry,
asymbol *symbol ATTRIBUTE_UNUSED,
void *data,
- asection *input_section ATTRIBUTE_UNUSED,
- bfd *output_bfd ATTRIBUTE_UNUSED,
- char **error_message ATTRIBUTE_UNUSED)
+ asection *input_section,
+ bfd *output_bfd,
+ char **error_message)
{
- uint64_t val;
+ if (output_bfd != NULL && output_bfd != abfd)
+ return bfd_reloc_continue;
+
+ if (!bfd_reloc_offset_in_range (reloc_entry->howto, abfd,
+ input_section, reloc_entry->address))
+ return bfd_reloc_outofrange;
- if ((int64_t) reloc_entry->addend > 0x7fffffff
- || (int64_t) reloc_entry->addend < -0x7fffffff)
- return bfd_reloc_overflow;
+ bfd_vma relocation = reloc_entry->addend;
+ bfd_reloc_status_type ret = bfd_reloc_ok;
+ if (output_bfd == NULL)
+ {
+ if (bfd_is_und_section (symbol->section))
+ {
+ if ((symbol->flags & BSF_WEAK) == 0)
+ ret = bfd_reloc_undefined;
+ }
+ else if (!bfd_is_com_section (symbol->section))
+ relocation += (symbol->value
+ + symbol->section->output_offset
+ + symbol->section->output_section->vma);
+ bfd_vma addend = bfd_getl_signed_32 (data + reloc_entry->address);
+ relocation += addend;
+ bfd *obfd = input_section->output_section->owner;
+ if (bfd_get_flavour (obfd) == bfd_target_coff_flavour
+ && obj_pe (obfd))
+ relocation -= pe_data (obfd)->pe_opthdr.ImageBase;
+ else
+ {
+ *error_message = "unsupported";
+ return bfd_reloc_dangerous;
+ }
+ }
- val = reloc_entry->addend;
+ if (relocation + 0x80000000 > 0xffffffff)
+ ret = bfd_reloc_overflow;
- bfd_putl32 ((uint32_t) val, data + reloc_entry->address);
+ bfd_putl32 (relocation, data + reloc_entry->address);
- return bfd_reloc_ok;
+ return ret;
}
static bfd_reloc_status_type
-coff_aarch64_secrel_reloc (bfd *abfd ATTRIBUTE_UNUSED,
+coff_aarch64_secrel_reloc (bfd *abfd,
arelent *reloc_entry,
asymbol *symbol ATTRIBUTE_UNUSED,
void *data,
- asection *input_section ATTRIBUTE_UNUSED,
- bfd *output_bfd ATTRIBUTE_UNUSED,
+ asection *input_section,
+ bfd *output_bfd,
char **error_message ATTRIBUTE_UNUSED)
{
- bfd_putl32 (reloc_entry->addend, data + reloc_entry->address);
+ if (output_bfd != NULL && output_bfd != abfd)
+ return bfd_reloc_continue;
+
+ if (!bfd_reloc_offset_in_range (reloc_entry->howto, abfd,
+ input_section, reloc_entry->address))
+ return bfd_reloc_outofrange;
- return bfd_reloc_ok;
+ bfd_vma relocation = reloc_entry->addend;
+ bfd_reloc_status_type ret = bfd_reloc_ok;
+ if (output_bfd == NULL)
+ {
+ if (bfd_is_und_section (symbol->section))
+ {
+ if ((symbol->flags & BSF_WEAK) == 0)
+ ret = bfd_reloc_undefined;
+ }
+ else if (!bfd_is_com_section (symbol->section))
+ relocation += (symbol->value
+ + symbol->section->output_offset);
+ bfd_vma addend = bfd_getl_signed_32 (data + reloc_entry->address);
+ relocation += addend;
+ }
+ if (relocation > 0xffffffff)
+ ret = bfd_reloc_overflow;
+
+ bfd_putl32 (relocation, data + reloc_entry->address);
+
+ return ret;
}
#define coff_aarch64_NULL NULL
= HOW (IMAGE_REL_ARM64_SECREL,
0, 4, 32, false, 0, dont, secrel_reloc, 0xffffffff);
+static const reloc_howto_type arm64_reloc_howto_secidx
+= HOW (IMAGE_REL_ARM64_SECTION,
+ 0, 2, 16, false, 0, dont, NULL, 0xffff);
+
static const reloc_howto_type* const arm64_howto_table[] = {
&arm64_reloc_howto_abs,
&arm64_reloc_howto_64,
&arm64_reloc_howto_branch14,
&arm64_reloc_howto_pgoff12a,
&arm64_reloc_howto_32nb,
- &arm64_reloc_howto_secrel
+ &arm64_reloc_howto_secrel,
+ &arm64_reloc_howto_secidx
};
/* No adjustment to addends should be needed. The actual relocation
return &arm64_reloc_howto_32nb;
case BFD_RELOC_32_SECREL:
return &arm64_reloc_howto_secrel;
+ case BFD_RELOC_16_SECIDX:
+ return &arm64_reloc_howto_secidx;
default:
BFD_FAIL ();
return NULL;
return &arm64_reloc_howto_32nb;
case IMAGE_REL_ARM64_SECREL:
return &arm64_reloc_howto_secrel;
+ case IMAGE_REL_ARM64_SECTION:
+ return &arm64_reloc_howto_secidx;
default:
return NULL;
}
|| (unsigned long) symndx >= obj_raw_syment_count (input_bfd))
continue;
+ /* All the relocs handled below operate on 4 bytes. */
+ if (input_section->size < rel->r_vaddr
+ || input_section->size - rel->r_vaddr < 4)
+ {
+ _bfd_error_handler
+ /* xgettext: c-format */
+ (_("%pB: bad reloc address %#" PRIx64 " in section `%pA'"),
+ input_bfd, (uint64_t) rel->r_vaddr, input_section);
+ continue;
+ }
+
switch (rel->r_type)
{
case IMAGE_REL_ARM64_ADDR32NB:
break;
}
+ case IMAGE_REL_ARM64_SECTION:
+ {
+ uint16_t idx = 0, i = 1;
+ asection *s;
+
+ s = output_bfd->sections;
+ while (s)
+ {
+ if (s == sec->output_section)
+ {
+ idx = i;
+ break;
+ }
+
+ i++;
+ s = s->next;
+ }
+
+
+ bfd_putl16 (idx, contents + rel->r_vaddr);
+ rel->r_type = IMAGE_REL_ARM64_ABSOLUTE;
+
+ break;
+ }
+
default:
info->callbacks->einfo (_("%F%P: Unhandled relocation type %u\n"),
rel->r_type);
projects / binutils-gdb.git / blobdiff