SEC_CODE | SEC_LOAD, BFD_MACH_O_S_REGULAR,
BFD_MACH_O_S_ATTR_NONE, 0},
{ ".eh_frame", "__eh_frame",
- SEC_READONLY | SEC_LOAD, BFD_MACH_O_S_COALESCED,
+ SEC_READONLY | SEC_DATA | SEC_LOAD, BFD_MACH_O_S_COALESCED,
BFD_MACH_O_S_ATTR_LIVE_SUPPORT
| BFD_MACH_O_S_ATTR_STRIP_STATIC_SYMS
- | BFD_MACH_O_S_ATTR_NO_TOC, 3},
+ | BFD_MACH_O_S_ATTR_NO_TOC, 2},
{ NULL, NULL, 0, 0, 0, 0}
};
bfd_boolean
bfd_mach_o_bfd_copy_private_symbol_data (bfd *ibfd ATTRIBUTE_UNUSED,
- asymbol *isymbol ATTRIBUTE_UNUSED,
+ asymbol *isymbol,
bfd *obfd ATTRIBUTE_UNUSED,
- asymbol *osymbol ATTRIBUTE_UNUSED)
+ asymbol *osymbol)
{
+ bfd_mach_o_asymbol *os, *is;
+ os = (bfd_mach_o_asymbol *)osymbol;
+ is = (bfd_mach_o_asymbol *)isymbol;
+ os->n_type = is->n_type;
+ os->n_sect = is->n_sect;
+ os->n_desc = is->n_desc;
+ os->symbol.udata.i = is->symbol.udata.i;
return TRUE;
}
return (asect->reloc_count + 1) * sizeof (arelent *);
}
+/* In addition to the need to byte-swap the symbol number, the bit positions
+ of the fields in the relocation information vary per target endian-ness. */
+
+static void
+bfd_mach_o_swap_in_non_scattered_reloc (bfd *abfd, bfd_mach_o_reloc_info *rel,
+ unsigned char *fields)
+{
+ unsigned char info = fields[3];
+
+ if (bfd_big_endian (abfd))
+ {
+ rel->r_value = (fields[0] << 16) | (fields[1] << 8) | fields[2];
+ rel->r_type = (info >> BFD_MACH_O_BE_TYPE_SHIFT) & BFD_MACH_O_TYPE_MASK;
+ rel->r_pcrel = (info & BFD_MACH_O_BE_PCREL) ? 1 : 0;
+ rel->r_length = (info >> BFD_MACH_O_BE_LENGTH_SHIFT)
+ & BFD_MACH_O_LENGTH_MASK;
+ rel->r_extern = (info & BFD_MACH_O_BE_EXTERN) ? 1 : 0;
+ }
+ else
+ {
+ rel->r_value = (fields[2] << 16) | (fields[1] << 8) | fields[0];
+ rel->r_type = (info >> BFD_MACH_O_LE_TYPE_SHIFT) & BFD_MACH_O_TYPE_MASK;
+ rel->r_pcrel = (info & BFD_MACH_O_LE_PCREL) ? 1 : 0;
+ rel->r_length = (info >> BFD_MACH_O_LE_LENGTH_SHIFT)
+ & BFD_MACH_O_LENGTH_MASK;
+ rel->r_extern = (info & BFD_MACH_O_LE_EXTERN) ? 1 : 0;
+ }
+}
+
static int
bfd_mach_o_canonicalize_one_reloc (bfd *abfd,
struct mach_o_reloc_info_external *raw,
bfd_mach_o_backend_data *bed = bfd_mach_o_get_backend_data (abfd);
bfd_mach_o_reloc_info reloc;
bfd_vma addr;
- bfd_vma symnum;
asymbol **sym;
addr = bfd_get_32 (abfd, raw->r_address);
- symnum = bfd_get_32 (abfd, raw->r_symbolnum);
-
+ res->sym_ptr_ptr = NULL;
+ res->addend = 0;
+
if (addr & BFD_MACH_O_SR_SCATTERED)
{
unsigned int j;
+ bfd_vma symnum = bfd_get_32 (abfd, raw->r_symbolnum);
- /* Scattered relocation.
- Extract section and offset from r_value. */
- res->sym_ptr_ptr = NULL;
- res->addend = 0;
+ /* Scattered relocation, can't be extern. */
+ reloc.r_scattered = 1;
+ reloc.r_extern = 0;
+
+ /* Extract section and offset from r_value (symnum). */
+ reloc.r_value = symnum;
+ /* FIXME: This breaks when a symbol in a reloc exactly follows the
+ end of the data for the section (e.g. in a calculation of section
+ data length). At present, the symbol will end up associated with
+ the following section or, if it falls within alignment padding, as
+ null - which will assert later. */
for (j = 0; j < mdata->nsects; j++)
{
bfd_mach_o_section *sect = mdata->sections[j];
break;
}
}
- res->address = BFD_MACH_O_GET_SR_ADDRESS (addr);
+
+ /* Extract the info and address fields from r_address. */
reloc.r_type = BFD_MACH_O_GET_SR_TYPE (addr);
reloc.r_length = BFD_MACH_O_GET_SR_LENGTH (addr);
reloc.r_pcrel = addr & BFD_MACH_O_SR_PCREL;
- reloc.r_scattered = 1;
+ reloc.r_address = BFD_MACH_O_GET_SR_TYPE (addr);
+ res->address = BFD_MACH_O_GET_SR_ADDRESS (addr);
}
else
{
- unsigned int num = BFD_MACH_O_GET_R_SYMBOLNUM (symnum);
- res->addend = 0;
- res->address = addr;
- if (symnum & BFD_MACH_O_R_EXTERN)
- {
- sym = syms + num;
- reloc.r_extern = 1;
- }
+ unsigned int num;
+
+ /* Non-scattered relocation. */
+ reloc.r_scattered = 0;
+
+ /* The value and info fields have to be extracted dependent on target
+ endian-ness. */
+ bfd_mach_o_swap_in_non_scattered_reloc (abfd, &reloc, raw->r_symbolnum);
+ num = reloc.r_value;
+
+ if (reloc.r_extern)
+ {
+ /* An external symbol number. */
+ sym = syms + num;
+ }
+ else if (num == 0x00ffffff)
+ {
+ /* The 'symnum' in a non-scattered PAIR is 0x00ffffff. But as this
+ is generic code, we don't know wether this is really a PAIR.
+ This value is almost certainly not a valid section number, hence
+ this specific case to avoid an assertion failure.
+ Target specific swap_reloc_in routine should adjust that. */
+ sym = bfd_abs_section_ptr->symbol_ptr_ptr;
+ }
else
{
+ /* A section number. */
BFD_ASSERT (num != 0);
BFD_ASSERT (num <= mdata->nsects);
+
sym = mdata->sections[num - 1]->bfdsection->symbol_ptr_ptr;
/* For a symbol defined in section S, the addend (stored in the
binary) contains the address of the section. To comply with
- bfd conventio, substract the section address.
+ bfd convention, subtract the section address.
Use the address from the header, so that the user can modify
the vma of the section. */
res->addend = -mdata->sections[num - 1]->addr;
- reloc.r_extern = 0;
}
+ /* Note: Pairs for PPC LO/HI/HA are not scattered, but contain the offset
+ in the lower 16bits of the address value. So we have to find the
+ 'symbol' from the preceding reloc. We do this even though the
+ section symbol is probably not needed here, because NULL symbol
+ values cause an assert in generic BFD code. This must be done in
+ the PPC swap_reloc_in routine. */
res->sym_ptr_ptr = sym;
- reloc.r_type = BFD_MACH_O_GET_R_TYPE (symnum);
- reloc.r_length = BFD_MACH_O_GET_R_LENGTH (symnum);
- reloc.r_pcrel = (symnum & BFD_MACH_O_R_PCREL) ? 1 : 0;
- reloc.r_scattered = 0;
+
+ /* The 'address' is just r_address.
+ ??? maybe this should be masked with 0xffffff for safety. */
+ res->address = addr;
+ reloc.r_address = addr;
}
-
+
+ /* We have set up a reloc with all the information present, so the swapper
+ can modify address, value and addend fields, if necessary, to convey
+ information in the generic BFD reloc that is mach-o specific. */
+
if (!(*bed->_bfd_mach_o_swap_reloc_in)(res, &reloc))
return -1;
return 0;
return i;
}
+/* In addition to the need to byte-swap the symbol number, the bit positions
+ of the fields in the relocation information vary per target endian-ness. */
+
+static void
+bfd_mach_o_swap_out_non_scattered_reloc (bfd *abfd, unsigned char *fields,
+ bfd_mach_o_reloc_info *rel)
+{
+ unsigned char info = 0;
+
+ BFD_ASSERT (rel->r_type <= 15);
+ BFD_ASSERT (rel->r_length <= 3);
+
+ if (bfd_big_endian (abfd))
+ {
+ fields[0] = (rel->r_value >> 16) & 0xff;
+ fields[1] = (rel->r_value >> 8) & 0xff;
+ fields[2] = rel->r_value & 0xff;
+ info |= rel->r_type << BFD_MACH_O_BE_TYPE_SHIFT;
+ info |= rel->r_pcrel ? BFD_MACH_O_BE_PCREL : 0;
+ info |= rel->r_length << BFD_MACH_O_BE_LENGTH_SHIFT;
+ info |= rel->r_extern ? BFD_MACH_O_BE_EXTERN : 0;
+ }
+ else
+ {
+ fields[2] = (rel->r_value >> 16) & 0xff;
+ fields[1] = (rel->r_value >> 8) & 0xff;
+ fields[0] = rel->r_value & 0xff;
+ info |= rel->r_type << BFD_MACH_O_LE_TYPE_SHIFT;
+ info |= rel->r_pcrel ? BFD_MACH_O_LE_PCREL : 0;
+ info |= rel->r_length << BFD_MACH_O_LE_LENGTH_SHIFT;
+ info |= rel->r_extern ? BFD_MACH_O_LE_EXTERN : 0;
+ }
+ fields[3] = info;
+}
+
static bfd_boolean
bfd_mach_o_write_relocs (bfd *abfd, bfd_mach_o_section *section)
{
- bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
unsigned int i;
arelent **entries;
asection *sec;
if (bed->_bfd_mach_o_swap_reloc_out == NULL)
return TRUE;
- /* Allocate relocation room. */
- mdata->filelen = FILE_ALIGN(mdata->filelen, 2);
- section->nreloc = sec->reloc_count;
- sec->rel_filepos = mdata->filelen;
- section->reloff = sec->rel_filepos;
- mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE;
-
if (bfd_seek (abfd, section->reloff, SEEK_SET) != 0)
return FALSE;
}
else
{
- unsigned long v;
-
bfd_put_32 (abfd, pinfo->r_address, raw.r_address);
- v = BFD_MACH_O_SET_R_SYMBOLNUM (pinfo->r_value)
- | (pinfo->r_pcrel ? BFD_MACH_O_R_PCREL : 0)
- | BFD_MACH_O_SET_R_LENGTH (pinfo->r_length)
- | (pinfo->r_extern ? BFD_MACH_O_R_EXTERN : 0)
- | BFD_MACH_O_SET_R_TYPE (pinfo->r_type);
- bfd_put_32 (abfd, v, raw.r_symbolnum);
+ bfd_mach_o_swap_out_non_scattered_reloc (abfd, raw.r_symbolnum,
+ pinfo);
}
if (bfd_bwrite (&raw, BFD_MACH_O_RELENT_SIZE, abfd)
{
bfd_size_type str_index;
bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
-
- /* For a bare indirect symbol, the system tools expect that the symbol
- value will be the string table offset for its referenced counterpart.
-
- Normally, indirect syms will not be written this way, but rather as
- part of the dysymtab command.
-
- In either case, correct operation depends on the symbol table being
- sorted such that the indirect symbols are at the end (since the
- string table index is filled in below). */
-
- if (IS_MACHO_INDIRECT (s->n_type))
- /* A pointer to the referenced symbol will be stored in the udata
- field. Use that to find the string index. */
- s->symbol.value =
- ((bfd_mach_o_asymbol *)s->symbol.udata.p)->symbol.udata.i;
if (s->symbol.name == 0 || s->symbol.name[0] == '\0')
/* An index of 0 always means the empty string. */
else
{
str_index = _bfd_stringtab_add (strtab, s->symbol.name, TRUE, FALSE);
- /* Record the string index. This can be looked up by an indirect sym
- which retains a pointer to its referenced counterpart, until it is
- actually output. */
- if (IS_MACHO_INDIRECT (s->n_type))
- s->symbol.udata.i = str_index;
if (str_index == (bfd_size_type) -1)
goto err;
}
static unsigned
-bfd_mach_o_primary_symbol_sort_key (unsigned type)
+bfd_mach_o_primary_symbol_sort_key (bfd_mach_o_asymbol *s)
{
- unsigned mtyp = type & BFD_MACH_O_N_TYPE;
+ unsigned mtyp = s->n_type & BFD_MACH_O_N_TYPE;
/* Just leave debug symbols where they are (pretend they are local, and
then they will just be sorted on position). */
- if (type & BFD_MACH_O_N_STAB)
+ if (s->n_type & BFD_MACH_O_N_STAB)
return 0;
- /* Sort indirects to last. */
- if (mtyp == BFD_MACH_O_N_INDR)
- return 3;
-
/* Local (we should never see an undefined local AFAICT). */
- if (! (type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT)))
+ if (! (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT)))
return 0;
/* Common symbols look like undefined externs. */
if (mtyp == BFD_MACH_O_N_UNDF)
return 2;
- /* A defined symbol that's not indirect or extern. */
+ /* A defined non-local, non-debug symbol. */
return 1;
}
bfd_mach_o_asymbol *sb = *(bfd_mach_o_asymbol **) b;
unsigned int soa, sob;
- soa = bfd_mach_o_primary_symbol_sort_key (sa->n_type);
- sob = bfd_mach_o_primary_symbol_sort_key (sb->n_type);
+ soa = bfd_mach_o_primary_symbol_sort_key (sa);
+ sob = bfd_mach_o_primary_symbol_sort_key (sb);
if (soa < sob)
return -1;
return -1;
if (sa->symbol.udata.i > sb->symbol.udata.i)
return 1;
+
+ /* This is probably an error. */
return 0;
}
- /* Unless it's an indirect the second sort key is name. */
- if (soa < 3)
- return strcmp (sa->symbol.name, sb->symbol.name);
-
- /* Here be indirect symbols, which have different sort rules. */
-
- /* Next sort key for indirect, is the section index. */
- if (sa->n_sect < sb->n_sect)
- return -1;
-
- if (sa->n_sect > sb->n_sect)
- return 1;
-
- /* Last sort key is the order of definition - which should be in line with
- the value, since a stub size of 0 is meaninglesss. */
-
- if (sa->symbol.value < sb->symbol.value)
- return -1;
-
- if (sa->symbol.value > sb->symbol.value)
- return 1;
-
- /* In the final analysis, this is probably an error ... but leave it alone
- for now. */
- return 0;
-}
-
-/* When this is finished, return the number of non-indirect symbols. */
-
-static unsigned int
-bfd_mach_o_sort_symbol_table (asymbol **symbols, unsigned int nin)
-{
- qsort (symbols, (size_t) nin, sizeof (void *), bfd_mach_o_cf_symbols);
-
- /* Find the last non-indirect symbol.
- There must be at least one non-indirect symbol otherwise there's
- nothing for the indirect(s) to refer to. */
- do
- {
- bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[nin - 1];
- if (IS_MACHO_INDIRECT (s->n_type))
- nin--;
- else
- break;
- } while (nin - 1 > 0);
- return nin;
+ /* The second sort key is name. */
+ return strcmp (sa->symbol.name, sb->symbol.name);
}
/* Process the symbols.
(unsorted)
( ii) external defined
(by name)
- (iii) external undefined
+ (iii) external undefined/common
(by name)
( iv) common
(by name)
- ( v) indirect
- (by section)
- (by position within section).
-
- (c) Indirect symbols are moved to the end of the list. */
+*/
static bfd_boolean
-bfd_mach_o_mangle_symbols (bfd *abfd, bfd_mach_o_data_struct *mdata)
+bfd_mach_o_mangle_symbols (bfd *abfd)
{
unsigned long i;
asymbol **symbols = bfd_get_outsymbols (abfd);
{
bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
- if (s->n_type == BFD_MACH_O_N_UNDF && !(s->symbol.flags & BSF_DEBUGGING))
+ /* We use this value, which is out-of-range as a symbol index, to signal
+ that the mach-o-specific data are not filled in and need to be created
+ from the bfd values. It is much preferable for the application to do
+ this, since more meaningful diagnostics can be made that way. */
+
+ if (s->symbol.udata.i == SYM_MACHO_FIELDS_UNSET)
{
- /* As genuine Mach-O symbols type shouldn't be N_UNDF (undefined
- symbols should be N_UNDEF | N_EXT), we suppose the back-end
- values haven't been set. */
+ /* No symbol information has been set - therefore determine
+ it from the bfd symbol flags/info. */
if (s->symbol.section == bfd_abs_section_ptr)
s->n_type = BFD_MACH_O_N_ABS;
else if (s->symbol.section == bfd_und_section_ptr)
s->n_desc |= BFD_MACH_O_N_WEAK_REF;
/* mach-o automatically makes undefined symbols extern. */
s->n_type |= BFD_MACH_O_N_EXT;
+ s->symbol.flags |= BSF_GLOBAL;
}
else if (s->symbol.section == bfd_com_section_ptr)
- s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT;
+ {
+ s->n_type = BFD_MACH_O_N_UNDF | BFD_MACH_O_N_EXT;
+ s->symbol.flags |= BSF_GLOBAL;
+ }
else
s->n_type = BFD_MACH_O_N_SECT;
&& s->symbol.name == NULL))
s->n_sect = s->symbol.section->target_index;
- /* Unless we're looking at an indirect sym, note the input ordering.
- We use this to keep local symbols ordered as per the input. */
- if (! IS_MACHO_INDIRECT (s->n_type))
- s->symbol.udata.i = i;
+ /* Number to preserve order for local and debug syms. */
+ s->symbol.udata.i = i;
}
- /* Sort the symbols and determine how many will remain in the main symbol
- table, and how many will be emitted as indirect (assuming that we will
- be emitting a dysymtab). Renumber the sorted symbols so that the right
- index will be found during indirection. */
- i = bfd_mach_o_sort_symbol_table (symbols, bfd_get_symcount (abfd));
- if (bfd_mach_o_should_emit_dysymtab ())
- {
- /* Point at the first indirect symbol. */
- if (i < bfd_get_symcount (abfd))
- {
- mdata->indirect_syms = &symbols[i];
- mdata->nindirect = bfd_get_symcount (abfd) - i;
- /* This is, essentially, local to the output section of mach-o,
- and therefore should be safe. */
- abfd->symcount = i;
- }
+ /* Sort the symbols. */
+ qsort ((void *) symbols, (size_t) bfd_get_symcount (abfd),
+ sizeof (asymbol *), bfd_mach_o_cf_symbols);
- /* Now setup the counts for each type of symbol. */
- for (i = 0; i < bfd_get_symcount (abfd); ++i)
- {
- bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
- s->symbol.udata.i = i; /* renumber. */
- if (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT))
- break;
- }
- mdata->nlocal = i;
- for (; i < bfd_get_symcount (abfd); ++i)
- {
- bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
- s->symbol.udata.i = i; /* renumber. */
- if ((s->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF)
- break;
- }
- mdata->ndefext = i - mdata->nlocal;
- mdata->nundefext = bfd_get_symcount (abfd)
- - mdata->ndefext
- - mdata->nlocal;
- for (; i < bfd_get_symcount (abfd); ++i)
- {
- bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
- s->symbol.udata.i = i; /* renumber. */
- }
+ for (i = 0; i < bfd_get_symcount (abfd); ++i)
+ {
+ bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
+ s->symbol.udata.i = i; /* renumber. */
}
return TRUE;
/* TODO: fix this up for non-MH_OBJECT cases. */
seg->vmaddr = 0;
+ seg->vmsize = 0;
seg->fileoff = mdata->filelen;
seg->filesize = 0;
seg->sect_head = NULL;
seg->sect_tail = NULL;
- /* Append sections to the segment. */
+ /* Append sections to the segment.
+
+ This is a little tedious, we have to honor the need to account zerofill
+ sections after all the rest. This forces us to do the calculation of
+ total vmsize in three passes so that any alignment increments are
+ properly accounted. */
for (i = 0; i < mdata->nsects; ++i)
{
&& strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) != 0)
continue;
+ /* Although we account for zerofill section sizes in vm order, they are
+ placed in the file in source sequence. */
bfd_mach_o_append_section_to_segment (seg, sec);
-
- if (s->size == 0)
- s->offset = 0;
- else
+ s->offset = 0;
+
+ /* Zerofill sections have zero file size & offset,
+ and are not written. */
+ if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) == BFD_MACH_O_S_ZEROFILL
+ || (s->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+ == BFD_MACH_O_S_GB_ZEROFILL)
+ continue;
+
+ if (s->size > 0)
{
+ seg->vmsize = FILE_ALIGN (seg->vmsize, s->align);
+ seg->vmsize += s->size;
+
+ seg->filesize = FILE_ALIGN (seg->filesize, s->align);
+ seg->filesize += s->size;
+
mdata->filelen = FILE_ALIGN (mdata->filelen, s->align);
s->offset = mdata->filelen;
}
sec->filepos = s->offset;
-
mdata->filelen += s->size;
}
- seg->filesize = mdata->filelen - seg->fileoff;
- seg->vmsize = seg->filesize;
+ /* Now pass through again, for zerofill, only now we just update the vmsize. */
+ for (i = 0; i < mdata->nsects; ++i)
+ {
+ bfd_mach_o_section *s = mdata->sections[i];
+
+ if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) != BFD_MACH_O_S_ZEROFILL)
+ continue;
+
+ if (! is_mho
+ && strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) != 0)
+ continue;
+
+ if (s->size > 0)
+ {
+ seg->vmsize = FILE_ALIGN (seg->vmsize, s->align);
+ seg->vmsize += s->size;
+ }
+ }
+
+ /* Now pass through again, for zerofill_GB. */
+ for (i = 0; i < mdata->nsects; ++i)
+ {
+ bfd_mach_o_section *s = mdata->sections[i];
+
+ if ((s->flags & BFD_MACH_O_SECTION_TYPE_MASK) != BFD_MACH_O_S_GB_ZEROFILL)
+ continue;
+
+ if (! is_mho
+ && strncmp (segment, s->segname, BFD_MACH_O_SEGNAME_SIZE) != 0)
+ continue;
+
+ if (s->size > 0)
+ {
+ seg->vmsize = FILE_ALIGN (seg->vmsize, s->align);
+ seg->vmsize += s->size;
+ }
+ }
+
+ /* Allocate space for the relocations. */
+ mdata->filelen = FILE_ALIGN(mdata->filelen, 2);
+
+ for (i = 0; i < mdata->nsects; ++i)
+ {
+ bfd_mach_o_section *ms = mdata->sections[i];
+ asection *sec = ms->bfdsection;
+
+ if ((ms->nreloc = sec->reloc_count) == 0)
+ {
+ ms->reloff = 0;
+ continue;
+ }
+ sec->rel_filepos = mdata->filelen;
+ ms->reloff = sec->rel_filepos;
+ mdata->filelen += sec->reloc_count * BFD_MACH_O_RELENT_SIZE;
+ }
return TRUE;
}
+/* Count the number of indirect symbols in the image.
+ Requires that the sections are in their final order. */
+
+static unsigned int
+bfd_mach_o_count_indirect_symbols (bfd *abfd, bfd_mach_o_data_struct *mdata)
+{
+ unsigned int i;
+ unsigned int nisyms = 0;
+
+ for (i = 0; i < mdata->nsects; ++i)
+ {
+ bfd_mach_o_section *sec = mdata->sections[i];
+
+ switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
+ {
+ case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+ case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+ case BFD_MACH_O_S_SYMBOL_STUBS:
+ nisyms += bfd_mach_o_section_get_nbr_indirect (abfd, sec);
+ break;
+ default:
+ break;
+ }
+ }
+ return nisyms;
+}
+
static bfd_boolean
bfd_mach_o_build_dysymtab_command (bfd *abfd,
bfd_mach_o_data_struct *mdata,
}
dsym->ilocalsym = 0;
- dsym->nlocalsym = mdata->nlocal;
- dsym->iextdefsym = dsym->nlocalsym;
- dsym->nextdefsym = mdata->ndefext;
- dsym->iundefsym = dsym->nextdefsym + dsym->iextdefsym;
- dsym->nundefsym = mdata->nundefext;
- if (mdata->nindirect > 0)
+ if (bfd_get_symcount (abfd) > 0)
+ {
+ asymbol **symbols = bfd_get_outsymbols (abfd);
+ unsigned long i;
+
+ /* Count the number of each kind of symbol. */
+ for (i = 0; i < bfd_get_symcount (abfd); ++i)
+ {
+ bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
+ if (s->n_type & (BFD_MACH_O_N_EXT | BFD_MACH_O_N_PEXT))
+ break;
+ }
+ dsym->nlocalsym = i;
+ dsym->iextdefsym = i;
+ for (; i < bfd_get_symcount (abfd); ++i)
+ {
+ bfd_mach_o_asymbol *s = (bfd_mach_o_asymbol *)symbols[i];
+ if ((s->n_type & BFD_MACH_O_N_TYPE) == BFD_MACH_O_N_UNDF)
+ break;
+ }
+ dsym->nextdefsym = i - dsym->nlocalsym;
+ dsym->iundefsym = dsym->nextdefsym + dsym->iextdefsym;
+ dsym->nundefsym = bfd_get_symcount (abfd)
+ - dsym->nlocalsym
+ - dsym->nextdefsym;
+ }
+ else
+ {
+ dsym->nlocalsym = 0;
+ dsym->iextdefsym = 0;
+ dsym->nextdefsym = 0;
+ dsym->iundefsym = 0;
+ dsym->nundefsym = 0;
+ }
+
+ dsym->nindirectsyms = bfd_mach_o_count_indirect_symbols (abfd, mdata);
+ if (dsym->nindirectsyms > 0)
{
- unsigned i, sect;
+ unsigned i;
+ unsigned n;
mdata->filelen = FILE_ALIGN (mdata->filelen, 2);
dsym->indirectsymoff = mdata->filelen;
- mdata->filelen += mdata->nindirect * 4;
+ mdata->filelen += dsym->nindirectsyms * 4;
- dsym->indirect_syms = bfd_zalloc (abfd, mdata->nindirect * 4);
+ dsym->indirect_syms = bfd_zalloc (abfd, dsym->nindirectsyms * 4);
if (dsym->indirect_syms == NULL)
return FALSE;
- dsym->nindirectsyms = mdata->nindirect;
-
- /* So fill in the indices, and point the section reserved1 fields
- at the right one. */
- sect = (unsigned) -1;
- for (i = 0; i < mdata->nindirect; ++i)
+
+ n = 0;
+ for (i = 0; i < mdata->nsects; ++i)
{
- bfd_mach_o_asymbol *s =
- (bfd_mach_o_asymbol *) mdata->indirect_syms[i];
- /* Lookup the index of the referenced symbol. */
- dsym->indirect_syms[i] =
- ((bfd_mach_o_asymbol *) s->symbol.udata.p)->symbol.udata.i;
- if (s->n_sect != sect)
+ bfd_mach_o_section *sec = mdata->sections[i];
+
+ switch (sec->flags & BFD_MACH_O_SECTION_TYPE_MASK)
{
- /* Mach-o sections are 1-based, but the section table
- is 0-based. */
- bfd_mach_o_section *sc = mdata->sections[s->n_sect-1];
- sc->reserved1 = i;
- sect = s->n_sect;
+ case BFD_MACH_O_S_NON_LAZY_SYMBOL_POINTERS:
+ case BFD_MACH_O_S_LAZY_SYMBOL_POINTERS:
+ case BFD_MACH_O_S_SYMBOL_STUBS:
+ {
+ unsigned j, num;
+ bfd_mach_o_asymbol **isyms = sec->indirect_syms;
+
+ num = bfd_mach_o_section_get_nbr_indirect (abfd, sec);
+ if (isyms == NULL || num == 0)
+ break;
+ /* Record the starting index in the reserved1 field. */
+ sec->reserved1 = n;
+ for (j = 0; j < num; j++, n++)
+ {
+ if (isyms[j] == NULL)
+ dsym->indirect_syms[n] = BFD_MACH_O_INDIRECT_SYM_LOCAL;
+ else if (isyms[j]->symbol.section == bfd_abs_section_ptr
+ && ! (isyms[j]->n_type & BFD_MACH_O_N_EXT))
+ dsym->indirect_syms[n] = BFD_MACH_O_INDIRECT_SYM_LOCAL
+ | BFD_MACH_O_INDIRECT_SYM_ABS;
+ else
+ dsym->indirect_syms[n] = isyms[j]->symbol.udata.i;
+ }
+ }
+ break;
+ default:
+ break;
}
}
}
bfd_mach_o_build_commands (bfd *abfd)
{
bfd_mach_o_data_struct *mdata = bfd_mach_o_get_data (abfd);
- unsigned int wide = mach_o_wide_p (&mdata->header);
- bfd_mach_o_segment_command *seg;
- bfd_mach_o_load_command *cmd;
- bfd_mach_o_load_command *symtab_cmd;
- unsigned symcind;
+ unsigned wide = mach_o_wide_p (&mdata->header);
+ int segcmd_idx = -1;
+ int symtab_idx = -1;
+ int dysymtab_idx = -1;
+ unsigned long base_offset = 0;
/* Return now if commands are already present. */
if (mdata->header.ncmds)
/* Order the symbol table, fill-in/check mach-o specific fields and
partition out any indirect symbols. */
- if (!bfd_mach_o_mangle_symbols (abfd, mdata))
+ if (!bfd_mach_o_mangle_symbols (abfd))
return FALSE;
- /* It's valid to have a file with only absolute symbols... */
+ /* Very simple command set (only really applicable to MH_OBJECTs):
+ All the commands are optional - present only when there is suitable data.
+ (i.e. it is valid to have an empty file)
+
+ a command (segment) to contain all the sections,
+ command for the symbol table,
+ a command for the dysymtab.
+
+ ??? maybe we should assert that this is an MH_OBJECT? */
+
if (mdata->nsects > 0)
{
+ segcmd_idx = 0;
mdata->header.ncmds = 1;
- symcind = 1;
}
- else
- symcind = 0;
- /* It's OK to have a file with only section statements. */
if (bfd_get_symcount (abfd) > 0)
- mdata->header.ncmds += 1;
+ {
+ mdata->header.ncmds++;
+ symtab_idx = segcmd_idx + 1; /* 0 if the seg command is absent. */
+ }
- /* Very simple version (only really applicable to MH_OBJECTs):
- a command (segment) to contain all the sections,
- a command for the symbol table
- a n (optional) command for the dysymtab.
+ /* FIXME:
+ This is a rather crude test for whether we should build a dysymtab. */
+ if (bfd_mach_o_should_emit_dysymtab ()
+ && bfd_get_symcount (abfd))
+ {
+ mdata->header.ncmds++;
+ /* If there should be a case where a dysymtab could be emitted without
+ a symtab (seems improbable), this would need amending. */
+ dysymtab_idx = symtab_idx + 1;
+ }
- ??? maybe we should assert that this is an MH_OBJECT? */
+ if (wide)
+ base_offset = BFD_MACH_O_HEADER_64_SIZE;
+ else
+ base_offset = BFD_MACH_O_HEADER_SIZE;
- if (bfd_mach_o_should_emit_dysymtab ()
- && bfd_get_symcount (abfd) > 0)
- mdata->header.ncmds += 1;
+ /* Well, we must have a header, at least. */
+ mdata->filelen = base_offset;
- /* A bit weird, but looks like no content;
+ /* A bit unusual, but no content is valid;
as -n empty.s -o empty.o */
if (mdata->header.ncmds == 0)
return TRUE;
if (mdata->commands == NULL)
return FALSE;
- if (mdata->nsects > 0)
+ if (segcmd_idx >= 0)
{
- cmd = &mdata->commands[0];
- seg = &cmd->command.segment;
+ bfd_mach_o_load_command *cmd = &mdata->commands[segcmd_idx];
+ bfd_mach_o_segment_command *seg = &cmd->command.segment;
/* Count the segctions in the special blank segment used for MH_OBJECT. */
seg->nsects = bfd_mach_o_count_sections_for_seg (NULL, mdata);
return FALSE;
/* Init segment command. */
+ cmd->offset = base_offset;
if (wide)
{
cmd->type = BFD_MACH_O_LC_SEGMENT_64;
- cmd->offset = BFD_MACH_O_HEADER_64_SIZE;
cmd->len = BFD_MACH_O_LC_SEGMENT_64_SIZE
+ BFD_MACH_O_SECTION_64_SIZE * seg->nsects;
}
else
{
cmd->type = BFD_MACH_O_LC_SEGMENT;
- cmd->offset = BFD_MACH_O_HEADER_SIZE;
cmd->len = BFD_MACH_O_LC_SEGMENT_SIZE
+ BFD_MACH_O_SECTION_SIZE * seg->nsects;
}
+
cmd->type_required = FALSE;
mdata->header.sizeofcmds = cmd->len;
- mdata->filelen = cmd->offset + cmd->len;
+ mdata->filelen += cmd->len;
}
- if (bfd_get_symcount (abfd) > 0)
+ if (symtab_idx >= 0)
{
/* Init symtab command. */
- symtab_cmd = &mdata->commands[symcind];
+ bfd_mach_o_load_command *cmd = &mdata->commands[symtab_idx];
- symtab_cmd->type = BFD_MACH_O_LC_SYMTAB;
- if (symcind > 0)
- symtab_cmd->offset = mdata->commands[0].offset
- + mdata->commands[0].len;
- else
- symtab_cmd->offset = 0;
- symtab_cmd->len = 6 * 4;
- symtab_cmd->type_required = FALSE;
-
- mdata->header.sizeofcmds += symtab_cmd->len;
- mdata->filelen += symtab_cmd->len;
+ cmd->type = BFD_MACH_O_LC_SYMTAB;
+ cmd->offset = base_offset;
+ if (segcmd_idx >= 0)
+ cmd->offset += mdata->commands[segcmd_idx].len;
+
+ cmd->len = sizeof (struct mach_o_symtab_command_external)
+ + BFD_MACH_O_LC_SIZE;
+ cmd->type_required = FALSE;
+ mdata->header.sizeofcmds += cmd->len;
+ mdata->filelen += cmd->len;
}
- /* If required, setup symtab command. */
- if (bfd_mach_o_should_emit_dysymtab ()
- && bfd_get_symcount (abfd) > 0)
+ /* If required, setup symtab command, see comment above about the quality
+ of this test. */
+ if (dysymtab_idx >= 0)
{
- cmd = &mdata->commands[symcind+1];
+ bfd_mach_o_load_command *cmd = &mdata->commands[dysymtab_idx];
+
cmd->type = BFD_MACH_O_LC_DYSYMTAB;
- cmd->offset = symtab_cmd->offset + symtab_cmd->len;
+ if (symtab_idx >= 0)
+ cmd->offset = mdata->commands[symtab_idx].offset
+ + mdata->commands[symtab_idx].len;
+ else if (segcmd_idx >= 0)
+ cmd->offset = mdata->commands[segcmd_idx].offset
+ + mdata->commands[segcmd_idx].len;
+ else
+ cmd->offset = base_offset;
+
cmd->type_required = FALSE;
- cmd->len = 18 * 4 + BFD_MACH_O_LC_SIZE;
+ cmd->len = sizeof (struct mach_o_dysymtab_command_external)
+ + BFD_MACH_O_LC_SIZE;
mdata->header.sizeofcmds += cmd->len;
mdata->filelen += cmd->len;
/* So, now we have sized the commands and the filelen set to that.
Now we can build the segment command and set the section file offsets. */
- if (mdata->nsects > 0
- && ! bfd_mach_o_build_seg_command (NULL, mdata, seg))
+ if (segcmd_idx >= 0
+ && ! bfd_mach_o_build_seg_command
+ (NULL, mdata, &mdata->commands[segcmd_idx].command.segment))
return FALSE;
/* If we're doing a dysymtab, cmd points to its load command. */
- if (bfd_mach_o_should_emit_dysymtab ()
- && bfd_get_symcount (abfd) > 0
+ if (dysymtab_idx >= 0
&& ! bfd_mach_o_build_dysymtab_command (abfd, mdata,
- &mdata->commands[symcind+1]))
+ &mdata->commands[dysymtab_idx]))
return FALSE;
/* The symtab command is filled in when the symtab is written. */
if (new_symbol == NULL)
return new_symbol;
new_symbol->the_bfd = abfd;
- new_symbol->udata.i = 0;
+ new_symbol->udata.i = SYM_MACHO_FIELDS_UNSET;
return new_symbol;
}
if (mach_o_wide_p (header))
header->reserved = (*get32) (raw.reserved);
+ else
+ header->reserved = 0;
return TRUE;
}
s->symbol.name = sym->strtab + stroff;
s->symbol.value = value;
s->symbol.flags = 0x0;
- s->symbol.udata.i = 0;
+ s->symbol.udata.i = i;
s->n_type = type;
s->n_sect = section;
s->n_desc = desc;
}
else
{
- if (type & BFD_MACH_O_N_PEXT)
+ if (type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT))
s->symbol.flags |= BSF_GLOBAL;
-
- if (type & BFD_MACH_O_N_EXT)
- s->symbol.flags |= BSF_GLOBAL;
-
- if (!(type & (BFD_MACH_O_N_PEXT | BFD_MACH_O_N_EXT)))
+ else
s->symbol.flags |= BSF_LOCAL;
switch (symtype)
return 0;
}
+static int
+bfd_mach_o_read_fvmlib (bfd *abfd, bfd_mach_o_load_command *command)
+{
+ bfd_mach_o_fvmlib_command *fvm = &command->command.fvmlib;
+ struct mach_o_fvmlib_command_external raw;
+ unsigned int nameoff;
+
+ if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+ || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+ return -1;
+
+ nameoff = bfd_h_get_32 (abfd, raw.name);
+ fvm->minor_version = bfd_h_get_32 (abfd, raw.minor_version);
+ fvm->header_addr = bfd_h_get_32 (abfd, raw.header_addr);
+
+ fvm->name_offset = command->offset + nameoff;
+ fvm->name_len = command->len - nameoff;
+ fvm->name_str = bfd_alloc (abfd, fvm->name_len);
+ if (fvm->name_str == NULL)
+ return -1;
+ if (bfd_seek (abfd, fvm->name_offset, SEEK_SET) != 0
+ || bfd_bread (fvm->name_str, fvm->name_len, abfd) != fvm->name_len)
+ return -1;
+ return 0;
+}
+
static int
bfd_mach_o_read_thread (bfd *abfd, bfd_mach_o_load_command *command)
{
return TRUE;
}
+static bfd_boolean
+bfd_mach_o_read_main (bfd *abfd, bfd_mach_o_load_command *command)
+{
+ bfd_mach_o_main_command *cmd = &command->command.main;
+ struct mach_o_entry_point_command_external raw;
+
+ if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+ || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+ return FALSE;
+
+ cmd->entryoff = bfd_get_64 (abfd, raw.entryoff);
+ cmd->stacksize = bfd_get_64 (abfd, raw.stacksize);
+ return TRUE;
+}
+
+static bfd_boolean
+bfd_mach_o_read_source_version (bfd *abfd, bfd_mach_o_load_command *command)
+{
+ bfd_mach_o_source_version_command *cmd = &command->command.source_version;
+ struct mach_o_source_version_command_external raw;
+ bfd_uint64_t ver;
+
+ if (bfd_seek (abfd, command->offset + BFD_MACH_O_LC_SIZE, SEEK_SET) != 0
+ || bfd_bread (&raw, sizeof (raw), abfd) != sizeof (raw))
+ return FALSE;
+
+ ver = bfd_get_64 (abfd, raw.version);
+ /* Note: we use a serie of shift to avoid shift > 32 (for which gcc
+ generates warnings) in case of the host doesn't support 64 bit
+ integers. */
+ cmd->e = ver & 0x3ff;
+ ver >>= 10;
+ cmd->d = ver & 0x3ff;
+ ver >>= 10;
+ cmd->c = ver & 0x3ff;
+ ver >>= 10;
+ cmd->b = ver & 0x3ff;
+ ver >>= 10;
+ cmd->a = ver & 0xffffff;
+ return TRUE;
+}
+
static int
bfd_mach_o_read_segment (bfd *abfd,
bfd_mach_o_load_command *command,
break;
case BFD_MACH_O_LC_LOADFVMLIB:
case BFD_MACH_O_LC_IDFVMLIB:
+ if (bfd_mach_o_read_fvmlib (abfd, command) != 0)
+ return -1;
+ break;
case BFD_MACH_O_LC_IDENT:
case BFD_MACH_O_LC_FVMFILE:
case BFD_MACH_O_LC_PREPAGE:
case BFD_MACH_O_LC_CODE_SIGNATURE:
case BFD_MACH_O_LC_SEGMENT_SPLIT_INFO:
case BFD_MACH_O_LC_FUNCTION_STARTS:
+ case BFD_MACH_O_LC_DATA_IN_CODE:
+ case BFD_MACH_O_LC_DYLIB_CODE_SIGN_DRS:
if (bfd_mach_o_read_linkedit (abfd, command) != 0)
return -1;
break;
if (!bfd_mach_o_read_version_min (abfd, command))
return -1;
break;
+ case BFD_MACH_O_LC_MAIN:
+ if (!bfd_mach_o_read_main (abfd, command))
+ return -1;
+ break;
+ case BFD_MACH_O_LC_SOURCE_VERSION:
+ if (!bfd_mach_o_read_source_version (abfd, command))
+ return -1;
+ break;
default:
(*_bfd_error_handler)(_("%B: unknown load command 0x%lx"),
abfd, (unsigned long) command->type);
if (header.cputype != cputype)
goto wrong;
}
+
if (filetype)
{
if (header.filetype != filetype)
return NULL;
}
+/* Set the filename for a fat binary member ABFD, whose bfd architecture is
+ ARCH_TYPE/ARCH_SUBTYPE and corresponding entry in header is ENTRY.
+ Set arelt_data and origin fields too. */
+
+static void
+bfd_mach_o_fat_member_init (bfd *abfd,
+ enum bfd_architecture arch_type,
+ unsigned long arch_subtype,
+ mach_o_fat_archentry *entry)
+{
+ struct areltdata *areltdata;
+ /* Create the member filename. Use ARCH_NAME. */
+ const bfd_arch_info_type *ap = bfd_lookup_arch (arch_type, arch_subtype);
+
+ if (ap)
+ {
+ /* Use the architecture name if known. */
+ abfd->filename = ap->printable_name;
+ }
+ else
+ {
+ /* Forge a uniq id. */
+ const size_t namelen = 2 + 8 + 1 + 2 + 8 + 1;
+ char *name = bfd_alloc (abfd, namelen);
+ snprintf (name, namelen, "0x%lx-0x%lx",
+ entry->cputype, entry->cpusubtype);
+ abfd->filename = name;
+ }
+
+ areltdata = bfd_zmalloc (sizeof (struct areltdata));
+ areltdata->parsed_size = entry->size;
+ abfd->arelt_data = areltdata;
+ abfd->iostream = NULL;
+ abfd->origin = entry->offset;
+}
+
bfd *
bfd_mach_o_openr_next_archived_file (bfd *archive, bfd *prev)
{
/* Find index of previous entry. */
if (prev == NULL)
- i = 0; /* Start at first one. */
+ {
+ /* Start at first one. */
+ i = 0;
+ }
else
{
+ /* Find index of PREV. */
for (i = 0; i < adata->nfat_arch; i++)
{
if (adata->archentries[i].offset == prev->origin)
bfd_set_error (bfd_error_bad_value);
return NULL;
}
- i++; /* Get next entry. */
- }
+
+ /* Get next entry. */
+ i++;
+ }
if (i >= adata->nfat_arch)
{
if (nbfd == NULL)
return NULL;
- nbfd->origin = entry->offset;
-
bfd_mach_o_convert_architecture (entry->cputype, entry->cpusubtype,
&arch_type, &arch_subtype);
- /* Create the member filename. Use ARCH_NAME. */
- nbfd->filename = bfd_printable_arch_mach (arch_type, arch_subtype);
- nbfd->iostream = NULL;
+ bfd_mach_o_fat_member_init (nbfd, arch_type, arch_subtype, entry);
+
bfd_set_arch_mach (nbfd, arch_type, arch_subtype);
return nbfd;
}
+/* Analogous to stat call. */
+
+static int
+bfd_mach_o_fat_stat_arch_elt (bfd *abfd, struct stat *buf)
+{
+ if (abfd->arelt_data == NULL)
+ {
+ bfd_set_error (bfd_error_invalid_operation);
+ return -1;
+ }
+
+ buf->st_mtime = 0;
+ buf->st_uid = 0;
+ buf->st_gid = 0;
+ buf->st_mode = 0644;
+ buf->st_size = arelt_size (abfd);
+
+ return 0;
+}
+
/* If ABFD format is FORMAT and architecture is ARCH, return it.
If ABFD is a fat image containing a member that corresponds to FORMAT
and ARCH, returns it.
In other case, returns NULL.
This function allows transparent uses of fat images. */
+
bfd *
bfd_mach_o_fat_extract (bfd *abfd,
bfd_format format,
if (res == NULL)
return NULL;
- res->origin = e->offset;
-
- res->filename = bfd_printable_arch_mach (cpu_type, cpu_subtype);
- res->iostream = NULL;
+ bfd_mach_o_fat_member_init (res, cpu_type, cpu_subtype, e);
if (bfd_check_format (res, format))
{
if (_bfd_dwarf2_find_nearest_line (abfd, dwarf_debug_sections,
section, symbols, offset,
filename_ptr, functionname_ptr,
- line_ptr, 0,
+ line_ptr, NULL, 0,
&mdata->dwarf2_find_line_info))
return TRUE;
return FALSE;
}
}
+ if (bfd_get_format (abfd) == bfd_archive
+ && abfd->xvec == &mach_o_fat_vec)
+ return TRUE;
return _bfd_generic_close_and_cleanup (abfd);
}
#define bfd_mach_o_truncate_arname _bfd_noarchive_truncate_arname
#define bfd_mach_o_write_armap _bfd_noarchive_write_armap
#define bfd_mach_o_get_elt_at_index _bfd_noarchive_get_elt_at_index
-#define bfd_mach_o_generic_stat_arch_elt _bfd_noarchive_generic_stat_arch_elt
+#define bfd_mach_o_generic_stat_arch_elt bfd_mach_o_fat_stat_arch_elt
#define bfd_mach_o_update_armap_timestamp _bfd_noarchive_update_armap_timestamp
#define TARGET_NAME mach_o_fat_vec
projects / deliverable / binutils-gdb.git / blobdiff