/* TILE-Gx-specific support for ELF.
- Copyright 2011 Free Software Foundation, Inc.
+ Copyright (C) 2011-2017 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Descriptor library.
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
MA 02110-1301, USA. */
-#include "bfd.h"
#include "sysdep.h"
+#include "bfd.h"
#include "libbfd.h"
#include "elf-bfd.h"
#include "elf/tilegx.h"
/* This reloc does nothing. */
HOWTO (R_TILEGX_NONE, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
- 32, /* bitsize */
+ 3, /* size (0 = byte, 1 = short, 2 = long) */
+ 0, /* bitsize */
FALSE, /* pc_relative */
0, /* bitpos */
- complain_overflow_bitfield, /* complain_on_overflow */
+ complain_overflow_dont, /* complain_on_overflow */
bfd_elf_generic_reloc, /* special_function */
"R_TILEGX_NONE", /* name */
FALSE, /* partial_inplace */
TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_GOT, 0),
TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_GOT, 0),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1_GOT, 16),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1_GOT, 16),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2_GOT, 32),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2_GOT, 32),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3_GOT, 48),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3_GOT, 48),
+
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW0_PLT_PCREL, 0),
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW0_PLT_PCREL, 0),
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW1_PLT_PCREL, 16),
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW1_PLT_PCREL, 16),
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW2_PLT_PCREL, 32),
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW2_PLT_PCREL, 32),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_GOT, 0),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_GOT, 0),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_GOT, 16),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_GOT, 16),
- TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST_GOT, 32),
- TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST_GOT, 32),
+
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X0_HW3_PLT_PCREL, 48),
+ TILEGX_IMM16_HOWTO_PCREL (R_TILEGX_IMM16_X1_HW3_PLT_PCREL, 48),
TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_TLS_GD, 0),
TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_TLS_GD, 0),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW1_TLS_GD, 16),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW1_TLS_GD, 16),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW2_TLS_GD, 32),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW2_TLS_GD, 32),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW3_TLS_GD, 48),
- TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW3_TLS_GD, 48),
+
+ TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X0_HW0_TLS_LE, 0),
+ TILEGX_IMM16_HOWTO (R_TILEGX_IMM16_X1_HW0_TLS_LE, 0),
+ TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE, 0),
+ TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE, 0),
+ TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE, 16),
+ TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE, 16),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD, 0),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD, 0),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD, 16),
TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD, 16),
- TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD, 32),
- TILEGX_IMM16_HOWTO_LAST (R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD, 32),
+ EMPTY_HOWTO (90),
+ EMPTY_HOWTO (91),
#define TILEGX_IMM16_HOWTO_TLS_IE(name, rshift) \
HOWTO (name, rshift, 1, 16, FALSE, 0, \
TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW0_TLS_IE, 0),
TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW0_TLS_IE, 0),
- TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW1_TLS_IE, 16),
- TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW1_TLS_IE, 16),
- TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW2_TLS_IE, 32),
- TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW2_TLS_IE, 32),
- TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X0_HW3_TLS_IE, 48),
- TILEGX_IMM16_HOWTO_TLS_IE (R_TILEGX_IMM16_X1_HW3_TLS_IE, 48),
+
+ TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL, 0),
+ TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL, 0),
+ TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL, 16),
+ TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL, 16),
+ TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL, 32),
+ TILEGX_IMM16_HOWTO_LAST_PCREL (R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL, 32),
#define TILEGX_IMM16_HOWTO_LAST_TLS_IE(name, rshift) \
HOWTO (name, rshift, 1, 16, FALSE, 0, \
TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE, 0),
TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE, 16),
TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE, 16),
- TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE, 32),
- TILEGX_IMM16_HOWTO_LAST_TLS_IE (R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE, 32),
+ EMPTY_HOWTO (104),
+ EMPTY_HOWTO (105),
HOWTO(R_TILEGX_TLS_DTPMOD64, 0, 0, 0, FALSE, 0, complain_overflow_dont,
bfd_elf_generic_reloc, "R_TILEGX_TLS_DTPMOD64",
FALSE, 0, -1, TRUE),
HOWTO(R_TILEGX_TLS_TPOFF32, 0, 0, 0, FALSE, 0, complain_overflow_dont,
bfd_elf_generic_reloc, "R_TILEGX_TLS_TPOFF32",
- FALSE, 0, 0, TRUE)
+ FALSE, 0, 0, TRUE),
+
+ HOWTO (R_TILEGX_TLS_GD_CALL, /* type */
+ TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES, /* rightshift */
+ 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 27, /* bitsize */
+ TRUE, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_signed,/* complain_on_overflow */
+ bfd_elf_generic_reloc, /* special_function */
+ "R_TILEGX_TLS_GD_CALL", /* name */
+ FALSE, /* partial_inplace */
+ 0, /* src_mask */
+ -1, /* dst_mask */
+ TRUE), /* pcrel_offset */
+
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X0_TLS_GD_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X1_TLS_GD_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y0_TLS_GD_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y1_TLS_GD_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_TLS_IE_LOAD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X0_TLS_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_X1_TLS_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y0_TLS_ADD, 0, 8),
+ TILEGX_IMM_HOWTO(R_TILEGX_IMM8_Y1_TLS_ADD, 0, 8),
};
static reloc_howto_type tilegx_elf_howto_table2 [] =
SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_PCREL)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_GOT)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_GOT)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_PLT_PCREL)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_GOT)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_GOT)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_GOT)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_GOT)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_GOT)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_PLT_PCREL)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_GD)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_TLS_GD)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_LE)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_LE)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_LE)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_LE)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_LE)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_LE)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_GD)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_GD)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_GD)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_TLS_GD)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_TLS_GD)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_TLS_IE)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW3_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW3_TLS_IE)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL)
+ SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW0_LAST_TLS_IE)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW0_LAST_TLS_IE)
SIMPLE_REMAP (TILEGX_IMM16_X0_HW1_LAST_TLS_IE)
SIMPLE_REMAP (TILEGX_IMM16_X1_HW1_LAST_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X0_HW2_LAST_TLS_IE)
- SIMPLE_REMAP (TILEGX_IMM16_X1_HW2_LAST_TLS_IE)
SIMPLE_REMAP (TILEGX_TLS_DTPMOD64)
SIMPLE_REMAP (TILEGX_TLS_DTPOFF64)
SIMPLE_REMAP (TILEGX_TLS_DTPOFF32)
SIMPLE_REMAP (TILEGX_TLS_TPOFF32)
+ SIMPLE_REMAP (TILEGX_TLS_GD_CALL)
+ SIMPLE_REMAP (TILEGX_IMM8_X0_TLS_GD_ADD)
+ SIMPLE_REMAP (TILEGX_IMM8_X1_TLS_GD_ADD)
+ SIMPLE_REMAP (TILEGX_IMM8_Y0_TLS_GD_ADD)
+ SIMPLE_REMAP (TILEGX_IMM8_Y1_TLS_GD_ADD)
+ SIMPLE_REMAP (TILEGX_TLS_IE_LOAD)
+ SIMPLE_REMAP (TILEGX_IMM8_X0_TLS_ADD)
+ SIMPLE_REMAP (TILEGX_IMM8_X1_TLS_ADD)
+ SIMPLE_REMAP (TILEGX_IMM8_Y0_TLS_ADD)
+ SIMPLE_REMAP (TILEGX_IMM8_Y1_TLS_ADD)
+
#undef SIMPLE_REMAP
#undef TH_REMAP
void (*put_word) (bfd *, bfd_vma, void *);
const char *dynamic_interpreter;
- /* Short-cuts to get to dynamic linker sections. */
- asection *sdynbss;
- asection *srelbss;
+ /* Whether LE transition has been disabled for some of the
+ sections. */
+ bfd_boolean disable_le_transition;
/* Small local sym to section mapping cache. */
struct sym_cache sym_cache;
{
unsigned int i;
- for (i = ARRAY_SIZE (tilegx_reloc_map); --i;)
+ for (i = ARRAY_SIZE (tilegx_reloc_map); i--;)
{
const reloc_map * entry;
{
unsigned int r_type = TILEGX_ELF_R_TYPE (dst->r_info);
- if (r_type <= (unsigned int) R_TILEGX_TLS_TPOFF32)
+ if (r_type <= (unsigned int) R_TILEGX_IMM8_Y1_TLS_ADD)
cache_ptr->howto = &tilegx_elf_howto_table [r_type];
else if (r_type - R_TILEGX_GNU_VTINHERIT
<= (unsigned int) R_TILEGX_GNU_VTENTRY)
create_Imm16_X1,
create_Imm16_X0,
create_Imm16_X1,
+ NULL,
+ NULL,
create_Imm16_X0,
create_Imm16_X1,
create_Imm16_X0,
create_Imm16_X1,
create_Imm16_X0,
create_Imm16_X1,
- create_Imm16_X0,
- create_Imm16_X1,
- create_Imm16_X0,
- create_Imm16_X1
};
static void
};
/* Reuse an existing info 10 bundle. */
-static const bfd_byte const *tilegx64_plt_tail_entry =
+static const bfd_byte *const tilegx64_plt_tail_entry =
&tilegx64_short_plt_entry[4 * TILEGX_BUNDLE_SIZE_IN_BYTES];
static const bfd_byte
};
/* Reuse an existing info 10 bundle. */
-static const bfd_byte const *tilegx32_plt_tail_entry =
+static const bfd_byte *const tilegx32_plt_tail_entry =
&tilegx64_short_plt_entry[4 * TILEGX_BUNDLE_SIZE_IN_BYTES];
static int
struct elf_link_hash_table *htab = elf_hash_table (info);
/* This function may be called more than once. */
- s = bfd_get_section_by_name (abfd, ".got");
- if (s != NULL && (s->flags & SEC_LINKER_CREATED) != 0)
+ if (htab->sgot != NULL)
return TRUE;
flags = bed->dynamic_sec_flags;
- s = bfd_make_section_with_flags (abfd,
- (bed->rela_plts_and_copies_p
- ? ".rela.got" : ".rel.got"),
- (bed->dynamic_sec_flags
- | SEC_READONLY));
+ s = bfd_make_section_anyway_with_flags (abfd,
+ (bed->rela_plts_and_copies_p
+ ? ".rela.got" : ".rel.got"),
+ (bed->dynamic_sec_flags
+ | SEC_READONLY));
if (s == NULL
|| ! bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
return FALSE;
htab->srelgot = s;
- s = s_got = bfd_make_section_with_flags (abfd, ".got", flags);
+ s = s_got = bfd_make_section_anyway_with_flags (abfd, ".got", flags);
if (s == NULL
|| !bfd_set_section_alignment (abfd, s, bed->s->log_file_align))
return FALSE;
if (bed->want_got_plt)
{
- s = bfd_make_section_with_flags (abfd, ".got.plt", flags);
+ s = bfd_make_section_anyway_with_flags (abfd, ".got.plt", flags);
if (s == NULL
|| !bfd_set_section_alignment (abfd, s,
bed->s->log_file_align))
tilegx_elf_create_dynamic_sections (bfd *dynobj,
struct bfd_link_info *info)
{
- struct tilegx_elf_link_hash_table *htab;
-
- htab = tilegx_elf_hash_table (info);
- BFD_ASSERT (htab != NULL);
-
if (!tilegx_elf_create_got_section (dynobj, info))
return FALSE;
- if (!_bfd_elf_create_dynamic_sections (dynobj, info))
- return FALSE;
-
- htab->sdynbss = bfd_get_section_by_name (dynobj, ".dynbss");
- if (!info->shared)
- htab->srelbss = bfd_get_section_by_name (dynobj, ".rela.bss");
-
- if (!htab->elf.splt || !htab->elf.srelplt || !htab->sdynbss
- || (!info->shared && !htab->srelbss))
- abort ();
-
- return TRUE;
+ return _bfd_elf_create_dynamic_sections (dynobj, info);
}
/* Copy the extra info we tack onto an elf_link_hash_entry. */
_bfd_elf_link_hash_copy_indirect (info, dir, ind);
}
+static int
+tilegx_tls_translate_to_le (int r_type)
+{
+ switch (r_type)
+ {
+ case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+ case R_TILEGX_IMM16_X0_HW0_TLS_IE:
+ return R_TILEGX_IMM16_X0_HW0_TLS_LE;
+
+ case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+ case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+ return R_TILEGX_IMM16_X1_HW0_TLS_LE;
+
+ case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE;
+
+ case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE;
+
+ case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE;
+
+ case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE;
+ }
+ return r_type;
+}
+
+static int
+tilegx_tls_translate_to_ie (int r_type)
+{
+ switch (r_type)
+ {
+ case R_TILEGX_IMM16_X0_HW0_TLS_GD:
+ case R_TILEGX_IMM16_X0_HW0_TLS_IE:
+ return R_TILEGX_IMM16_X0_HW0_TLS_IE;
+
+ case R_TILEGX_IMM16_X1_HW0_TLS_GD:
+ case R_TILEGX_IMM16_X1_HW0_TLS_IE:
+ return R_TILEGX_IMM16_X1_HW0_TLS_IE;
+
+ case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE;
+
+ case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE;
+
+ case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE;
+
+ case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
+ case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
+ return R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE;
+ }
+ return r_type;
+}
+
+static int
+tilegx_elf_tls_transition (struct bfd_link_info *info, int r_type,
+ int is_local, bfd_boolean disable_le_transition)
+{
+ if (bfd_link_pic (info))
+ return r_type;
+
+ if (is_local && !disable_le_transition)
+ return tilegx_tls_translate_to_le (r_type);
+ else
+ return tilegx_tls_translate_to_ie (r_type);
+}
+
/* Look through the relocs for a section during the first phase, and
allocate space in the global offset table or procedure linkage
table. */
const Elf_Internal_Rela *rel_end;
asection *sreloc;
int num_relocs;
+ bfd_boolean has_tls_gd_or_ie = FALSE, has_tls_add = FALSE;
- if (info->relocatable)
+ if (bfd_link_relocatable (info))
return TRUE;
htab = tilegx_elf_hash_table (info);
htab->elf.dynobj = abfd;
rel_end = relocs + num_relocs;
+
+ /* Check whether to do optimization to transform TLS GD/IE
+ referehces to TLS LE. We disable it if we're linking with old
+ TLS code sequences that do not support such optimization. Old
+ TLS code sequences have tls_gd_call/tls_ie_load relocations but
+ no tls_add relocations. */
+ for (rel = relocs; rel < rel_end && !has_tls_add; rel++)
+ {
+ int r_type = TILEGX_ELF_R_TYPE (rel->r_info);
+ switch (r_type)
+ {
+ case R_TILEGX_TLS_GD_CALL:
+ case R_TILEGX_TLS_IE_LOAD:
+ has_tls_gd_or_ie = TRUE;
+ break;
+ case R_TILEGX_IMM8_X0_TLS_ADD:
+ case R_TILEGX_IMM8_Y0_TLS_ADD:
+ case R_TILEGX_IMM8_X1_TLS_ADD:
+ case R_TILEGX_IMM8_Y1_TLS_ADD:
+ has_tls_add = TRUE;
+ break;
+ }
+ }
+
+ sec->sec_flg0 = (has_tls_gd_or_ie && !has_tls_add);
+ htab->disable_le_transition |= sec->sec_flg0;
+
for (rel = relocs; rel < rel_end; rel++)
{
unsigned int r_type;
if (r_symndx >= NUM_SHDR_ENTRIES (symtab_hdr))
{
- (*_bfd_error_handler) (_("%B: bad symbol index: %d"),
- abfd, r_symndx);
+ /* xgettext:c-format */
+ _bfd_error_handler (_("%B: bad symbol index: %d"),
+ abfd, r_symndx);
return FALSE;
}
while (h->root.type == bfd_link_hash_indirect
|| h->root.type == bfd_link_hash_warning)
h = (struct elf_link_hash_entry *) h->root.u.i.link;
+
+ /* PR15323, ref flags aren't set for references in the same
+ object. */
+ h->root.non_ir_ref = 1;
}
+ r_type = tilegx_elf_tls_transition (info, r_type, h == NULL,
+ sec->sec_flg0);
switch (r_type)
{
+ case R_TILEGX_IMM16_X0_HW0_TLS_LE:
+ case R_TILEGX_IMM16_X1_HW0_TLS_LE:
+ case R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE:
+ case R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE:
+ case R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE:
+ case R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE:
+ if (bfd_link_pic (info))
+ goto r_tilegx_plt32;
+ break;
+
case R_TILEGX_IMM16_X0_HW0_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_TLS_GD:
- case R_TILEGX_IMM16_X0_HW1_TLS_GD:
- case R_TILEGX_IMM16_X1_HW1_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_TLS_GD:
- case R_TILEGX_IMM16_X0_HW3_TLS_GD:
- case R_TILEGX_IMM16_X1_HW3_TLS_GD:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
- tls_type = GOT_TLS_GD;
+ BFD_ASSERT (bfd_link_pic (info));
+ tls_type = GOT_TLS_GD;
goto have_got_reference;
case R_TILEGX_IMM16_X0_HW0_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_TLS_IE:
- case R_TILEGX_IMM16_X0_HW1_TLS_IE:
- case R_TILEGX_IMM16_X1_HW1_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_TLS_IE:
- case R_TILEGX_IMM16_X0_HW3_TLS_IE:
- case R_TILEGX_IMM16_X1_HW3_TLS_IE:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
tls_type = GOT_TLS_IE;
- if (info->shared)
+ if (bfd_link_pic (info))
info->flags |= DF_STATIC_TLS;
goto have_got_reference;
case R_TILEGX_IMM16_X0_HW0_GOT:
case R_TILEGX_IMM16_X1_HW0_GOT:
- case R_TILEGX_IMM16_X0_HW1_GOT:
- case R_TILEGX_IMM16_X1_HW1_GOT:
- case R_TILEGX_IMM16_X0_HW2_GOT:
- case R_TILEGX_IMM16_X1_HW2_GOT:
- case R_TILEGX_IMM16_X0_HW3_GOT:
- case R_TILEGX_IMM16_X1_HW3_GOT:
case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
- case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
- case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
tls_type = GOT_NORMAL;
/* Fall Through */
tls_type = old_tls_type;
else
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B: `%s' accessed both as normal and thread local symbol"),
abfd, h ? h->root.root.string : "<local>");
return FALSE;
}
break;
+ case R_TILEGX_TLS_GD_CALL:
+ if (bfd_link_pic (info))
+ {
+ /* These are basically R_TILEGX_JUMPOFF_X1_PLT relocs
+ against __tls_get_addr. */
+ struct bfd_link_hash_entry *bh = NULL;
+ if (! _bfd_generic_link_add_one_symbol (info, abfd,
+ "__tls_get_addr", 0,
+ bfd_und_section_ptr, 0,
+ NULL, FALSE, FALSE,
+ &bh))
+ return FALSE;
+ h = (struct elf_link_hash_entry *) bh;
+ }
+ else
+ break;
+ /* Fall through */
+
case R_TILEGX_JUMPOFF_X1_PLT:
+ case R_TILEGX_IMM16_X0_HW0_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW0_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW1_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW1_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW2_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW2_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW3_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW3_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL:
/* This symbol requires a procedure linkage table entry. We
actually build the entry in adjust_dynamic_symbol,
because this might be a case of linking PIC code without
case R_TILEGX_IMM16_X0_HW2_LAST:
case R_TILEGX_IMM16_X1_HW2_LAST:
if (h != NULL)
- {
- h->non_got_ref = 1;
+ h->non_got_ref = 1;
- if (!info->shared)
- {
- /* We may need a .plt entry if the function this reloc
- refers to is in a shared lib. */
- h->plt.refcount += 1;
- }
- }
+ r_tilegx_plt32:
+ if (h != NULL && !bfd_link_pic (info))
+ {
+ /* We may need a .plt entry if the function this reloc
+ refers to is in a shared lib. */
+ h->plt.refcount += 1;
+ }
/* If we are creating a shared library, and this is a reloc
against a global symbol, or a non PC relative reloc
may need to keep relocations for symbols satisfied by a
dynamic library if we manage to avoid copy relocs for the
symbol. */
- if ((info->shared
+ if ((bfd_link_pic (info)
&& (sec->flags & SEC_ALLOC) != 0
&& (! tilegx_elf_howto_table[r_type].pc_relative
|| (h != NULL
&& (! info->symbolic
|| h->root.type == bfd_link_hash_defweak
|| !h->def_regular))))
- || (!info->shared
+ || (!bfd_link_pic (info)
&& (sec->flags & SEC_ALLOC) != 0
&& h != NULL
&& (h->root.type == bfd_link_hash_defweak
if (h != NULL)
{
switch (TILEGX_ELF_R_TYPE (rel->r_info))
- {
- case R_TILEGX_GNU_VTINHERIT:
- case R_TILEGX_GNU_VTENTRY:
- break;
- }
+ {
+ case R_TILEGX_GNU_VTINHERIT:
+ case R_TILEGX_GNU_VTENTRY:
+ return NULL;
+ }
+ }
+
+ /* FIXME: The test here, in check_relocs and in relocate_section
+ dealing with TLS optimization, ought to be !bfd_link_executable (info). */
+ if (bfd_link_pic (info))
+ {
+ switch (TILEGX_ELF_R_TYPE (rel->r_info))
+ {
+ case R_TILEGX_TLS_GD_CALL:
+ /* This reloc implicitly references __tls_get_addr. We know
+ another reloc will reference the same symbol as the one
+ on this reloc, so the real symbol and section will be
+ gc marked when processing the other reloc. That lets
+ us handle __tls_get_addr here. */
+ h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
+ FALSE, FALSE, TRUE);
+ BFD_ASSERT (h != NULL);
+ h->mark = 1;
+ if (h->u.weakdef != NULL)
+ h->u.weakdef->mark = 1;
+ sym = NULL;
+ }
}
return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
bfd_signed_vma *local_got_refcounts;
const Elf_Internal_Rela *rel, *relend;
- if (info->relocatable)
+ if (bfd_link_relocatable (info))
return TRUE;
BFD_ASSERT (is_tilegx_elf (abfd) || sec->reloc_count == 0);
}
r_type = TILEGX_ELF_R_TYPE (rel->r_info);
-
+ r_type = tilegx_elf_tls_transition (info, r_type, h != NULL,
+ sec->sec_flg0);
switch (r_type)
{
case R_TILEGX_IMM16_X0_HW0_GOT:
case R_TILEGX_IMM16_X1_HW0_GOT:
- case R_TILEGX_IMM16_X0_HW1_GOT:
- case R_TILEGX_IMM16_X1_HW1_GOT:
- case R_TILEGX_IMM16_X0_HW2_GOT:
- case R_TILEGX_IMM16_X1_HW2_GOT:
- case R_TILEGX_IMM16_X0_HW3_GOT:
- case R_TILEGX_IMM16_X1_HW3_GOT:
case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
- case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
- case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
case R_TILEGX_IMM16_X0_HW0_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_TLS_GD:
- case R_TILEGX_IMM16_X0_HW1_TLS_GD:
- case R_TILEGX_IMM16_X1_HW1_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_TLS_GD:
- case R_TILEGX_IMM16_X0_HW3_TLS_GD:
- case R_TILEGX_IMM16_X1_HW3_TLS_GD:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
case R_TILEGX_IMM16_X0_HW0_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_TLS_IE:
- case R_TILEGX_IMM16_X0_HW1_TLS_IE:
- case R_TILEGX_IMM16_X1_HW1_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_TLS_IE:
- case R_TILEGX_IMM16_X0_HW3_TLS_IE:
- case R_TILEGX_IMM16_X1_HW3_TLS_IE:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
if (h != NULL)
{
if (h->got.refcount > 0)
}
else
{
- if (local_got_refcounts[r_symndx] > 0)
+ if (local_got_refcounts &&
+ local_got_refcounts[r_symndx] > 0)
local_got_refcounts[r_symndx]--;
}
break;
case R_TILEGX_IMM16_X1_HW1_LAST:
case R_TILEGX_IMM16_X0_HW2_LAST:
case R_TILEGX_IMM16_X1_HW2_LAST:
- if (info->shared)
+ if (bfd_link_pic (info))
break;
/* Fall through. */
case R_TILEGX_JUMPOFF_X1_PLT:
+ case R_TILEGX_IMM16_X0_HW0_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW0_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW1_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW1_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW2_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW2_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW3_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW3_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL:
if (h != NULL)
{
if (h->plt.refcount > 0)
struct tilegx_elf_link_hash_entry * eh;
struct tilegx_elf_dyn_relocs *p;
bfd *dynobj;
- asection *s;
+ asection *s, *srel;
htab = tilegx_elf_hash_table (info);
BFD_ASSERT (htab != NULL);
only references to the symbol are via the global offset table.
For such cases we need not do anything here; the relocations will
be handled correctly by relocate_section. */
- if (info->shared)
+ if (bfd_link_pic (info))
return TRUE;
/* If there are no references to this symbol that do not use the
return TRUE;
}
- if (h->size == 0)
- {
- (*_bfd_error_handler) (_("dynamic variable `%s' is zero size"),
- h->root.root.string);
- return TRUE;
- }
-
/* We must allocate the symbol in our .dynbss section, which will
become part of the .bss section of the executable. There will be
an entry for this symbol in the .dynsym section. The dynamic
to copy the initial value out of the dynamic object and into the
runtime process image. We need to remember the offset into the
.rel.bss section we are going to use. */
- if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
+ if ((h->root.u.def.section->flags & SEC_READONLY) != 0)
{
- htab->srelbss->size += TILEGX_ELF_RELA_BYTES (htab);
+ s = htab->elf.sdynrelro;
+ srel = htab->elf.sreldynrelro;
+ }
+ else
+ {
+ s = htab->elf.sdynbss;
+ srel = htab->elf.srelbss;
+ }
+ if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0)
+ {
+ srel->size += TILEGX_ELF_RELA_BYTES (htab);
h->needs_copy = 1;
}
- return _bfd_elf_adjust_dynamic_copy (h, htab->sdynbss);
+ return _bfd_elf_adjust_dynamic_copy (info, h, s);
}
/* Allocate space in .plt, .got and associated reloc sections for
dynamic relocs. */
static bfd_boolean
-allocate_dynrelocs (struct elf_link_hash_entry *h, PTR inf)
+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
{
struct bfd_link_info *info;
struct tilegx_elf_link_hash_table *htab;
if (h->root.type == bfd_link_hash_indirect)
return TRUE;
- if (h->root.type == bfd_link_hash_warning)
- /* When warning symbols are created, they **replace** the "real"
- entry in the hash table, thus we never get to see the real
- symbol in a hash traversal. So look at it now. */
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
info = (struct bfd_link_info *) inf;
htab = tilegx_elf_hash_table (info);
BFD_ASSERT (htab != NULL);
return FALSE;
}
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, info->shared, h))
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (1, bfd_link_pic (info), h))
{
asection *s = htab->elf.splt;
/* Allocate room for the header and tail. */
if (s->size == 0)
{
- s->size = PLT_HEADER_SIZE + PLT_TAIL_SIZE;
+ s->size = PLT_ENTRY_SIZE;
}
- h->plt.offset = s->size - PLT_TAIL_SIZE;
+ h->plt.offset = s->size - PLT_ENTRY_SIZE + PLT_HEADER_SIZE;
/* If this symbol is not defined in a regular file, and we are
not generating a shared library, then set the symbol to this
location in the .plt. This is required to make function
pointers compare as equal between the normal executable and
the shared library. */
- if (! info->shared
+ if (! bfd_link_pic (info)
&& !h->def_regular)
{
h->root.u.def.section = s;
h->needs_plt = 0;
}
- if (h->got.refcount > 0)
+ /* If a TLS_IE symbol is now local to the binary, make it a TLS_LE
+ requiring no TLS entry. */
+ if (h->got.refcount > 0
+ && !htab->disable_le_transition
+ && !bfd_link_pic (info)
+ && h->dynindx == -1
+ && tilegx_elf_hash_entry(h)->tls_type == GOT_TLS_IE)
+ h->got.offset = (bfd_vma) -1;
+ else if (h->got.refcount > 0)
{
asection *s;
bfd_boolean dyn;
TLS_GD needs two if local symbol and two if global. */
if (tls_type == GOT_TLS_GD || tls_type == GOT_TLS_IE)
htab->elf.srelgot->size += 2 * TILEGX_ELF_RELA_BYTES (htab);
- else if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h))
+ else if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+ bfd_link_pic (info),
+ h))
htab->elf.srelgot->size += TILEGX_ELF_RELA_BYTES (htab);
}
else
space for pc-relative relocs that have become local due to symbol
visibility changes. */
- if (info->shared)
+ if (bfd_link_pic (info))
{
if (SYMBOL_CALLS_LOCAL (info, h))
{
/* Find any dynamic relocs that apply to read-only sections. */
static bfd_boolean
-readonly_dynrelocs (struct elf_link_hash_entry *h, PTR inf)
+readonly_dynrelocs (struct elf_link_hash_entry *h, void *inf)
{
struct tilegx_elf_link_hash_entry *eh;
struct tilegx_elf_dyn_relocs *p;
- if (h->root.type == bfd_link_hash_warning)
- h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
eh = (struct tilegx_elf_link_hash_entry *) h;
for (p = eh->dyn_relocs; p != NULL; p = p->next)
{
if (elf_hash_table (info)->dynamic_sections_created)
{
/* Set the contents of the .interp section to the interpreter. */
- if (info->executable)
+ if (bfd_link_executable (info) && !info->nointerp)
{
- s = bfd_get_section_by_name (dynobj, ".interp");
+ s = bfd_get_linker_section (dynobj, ".interp");
BFD_ASSERT (s != NULL);
s->size = strlen (htab->dynamic_interpreter) + 1;
s->contents = (unsigned char *) htab->dynamic_interpreter;
/* Set up .got offsets for local syms, and space for local dynamic
relocs. */
- for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
+ for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link.next)
{
bfd_signed_vma *local_got;
bfd_signed_vma *end_local_got;
s->size += TILEGX_ELF_WORD_BYTES (htab);
if (*local_tls_type == GOT_TLS_GD)
s->size += TILEGX_ELF_WORD_BYTES (htab);
- if (info->shared
+ if (bfd_link_pic (info)
|| *local_tls_type == GOT_TLS_GD
|| *local_tls_type == GOT_TLS_IE)
srel->size += TILEGX_ELF_RELA_BYTES (htab);
/* Allocate global sym .plt and .got entries, and space for global
sym dynamic relocs. */
- elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, (PTR) info);
+ elf_link_hash_traverse (&htab->elf, allocate_dynrelocs, info);
if (elf_hash_table (info)->dynamic_sections_created)
{
if (s == htab->elf.splt
|| s == htab->elf.sgot
|| s == htab->elf.sgotplt
- || s == htab->sdynbss)
+ || s == htab->elf.sdynbss
+ || s == htab->elf.sdynrelro)
{
/* Strip this section if we don't need it; see the
comment below. */
#define add_dynamic_entry(TAG, VAL) \
_bfd_elf_add_dynamic_entry (info, TAG, VAL)
- if (info->executable)
+ if (bfd_link_executable (info))
{
if (!add_dynamic_entry (DT_DEBUG, 0))
return FALSE;
/* If any dynamic relocs apply to a read-only section,
then we need a DT_TEXTREL entry. */
if ((info->flags & DF_TEXTREL) == 0)
- elf_link_hash_traverse (&htab->elf, readonly_dynrelocs,
- (PTR) info);
+ elf_link_hash_traverse (&htab->elf, readonly_dynrelocs, info);
if (info->flags & DF_TEXTREL)
{
return (address - htab->tls_sec->vma);
}
+/* Copy SIZE bits from FROM to TO at address ADDR. */
+
+static void
+tilegx_copy_bits (bfd_byte *addr, int from, int to, int size)
+{
+ int i;
+ for (i = 0; i < size; i++)
+ {
+ int from_byte = (from + i) / 8;
+ int from_bit = (from + i) % 8;
+ int to_byte = (to + i) / 8;
+ int to_bit = (to + i) % 8;
+ bfd_byte to_mask = 1 << to_bit;
+ addr[to_byte] = (addr[to_byte] & ~to_mask)
+ | ((addr[from_byte] >> from_bit << to_bit) & to_mask);
+ }
+}
+
+/* Replace the MASK bits in ADDR with those in INSN, for the next
+ TILEGX_BUNDLE_SIZE_IN_BYTES bytes. */
+
+static void
+tilegx_replace_insn (bfd_byte *addr, const bfd_byte *mask,
+ const bfd_byte *insn)
+{
+ int i;
+ for (i = 0; i < TILEGX_BUNDLE_SIZE_IN_BYTES; i++)
+ {
+ addr[i] = (addr[i] & ~mask[i]) | (insn[i] & mask[i]);
+ }
+}
+
+/* Mask to extract the bits corresponding to an instruction in a
+ specific pipe of a bundle. */
+static const bfd_byte insn_mask_X1[] = {
+ 0x00, 0x00, 0x00, 0x80, 0xff, 0xff, 0xff, 0x3f
+};
+
+/* Mask to extract the bits corresponding to an instruction in a
+ specific pipe of a bundle, minus the destination operand and the
+ first source operand. */
+static const bfd_byte insn_mask_X0_no_dest_no_srca[] = {
+ 0x00, 0xf0, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00
+};
+
+static const bfd_byte insn_mask_X1_no_dest_no_srca[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0x3f
+};
+
+static const bfd_byte insn_mask_Y0_no_dest_no_srca[] = {
+ 0x00, 0xf0, 0x0f, 0x78, 0x00, 0x00, 0x00, 0x00
+};
+static const bfd_byte insn_mask_Y1_no_dest_no_srca[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x07, 0x3c
+};
+
+/* Mask to extract the bits corresponding to an instruction in a
+ specific pipe of a bundle, minus the register operands. */
+static const bfd_byte insn_mask_X0_no_operand[] = {
+ 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00, 0x00
+};
+
+static const bfd_byte insn_mask_X1_no_operand[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x3f
+};
+
+static const bfd_byte insn_mask_Y0_no_operand[] = {
+ 0x00, 0x00, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00
+};
+
+static const bfd_byte insn_mask_Y1_no_operand[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x3c
+};
+
+/* Various instructions synthesized to support tls references. */
+
+/* ld r0, r0 in the X1 pipe, used for tls ie. */
+static const bfd_byte insn_tls_ie_ld_X1[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x6a, 0x28
+};
+
+/* ld4s r0, r0 in the X1 pipe, used for tls ie. */
+static const bfd_byte insn_tls_ie_ld4s_X1[] = {
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x6a, 0x28
+};
+
+/* add r0, r0, tp in various pipes, used for tls ie. */
+static const bfd_byte insn_tls_ie_add_X0X1[] = {
+ 0x00, 0x50, 0x0f, 0x50, 0x00, 0xa8, 0x07, 0x28
+};
+static const bfd_byte insn_tls_ie_add_Y0Y1[] = {
+ 0x00, 0x50, 0x27, 0x2c, 0x00, 0xa8, 0x13, 0x9a
+};
+
+/* addx r0, r0, tp in various pipes, used for tls ie. */
+static const bfd_byte insn_tls_ie_addx_X0X1[] = {
+ 0x00, 0x50, 0x0b, 0x50, 0x00, 0xa8, 0x05, 0x28
+};
+static const bfd_byte insn_tls_ie_addx_Y0Y1[] = {
+ 0x00, 0x50, 0x03, 0x2c, 0x00, 0xa8, 0x01, 0x9a
+};
+
+/* move r0, r0 in various pipes, used for tls gd. */
+static const bfd_byte insn_tls_gd_add_X0X1[] = {
+ 0x00, 0xf0, 0x07, 0x51, 0x00, 0xf8, 0x3b, 0x28
+};
+static const bfd_byte insn_tls_gd_add_Y0Y1[] = {
+ 0x00, 0xf0, 0x0b, 0x54, 0x00, 0xf8, 0x05, 0xae
+};
+
+static const bfd_byte *insn_move_X0X1 = insn_tls_gd_add_X0X1;
+static const bfd_byte *insn_move_Y0Y1 = insn_tls_gd_add_Y0Y1;
+
+static const bfd_byte *insn_add_X0X1 = insn_tls_ie_add_X0X1;
+static const bfd_byte *insn_add_Y0Y1 = insn_tls_ie_add_Y0Y1;
+
+static const bfd_byte *insn_addx_X0X1 = insn_tls_ie_addx_X0X1;
+static const bfd_byte *insn_addx_Y0Y1 = insn_tls_ie_addx_Y0Y1;
+
/* Relocate an TILEGX ELF section.
The RELOCATE_SECTION function is called by the new ELF backend linker
for (; rel < relend; rel++)
{
int r_type, tls_type;
+ bfd_boolean is_tls_iele, is_tls_le;
reloc_howto_type *howto;
unsigned long r_symndx;
struct elf_link_hash_entry *h;
if ((unsigned int)r_type >= ARRAY_SIZE (tilegx_elf_howto_table))
{
/* Not clear if we need to check here, but just be paranoid. */
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B: unrecognized relocation (0x%x) in section `%A'"),
input_bfd, r_type, input_section);
bfd_set_error (bfd_error_bad_value);
}
else
{
- bfd_boolean warned;
+ bfd_boolean warned ATTRIBUTE_UNUSED;
+ bfd_boolean ignored ATTRIBUTE_UNUSED;
RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
r_symndx, symtab_hdr, sym_hashes,
h, sec, relocation,
- unresolved_reloc, warned);
+ unresolved_reloc, warned, ignored);
if (warned)
{
/* To avoid generating warning messages about truncated
}
}
- if (sec != NULL && elf_discarded_section (sec))
+ if (sec != NULL && discarded_section (sec))
RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
- rel, relend, howto, contents);
+ rel, 1, relend, howto, 0, contents);
- if (info->relocatable)
+ if (bfd_link_relocatable (info))
continue;
if (h != NULL)
name = bfd_section_name (input_bfd, sec);
}
+ switch (r_type)
+ {
+ case R_TILEGX_TLS_GD_CALL:
+ case R_TILEGX_IMM8_X0_TLS_GD_ADD:
+ case R_TILEGX_IMM8_Y0_TLS_GD_ADD:
+ case R_TILEGX_IMM8_X1_TLS_GD_ADD:
+ case R_TILEGX_IMM8_Y1_TLS_GD_ADD:
+ case R_TILEGX_IMM8_X0_TLS_ADD:
+ case R_TILEGX_IMM8_Y0_TLS_ADD:
+ case R_TILEGX_IMM8_X1_TLS_ADD:
+ case R_TILEGX_IMM8_Y1_TLS_ADD:
+ tls_type = GOT_UNKNOWN;
+ if (h == NULL && local_got_offsets)
+ tls_type =
+ _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
+ else if (h != NULL)
+ tls_type = tilegx_elf_hash_entry(h)->tls_type;
+
+ is_tls_iele = (! bfd_link_pic (info) || tls_type == GOT_TLS_IE);
+ is_tls_le = is_tls_iele && (!input_section->sec_flg0
+ && !bfd_link_pic (info)
+ && (h == NULL || h->dynindx == -1));
+
+ if (r_type == R_TILEGX_TLS_GD_CALL)
+ {
+ if (is_tls_le)
+ {
+ /* GD -> LE */
+ tilegx_replace_insn (contents + rel->r_offset,
+ insn_mask_X1, insn_move_X0X1);
+ continue;
+ }
+ else if (is_tls_iele)
+ {
+ /* GD -> IE */
+ if (ABI_64_P (output_bfd))
+ tilegx_replace_insn (contents + rel->r_offset,
+ insn_mask_X1, insn_tls_ie_ld_X1);
+ else
+ tilegx_replace_insn (contents + rel->r_offset,
+ insn_mask_X1, insn_tls_ie_ld4s_X1);
+ continue;
+ }
+
+ /* GD -> GD */
+ h = (struct elf_link_hash_entry *)
+ bfd_link_hash_lookup (info->hash, "__tls_get_addr", FALSE,
+ FALSE, TRUE);
+ BFD_ASSERT (h != NULL);
+ r_type = R_TILEGX_JUMPOFF_X1_PLT;
+ howto = tilegx_elf_howto_table + r_type;
+ }
+ else if (r_type == R_TILEGX_IMM8_X0_TLS_ADD
+ || r_type == R_TILEGX_IMM8_X1_TLS_ADD
+ || r_type == R_TILEGX_IMM8_Y0_TLS_ADD
+ || r_type == R_TILEGX_IMM8_Y1_TLS_ADD)
+ {
+ bfd_boolean is_pipe0 =
+ (r_type == R_TILEGX_IMM8_X0_TLS_ADD
+ || r_type == R_TILEGX_IMM8_Y0_TLS_ADD);
+ bfd_boolean is_X0X1 =
+ (r_type == R_TILEGX_IMM8_X0_TLS_ADD
+ || r_type == R_TILEGX_IMM8_X1_TLS_ADD);
+ int dest_begin = is_pipe0 ? 0 : 31;
+ int src_begin;
+ const bfd_byte *insn;
+ const bfd_byte *mask = NULL;
+
+ if (is_tls_le)
+ {
+ /* 1. copy dest operand into the first source operand.
+ 2. change the opcode to "move". */
+ src_begin = is_pipe0 ? 6 : 37;
+ insn = is_X0X1 ? insn_move_X0X1 : insn_move_Y0Y1;
+
+ switch (r_type)
+ {
+ case R_TILEGX_IMM8_X0_TLS_ADD:
+ mask = insn_mask_X0_no_dest_no_srca;
+ break;
+ case R_TILEGX_IMM8_X1_TLS_ADD:
+ mask = insn_mask_X1_no_dest_no_srca;
+ break;
+ case R_TILEGX_IMM8_Y0_TLS_ADD:
+ mask = insn_mask_Y0_no_dest_no_srca;
+ break;
+ case R_TILEGX_IMM8_Y1_TLS_ADD:
+ mask = insn_mask_Y1_no_dest_no_srca;
+ break;
+ }
+ }
+ else
+ {
+ /* 1. copy dest operand into the second source operand.
+ 2. change the opcode to "add". */
+ src_begin = is_pipe0 ? 12 : 43;
+ if (ABI_64_P (output_bfd))
+ insn = is_X0X1 ? insn_add_X0X1 : insn_add_Y0Y1;
+ else
+ insn = is_X0X1 ? insn_addx_X0X1 : insn_addx_Y0Y1;
+
+ switch (r_type)
+ {
+ case R_TILEGX_IMM8_X0_TLS_ADD:
+ mask = insn_mask_X0_no_operand;
+ break;
+ case R_TILEGX_IMM8_X1_TLS_ADD:
+ mask = insn_mask_X1_no_operand;
+ break;
+ case R_TILEGX_IMM8_Y0_TLS_ADD:
+ mask = insn_mask_Y0_no_operand;
+ break;
+ case R_TILEGX_IMM8_Y1_TLS_ADD:
+ mask = insn_mask_Y1_no_operand;
+ break;
+ }
+ }
+
+ tilegx_copy_bits (contents + rel->r_offset, dest_begin,
+ src_begin, 6);
+ tilegx_replace_insn (contents + rel->r_offset, mask, insn);
+
+ continue;
+ }
+ else
+ {
+ const bfd_byte *mask = NULL;
+ const bfd_byte *add_insn = NULL;
+ bfd_boolean is_64bit = ABI_64_P (output_bfd);
+
+ switch (r_type)
+ {
+ case R_TILEGX_IMM8_X0_TLS_GD_ADD:
+ add_insn = is_tls_iele
+ ? (is_64bit ? insn_tls_ie_add_X0X1 : insn_tls_ie_addx_X0X1)
+ : insn_tls_gd_add_X0X1;
+ mask = insn_mask_X0_no_dest_no_srca;
+ break;
+ case R_TILEGX_IMM8_X1_TLS_GD_ADD:
+ add_insn = is_tls_iele
+ ? (is_64bit ? insn_tls_ie_add_X0X1 : insn_tls_ie_addx_X0X1)
+ : insn_tls_gd_add_X0X1;
+ mask = insn_mask_X1_no_dest_no_srca;
+ break;
+ case R_TILEGX_IMM8_Y0_TLS_GD_ADD:
+ add_insn = is_tls_iele
+ ? (is_64bit ? insn_tls_ie_add_Y0Y1 : insn_tls_ie_addx_Y0Y1)
+ : insn_tls_gd_add_Y0Y1;
+ mask = insn_mask_Y0_no_dest_no_srca;
+ break;
+ case R_TILEGX_IMM8_Y1_TLS_GD_ADD:
+ add_insn = is_tls_iele
+ ? (is_64bit ? insn_tls_ie_add_Y0Y1 : insn_tls_ie_addx_Y0Y1)
+ : insn_tls_gd_add_Y0Y1;
+ mask = insn_mask_Y1_no_dest_no_srca;
+ break;
+ }
+
+ tilegx_replace_insn (contents + rel->r_offset, mask, add_insn);
+
+ continue;
+ }
+ break;
+ case R_TILEGX_TLS_IE_LOAD:
+ if (!input_section->sec_flg0
+ && !bfd_link_pic (info)
+ && (h == NULL || h->dynindx == -1))
+ {
+ /* IE -> LE */
+ tilegx_replace_insn (contents + rel->r_offset,
+ insn_mask_X1_no_dest_no_srca,
+ insn_move_X0X1);
+ }
+ else
+ {
+ /* IE -> IE */
+ if (ABI_64_P (output_bfd))
+ tilegx_replace_insn (contents + rel->r_offset,
+ insn_mask_X1_no_dest_no_srca,
+ insn_tls_ie_ld_X1);
+ else
+ tilegx_replace_insn (contents + rel->r_offset,
+ insn_mask_X1_no_dest_no_srca,
+ insn_tls_ie_ld4s_X1);
+ }
+ continue;
+ break;
+ default:
+ break;
+ }
+
switch (r_type)
{
case R_TILEGX_IMM16_X0_HW0_GOT:
case R_TILEGX_IMM16_X1_HW0_GOT:
- case R_TILEGX_IMM16_X0_HW1_GOT:
- case R_TILEGX_IMM16_X1_HW1_GOT:
- case R_TILEGX_IMM16_X0_HW2_GOT:
- case R_TILEGX_IMM16_X1_HW2_GOT:
- case R_TILEGX_IMM16_X0_HW3_GOT:
- case R_TILEGX_IMM16_X1_HW3_GOT:
case R_TILEGX_IMM16_X0_HW0_LAST_GOT:
case R_TILEGX_IMM16_X1_HW0_LAST_GOT:
case R_TILEGX_IMM16_X0_HW1_LAST_GOT:
case R_TILEGX_IMM16_X1_HW1_LAST_GOT:
- case R_TILEGX_IMM16_X0_HW2_LAST_GOT:
- case R_TILEGX_IMM16_X1_HW2_LAST_GOT:
/* Relocation is to the entry for this symbol in the global
offset table. */
if (htab->elf.sgot == NULL)
BFD_ASSERT (off != (bfd_vma) -1);
dyn = elf_hash_table (info)->dynamic_sections_created;
- if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
- || (info->shared
+ if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+ bfd_link_pic (info),
+ h)
+ || (bfd_link_pic (info)
&& SYMBOL_REFERENCES_LOCAL (info, h)))
{
/* This is actually a static link, or it is a
off &= ~1;
else
{
- if (info->shared)
+ if (bfd_link_pic (info))
{
asection *s;
Elf_Internal_Rela outrel;
local_got_offsets[r_symndx] |= 1;
}
}
- relocation = htab->elf.sgot->output_offset + off - got_base;
+ relocation = off - got_base;
break;
case R_TILEGX_JUMPOFF_X1_PLT:
+ case R_TILEGX_IMM16_X0_HW0_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW0_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW1_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW1_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW2_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW2_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW3_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW3_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW0_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW0_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW1_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW1_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X0_HW2_LAST_PLT_PCREL:
+ case R_TILEGX_IMM16_X1_HW2_LAST_PLT_PCREL:
/* Relocation is to the entry for this symbol in the
procedure linkage table. */
BFD_ASSERT (h != NULL);
if ((input_section->flags & SEC_ALLOC) == 0)
break;
- if ((info->shared
+ if ((bfd_link_pic (info)
&& (h == NULL
|| ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|| h->root.type != bfd_link_hash_undefweak)
&& (! howto->pc_relative
|| !SYMBOL_CALLS_LOCAL (info, h)))
- || (!info->shared
+ || (!bfd_link_pic (info)
&& h != NULL
&& h->dynindx != -1
&& !h->non_got_ref
else if (h != NULL &&
h->dynindx != -1
&& (! is_plt
- || !info->shared
+ || !bfd_link_pic (info)
|| !SYMBOLIC_BIND (info, h)
|| !h->def_regular))
{
if (indx == 0)
{
BFD_FAIL ();
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: probably compiled without -fPIC?"),
input_bfd);
bfd_set_error (bfd_error_bad_value);
}
break;
+ case R_TILEGX_IMM16_X0_HW0_TLS_LE:
+ case R_TILEGX_IMM16_X1_HW0_TLS_LE:
+ case R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE:
+ case R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE:
+ case R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE:
+ case R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE:
+ if (bfd_link_pic (info))
+ {
+ Elf_Internal_Rela outrel;
+ bfd_boolean skip;
+
+ BFD_ASSERT (sreloc != NULL);
+ skip = FALSE;
+ outrel.r_offset =
+ _bfd_elf_section_offset (output_bfd, info, input_section,
+ rel->r_offset);
+ if (outrel.r_offset == (bfd_vma) -1)
+ skip = TRUE;
+ else if (outrel.r_offset == (bfd_vma) -2)
+ skip = TRUE;
+ outrel.r_offset += (input_section->output_section->vma
+ + input_section->output_offset);
+ if (skip)
+ memset (&outrel, 0, sizeof outrel);
+ else
+ {
+ outrel.r_info = TILEGX_ELF_R_INFO (htab, NULL, 0, r_type);
+ outrel.r_addend = relocation - dtpoff_base (info)
+ + rel->r_addend;
+ }
+
+ tilegx_elf_append_rela (output_bfd, sreloc, &outrel);
+ continue;
+ }
+ relocation = tpoff (info, relocation);
+ break;
+
case R_TILEGX_IMM16_X0_HW0_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_TLS_GD:
- case R_TILEGX_IMM16_X0_HW1_TLS_GD:
- case R_TILEGX_IMM16_X1_HW1_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_TLS_GD:
- case R_TILEGX_IMM16_X0_HW3_TLS_GD:
- case R_TILEGX_IMM16_X1_HW3_TLS_GD:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
- tls_type = GOT_TLS_GD;
- goto have_tls_reference;
-
case R_TILEGX_IMM16_X0_HW0_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_TLS_IE:
- case R_TILEGX_IMM16_X0_HW1_TLS_IE:
- case R_TILEGX_IMM16_X1_HW1_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_TLS_IE:
- case R_TILEGX_IMM16_X0_HW3_TLS_IE:
- case R_TILEGX_IMM16_X1_HW3_TLS_IE:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
- tls_type = GOT_TLS_IE;
- /* Fall through. */
-
- have_tls_reference:
+ r_type = tilegx_elf_tls_transition (info, r_type, h == NULL,
+ input_section->sec_flg0);
+ tls_type = GOT_UNKNOWN;
if (h == NULL && local_got_offsets)
- tls_type = _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
+ tls_type =
+ _bfd_tilegx_elf_local_got_tls_type (input_bfd) [r_symndx];
else if (h != NULL)
- tls_type = tilegx_elf_hash_entry(h)->tls_type;
+ {
+ tls_type = tilegx_elf_hash_entry(h)->tls_type;
+ if (!bfd_link_pic (info)
+ && h->dynindx == -1
+ && tls_type == GOT_TLS_IE)
+ r_type = (!input_section->sec_flg0
+ ? tilegx_tls_translate_to_le (r_type)
+ : tilegx_tls_translate_to_ie (r_type));
+ }
if (tls_type == GOT_TLS_IE)
- switch (r_type)
- {
- case R_TILEGX_IMM16_X0_HW0_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW0_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW0_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW0_TLS_IE;
- break;
- case R_TILEGX_IMM16_X0_HW1_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW1_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW1_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW1_TLS_IE;
- break;
- case R_TILEGX_IMM16_X0_HW2_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW2_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW2_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW2_TLS_IE;
- break;
- case R_TILEGX_IMM16_X0_HW3_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW3_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW3_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW3_TLS_IE;
- break;
- case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE;
- break;
- case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE;
- break;
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
- r_type = R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE;
- break;
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
- r_type = R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE;
- break;
- }
+ r_type = tilegx_tls_translate_to_ie (r_type);
+
+ if (r_type == R_TILEGX_IMM16_X0_HW0_TLS_LE
+ || r_type == R_TILEGX_IMM16_X1_HW0_TLS_LE
+ || r_type == R_TILEGX_IMM16_X0_HW0_LAST_TLS_LE
+ || r_type == R_TILEGX_IMM16_X1_HW0_LAST_TLS_LE
+ || r_type == R_TILEGX_IMM16_X0_HW1_LAST_TLS_LE
+ || r_type == R_TILEGX_IMM16_X1_HW1_LAST_TLS_LE)
+ {
+ relocation = tpoff (info, relocation);
+ break;
+ }
if (h != NULL)
{
bfd_boolean dyn;
dyn = htab->elf.dynamic_sections_created;
- if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
- && (!info->shared
+ if (WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn,
+ bfd_link_pic (info),
+ h)
+ && (!bfd_link_pic (info)
|| !SYMBOL_REFERENCES_LOCAL (info, h)))
{
indx = h->dynindx;
/* The GOT entries have not been initialized yet. Do it
now, and emit any relocations. */
- if ((info->shared || indx != 0)
+ if ((bfd_link_pic (info) || indx != 0)
&& (h == NULL
|| ELF_ST_VISIBILITY (h->other) == STV_DEFAULT
|| h->root.type != bfd_link_hash_undefweak))
{
case R_TILEGX_IMM16_X0_HW0_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_TLS_IE:
- case R_TILEGX_IMM16_X0_HW1_TLS_IE:
- case R_TILEGX_IMM16_X1_HW1_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_TLS_IE:
- case R_TILEGX_IMM16_X0_HW3_TLS_IE:
- case R_TILEGX_IMM16_X1_HW3_TLS_IE:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_IE:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_IE:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_IE:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_IE:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_IE:
if (need_relocs) {
TILEGX_ELF_PUT_WORD (htab, output_bfd, 0,
htab->elf.sgot->contents + off);
case R_TILEGX_IMM16_X0_HW0_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_TLS_GD:
- case R_TILEGX_IMM16_X0_HW1_TLS_GD:
- case R_TILEGX_IMM16_X1_HW1_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_TLS_GD:
- case R_TILEGX_IMM16_X0_HW3_TLS_GD:
- case R_TILEGX_IMM16_X1_HW3_TLS_GD:
case R_TILEGX_IMM16_X0_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW0_LAST_TLS_GD:
case R_TILEGX_IMM16_X0_HW1_LAST_TLS_GD:
case R_TILEGX_IMM16_X1_HW1_LAST_TLS_GD:
- case R_TILEGX_IMM16_X0_HW2_LAST_TLS_GD:
- case R_TILEGX_IMM16_X1_HW2_LAST_TLS_GD:
if (need_relocs) {
outrel.r_offset = (htab->elf.sgot->output_section->vma
+ htab->elf.sgot->output_offset + off);
if (off >= (bfd_vma) -2)
abort ();
- relocation = htab->elf.sgot->output_offset + off - got_base;
+ relocation = off - got_base;
unresolved_reloc = FALSE;
howto = tilegx_elf_howto_table + r_type;
break;
not process them. */
if (unresolved_reloc
&& !((input_section->flags & SEC_DEBUGGING) != 0
- && h->def_dynamic))
- (*_bfd_error_handler)
+ && h->def_dynamic)
+ && _bfd_elf_section_offset (output_bfd, info, input_section,
+ rel->r_offset) != (bfd_vma) -1)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B(%A+0x%lx): unresolvable %s relocation against symbol `%s'"),
input_bfd,
input_section,
switch (r)
{
case bfd_reloc_overflow:
- 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_outofrange:
}
if (msg)
- r = info->callbacks->warning
- (info, msg, name, input_bfd, input_section, rel->r_offset);
-
- if (! r)
- return FALSE;
+ (*info->callbacks->warning) (info, msg, name, input_bfd,
+ input_section, rel->r_offset);
}
}
the symbol was forced to be local because of a version file.
The entry in the global offset table will already have been
initialized in the relocate_section function. */
- if (info->shared
+ if (bfd_link_pic (info)
&& (info->symbolic || h->dynindx == -1)
&& h->def_regular)
{
/* This symbols needs a copy reloc. Set it up. */
BFD_ASSERT (h->dynindx != -1);
- s = bfd_get_section_by_name (h->root.u.def.section->owner,
- ".rela.bss");
+ if ((h->root.u.def.section->flags & SEC_READONLY) != 0)
+ s = htab->elf.sreldynrelro;
+ else
+ s = htab->elf.srelbss;
BFD_ASSERT (s != NULL);
rela.r_offset = (h->root.u.def.value
}
/* Mark some specially defined symbols as absolute. */
- if (strcmp (h->root.root.string, "_DYNAMIC") == 0
+ if (h == htab->elf.hdynamic
|| (h == htab->elf.hgot || h == htab->elf.hplt))
sym->st_shndx = SHN_ABS;
bfd *dynobj;
asection *sdyn;
struct tilegx_elf_link_hash_table *htab;
+ size_t pad_size;
htab = tilegx_elf_hash_table (info);
BFD_ASSERT (htab != NULL);
dynobj = htab->elf.dynobj;
- sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
+ sdyn = bfd_get_linker_section (dynobj, ".dynamic");
if (elf_hash_table (info)->dynamic_sections_created)
{
asection *splt;
bfd_boolean ret;
- splt = bfd_get_section_by_name (dynobj, ".plt");
+ splt = htab->elf.splt;
BFD_ASSERT (splt != NULL && sdyn != NULL);
ret = tilegx_finish_dyn (output_bfd, info, dynobj, sdyn, splt);
tilegx64_plt0_entry : tilegx32_plt0_entry,
PLT_HEADER_SIZE);
- memcpy (splt->contents + splt->size - PLT_TAIL_SIZE,
+ memcpy (splt->contents + splt->size
+ - PLT_ENTRY_SIZE + PLT_HEADER_SIZE,
ABI_64_P (output_bfd) ?
tilegx64_plt_tail_entry : tilegx32_plt_tail_entry,
PLT_TAIL_SIZE);
+ /* Add padding so that the plt section is a multiple of its
+ entry size. */
+ pad_size = PLT_ENTRY_SIZE - PLT_HEADER_SIZE - PLT_TAIL_SIZE;
+ memset (splt->contents + splt->size - pad_size, 0, pad_size);
}
elf_section_data (splt->output_section)->this_hdr.sh_entsize
{
if (bfd_is_abs_section (htab->elf.sgotplt->output_section))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("discarded output section: `%A'"), htab->elf.sgotplt);
return FALSE;
}
}
enum elf_reloc_type_class
-tilegx_reloc_type_class (const Elf_Internal_Rela *rela)
+tilegx_reloc_type_class (const struct bfd_link_info *info ATTRIBUTE_UNUSED,
+ const asection *rel_sec ATTRIBUTE_UNUSED,
+ const Elf_Internal_Rela *rela)
{
switch ((int) TILEGX_ELF_R_TYPE (rela->r_info))
{
bfd_boolean
-_bfd_tilegx_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
+_bfd_tilegx_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
{
+ bfd *obfd = info->output_bfd;
const char *targ1 = bfd_get_target (ibfd);
const char *targ2 = bfd_get_target (obfd);
if (strcmp (targ1, targ2) != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B: Cannot link together %s and %s objects."),
ibfd, targ1, targ2);
bfd_set_error (bfd_error_bad_value);
projects / thirdparty / binutils-gdb.git / blobdiff