/* BFD back-end for IBM RS/6000 "XCOFF64" files.
- Copyright (C) 2000-2021 Free Software Foundation, Inc.
+ Copyright (C) 2000-2023 Free Software Foundation, Inc.
Written Clinton Popetz.
Contributed by Cygnus Support.
(bfd *, void *, void *);
static unsigned int _bfd_xcoff64_swap_lineno_out
(bfd *, void *, void *);
-static bfd_boolean _bfd_xcoff64_put_symbol_name
+static bool _bfd_xcoff64_put_symbol_name
(struct bfd_link_info *, struct bfd_strtab_hash *,
struct internal_syment *, const char *);
-static bfd_boolean _bfd_xcoff64_put_ldsymbol_name
+static bool _bfd_xcoff64_put_ldsymbol_name
(bfd *, struct xcoff_loader_info *, struct internal_ldsym *, const char *);
static void _bfd_xcoff64_swap_sym_in
(bfd *, void *, void *);
(bfd *, void *, void *);
static unsigned int xcoff64_swap_reloc_out
(bfd *, void *, void *);
-extern bfd_boolean _bfd_xcoff_mkobject
+extern bool _bfd_xcoff_mkobject
(bfd *);
-extern bfd_boolean _bfd_xcoff_copy_private_bfd_data
+extern bool _bfd_xcoff_copy_private_bfd_data
(bfd *, bfd *);
-extern bfd_boolean _bfd_xcoff_is_local_label_name
+extern bool _bfd_xcoff_is_local_label_name
(bfd *, const char *);
extern void xcoff64_rtype2howto
(arelent *, struct internal_reloc *);
extern reloc_howto_type * xcoff64_reloc_type_lookup
(bfd *, bfd_reloc_code_real_type);
-extern bfd_boolean _bfd_xcoff_slurp_armap
+extern bool _bfd_xcoff_slurp_armap
(bfd *);
extern void *_bfd_xcoff_read_ar_hdr
(bfd *);
(bfd *, bfd *);
extern int _bfd_xcoff_stat_arch_elt
(bfd *, struct stat *);
-extern bfd_boolean _bfd_xcoff_write_armap
+extern bool _bfd_xcoff_write_armap
(bfd *, unsigned int, struct orl *, unsigned int, int);
-extern bfd_boolean _bfd_xcoff_write_archive_contents
+extern bool _bfd_xcoff_write_archive_contents
(bfd *);
extern int _bfd_xcoff_sizeof_headers
(bfd *, struct bfd_link_info *);
(bfd *, const void *, struct internal_ldrel *);
static void xcoff64_swap_ldrel_out
(bfd *, const struct internal_ldrel *, void *d);
-static bfd_boolean xcoff64_ppc_relocate_section
+static bool xcoff64_ppc_relocate_section
(bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
struct internal_reloc *, struct internal_syment *,
asection **);
-static bfd_boolean xcoff64_slurp_armap
+static bool xcoff64_slurp_armap
(bfd *);
static bfd_cleanup xcoff64_archive_p
(bfd *);
(bfd *, struct bfd_link_info *);
static asection *xcoff64_create_csect_from_smclas
(bfd *, union internal_auxent *, const char *);
-static bfd_boolean xcoff64_is_lineno_count_overflow
+static bool xcoff64_is_lineno_count_overflow
(bfd *, bfd_vma);
-static bfd_boolean xcoff64_is_reloc_count_overflow
+static bool xcoff64_is_reloc_count_overflow
(bfd *, bfd_vma);
static bfd_vma xcoff64_loader_symbol_offset
(bfd *, struct internal_ldhdr *);
static bfd_vma xcoff64_loader_reloc_offset
(bfd *, struct internal_ldhdr *);
-static bfd_boolean xcoff64_generate_rtinit
- (bfd *, const char *, const char *, bfd_boolean);
-static bfd_boolean xcoff64_bad_format_hook
+static bool xcoff64_generate_rtinit
+ (bfd *, const char *, const char *, bool);
+static bool xcoff64_bad_format_hook
(bfd *, void *);
/* Relocation functions */
xcoff_reloc_type_fail, /* (0x1d) */
xcoff_reloc_type_fail, /* (0x1e) */
xcoff_reloc_type_fail, /* (0x1f) */
- xcoff_reloc_type_fail, /* R_TLS (0x20) */
- xcoff_reloc_type_fail, /* R_TLS_IE (0x21) */
- xcoff_reloc_type_fail, /* R_TLS_LD (0x22) */
- xcoff_reloc_type_fail, /* R_TLS_LE (0x23) */
- xcoff_reloc_type_fail, /* R_TLSM (0x24) */
- xcoff_reloc_type_fail, /* R_TLSML (0x25) */
+ xcoff_reloc_type_tls, /* R_TLS (0x20) */
+ xcoff_reloc_type_tls, /* R_TLS_IE (0x21) */
+ xcoff_reloc_type_tls, /* R_TLS_LD (0x22) */
+ xcoff_reloc_type_tls, /* R_TLS_LE (0x23) */
+ xcoff_reloc_type_tls, /* R_TLSM (0x24) */
+ xcoff_reloc_type_tls, /* R_TLSML (0x25) */
xcoff_reloc_type_fail, /* (0x26) */
xcoff_reloc_type_fail, /* (0x27) */
xcoff_reloc_type_fail, /* (0x28) */
#ifdef AIX_CORE
extern bfd_cleanup rs6000coff_core_p
(bfd *abfd);
-extern bfd_boolean rs6000coff_core_file_matches_executable_p
+extern bool rs6000coff_core_file_matches_executable_p
(bfd *cbfd, bfd *ebfd);
extern char *rs6000coff_core_file_failing_command
(bfd *abfd);
}
static void
-_bfd_xcoff64_swap_aux_in (bfd *abfd, void *ext1, int type, int in_class,
- int indx, int numaux, void *in1)
+_bfd_xcoff64_swap_aux_in (bfd *abfd, void *ext1, int type ATTRIBUTE_UNUSED,
+ int in_class, int indx, int numaux, void *in1)
{
union external_auxent *ext = (union external_auxent *) ext1;
union internal_auxent *in = (union internal_auxent *) in1;
+ unsigned char auxtype;
switch (in_class)
{
+ default:
+ _bfd_error_handler
+ /* xgettext: c-format */
+ (_("%pB: unsupported swap_aux_in for storage class %#x"),
+ abfd, (unsigned int) in_class);
+ bfd_set_error (bfd_error_bad_value);
+ break;
+
case C_FILE:
+ auxtype = H_GET_8 (abfd, ext->x_file.x_auxtype);
+ if (auxtype != _AUX_FILE)
+ goto error;
+
if (ext->x_file.x_n.x_n.x_zeroes[0] == 0)
{
- in->x_file.x_n.x_zeroes = 0;
- in->x_file.x_n.x_offset =
+ in->x_file.x_n.x_n.x_zeroes = 0;
+ in->x_file.x_n.x_n.x_offset =
H_GET_32 (abfd, ext->x_file.x_n.x_n.x_offset);
}
else
- {
- memcpy (in->x_file.x_fname, ext->x_file.x_n.x_fname, FILNMLEN);
- }
- goto end;
+ memcpy (in->x_file.x_n.x_fname, ext->x_file.x_n.x_fname, FILNMLEN);
+ in->x_file.x_ftype = H_GET_8 (abfd, ext->x_file.x_ftype);
+ break;
- /* RS/6000 "csect" auxents */
+ /* RS/6000 "csect" auxents.
+ There is always a CSECT auxiliary entry. But functions can
+ have FCN and EXCEPT ones too. In this case, CSECT is always the last
+ one.
+ For now, we only support FCN types. */
case C_EXT:
case C_AIX_WEAKEXT:
case C_HIDEXT:
if (indx + 1 == numaux)
{
- bfd_signed_vma h = 0;
- bfd_vma l = 0;
+ /* C_EXT can have several aux enties. But the _AUX_CSECT is always
+ the last one. */
+ auxtype = H_GET_8 (abfd, ext->x_csect.x_auxtype);
+ if (auxtype != _AUX_CSECT)
+ goto error;
- h = H_GET_S32 (abfd, ext->x_csect.x_scnlen_hi);
- l = H_GET_32 (abfd, ext->x_csect.x_scnlen_lo);
+ bfd_vma h = H_GET_32 (abfd, ext->x_csect.x_scnlen_hi);
+ bfd_vma l = H_GET_32 (abfd, ext->x_csect.x_scnlen_lo);
- in->x_csect.x_scnlen.l = h << 32 | (l & 0xffffffff);
+ in->x_csect.x_scnlen.u64 = h << 32 | (l & 0xffffffff);
in->x_csect.x_parmhash = H_GET_32 (abfd, ext->x_csect.x_parmhash);
in->x_csect.x_snhash = H_GET_16 (abfd, ext->x_csect.x_snhash);
byte orders. */
in->x_csect.x_smtyp = H_GET_8 (abfd, ext->x_csect.x_smtyp);
in->x_csect.x_smclas = H_GET_8 (abfd, ext->x_csect.x_smclas);
- goto end;
+ }
+ else
+ {
+ /* It can also be a _AUX_EXCEPT entry. But it's not supported
+ for now. */
+ auxtype = H_GET_8 (abfd, ext->x_fcn.x_auxtype);
+ if (auxtype != _AUX_FCN)
+ goto error;
+
+ in->x_sym.x_fcnary.x_fcn.x_lnnoptr
+ = H_GET_64 (abfd, ext->x_fcn.x_lnnoptr);
+ in->x_sym.x_misc.x_fsize
+ = H_GET_32 (abfd, ext->x_fcn.x_fsize);
+ in->x_sym.x_fcnary.x_fcn.x_endndx.u32
+ = H_GET_32 (abfd, ext->x_fcn.x_endndx);
}
break;
case C_STAT:
- case C_LEAFSTAT:
- case C_HIDDEN:
- if (type == T_NULL)
- {
- /* PE defines some extra fields; we zero them out for
- safety. */
- in->x_scn.x_checksum = 0;
- in->x_scn.x_associated = 0;
- in->x_scn.x_comdat = 0;
-
- goto end;
- }
+ _bfd_error_handler
+ /* xgettext: c-format */
+ (_("%pB: C_STAT isn't supported by XCOFF64"),
+ abfd);
+ bfd_set_error (bfd_error_bad_value);
break;
- }
- if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
- || ISTAG (in_class))
- {
- in->x_sym.x_fcnary.x_fcn.x_lnnoptr
- = H_GET_64 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
- in->x_sym.x_fcnary.x_fcn.x_endndx.l
- = H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx);
- }
- if (ISFCN (type))
- {
- in->x_sym.x_misc.x_fsize
- = H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_fsize);
- }
- else
- {
+ case C_BLOCK:
+ case C_FCN:
+ auxtype = H_GET_8 (abfd, ext->x_sym.x_auxtype);
+ if (auxtype != _AUX_SYM)
+ goto error;
+
in->x_sym.x_misc.x_lnsz.x_lnno
- = H_GET_32 (abfd, ext->x_sym.x_fcnary.x_lnsz.x_lnno);
- in->x_sym.x_misc.x_lnsz.x_size
- = H_GET_16 (abfd, ext->x_sym.x_fcnary.x_lnsz.x_size);
+ = H_GET_32 (abfd, ext->x_sym.x_lnno);
+ break;
+
+ case C_DWARF:
+ auxtype = H_GET_8 (abfd, ext->x_sect.x_auxtype);
+ if (auxtype != _AUX_SECT)
+ goto error;
+
+ in->x_sect.x_scnlen = H_GET_64 (abfd, ext->x_sect.x_scnlen);
+ in->x_sect.x_nreloc = H_GET_64 (abfd, ext->x_sect.x_nreloc);
+ break;
}
- end: ;
+ return;
+
+ error:
+ _bfd_error_handler
+ /* xgettext: c-format */
+ (_("%pB: wrong auxtype %#x for storage class %#x"),
+ abfd, auxtype, (unsigned int) in_class);
+ bfd_set_error (bfd_error_bad_value);
+
+
}
static unsigned int
-_bfd_xcoff64_swap_aux_out (bfd *abfd, void *inp, int type, int in_class,
- int indx ATTRIBUTE_UNUSED,
- int numaux ATTRIBUTE_UNUSED,
- void *extp)
+_bfd_xcoff64_swap_aux_out (bfd *abfd, void *inp, int type ATTRIBUTE_UNUSED,
+ int in_class, int indx, int numaux, void *extp)
{
union internal_auxent *in = (union internal_auxent *) inp;
union external_auxent *ext = (union external_auxent *) extp;
memset (ext, 0, bfd_coff_auxesz (abfd));
switch (in_class)
{
+ default:
+ _bfd_error_handler
+ /* xgettext: c-format */
+ (_("%pB: unsupported swap_aux_out for storage class %#x"),
+ abfd, (unsigned int) in_class);
+ bfd_set_error (bfd_error_bad_value);
+ break;
+
case C_FILE:
- if (in->x_file.x_n.x_zeroes == 0)
+ if (in->x_file.x_n.x_n.x_zeroes == 0)
{
H_PUT_32 (abfd, 0, ext->x_file.x_n.x_n.x_zeroes);
- H_PUT_32 (abfd, in->x_file.x_n.x_offset,
+ H_PUT_32 (abfd, in->x_file.x_n.x_n.x_offset,
ext->x_file.x_n.x_n.x_offset);
}
else
- {
- memcpy (ext->x_file.x_n.x_fname, in->x_file.x_fname, FILNMLEN);
- }
- H_PUT_8 (abfd, _AUX_FILE, ext->x_auxtype.x_auxtype);
- goto end;
+ memcpy (ext->x_file.x_n.x_fname, in->x_file.x_n.x_fname, FILNMLEN);
+ H_PUT_8 (abfd, in->x_file.x_ftype, ext->x_file.x_ftype);
+ H_PUT_8 (abfd, _AUX_FILE, ext->x_file.x_auxtype);
+ break;
- /* RS/6000 "csect" auxents */
+ /* RS/6000 "csect" auxents.
+ There is always a CSECT auxiliary entry. But functions can
+ have FCN and EXCEPT ones too. In this case, CSECT is always the last
+ one.
+ For now, we only support FCN types. */
case C_EXT:
case C_AIX_WEAKEXT:
case C_HIDEXT:
{
bfd_vma temp;
- temp = in->x_csect.x_scnlen.l & 0xffffffff;
+ temp = in->x_csect.x_scnlen.u64 & 0xffffffff;
H_PUT_32 (abfd, temp, ext->x_csect.x_scnlen_lo);
- temp = in->x_csect.x_scnlen.l >> 32;
+ temp = in->x_csect.x_scnlen.u64 >> 32;
H_PUT_32 (abfd, temp, ext->x_csect.x_scnlen_hi);
H_PUT_32 (abfd, in->x_csect.x_parmhash, ext->x_csect.x_parmhash);
H_PUT_16 (abfd, in->x_csect.x_snhash, ext->x_csect.x_snhash);
byte orders. */
H_PUT_8 (abfd, in->x_csect.x_smtyp, ext->x_csect.x_smtyp);
H_PUT_8 (abfd, in->x_csect.x_smclas, ext->x_csect.x_smclas);
- H_PUT_8 (abfd, _AUX_CSECT, ext->x_auxtype.x_auxtype);
- goto end;
+ H_PUT_8 (abfd, _AUX_CSECT, ext->x_csect.x_auxtype);
+ }
+ else
+ {
+ H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
+ ext->x_fcn.x_lnnoptr);
+ H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, ext->x_fcn.x_fsize);
+ H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.u32,
+ ext->x_fcn.x_endndx);
+ H_PUT_8 (abfd, _AUX_FCN, ext->x_csect.x_auxtype);
}
break;
case C_STAT:
- case C_LEAFSTAT:
- case C_HIDDEN:
- if (type == T_NULL)
- {
- goto end;
- }
+ _bfd_error_handler
+ /* xgettext: c-format */
+ (_("%pB: C_STAT isn't supported by XCOFF64"),
+ abfd);
+ bfd_set_error (bfd_error_bad_value);
break;
- }
- if (in_class == C_BLOCK || in_class == C_FCN || ISFCN (type)
- || ISTAG (in_class))
- {
- H_PUT_64 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
- ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
- H_PUT_8 (abfd, _AUX_FCN,
- ext->x_auxtype.x_auxtype);
- H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l,
- ext->x_sym.x_fcnary.x_fcn.x_endndx);
- }
- if (ISFCN (type))
- {
- H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize,
- ext->x_sym.x_fcnary.x_fcn.x_fsize);
- }
- else
- {
- H_PUT_32 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno,
- ext->x_sym.x_fcnary.x_lnsz.x_lnno);
- H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_size,
- ext->x_sym.x_fcnary.x_lnsz.x_size);
- }
+ case C_BLOCK:
+ case C_FCN:
+ H_PUT_32 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext->x_sym.x_lnno);
+ H_PUT_8 (abfd, _AUX_SYM, ext->x_sym.x_auxtype);
+ break;
- end:
+ case C_DWARF:
+ H_PUT_64 (abfd, in->x_sect.x_scnlen, ext->x_sect.x_scnlen);
+ H_PUT_64 (abfd, in->x_sect.x_nreloc, ext->x_sect.x_nreloc);
+ H_PUT_8 (abfd, _AUX_SECT, ext->x_sect.x_auxtype);
+ break;
+ }
return bfd_coff_auxesz (abfd);
}
-static bfd_boolean
+static bool
_bfd_xcoff64_put_symbol_name (struct bfd_link_info *info,
struct bfd_strtab_hash *strtab,
struct internal_syment *sym,
const char *name)
{
- bfd_boolean hash;
+ bool hash;
bfd_size_type indx;
hash = !info->traditional_format;
- indx = _bfd_stringtab_add (strtab, name, hash, FALSE);
+ indx = _bfd_stringtab_add (strtab, name, hash, false);
if (indx == (bfd_size_type) -1)
- return FALSE;
+ return false;
sym->_n._n_n._n_zeroes = 0;
sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx;
- return TRUE;
+ return true;
}
-static bfd_boolean
+static bool
_bfd_xcoff64_put_ldsymbol_name (bfd *abfd ATTRIBUTE_UNUSED,
struct xcoff_loader_info *ldinfo,
struct internal_ldsym *ldsym,
newstrings = bfd_realloc (ldinfo->strings, newalc);
if (newstrings == NULL)
{
- ldinfo->failed = TRUE;
- return FALSE;
+ ldinfo->failed = true;
+ return false;
}
ldinfo->string_alc = newalc;
ldinfo->strings = newstrings;
}
- bfd_put_16 (ldinfo->output_bfd, (bfd_vma) (len + 1),
- ldinfo->strings + ldinfo->string_size);
+ ldinfo->strings[ldinfo->string_size] = ((len + 1) >> 8) & 0xff;
+ ldinfo->strings[ldinfo->string_size + 1] = ((len + 1)) & 0xff;
strcpy (ldinfo->strings + ldinfo->string_size + 2, name);
ldsym->_l._l_l._l_zeroes = 0;
ldsym->_l._l_l._l_offset = ldinfo->string_size + 2;
ldinfo->string_size += len + 3;
- return TRUE;
+ return true;
}
/* Routines to swap information in the XCOFF .loader section. If we
}
-static bfd_boolean
+static bool
xcoff64_reloc_type_br (bfd *input_bfd,
asection *input_section,
bfd *output_bfd ATTRIBUTE_UNUSED,
bfd_vma val,
bfd_vma addend,
bfd_vma *relocation,
- bfd_byte *contents)
+ bfd_byte *contents,
+ struct bfd_link_info *info)
{
struct xcoff_link_hash_entry *h;
bfd_vma section_offset;
+ struct xcoff_stub_hash_entry *stub_entry = NULL;
+ enum xcoff_stub_type stub_type;
if (0 > rel->r_symndx)
- return FALSE;
+ return false;
h = obj_xcoff_sym_hashes (input_bfd)[rel->r_symndx];
section_offset = rel->r_vaddr - input_section->vma;
howto->complain_on_overflow = complain_overflow_dont;
}
+ /* Check if a stub is needed. */
+ stub_type = bfd_xcoff_type_of_stub (input_section, rel, val, h);
+ if (stub_type != xcoff_stub_none)
+ {
+ asection *stub_csect;
+
+ stub_entry = bfd_xcoff_get_stub_entry (input_section, h, info);
+ if (stub_entry == NULL)
+ {
+ _bfd_error_handler (_("Unable to find the stub entry targeting %s"),
+ h->root.root.string);
+ bfd_set_error (bfd_error_bad_value);
+ return false;
+ }
+
+ stub_csect = stub_entry->hcsect->root.u.def.section;
+ val = (stub_entry->stub_offset
+ + stub_csect->output_section->vma
+ + stub_csect->output_offset);
+ }
+
/* The original PC-relative relocation is biased by -r_vaddr, so adding
the value below will give the absolute target address. */
*relocation = val + addend + rel->r_vaddr;
bfd_put_32 (input_bfd, insn, ptr);
/* Make the howto absolute too. */
- howto->pc_relative = FALSE;
+ howto->pc_relative = false;
howto->complain_on_overflow = complain_overflow_bitfield;
}
else
{
/* Use a PC-relative howto and subtract the instruction's address
from the target address we calculated above. */
- howto->pc_relative = TRUE;
+ howto->pc_relative = true;
*relocation -= (input_section->output_section->vma
+ input_section->output_offset
+ section_offset);
}
- return TRUE;
+ return true;
}
/* 0x00: Standard 64 bit relocation. */
HOWTO (R_POS, /* type */
0, /* rightshift */
- 4, /* size (0 = byte, 1 = short, 2 = long) */
+ 8, /* size */
64, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_POS_64", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
MINUS_ONE, /* src_mask */
MINUS_ONE, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x01: 64 bit relocation, but store negative value. */
HOWTO (R_NEG, /* type */
0, /* rightshift */
- -4, /* size (0 = byte, 1 = short, 2 = long) */
+ -8, /* size */
64, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_NEG", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
MINUS_ONE, /* src_mask */
MINUS_ONE, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x02: 64 bit PC relative relocation. */
HOWTO (R_REL, /* type */
0, /* rightshift */
- 4, /* size (0 = byte, 1 = short, 2 = long) */
+ 8, /* size */
64, /* bitsize */
- TRUE, /* pc_relative */
+ true, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
0, /* special_function */
"R_REL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
MINUS_ONE, /* src_mask */
MINUS_ONE, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x03: 16 bit TOC relative relocation. */
HOWTO (R_TOC, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_TOC", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x04: Same as R_TOC. */
HOWTO (R_TRL, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_TRL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x05: External TOC relative symbol. */
HOWTO (R_GL, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_GL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x06: Local TOC relative symbol. */
HOWTO (R_TCL, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_TCL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
EMPTY_HOWTO (7),
/* 0x08: Same as R_RBA. */
HOWTO (R_BA, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
26, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_BA_26", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0x03fffffc, /* src_mask */
0x03fffffc, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
EMPTY_HOWTO (9),
/* 0x0a: Same as R_RBR. */
HOWTO (R_BR, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
26, /* bitsize */
- TRUE, /* pc_relative */
+ true, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
0, /* special_function */
"R_BR", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0x03fffffc, /* src_mask */
0x03fffffc, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
EMPTY_HOWTO (0xb),
/* 0x0c: Same as R_POS. */
HOWTO (R_RL, /* type */
0, /* rightshift */
- 4, /* size (0 = byte, 1 = short, 2 = long) */
+ 8, /* size */
64, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
MINUS_ONE, /* src_mask */
MINUS_ONE, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x0d: Same as R_POS. */
HOWTO (R_RLA, /* type */
0, /* rightshift */
- 4, /* size (0 = byte, 1 = short, 2 = long) */
+ 8, /* size */
64, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RLA", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
MINUS_ONE, /* src_mask */
MINUS_ONE, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
EMPTY_HOWTO (0xe),
/* 0x0f: Non-relocating reference. Bitsize is 1 so that r_rsize is 0. */
HOWTO (R_REF, /* type */
0, /* rightshift */
- 0, /* size (0 = byte, 1 = short, 2 = long) */
+ 1, /* size */
1, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
0, /* special_function */
"R_REF", /* name */
- FALSE, /* partial_inplace */
+ false, /* partial_inplace */
0, /* src_mask */
0, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
EMPTY_HOWTO (0x10),
EMPTY_HOWTO (0x11),
/* 0x13: Same as R_TOC */
HOWTO (R_TRLA, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_TRLA", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffff, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x14: Modifiable relative branch. */
HOWTO (R_RRTBI, /* type */
1, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
32, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RRTBI", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffffffff, /* src_mask */
0xffffffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x15: Modifiable absolute branch. */
HOWTO (R_RRTBA, /* type */
1, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
32, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RRTBA", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffffffff, /* src_mask */
0xffffffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x16: Modifiable call absolute indirect. */
HOWTO (R_CAI, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_CAI", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffff, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x17: Modifiable call relative. */
HOWTO (R_CREL, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_CREL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffff, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x18: Modifiable branch absolute. */
HOWTO (R_RBA, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
26, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RBA", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0x03fffffc, /* src_mask */
0x03fffffc, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x19: Modifiable branch absolute. */
HOWTO (R_RBAC, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
32, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RBAC", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffffffff, /* src_mask */
0xffffffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x1a: Modifiable branch relative. */
HOWTO (R_RBR, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
26, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
0, /* special_function */
"R_RBR_26", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0x03fffffc, /* src_mask */
0x03fffffc, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x1b: Modifiable branch absolute. */
HOWTO (R_RBRC, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RBRC", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffff, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x1c: Standard 32 bit relocation. */
HOWTO (R_POS, /* type */
0, /* rightshift */
- 2, /* size (0 = byte, 1 = short, 2 = long) */
+ 4, /* size */
32, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_POS_32", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffffffff, /* src_mask */
0xffffffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x1d: 16 bit Non modifiable absolute branch. */
HOWTO (R_BA, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_BA_16", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xfffc, /* src_mask */
0xfffc, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x1e: Modifiable branch relative. */
HOWTO (R_RBR, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- TRUE, /* pc_relative */
+ true, /* pc_relative */
0, /* bitpos */
complain_overflow_signed, /* complain_on_overflow */
0, /* special_function */
"R_RBR_16", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xfffc, /* src_mask */
0xfffc, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x1f: Modifiable branch absolute. */
HOWTO (R_RBA, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_RBA_16", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0xffff, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
-
+ false), /* pcrel_offset */
/* 0x20: General-dynamic TLS relocation. */
- EMPTY_HOWTO (R_TLS),
+ HOWTO (R_TLS, /* type */
+ 0, /* rightshift */
+ 8, /* size */
+ 64, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_TLS", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
/* 0x21: Initial-exec TLS relocation. */
- EMPTY_HOWTO (R_TLS_IE),
+ HOWTO (R_TLS_IE, /* type */
+ 0, /* rightshift */
+ 8, /* size */
+ 64, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_TLS_IE", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
/* 0x22: Local-dynamic TLS relocation. */
- EMPTY_HOWTO (R_TLS_LD),
+ HOWTO (R_TLS_LD, /* type */
+ 0, /* rightshift */
+ 8, /* size */
+ 64, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_TLS_LD", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
/* 0x23: Local-exec TLS relocation. */
- EMPTY_HOWTO (R_TLS_LE),
+ HOWTO (R_TLS_LE, /* type */
+ 0, /* rightshift */
+ 8, /* size */
+ 64, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_TLS_LE", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
/* 0x24: TLS relocation. */
- EMPTY_HOWTO(R_TLSM),
+ HOWTO (R_TLSM, /* type */
+ 0, /* rightshift */
+ 8, /* size */
+ 64, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_TLSM", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
/* 0x25: TLS module relocation. */
- EMPTY_HOWTO(R_TLSML),
+ HOWTO (R_TLSML, /* type */
+ 0, /* rightshift */
+ 8, /* size */
+ 64, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_TLSML", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
+
+ /* 0x26: 32 bit relocation, but store negative value. */
+ HOWTO (R_NEG, /* type */
+ 0, /* rightshift */
+ -4, /* size */
+ 32, /* bitsize */
+ false, /* pc_relative */
+ 0, /* bitpos */
+ complain_overflow_bitfield, /* complain_on_overflow */
+ 0, /* special_function */
+ "R_NEG_32", /* name */
+ true, /* partial_inplace */
+ MINUS_ONE, /* src_mask */
+ MINUS_ONE, /* dst_mask */
+ false), /* pcrel_offset */
- EMPTY_HOWTO(0x26),
EMPTY_HOWTO(0x27),
EMPTY_HOWTO(0x28),
EMPTY_HOWTO(0x29),
HOWTO (R_TOCU, /* type */
16, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_TOCU", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
/* 0x31: Low-order 16 bit TOC relative relocation. */
HOWTO (R_TOCL, /* type */
0, /* rightshift */
- 1, /* size (0 = byte, 1 = short, 2 = long) */
+ 2, /* size */
16, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
0, /* special_function */
"R_TOCL", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
- FALSE), /* pcrel_offset */
+ false), /* pcrel_offset */
};
{
if (R_POS == internal->r_type)
relent->howto = &xcoff64_howto_table[0x1c];
+
+ if (R_NEG == internal->r_type)
+ relent->howto = &xcoff64_howto_table[0x26];
}
/* The r_size field of an XCOFF reloc encodes the bitsize of the
return &xcoff64_howto_table[0];
case BFD_RELOC_NONE:
return &xcoff64_howto_table[0xf];
+ case BFD_RELOC_PPC_NEG:
+ return &xcoff64_howto_table[0x1];
+ case BFD_RELOC_PPC64_TLSGD:
+ return &xcoff64_howto_table[0x20];
+ case BFD_RELOC_PPC64_TLSIE:
+ return &xcoff64_howto_table[0x21];
+ case BFD_RELOC_PPC64_TLSLD:
+ return &xcoff64_howto_table[0x22];
+ case BFD_RELOC_PPC64_TLSLE:
+ return &xcoff64_howto_table[0x23];
+ case BFD_RELOC_PPC64_TLSM:
+ return &xcoff64_howto_table[0x24];
+ case BFD_RELOC_PPC64_TLSML:
+ return &xcoff64_howto_table[0x25];
default:
return NULL;
}
/* This is the relocation function for the PowerPC64.
See xcoff_ppc_relocation_section for more information. */
-bfd_boolean
+bool
xcoff64_ppc_relocate_section (bfd *output_bfd,
struct bfd_link_info *info,
bfd *input_bfd,
case R_POS:
case R_NEG:
howto.bitsize = (rel->r_size & 0x3f) + 1;
- howto.size = howto.bitsize > 16 ? (howto.bitsize > 32 ? 4 : 2) : 1;
+ howto.size = HOWTO_RSIZE (howto.bitsize <= 16
+ ? 2 : howto.bitsize <= 32
+ ? 4 : 8);
howto.src_mask = howto.dst_mask = N_ONES (howto.bitsize);
break;
default:
_bfd_error_handler
- (_("%pB: relocatation (%d) at (0x%" BFD_VMA_FMT "x) has wrong"
+ (_("%pB: relocation (%d) at (0x%" PRIx64 ") has wrong"
" r_rsize (0x%x)\n"),
input_bfd, rel->r_type, rel->r_vaddr, rel->r_size);
- return FALSE;
+ return false;
}
}
if (rel->r_type >= XCOFF_MAX_CALCULATE_RELOCATION
|| !((*xcoff64_calculate_relocation[rel->r_type])
(input_bfd, input_section, output_bfd, rel, sym, &howto, val,
- addend, &relocation, contents)))
- return FALSE;
+ addend, &relocation, contents, info)))
+ return false;
/* address */
address = rel->r_vaddr - input_section->vma;
abort ();
/* Get the value we are going to relocate. */
- if (1 == howto.size)
- value_to_relocate = bfd_get_16 (input_bfd, location);
- else if (2 == howto.size)
- value_to_relocate = bfd_get_32 (input_bfd, location);
- else
- value_to_relocate = bfd_get_64 (input_bfd, location);
+ switch (bfd_get_reloc_size (&howto))
+ {
+ case 2:
+ value_to_relocate = bfd_get_16 (input_bfd, location);
+ break;
+ case 4:
+ value_to_relocate = bfd_get_32 (input_bfd, location);
+ break;
+ default:
+ value_to_relocate = bfd_get_64 (input_bfd, location);
+ break;
+ }
/* overflow.
+ relocation) & howto.dst_mask));
/* Put the value back in the object file. */
- if (1 == howto.size)
- bfd_put_16 (input_bfd, value_to_relocate, location);
- else if (2 == howto.size)
- bfd_put_32 (input_bfd, value_to_relocate, location);
- else
- bfd_put_64 (input_bfd, value_to_relocate, location);
-
+ switch (bfd_get_reloc_size (&howto))
+ {
+ case 2:
+ bfd_put_16 (input_bfd, value_to_relocate, location);
+ break;
+ case 4:
+ bfd_put_32 (input_bfd, value_to_relocate, location);
+ break;
+ default:
+ bfd_put_64 (input_bfd, value_to_relocate, location);
+ break;
+ }
}
- return TRUE;
+ return true;
}
/* Read in the armap of an XCOFF archive. */
-static bfd_boolean
+static bool
xcoff64_slurp_armap (bfd *abfd)
{
file_ptr off;
/* This is for the new format. */
struct xcoff_ar_hdr_big hdr;
- if (xcoff_ardata (abfd) == NULL)
+ if (x_artdata (abfd) == NULL)
{
- abfd->has_armap = FALSE;
- return TRUE;
+ abfd->has_armap = false;
+ return true;
}
- off = bfd_scan_vma (xcoff_ardata_big (abfd)->symoff64,
+ off = bfd_scan_vma (x_artdata (abfd)->u.bhdr.symoff64,
(const char **) NULL, 10);
if (off == 0)
{
- abfd->has_armap = FALSE;
- return TRUE;
+ abfd->has_armap = false;
+ return true;
}
if (bfd_seek (abfd, off, SEEK_SET) != 0)
- return FALSE;
+ return false;
/* The symbol table starts with a normal archive header. */
if (bfd_bread (&hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
!= SIZEOF_AR_HDR_BIG)
- return FALSE;
+ return false;
/* Skip the name (normally empty). */
GET_VALUE_IN_FIELD (namlen, hdr.namlen, 10);
pos = ((namlen + 1) & ~(size_t) 1) + SXCOFFARFMAG;
if (bfd_seek (abfd, pos, SEEK_CUR) != 0)
- return FALSE;
+ return false;
sz = bfd_scan_vma (hdr.size, (const char **) NULL, 10);
if (sz + 1 < 9)
{
bfd_set_error (bfd_error_bad_value);
- return FALSE;
+ return false;
}
/* Read in the entire symbol table. */
contents = (bfd_byte *) _bfd_alloc_and_read (abfd, sz + 1, sz);
if (contents == NULL)
- return FALSE;
+ return false;
/* Ensure strings are NULL terminated so we don't wander off the end
of the buffer. */
if (c >= sz / 8)
{
bfd_set_error (bfd_error_bad_value);
- return FALSE;
+ return false;
}
amt = c;
amt *= sizeof (carsym);
bfd_ardata (abfd)->symdefs = (carsym *) bfd_alloc (abfd, amt);
if (bfd_ardata (abfd)->symdefs == NULL)
- return FALSE;
+ return false;
/* After the count comes a list of eight byte file offsets. */
for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8;
if (p >= cend)
{
bfd_set_error (bfd_error_bad_value);
- return FALSE;
+ return false;
}
arsym->name = (char *) p;
}
bfd_ardata (abfd)->symdef_count = c;
- abfd->has_armap = TRUE;
+ abfd->has_armap = true;
- return TRUE;
+ return true;
}
if (bfd_ardata (abfd) == (struct artdata *) NULL)
goto error_ret_restore;
- /* Already cleared by bfd_zalloc above.
- bfd_ardata (abfd)->cache = NULL;
- bfd_ardata (abfd)->archive_head = NULL;
- bfd_ardata (abfd)->symdefs = NULL;
- bfd_ardata (abfd)->extended_names = NULL;
- bfd_ardata (abfd)->extended_names_size = 0; */
bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff,
(const char **) NULL,
10);
- amt = SIZEOF_AR_FILE_HDR_BIG;
+ amt = sizeof (struct xcoff_artdata);
bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt);
if (bfd_ardata (abfd)->tdata == NULL)
goto error_ret;
- memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR_BIG);
+ memcpy (&x_artdata (abfd)->u.bhdr, &hdr, SIZEOF_AR_FILE_HDR_BIG);
if (! xcoff64_slurp_armap (abfd))
{
static bfd *
xcoff64_openr_next_archived_file (bfd *archive, bfd *last_file)
{
- bfd_vma filestart;
-
- if ((xcoff_ardata (archive) == NULL)
+ if (x_artdata (archive) == NULL
|| ! xcoff_big_format_p (archive))
{
bfd_set_error (bfd_error_invalid_operation);
return NULL;
}
- if (last_file == NULL)
- {
- filestart = bfd_ardata (archive)->first_file_filepos;
- }
- else
- {
- filestart = bfd_scan_vma (arch_xhdr_big (last_file)->nextoff,
- (const char **) NULL, 10);
- }
-
- if (filestart == 0
- || filestart == bfd_scan_vma (xcoff_ardata_big (archive)->memoff,
- (const char **) NULL, 10)
- || filestart == bfd_scan_vma (xcoff_ardata_big (archive)->symoff,
- (const char **) NULL, 10))
- {
- bfd_set_error (bfd_error_no_more_archived_files);
- return NULL;
- }
-
- return _bfd_get_elt_at_filepos (archive, (file_ptr) filestart);
+ return _bfd_xcoff_openr_next_archived_file (archive, last_file);
}
/* We can't use the usual coff_sizeof_headers routine, because AIX
return return_value;
}
-static bfd_boolean
+static bool
xcoff64_is_lineno_count_overflow (bfd *abfd ATTRIBUTE_UNUSED,
bfd_vma value ATTRIBUTE_UNUSED)
{
- return FALSE;
+ return false;
}
-static bfd_boolean
+static bool
xcoff64_is_reloc_count_overflow (bfd *abfd ATTRIBUTE_UNUSED,
bfd_vma value ATTRIBUTE_UNUSED)
{
- return FALSE;
+ return false;
}
static bfd_vma
return (ldhdr->l_rldoff);
}
-static bfd_boolean
+static bool
xcoff64_bad_format_hook (bfd * abfd, void *filehdr)
{
struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
/* Check flavor first. */
if (bfd_get_flavour (abfd) != bfd_target_xcoff_flavour)
- return FALSE;
+ return false;
if (bfd_xcoff_magic_number (abfd) != internal_f->f_magic)
- return FALSE;
+ return false;
- return TRUE;
+ return true;
}
-static bfd_boolean
+static bool
xcoff64_generate_rtinit (bfd *abfd, const char *init, const char *fini,
- bfd_boolean rtld)
+ bool rtld)
{
bfd_byte filehdr_ext[FILHSZ];
bfd_byte scnhdr_ext[SCNHSZ * 3];
char *rtld_name = "__rtld";
if (! bfd_xcoff_rtinit_size (abfd))
- return FALSE;
+ return false;
initsz = (init == NULL ? 0 : 1 + strlen (init));
finisz = (fini == NULL ? 0 : 1 + strlen (fini));
data_buffer = NULL;
data_buffer = (bfd_byte *) bfd_zmalloc (data_buffer_size);
if (data_buffer == NULL)
- return FALSE;
+ return false;
if (initsz)
{
string_table = (bfd_byte *) bfd_zmalloc (string_table_size);
if (string_table == NULL)
- return FALSE;
+ return false;
val = string_table_size;
bfd_put_32 (abfd, val, &string_table[0]);
syment.n_scnum = 2;
syment.n_sclass = C_HIDEXT;
syment.n_numaux = 1;
- auxent.x_csect.x_scnlen.l = data_buffer_size;
+ auxent.x_csect.x_scnlen.u64 = data_buffer_size;
auxent.x_csect.x_smtyp = 3 << 3 | XTY_SD;
auxent.x_csect.x_smclas = XMC_RW;
bfd_coff_swap_sym_out (abfd, &syment,
free (data_buffer);
data_buffer = NULL;
- return TRUE;
+ return true;
}
/* The typical dynamic reloc. */
static reloc_howto_type xcoff64_dynamic_reloc =
HOWTO (0, /* type */
0, /* rightshift */
- 4, /* size (0 = byte, 1 = short, 2 = long) */
+ 8, /* size */
64, /* bitsize */
- FALSE, /* pc_relative */
+ false, /* pc_relative */
0, /* bitpos */
complain_overflow_bitfield, /* complain_on_overflow */
0, /* special_function */
"R_POS", /* name */
- TRUE, /* partial_inplace */
+ true, /* partial_inplace */
MINUS_ONE, /* src_mask */
MINUS_ONE, /* dst_mask */
- FALSE); /* pcrel_offset */
+ false); /* pcrel_offset */
+
+/* Indirect call stub */
+static const unsigned long xcoff64_stub_indirect_call_code[4] =
+ {
+ 0xe9820000, /* ld r12,0(r2) */
+ 0xe80c0000, /* ld r0,0(r12) */
+ 0x7c0903a6, /* mtctr r0 */
+ 0x4e800420, /* bctr */
+ };
+
+/* Shared call stub */
+static const unsigned long xcoff64_stub_shared_call_code[6] =
+ {
+ 0xe9820000, /* ld r12,0(r2) */
+ 0xf8410028, /* std r2,40(r1) */
+ 0xe80c0000, /* ld r0,0(r12) */
+ 0xe84c0008, /* ld r2,8(r12) */
+ 0x7c0903a6, /* mtctr r0 */
+ 0x4e800420, /* bctr */
+ };
static const unsigned long xcoff64_glink_code[10] =
{
0xe9820000, /* ld r12,0(r2) */
0xf8410028, /* std r2,40(r1) */
0xe80c0000, /* ld r0,0(r12) */
- 0xe84c0008, /* ld r0,8(r12) */
+ 0xe84c0008, /* ld r2,8(r12) */
0x7c0903a6, /* mtctr r0 */
0x4e800420, /* bctr */
0x00000000, /* start of traceback table */
RELSZ,
LINESZ,
FILNMLEN,
- TRUE, /* _bfd_coff_long_filenames */
+ true, /* _bfd_coff_long_filenames */
XCOFF_NO_LONG_SECTION_NAMES, /* _bfd_coff_long_section_names */
3, /* _bfd_coff_default_section_alignment_power */
- TRUE, /* _bfd_coff_force_symnames_in_strings */
+ true, /* _bfd_coff_force_symnames_in_strings */
4, /* _bfd_coff_debug_string_prefix_length */
32768, /* _bfd_coff_max_nscns */
coff_swap_filehdr_in,
/* rtinit. */
88, /* _xcoff_rtinit_size */
xcoff64_generate_rtinit,
+
+ /* Stub indirect call. */
+ &xcoff64_stub_indirect_call_code[0],
+ 16, /* _xcoff_stub_indirect_call_size */
+
+ /* Stub shared call. */
+ &xcoff64_stub_shared_call_code[0],
+ 24, /* _xcoff_stub_shared_call_size */
};
/* The transfer vector that leads the outside world to all of the above. */
},
/* Generic */
- _bfd_archive_close_and_cleanup,
+ _bfd_coff_close_and_cleanup,
_bfd_bool_bfd_true,
coff_new_section_hook,
_bfd_generic_get_section_contents,
coff_bfd_is_target_special_symbol,
coff_get_lineno,
coff_find_nearest_line,
+ coff_find_nearest_line_with_alt,
coff_find_line,
coff_find_inliner_info,
coff_bfd_make_debug_symbol,
extern bfd_cleanup xcoff64_core_p
(bfd *);
-extern bfd_boolean xcoff64_core_file_matches_executable_p
+extern bool xcoff64_core_file_matches_executable_p
(bfd *, bfd *);
extern char *xcoff64_core_file_failing_command
(bfd *);
RELSZ,
LINESZ,
FILNMLEN,
- TRUE, /* _bfd_coff_long_filenames */
+ true, /* _bfd_coff_long_filenames */
XCOFF_NO_LONG_SECTION_NAMES, /* _bfd_coff_long_section_names */
3, /* _bfd_coff_default_section_alignment_power */
- TRUE, /* _bfd_coff_force_symnames_in_strings */
+ true, /* _bfd_coff_force_symnames_in_strings */
4, /* _bfd_coff_debug_string_prefix_length */
32768, /* _bfd_coff_max_nscns */
coff_swap_filehdr_in,
/* rtinit. */
88, /* _xcoff_rtinit_size */
xcoff64_generate_rtinit,
+
+ /* Stub indirect call. */
+ &xcoff64_stub_indirect_call_code[0],
+ 16, /* _xcoff_stub_indirect_call_size */
+
+ /* Stub shared call. */
+ &xcoff64_stub_shared_call_code[0],
+ 24, /* _xcoff_stub_shared_call_size */
};
/* The transfer vector that leads the outside world to all of the above. */
},
/* Generic */
- _bfd_archive_close_and_cleanup,
+ _bfd_coff_close_and_cleanup,
_bfd_bool_bfd_true,
coff_new_section_hook,
_bfd_generic_get_section_contents,
coff_bfd_is_target_special_symbol,
coff_get_lineno,
coff_find_nearest_line,
+ coff_find_nearest_line_with_alt,
coff_find_line,
coff_find_inliner_info,
coff_bfd_make_debug_symbol,
projects / binutils-gdb.git / blobdiff