/* Renesas RX specific support for 32-bit ELF.
- Copyright (C) 2008-2016 Free Software Foundation, Inc.
+ Copyright (C) 2008-2017 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
r_type = ELF32_R_TYPE (dst->r_info);
if (r_type >= (unsigned int) R_RX_max)
{
+ /* xgettext:c-format */
_bfd_error_handler (_("%B: invalid RX reloc number: %d"), abfd, r_type);
r_type = 0;
}
\f
static bfd_vma
get_symbol_value (const char * name,
- bfd_reloc_status_type * status,
struct bfd_link_info * info,
bfd * input_bfd,
asection * input_section,
if (h == NULL
|| (h->type != bfd_link_hash_defined
&& h->type != bfd_link_hash_defweak))
- * status = info->callbacks->undefined_symbol
+ (*info->callbacks->undefined_symbol)
(info, name, input_bfd, input_section, offset, TRUE);
else
value = (h->u.def.value
return value;
}
+
static bfd_vma
get_symbol_value_maybe (const char * name,
struct bfd_link_info * info)
}
static bfd_vma
-get_gp (bfd_reloc_status_type * status,
- struct bfd_link_info * info,
+get_gp (struct bfd_link_info * info,
bfd * abfd,
asection * sec,
int offset)
if (!cached)
{
- cached_value = get_symbol_value ("__gp", status, info, abfd, sec, offset);
+ cached_value = get_symbol_value ("__gp", info, abfd, sec, offset);
cached = TRUE;
}
return cached_value;
}
static bfd_vma
-get_romstart (bfd_reloc_status_type * status,
- struct bfd_link_info * info,
+get_romstart (struct bfd_link_info * info,
bfd * abfd,
asection * sec,
int offset)
if (!cached)
{
- cached_value = get_symbol_value ("_start", status, info, abfd, sec, offset);
+ cached_value = get_symbol_value ("_start", info, abfd, sec, offset);
cached = TRUE;
}
return cached_value;
}
static bfd_vma
-get_ramstart (bfd_reloc_status_type * status,
- struct bfd_link_info * info,
+get_ramstart (struct bfd_link_info * info,
bfd * abfd,
asection * sec,
int offset)
if (!cached)
{
- cached_value = get_symbol_value ("__datastart", status, info, abfd, sec, offset);
+ cached_value = get_symbol_value ("__datastart", info, abfd, sec, offset);
cached = TRUE;
}
return cached_value;
bfd_vma entry_vma;
int idx;
char *buf;
- bfd_reloc_status_type tstat = 0;
if (table_default_cache != name)
{
buf = (char *) malloc (13 + strlen (name + 20));
sprintf (buf, "$tablestart$%s", name + 20);
- tstat = 0;
table_start_cache = get_symbol_value (buf,
- &tstat,
info,
input_bfd,
input_section,
rel->r_offset);
sprintf (buf, "$tableend$%s", name + 20);
- tstat = 0;
table_end_cache = get_symbol_value (buf,
- &tstat,
info,
input_bfd,
input_section,
if (table_end_cache <= entry_vma || entry_vma < table_start_cache)
{
+ /* xgettext:c-format */
_bfd_error_handler (_("%B:%A: table entry %s outside table"),
input_bfd, input_section,
name);
}
else if ((int) (entry_vma - table_start_cache) % 4)
{
+ /* xgettext:c-format */
_bfd_error_handler (_("%B:%A: table entry %s not word-aligned within table"),
input_bfd, input_section,
name);
#define ALIGN(m) if (relocation & m) r = bfd_reloc_other;
#define OP(i) (contents[rel->r_offset + (i)])
#define WARN_REDHAT(type) \
+ /* xgettext:c-format */ \
_bfd_error_handler (_("%B:%A: Warning: deprecated Red Hat reloc " type " detected against: %s."), \
input_bfd, input_section, name)
&& strcmp (name, "__gp") != 0 \
&& strcmp (name, "__romdatastart") != 0 \
&& !saw_subtract) \
+ /* xgettext:c-format */ \
_bfd_error_handler (_("%B(%A): unsafe PID relocation %s at 0x%08lx (against %s in %s)"), \
input_bfd, input_section, howto->name, \
input_section->output_section->vma + input_section->output_offset + rel->r_offset, \
case R_RX_RH_8_NEG:
WARN_REDHAT ("RX_RH_8_NEG");
relocation = - relocation;
+ /* Fall through. */
case R_RX_DIR8S_PCREL:
UNSAFE_FOR_PID;
RANGE (-128, 127);
case R_RX_RH_16_NEG:
WARN_REDHAT ("RX_RH_16_NEG");
relocation = - relocation;
+ /* Fall through. */
case R_RX_DIR16S_PCREL:
UNSAFE_FOR_PID;
RANGE (-32768, 32767);
UNSAFE_FOR_PID;
WARN_REDHAT ("RX_RH_24_NEG");
relocation = - relocation;
+ /* Fall through. */
case R_RX_DIR24S_PCREL:
RANGE (-0x800000, 0x7fffff);
#if RX_OPCODE_BIG_ENDIAN
case R_RX_RH_GPRELB:
WARN_REDHAT ("RX_RH_GPRELB");
- relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset);
+ relocation -= get_gp (info, input_bfd, input_section, rel->r_offset);
RANGE (0, 65535);
#if RX_OPCODE_BIG_ENDIAN
OP (1) = relocation;
case R_RX_RH_GPRELW:
WARN_REDHAT ("RX_RH_GPRELW");
- relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset);
+ relocation -= get_gp (info, input_bfd, input_section, rel->r_offset);
ALIGN (1);
relocation >>= 1;
RANGE (0, 65535);
case R_RX_RH_GPRELL:
WARN_REDHAT ("RX_RH_GPRELL");
- relocation -= get_gp (&r, info, input_bfd, input_section, rel->r_offset);
+ relocation -= get_gp (info, input_bfd, input_section, rel->r_offset);
ALIGN (3);
relocation >>= 2;
RANGE (0, 65535);
case R_RX_ABS8S:
UNSAFE_FOR_PID;
+ /* Fall through. */
case R_RX_ABS8S_PCREL:
RX_STACK_POP (relocation);
RANGE (-128, 127);
break;
case R_RX_OPromtop:
- RX_STACK_PUSH (get_romstart (&r, info, input_bfd, input_section, rel->r_offset));
+ RX_STACK_PUSH (get_romstart (info, input_bfd, input_section, rel->r_offset));
break;
case R_RX_OPramtop:
- RX_STACK_PUSH (get_ramstart (&r, info, input_bfd, input_section, rel->r_offset));
+ RX_STACK_PUSH (get_ramstart (info, input_bfd, input_section, rel->r_offset));
break;
default:
/* Catch the case of a missing function declaration
and emit a more helpful error message. */
if (r_type == R_RX_DIR24S_PCREL)
+ /* xgettext:c-format */
msg = _("%B(%A): error: call to undefined function '%s'");
else
- r = info->callbacks->reloc_overflow
+ (*info->callbacks->reloc_overflow)
(info, (h ? &h->root : NULL), name, howto->name, (bfd_vma) 0,
input_bfd, input_section, rel->r_offset);
break;
case bfd_reloc_undefined:
- r = info->callbacks->undefined_symbol
- (info, name, input_bfd, input_section, rel->r_offset,
- TRUE);
+ (*info->callbacks->undefined_symbol)
+ (info, name, input_bfd, input_section, rel->r_offset, TRUE);
break;
case bfd_reloc_other:
+ /* xgettext:c-format */
msg = _("%B(%A): warning: unaligned access to symbol '%s' in the small data area");
break;
case bfd_reloc_outofrange:
+ /* xgettext:c-format */
msg = _("%B(%A): internal error: out of range error");
break;
case bfd_reloc_notsupported:
+ /* xgettext:c-format */
msg = _("%B(%A): internal error: unsupported relocation error");
break;
case bfd_reloc_dangerous:
+ /* xgettext:c-format */
msg = _("%B(%A): internal error: dangerous relocation");
break;
default:
+ /* xgettext:c-format */
msg = _("%B(%A): internal error: unknown error");
break;
}
if (msg)
_bfd_error_handler (msg, input_bfd, input_section, name);
-
- if (! r)
- return FALSE;
}
}
break;
case R_RX_OPromtop:
- RX_STACK_PUSH (get_romstart (&r, info, input_bfd, input_section, rel->r_offset));
+ RX_STACK_PUSH (get_romstart (info, input_bfd, input_section, rel->r_offset));
break;
case R_RX_OPramtop:
- RX_STACK_PUSH (get_ramstart (&r, info, input_bfd, input_section, rel->r_offset));
+ RX_STACK_PUSH (get_ramstart (info, input_bfd, input_section, rel->r_offset));
break;
case R_RX_DIR16UL:
rel ++;
}
+ /* FIXME. */
+ (void) r;
}
static void
object file when linking. */
static bfd_boolean
-rx_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+rx_elf_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info)
{
+ bfd *obfd = info->output_bfd;
flagword old_flags;
flagword new_flags;
bfd_boolean error = FALSE;
}
else
{
- _bfd_error_handler ("There is a conflict merging the ELF header flags from %s",
- bfd_get_filename (ibfd));
- _bfd_error_handler (" the input file's flags: %s",
+ _bfd_error_handler (_("There is a conflict merging the"
+ " ELF header flags from %B"),
+ ibfd);
+ _bfd_error_handler (_(" the input file's flags: %s"),
describe_flags (new_flags));
- _bfd_error_handler (" the output file's flags: %s",
+ _bfd_error_handler (_(" the output file's flags: %s"),
describe_flags (old_flags));
error = TRUE;
}
int i;
unsigned int u;
Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr;
- int nphdrs = elf_elfheader (abfd)->e_phnum;
+ Elf_Internal_Ehdr *ehdr = elf_elfheader (abfd);
+ int nphdrs = ehdr->e_phnum;
sec_ptr bsec;
static int saw_be = FALSE;
+ bfd_vma end_phdroff;
/* We never want to automatically choose the non-swapping big-endian
target. The user can only get that explicitly, such as with -I
corresponds (based on matching file offsets) and use its VMA
information to reconstruct the p_vaddr field we clobbered when we
wrote it out. */
+ /* If PT_LOAD headers include the ELF file header or program headers
+ then the PT_LOAD header does not start with some section contents.
+ Making adjustments based on the difference between sh_offset and
+ p_offset is nonsense in such cases. Exclude them. Note that
+ since standard linker scripts for RX do not use SIZEOF_HEADERS,
+ the linker won't normally create PT_LOAD segments covering the
+ headers so this is mainly for passing the ld testsuite.
+ FIXME. Why are we looking at non-PT_LOAD headers here? */
+ end_phdroff = ehdr->e_ehsize;
+ if (ehdr->e_phoff != 0)
+ end_phdroff = ehdr->e_phoff + nphdrs * ehdr->e_phentsize;
for (i=0; i<nphdrs; i++)
{
for (u=0; u<elf_tdata(abfd)->num_elf_sections; u++)
Elf_Internal_Shdr *sec = elf_tdata(abfd)->elf_sect_ptr[u];
if (phdr[i].p_filesz
+ && phdr[i].p_offset >= end_phdroff
&& phdr[i].p_offset <= (bfd_vma) sec->sh_offset
&& sec->sh_size > 0
&& sec->sh_type != SHT_NOBITS
if (! rv)
return rv;
- location ++;
+ location = (bfd_byte *) location + 1;
offset ++;
count --;
caddr ++;
}
count -= scount;
- location += scount;
+ location = (bfd_byte *) location + scount;
offset += scount;
if (count > 0)
if (! rv)
return rv;
- location ++;
+ location = (bfd_byte *) location + 1;
offset ++;
count --;
caddr ++;
if (!h || (h->type != bfd_link_hash_defined
&& h->type != bfd_link_hash_defweak))
{
+ /* xgettext:c-format */
_bfd_error_handler (_("%B:%A: table %s missing corresponding %s"),
abfd, sec, name, buf);
return TRUE;
if (h->u.def.section != ent->u.def.section)
{
+ /* xgettext:c-format */
_bfd_error_handler (_("%B:%A: %s and %s must be in the same input section"),
h->u.def.section->owner, h->u.def.section,
name, buf);
projects / deliverable / binutils-gdb.git / blobdiff