diff options
| author | Nick Clifton <nickc@redhat.com> | 2005-04-11 08:23:05 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2005-04-11 08:23:05 +0000 |
| commit | 116c20d240af833e0a1f1f959951f57b6e465782 (patch) | |
| tree | 345a9e65464ab3e045860c9dd7ac5b371186a347 /bfd/xcofflink.c | |
| parent | 514d955ded1ad3ca20e22ee3dddeabf0c3b84296 (diff) | |
| download | gdb-116c20d240af833e0a1f1f959951f57b6e465782.zip gdb-116c20d240af833e0a1f1f959951f57b6e465782.tar.gz gdb-116c20d240af833e0a1f1f959951f57b6e465782.tar.bz2 | |
Convert to ISO C90 formatting
Diffstat (limited to 'bfd/xcofflink.c')
| -rw-r--r-- | bfd/xcofflink.c | 3352 |
1 files changed, 1576 insertions, 1776 deletions
diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c index 8142e16..10c4843 100644 --- a/bfd/xcofflink.c +++ b/bfd/xcofflink.c @@ -1,5 +1,5 @@ /* POWER/PowerPC XCOFF linker support. - Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Ian Lance Taylor <ian@cygnus.com>, Cygnus Support. @@ -30,7 +30,8 @@ /* This file holds the XCOFF linker code. */ -#define STRING_SIZE_SIZE (4) +#undef STRING_SIZE_SIZE +#define STRING_SIZE_SIZE 4 /* We reuse the SEC_ROM flag as a mark flag for garbage collection. This flag will only be used on input sections. */ @@ -65,7 +66,8 @@ struct xcoff_link_section_info index of the TOC symbol is not known when the reloc was handled, an entry is added to this linked list. This is not an array, like rel_hashes, because this case is quite uncommon. */ - struct xcoff_toc_rel_hash { + struct xcoff_toc_rel_hash + { struct xcoff_toc_rel_hash *next; struct xcoff_link_hash_entry *h; struct internal_reloc *rel; @@ -113,40 +115,8 @@ struct xcoff_final_link_info bfd_byte *external_relocs; }; -static struct bfd_hash_entry *xcoff_link_hash_newfunc - PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *)); -static bfd_boolean xcoff_get_section_contents PARAMS ((bfd *, asection *)); -static struct internal_reloc *xcoff_read_internal_relocs - PARAMS ((bfd *, asection *, bfd_boolean, bfd_byte *, bfd_boolean, - struct internal_reloc *)); -static bfd_boolean xcoff_link_add_object_symbols - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean xcoff_link_check_archive_element - PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *)); -static bfd_boolean xcoff_link_check_ar_symbols - PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *)); -static bfd_boolean xcoff_link_check_dynamic_ar_symbols - PARAMS ((bfd *, struct bfd_link_info *, bfd_boolean *)); -static bfd_size_type xcoff_find_reloc - PARAMS ((struct internal_reloc *, bfd_size_type, bfd_vma)); -static bfd_boolean xcoff_link_add_symbols - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean xcoff_link_add_dynamic_symbols - PARAMS ((bfd *, struct bfd_link_info *)); -static bfd_boolean xcoff_mark_symbol - PARAMS ((struct bfd_link_info *, struct xcoff_link_hash_entry *)); -static bfd_boolean xcoff_mark PARAMS ((struct bfd_link_info *, asection *)); -static void xcoff_sweep PARAMS ((struct bfd_link_info *)); -static bfd_boolean xcoff_build_ldsyms - PARAMS ((struct xcoff_link_hash_entry *, PTR)); -static bfd_boolean xcoff_link_input_bfd - PARAMS ((struct xcoff_final_link_info *, bfd *)); -static bfd_boolean xcoff_write_global_symbol - PARAMS ((struct xcoff_link_hash_entry *, PTR)); -static bfd_boolean xcoff_reloc_link_order - PARAMS ((bfd *, struct xcoff_final_link_info *, asection *, - struct bfd_link_order *)); -static int xcoff_sort_relocs PARAMS ((const PTR, const PTR)); +static bfd_boolean xcoff_mark (struct bfd_link_info *, asection *); + /* Routines to read XCOFF dynamic information. This don't really @@ -156,14 +126,12 @@ static int xcoff_sort_relocs PARAMS ((const PTR, const PTR)); /* Read the contents of a section. */ static bfd_boolean -xcoff_get_section_contents (abfd, sec) - bfd *abfd; - asection *sec; +xcoff_get_section_contents (bfd *abfd, asection *sec) { - if (coff_section_data (abfd, sec) == NULL) { bfd_size_type amt = sizeof (struct coff_section_tdata); + sec->used_by_bfd = bfd_zalloc (abfd, amt); if (sec->used_by_bfd == NULL) return FALSE; @@ -172,7 +140,8 @@ xcoff_get_section_contents (abfd, sec) if (coff_section_data (abfd, sec)->contents == NULL) { bfd_byte *contents; - if (!bfd_malloc_and_get_section (abfd, sec, &contents)) + + if (! bfd_malloc_and_get_section (abfd, sec, &contents)) { if (contents != NULL) free (contents); @@ -187,8 +156,7 @@ xcoff_get_section_contents (abfd, sec) /* Get the size required to hold the dynamic symbols. */ long -_bfd_xcoff_get_dynamic_symtab_upper_bound (abfd) - bfd *abfd; +_bfd_xcoff_get_dynamic_symtab_upper_bound (bfd *abfd) { asection *lsec; bfd_byte *contents; @@ -211,7 +179,7 @@ _bfd_xcoff_get_dynamic_symtab_upper_bound (abfd) return -1; contents = coff_section_data (abfd, lsec)->contents; - bfd_xcoff_swap_ldhdr_in (abfd, (PTR) contents, &ldhdr); + bfd_xcoff_swap_ldhdr_in (abfd, (void *) contents, &ldhdr); return (ldhdr.l_nsyms + 1) * sizeof (asymbol *); } @@ -219,9 +187,7 @@ _bfd_xcoff_get_dynamic_symtab_upper_bound (abfd) /* Get the dynamic symbols. */ long -_bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms) - bfd *abfd; - asymbol **psyms; +_bfd_xcoff_canonicalize_dynamic_symtab (bfd *abfd, asymbol **psyms) { asection *lsec; bfd_byte *contents; @@ -253,8 +219,7 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms) strings = (char *) contents + ldhdr.l_stoff; - symbuf = ((coff_symbol_type *) - bfd_zalloc (abfd, ldhdr.l_nsyms * sizeof (coff_symbol_type))); + symbuf = bfd_zalloc (abfd, ldhdr.l_nsyms * sizeof (* symbuf)); if (symbuf == NULL) return -1; @@ -296,7 +261,6 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms) /* FIXME: We have no way to record the other information stored with the loader symbol. */ - *psyms = (asymbol *) symbuf; } @@ -308,8 +272,7 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms) /* Get the size required to hold the dynamic relocs. */ long -_bfd_xcoff_get_dynamic_reloc_upper_bound (abfd) - bfd *abfd; +_bfd_xcoff_get_dynamic_reloc_upper_bound (bfd *abfd) { asection *lsec; bfd_byte *contents; @@ -340,10 +303,9 @@ _bfd_xcoff_get_dynamic_reloc_upper_bound (abfd) /* Get the dynamic relocs. */ long -_bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms) - bfd *abfd; - arelent **prelocs; - asymbol **syms; +_bfd_xcoff_canonicalize_dynamic_reloc (bfd *abfd, + arelent **prelocs, + asymbol **syms) { asection *lsec; bfd_byte *contents; @@ -370,7 +332,7 @@ _bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms) bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr); - relbuf = (arelent *) bfd_alloc (abfd, ldhdr.l_nreloc * sizeof (arelent)); + relbuf = bfd_alloc (abfd, ldhdr.l_nreloc * sizeof (arelent)); if (relbuf == NULL) return -1; @@ -438,20 +400,18 @@ _bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms) /* Routine to create an entry in an XCOFF link hash table. */ static struct bfd_hash_entry * -xcoff_link_hash_newfunc (entry, table, string) - struct bfd_hash_entry *entry; - struct bfd_hash_table *table; - const char *string; +xcoff_link_hash_newfunc (struct bfd_hash_entry *entry, + struct bfd_hash_table *table, + const char *string) { struct xcoff_link_hash_entry *ret = (struct xcoff_link_hash_entry *) entry; /* Allocate the structure if it has not already been allocated by a subclass. */ - if (ret == (struct xcoff_link_hash_entry *) NULL) - ret = ((struct xcoff_link_hash_entry *) - bfd_hash_allocate (table, sizeof (struct xcoff_link_hash_entry))); - if (ret == (struct xcoff_link_hash_entry *) NULL) - return (struct bfd_hash_entry *) ret; + if (ret == NULL) + ret = bfd_hash_allocate (table, sizeof (* ret)); + if (ret == NULL) + return NULL; /* Call the allocation method of the superclass. */ ret = ((struct xcoff_link_hash_entry *) @@ -476,19 +436,18 @@ xcoff_link_hash_newfunc (entry, table, string) /* Create a XCOFF link hash table. */ struct bfd_link_hash_table * -_bfd_xcoff_bfd_link_hash_table_create (abfd) - bfd *abfd; +_bfd_xcoff_bfd_link_hash_table_create (bfd *abfd) { struct xcoff_link_hash_table *ret; - bfd_size_type amt = sizeof (struct xcoff_link_hash_table); + bfd_size_type amt = sizeof (* ret); - ret = (struct xcoff_link_hash_table *) bfd_malloc (amt); - if (ret == (struct xcoff_link_hash_table *) NULL) - return (struct bfd_link_hash_table *) NULL; + ret = bfd_malloc (amt); + if (ret == NULL) + return NULL; if (! _bfd_link_hash_table_init (&ret->root, abfd, xcoff_link_hash_newfunc)) { free (ret); - return (struct bfd_link_hash_table *) NULL; + return NULL; } ret->debug_strtab = _bfd_xcoff_stringtab_init (); @@ -516,8 +475,7 @@ _bfd_xcoff_bfd_link_hash_table_create (abfd) /* Free a XCOFF link hash table. */ void -_bfd_xcoff_bfd_link_hash_table_free (hash) - struct bfd_link_hash_table *hash; +_bfd_xcoff_bfd_link_hash_table_free (struct bfd_link_hash_table *hash) { struct xcoff_link_hash_table *ret = (struct xcoff_link_hash_table *) hash; @@ -531,16 +489,13 @@ _bfd_xcoff_bfd_link_hash_table_free (hash) relocs which may have been cached for the enclosing section. */ static struct internal_reloc * -xcoff_read_internal_relocs (abfd, sec, cache, external_relocs, - require_internal, internal_relocs) - bfd *abfd; - asection *sec; - bfd_boolean cache; - bfd_byte *external_relocs; - bfd_boolean require_internal; - struct internal_reloc *internal_relocs; +xcoff_read_internal_relocs (bfd *abfd, + asection *sec, + bfd_boolean cache, + bfd_byte *external_relocs, + bfd_boolean require_internal, + struct internal_reloc *internal_relocs) { - if (coff_section_data (abfd, sec) != NULL && coff_section_data (abfd, sec)->relocs == NULL && xcoff_section_data (abfd, sec) != NULL) @@ -556,8 +511,7 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs, && enclosing->reloc_count > 0) { if (_bfd_coff_read_internal_relocs (abfd, enclosing, TRUE, - external_relocs, FALSE, - (struct internal_reloc *) NULL) + external_relocs, FALSE, NULL) == NULL) return NULL; } @@ -584,215 +538,64 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs, require_internal, internal_relocs); } -/* Given an XCOFF BFD, add symbols to the global hash table as - appropriate. */ - -bfd_boolean -_bfd_xcoff_bfd_link_add_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; -{ - - switch (bfd_get_format (abfd)) - { - case bfd_object: - return xcoff_link_add_object_symbols (abfd, info); - - case bfd_archive: - /* If the archive has a map, do the usual search. We then need - to check the archive for dynamic objects, because they may not - appear in the archive map even though they should, perhaps, be - included. If the archive has no map, we just consider each object - file in turn, since that apparently is what the AIX native linker - does. */ - if (bfd_has_map (abfd)) - { - if (! (_bfd_generic_link_add_archive_symbols - (abfd, info, xcoff_link_check_archive_element))) - return FALSE; - } - - { - bfd *member; - - member = bfd_openr_next_archived_file (abfd, (bfd *) NULL); - while (member != NULL) - { - if (bfd_check_format (member, bfd_object) - && (info->hash->creator == member->xvec) - && (! bfd_has_map (abfd) || (member->flags & DYNAMIC) != 0)) - { - bfd_boolean needed; - - if (! xcoff_link_check_archive_element (member, info, - &needed)) - return FALSE; - if (needed) - member->archive_pass = -1; - } - member = bfd_openr_next_archived_file (abfd, member); - } - } - - return TRUE; - - default: - bfd_set_error (bfd_error_wrong_format); - return FALSE; - } -} - -/* Add symbols from an XCOFF object file. */ - -static bfd_boolean -xcoff_link_add_object_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; -{ - - if (! _bfd_coff_get_external_symbols (abfd)) - return FALSE; - if (! xcoff_link_add_symbols (abfd, info)) - return FALSE; - if (! info->keep_memory) - { - if (! _bfd_coff_free_symbols (abfd)) - return FALSE; - } - return TRUE; -} - -/* Check a single archive element to see if we need to include it in - the link. *PNEEDED is set according to whether this element is - needed in the link or not. This is called via - _bfd_generic_link_add_archive_symbols. */ - -static bfd_boolean -xcoff_link_check_archive_element (abfd, info, pneeded) - bfd *abfd; - struct bfd_link_info *info; - bfd_boolean *pneeded; -{ - - if (! _bfd_coff_get_external_symbols (abfd)) - return FALSE; - - if (! xcoff_link_check_ar_symbols (abfd, info, pneeded)) - return FALSE; - - if (*pneeded) - { - if (! xcoff_link_add_symbols (abfd, info)) - return FALSE; - } - - if (! info->keep_memory || ! *pneeded) - { - if (! _bfd_coff_free_symbols (abfd)) - return FALSE; - } - - return TRUE; -} - -/* Look through the symbols to see if this object file should be - included in the link. */ - -static bfd_boolean -xcoff_link_check_ar_symbols (abfd, info, pneeded) - bfd *abfd; - struct bfd_link_info *info; - bfd_boolean *pneeded; -{ - bfd_size_type symesz; - bfd_byte *esym; - bfd_byte *esym_end; - - *pneeded = FALSE; - - if ((abfd->flags & DYNAMIC) != 0 - && ! info->static_link - && info->hash->creator == abfd->xvec) - return xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded); - - symesz = bfd_coff_symesz (abfd); - esym = (bfd_byte *) obj_coff_external_syms (abfd); - esym_end = esym + obj_raw_syment_count (abfd) * symesz; - while (esym < esym_end) - { - struct internal_syment sym; - - bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym); - - if (sym.n_sclass == C_EXT && sym.n_scnum != N_UNDEF) - { - const char *name; - char buf[SYMNMLEN + 1]; - struct bfd_link_hash_entry *h; - - /* This symbol is externally visible, and is defined by this - object file. */ - - name = _bfd_coff_internal_syment_name (abfd, &sym, buf); - - if (name == NULL) - return FALSE; - h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); - - /* We are only interested in symbols that are currently - undefined. If a symbol is currently known to be common, - XCOFF linkers do not bring in an object file which - defines it. We also don't bring in symbols to satisfy - undefined references in shared objects. */ - if (h != (struct bfd_link_hash_entry *) NULL - && h->type == bfd_link_hash_undefined - && (info->hash->creator != abfd->xvec - || (((struct xcoff_link_hash_entry *) h)->flags - & XCOFF_DEF_DYNAMIC) == 0)) - { - if (! (*info->callbacks->add_archive_element) (info, abfd, name)) - return FALSE; - *pneeded = TRUE; - return TRUE; - } - } - - esym += (sym.n_numaux + 1) * symesz; - } - - /* We do not need this object file. */ - return TRUE; -} - -/* Look through the loader symbols to see if this dynamic object - should be included in the link. The native linker uses the loader - symbols, not the normal symbol table, so we do too. */ +/* This function is used to add symbols from a dynamic object to the + global symbol table. */ static bfd_boolean -xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded) - bfd *abfd; - struct bfd_link_info *info; - bfd_boolean *pneeded; +xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info) { asection *lsec; bfd_byte *contents; struct internal_ldhdr ldhdr; const char *strings; bfd_byte *elsym, *elsymend; + struct xcoff_import_file *n; + const char *bname; + const char *mname; + const char *s; + unsigned int c; + struct xcoff_import_file **pp; - *pneeded = FALSE; + /* We can only handle a dynamic object if we are generating an XCOFF + output file. */ + if (info->hash->creator != abfd->xvec) + { + (*_bfd_error_handler) + (_("%s: XCOFF shared object when not producing XCOFF output"), + bfd_get_filename (abfd)); + bfd_set_error (bfd_error_invalid_operation); + return FALSE; + } + /* The symbols we use from a dynamic object are not the symbols in + the normal symbol table, but, rather, the symbols in the export + table. If there is a global symbol in a dynamic object which is + not in the export table, the loader will not be able to find it, + so we don't want to find it either. Also, on AIX 4.1.3, shr.o in + libc.a has symbols in the export table which are not in the + symbol table. */ + + /* Read in the .loader section. FIXME: We should really use the + o_snloader field in the a.out header, rather than grabbing the + section by name. */ lsec = bfd_get_section_by_name (abfd, ".loader"); if (lsec == NULL) { - /* There are no symbols, so don't try to include it. */ - return TRUE; + (*_bfd_error_handler) + (_("%s: dynamic object with no .loader section"), + bfd_get_filename (abfd)); + bfd_set_error (bfd_error_no_symbols); + return FALSE; } if (! xcoff_get_section_contents (abfd, lsec)) return FALSE; contents = coff_section_data (abfd, lsec)->contents; + /* Remove the sections from this object, so that they do not get + included in the link. */ + bfd_section_list_clear (abfd); + bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr); strings = (char *) contents + ldhdr.l_stoff; @@ -800,12 +603,13 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded) elsym = contents + bfd_xcoff_loader_symbol_offset(abfd, &ldhdr); elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz(abfd); + for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz(abfd)) { struct internal_ldsym ldsym; char nambuf[SYMNMLEN + 1]; const char *name; - struct bfd_link_hash_entry *h; + struct xcoff_link_hash_entry *h; bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym); @@ -822,24 +626,109 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded) name = nambuf; } - h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); - - /* We are only interested in symbols that are currently - undefined. At this point we know that we are using an XCOFF + /* Normally we could not call xcoff_link_hash_lookup in an add + symbols routine, since we might not be using an XCOFF hash + table. However, we verified above that we are using an XCOFF hash table. */ - if (h != NULL - && h->type == bfd_link_hash_undefined - && (((struct xcoff_link_hash_entry *) h)->flags - & XCOFF_DEF_DYNAMIC) == 0) + + h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE, + TRUE, TRUE); + if (h == NULL) + return FALSE; + + h->flags |= XCOFF_DEF_DYNAMIC; + + /* If the symbol is undefined, and the BFD it was found in is + not a dynamic object, change the BFD to this dynamic object, + so that we can get the correct import file ID. */ + if ((h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak) + && (h->root.u.undef.abfd == NULL + || (h->root.u.undef.abfd->flags & DYNAMIC) == 0)) + h->root.u.undef.abfd = abfd; + + if (h->root.type == bfd_link_hash_new) { - if (! (*info->callbacks->add_archive_element) (info, abfd, name)) - return FALSE; - *pneeded = TRUE; - return TRUE; + h->root.type = bfd_link_hash_undefined; + h->root.u.undef.abfd = abfd; + /* We do not want to add this to the undefined symbol list. */ } - } - /* We do not need this shared object. */ + if (h->smclas == XMC_UA + || h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak) + h->smclas = ldsym.l_smclas; + + /* Unless this is an XMC_XO symbol, we don't bother to actually + define it, since we don't have a section to put it in anyhow. + Instead, the relocation routines handle the DEF_DYNAMIC flag + correctly. */ + + if (h->smclas == XMC_XO + && (h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak)) + { + /* This symbol has an absolute value. */ + h->root.type = bfd_link_hash_defined; + h->root.u.def.section = bfd_abs_section_ptr; + h->root.u.def.value = ldsym.l_value; + } + + /* If this symbol defines a function descriptor, then it + implicitly defines the function code as well. */ + if (h->smclas == XMC_DS + || (h->smclas == XMC_XO && name[0] != '.')) + h->flags |= XCOFF_DESCRIPTOR; + if ((h->flags & XCOFF_DESCRIPTOR) != 0) + { + struct xcoff_link_hash_entry *hds; + + hds = h->descriptor; + if (hds == NULL) + { + char *dsnm; + + dsnm = bfd_malloc ((bfd_size_type) strlen (name) + 2); + if (dsnm == NULL) + return FALSE; + dsnm[0] = '.'; + strcpy (dsnm + 1, name); + hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm, + TRUE, TRUE, TRUE); + free (dsnm); + if (hds == NULL) + return FALSE; + + if (hds->root.type == bfd_link_hash_new) + { + hds->root.type = bfd_link_hash_undefined; + hds->root.u.undef.abfd = abfd; + /* We do not want to add this to the undefined + symbol list. */ + } + + hds->descriptor = h; + h->descriptor = hds; + } + + hds->flags |= XCOFF_DEF_DYNAMIC; + if (hds->smclas == XMC_UA) + hds->smclas = XMC_PR; + + /* An absolute symbol appears to actually define code, not a + function descriptor. This is how some math functions are + implemented on AIX 4.1. */ + if (h->smclas == XMC_XO + && (hds->root.type == bfd_link_hash_undefined + || hds->root.type == bfd_link_hash_undefweak)) + { + hds->smclas = XMC_XO; + hds->root.type = bfd_link_hash_defined; + hds->root.u.def.section = bfd_abs_section_ptr; + hds->root.u.def.value = ldsym.l_value; + } + } + } if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents) { @@ -847,73 +736,56 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded) coff_section_data (abfd, lsec)->contents = NULL; } - return TRUE; -} - -/* Returns the index of reloc in RELOCS with the least address greater - than or equal to ADDRESS. The relocs are sorted by address. */ - -static bfd_size_type -xcoff_find_reloc (relocs, count, address) - struct internal_reloc *relocs; - bfd_size_type count; - bfd_vma address; -{ - bfd_size_type min, max, this; + /* Record this file in the import files. */ + n = bfd_alloc (abfd, (bfd_size_type) sizeof (struct xcoff_import_file)); + if (n == NULL) + return FALSE; + n->next = NULL; - if (count < 2) + /* For some reason, the path entry in the import file list for a + shared object appears to always be empty. The file name is the + base name. */ + n->path = ""; + if (abfd->my_archive == NULL) { - if (count == 1 && relocs[0].r_vaddr < address) - return 1; - else - return 0; + bname = bfd_get_filename (abfd); + mname = ""; } - - min = 0; - max = count; - - /* Do a binary search over (min,max]. */ - while (min + 1 < max) + else { - bfd_vma raddr; - - this = (max + min) / 2; - raddr = relocs[this].r_vaddr; - if (raddr > address) - max = this; - else if (raddr < address) - min = this; - else - { - min = this; - break; - } + bname = bfd_get_filename (abfd->my_archive); + mname = bfd_get_filename (abfd); } + s = strrchr (bname, '/'); + if (s != NULL) + bname = s + 1; + n->file = bname; + n->member = mname; - if (relocs[min].r_vaddr < address) - return min + 1; + /* We start c at 1 because the first import file number is reserved + for LIBPATH. */ + for (pp = &xcoff_hash_table (info)->imports, c = 1; + *pp != NULL; + pp = &(*pp)->next, ++c) + ; + *pp = n; - while (min > 0 - && relocs[min - 1].r_vaddr == address) - --min; + xcoff_data (abfd)->import_file_id = c; - return min; + return TRUE; } - /* xcoff_link_create_extra_sections Takes care of creating the .loader, .gl, .ds, .debug and sections. */ static bfd_boolean -xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) +xcoff_link_create_extra_sections (bfd * abfd, struct bfd_link_info *info) { - bfd_boolean return_value = FALSE; if (info->hash->creator == abfd->xvec) { - /* We need to build a .loader section, so we do it here. This won't work if we're producing an XCOFF output file with no XCOFF input files. FIXME. */ @@ -924,9 +796,8 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) lsec = bfd_make_section_anyway (abfd, ".loader"); if (lsec == NULL) - { - goto end_return; - } + goto end_return; + xcoff_hash_table (info)->loader_section = lsec; lsec->flags |= SEC_HAS_CONTENTS | SEC_IN_MEMORY; } @@ -938,9 +809,7 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) lsec = bfd_make_section_anyway (abfd, ".gl"); if (lsec == NULL) - { - goto end_return; - } + goto end_return; xcoff_hash_table (info)->linkage_section = lsec; lsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS @@ -955,9 +824,7 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) tsec = bfd_make_section_anyway (abfd, ".tc"); if (tsec == NULL) - { - goto end_return; - } + goto end_return; xcoff_hash_table (info)->toc_section = tsec; tsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS @@ -972,9 +839,7 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) dsec = bfd_make_section_anyway (abfd, ".ds"); if (dsec == NULL) - { - goto end_return; - } + goto end_return; xcoff_hash_table (info)->descriptor_section = dsec; dsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS @@ -990,9 +855,8 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) dsec = bfd_make_section_anyway (abfd, ".debug"); if (dsec == NULL) - { - goto end_return; - } + goto end_return; + xcoff_hash_table (info)->debug_section = dsec; dsec->flags |= SEC_HAS_CONTENTS | SEC_IN_MEMORY; } @@ -1005,6 +869,55 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) return return_value; } +/* Returns the index of reloc in RELOCS with the least address greater + than or equal to ADDRESS. The relocs are sorted by address. */ + +static bfd_size_type +xcoff_find_reloc (struct internal_reloc *relocs, + bfd_size_type count, + bfd_vma address) +{ + bfd_size_type min, max, this; + + if (count < 2) + { + if (count == 1 && relocs[0].r_vaddr < address) + return 1; + else + return 0; + } + + min = 0; + max = count; + + /* Do a binary search over (min,max]. */ + while (min + 1 < max) + { + bfd_vma raddr; + + this = (max + min) / 2; + raddr = relocs[this].r_vaddr; + if (raddr > address) + max = this; + else if (raddr < address) + min = this; + else + { + min = this; + break; + } + } + + if (relocs[min].r_vaddr < address) + return min + 1; + + while (min > 0 + && relocs[min - 1].r_vaddr == address) + --min; + + return min; +} + /* Add all the symbols from an object file to the hash table. XCOFF is a weird format. A normal XCOFF .o files will have three @@ -1024,9 +937,7 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info) csect they belong to is to examine the address. */ static bfd_boolean -xcoff_link_add_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info) { unsigned int n_tmask; unsigned int n_btshft; @@ -1061,7 +972,7 @@ xcoff_link_add_symbols (abfd, info) return FALSE; } - /* create the loader, toc, gl, ds and debug sections, if needed */ + /* Create the loader, toc, gl, ds and debug sections, if needed. */ if (! xcoff_link_create_extra_sections (abfd, info)) goto error_return; @@ -1086,7 +997,7 @@ xcoff_link_add_symbols (abfd, info) /* We keep a list of the linker hash table entries that correspond to each external symbol. */ amt = symcount * sizeof (struct xcoff_link_hash_entry *); - sym_hash = (struct xcoff_link_hash_entry **) bfd_zalloc (abfd, amt); + sym_hash = bfd_zalloc (abfd, amt); if (sym_hash == NULL && symcount != 0) goto error_return; coff_data (abfd)->sym_hashes = (struct coff_link_hash_entry **) sym_hash; @@ -1095,7 +1006,7 @@ xcoff_link_add_symbols (abfd, info) not easily determine which section a symbol is in, so we store the information in the tdata for the input file. */ amt = symcount * sizeof (asection *); - csect_cache = (asection **) bfd_zalloc (abfd, amt); + csect_cache = bfd_zalloc (abfd, amt); if (csect_cache == NULL && symcount != 0) goto error_return; xcoff_data (abfd)->csects = csect_cache; @@ -1107,7 +1018,7 @@ xcoff_link_add_symbols (abfd, info) into reloc_info using the section target_index. */ amt = abfd->section_count + 1; amt *= sizeof (struct reloc_info_struct); - reloc_info = (struct reloc_info_struct *) bfd_zmalloc (amt); + reloc_info = bfd_zmalloc (amt); if (reloc_info == NULL) goto error_return; @@ -1116,17 +1027,15 @@ xcoff_link_add_symbols (abfd, info) last_real = NULL; for (o = abfd->sections; o != NULL; o = o->next) { - last_real = o; + if ((o->flags & SEC_RELOC) != 0) { - reloc_info[o->target_index].relocs = - xcoff_read_internal_relocs (abfd, o, TRUE, (bfd_byte *) NULL, - FALSE, (struct internal_reloc *) NULL); + xcoff_read_internal_relocs (abfd, o, TRUE, NULL, FALSE, NULL); amt = o->reloc_count; amt *= sizeof (asection *); - reloc_info[o->target_index].csects = (asection **) bfd_zmalloc (amt); + reloc_info[o->target_index].csects = bfd_zmalloc (amt); if (reloc_info[o->target_index].csects == NULL) goto error_return; } @@ -1134,18 +1043,16 @@ xcoff_link_add_symbols (abfd, info) if ((info->strip == strip_none || info->strip == strip_some) && o->lineno_count > 0) { - bfd_byte *linenos; amt = linesz * o->lineno_count; - linenos = (bfd_byte *) bfd_malloc (amt); + linenos = bfd_malloc (amt); if (linenos == NULL) goto error_return; reloc_info[o->target_index].linenos = linenos; if (bfd_seek (abfd, o->line_filepos, SEEK_SET) != 0 || bfd_bread (linenos, amt, abfd) != amt) goto error_return; - } } @@ -1173,13 +1080,12 @@ xcoff_link_add_symbols (abfd, info) bfd_vma value; struct xcoff_link_hash_entry *set_toc; - bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym); + bfd_coff_swap_sym_in (abfd, (void *) esym, (void *) &sym); /* In this pass we are only interested in symbols with csect information. */ if (sym.n_sclass != C_EXT && sym.n_sclass != C_HIDEXT) { - /* Set csect_cache, Normally csect is a .pr, .rw etc. created in the loop If C_FILE or first time, handle special @@ -1224,12 +1130,11 @@ xcoff_link_add_symbols (abfd, info) && csect != NULL && ISFCN (sym.n_type)) { - union internal_auxent auxlin; - bfd_coff_swap_aux_in (abfd, (PTR) (esym + symesz), + bfd_coff_swap_aux_in (abfd, (void *) (esym + symesz), sym.n_type, sym.n_sclass, - 0, sym.n_numaux, (PTR) &auxlin); + 0, sym.n_numaux, (void *) &auxlin); if (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0) { @@ -1247,7 +1152,7 @@ xcoff_link_add_symbols (abfd, info) } linoff = (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr - enclosing->line_filepos); - /* explicit cast to bfd_signed_vma for compiler */ + /* Explicit cast to bfd_signed_vma for compiler. */ if (linoff < (bfd_signed_vma) (enclosing->lineno_count * linesz)) { struct internal_lineno lin; @@ -1255,7 +1160,7 @@ xcoff_link_add_symbols (abfd, info) linpstart = (reloc_info[enclosing->target_index].linenos + linoff); - bfd_coff_swap_lineno_in (abfd, (PTR) linpstart, (PTR) &lin); + bfd_coff_swap_lineno_in (abfd, (void *) linpstart, (void *) &lin); if (lin.l_lnno == 0 && ((bfd_size_type) lin.l_addr.l_symndx == ((esym @@ -1270,8 +1175,8 @@ xcoff_link_add_symbols (abfd, info) linp < linpend; linp += linesz) { - bfd_coff_swap_lineno_in (abfd, (PTR) linp, - (PTR) &lin); + bfd_coff_swap_lineno_in (abfd, (void *) linp, + (void *) &lin); if (lin.l_lnno == 0) break; } @@ -1289,7 +1194,6 @@ xcoff_link_add_symbols (abfd, info) } /* Pick up the csect auxiliary information. */ - if (sym.n_numaux == 0) { (*_bfd_error_handler) @@ -1300,10 +1204,10 @@ xcoff_link_add_symbols (abfd, info) } bfd_coff_swap_aux_in (abfd, - (PTR) (esym + symesz * sym.n_numaux), + (void *) (esym + symesz * sym.n_numaux), sym.n_type, sym.n_sclass, sym.n_numaux - 1, sym.n_numaux, - (PTR) &aux); + (void *) &aux); smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp); @@ -1424,7 +1328,7 @@ xcoff_link_add_symbols (abfd, info) erelsym = ((bfd_byte *) obj_coff_external_syms (abfd) + rel->r_symndx * symesz); - bfd_coff_swap_sym_in (abfd, (PTR) erelsym, (PTR) &relsym); + bfd_coff_swap_sym_in (abfd, (void *) erelsym, (void *) &relsym); if (relsym.n_sclass == C_EXT) { const char *relname; @@ -1434,7 +1338,6 @@ xcoff_link_add_symbols (abfd, info) /* At this point we know that the TOC entry is for an externally visible symbol. */ - relname = _bfd_coff_internal_syment_name (abfd, &relsym, relbuf); if (relname == NULL) @@ -1445,7 +1348,6 @@ xcoff_link_add_symbols (abfd, info) the normal case, but not common cases like SYM.P4 which gcc generates to store SYM + 4 in the TOC. FIXME. */ - if (strcmp (name, relname) == 0) { copy = (! info->keep_memory @@ -1484,13 +1386,12 @@ xcoff_link_add_symbols (abfd, info) /* We are about to create a TOC entry for this symbol. */ set_toc = h; - } /* merge toc reloc */ - } /* c_ext */ - } /* reloc */ - } /* merge toc */ + } + } + } + } { - asection *enclosing; /* We need to create a new section. We get the name from @@ -1499,9 +1400,7 @@ xcoff_link_add_symbols (abfd, info) csect = bfd_xcoff_create_csect_from_smclas(abfd, &aux, name); if (NULL == csect) - { - goto error_return; - } + goto error_return; /* The enclosing section is the main section : .data, .text or .bss that the csect is coming from. */ @@ -1531,7 +1430,7 @@ xcoff_link_add_symbols (abfd, info) /* Record the enclosing section in the tdata for this new section. */ amt = sizeof (struct coff_section_tdata); - csect->used_by_bfd = (PTR) bfd_zalloc (abfd, amt); + csect->used_by_bfd = bfd_zalloc (abfd, amt); if (csect->used_by_bfd == NULL) goto error_return; amt = sizeof (struct xcoff_section_tdata); @@ -1653,12 +1552,10 @@ xcoff_link_add_symbols (abfd, info) /* The linker script puts the .td section in the data section after the .tc section. */ csect = bfd_make_section_anyway (abfd, ".td"); - } else - { - csect = bfd_make_section_anyway (abfd, ".bss"); - } + csect = bfd_make_section_anyway (abfd, ".bss"); + if (csect == NULL) goto error_return; csect->vma = sym.n_value; @@ -1673,7 +1570,7 @@ xcoff_link_add_symbols (abfd, info) / symesz); amt = sizeof (struct coff_section_tdata); - csect->used_by_bfd = (PTR) bfd_zalloc (abfd, amt); + csect->used_by_bfd = bfd_zalloc (abfd, amt); if (csect->used_by_bfd == NULL) goto error_return; amt = sizeof (struct xcoff_section_tdata); @@ -1701,7 +1598,6 @@ xcoff_link_add_symbols (abfd, info) && aux.x_csect.x_smclas != XMC_TC && aux.x_csect.x_smclas != XMC_TD) { - int i = -1; if (name[0] == '_') @@ -1718,14 +1614,10 @@ xcoff_link_add_symbols (abfd, info) i = XCOFF_SPECIAL_SECTION_END; } else if (name[0] == 'e' && strcmp (name, "end") == 0) - { - i = XCOFF_SPECIAL_SECTION_END2; - } + i = XCOFF_SPECIAL_SECTION_END2; if (i != -1) - { - xcoff_hash_table (info)->special_sections[i] = csect; - } + xcoff_hash_table (info)->special_sections[i] = csect; } /* Now we have enough information to add the symbol to the @@ -1772,19 +1664,15 @@ xcoff_link_add_symbols (abfd, info) if (info->hash->creator == abfd->xvec) { if (! bfd_is_und_section (section)) - { - *sym_hash = xcoff_link_hash_lookup (xcoff_hash_table (info), - name, TRUE, copy, FALSE); - } + *sym_hash = xcoff_link_hash_lookup (xcoff_hash_table (info), + name, TRUE, copy, FALSE); else - { - /* Make a copy of the symbol name to prevent problems with - merging symbols. */ - *sym_hash = ((struct xcoff_link_hash_entry *) - bfd_wrapped_link_hash_lookup (abfd, info, name, - TRUE, TRUE, - FALSE)); - } + /* Make a copy of the symbol name to prevent problems with + merging symbols. */ + *sym_hash = ((struct xcoff_link_hash_entry *) + bfd_wrapped_link_hash_lookup (abfd, info, name, + TRUE, TRUE, FALSE)); + if (*sym_hash == NULL) goto error_return; if (((*sym_hash)->root.type == bfd_link_hash_defined @@ -1858,7 +1746,7 @@ xcoff_link_add_symbols (abfd, info) not an error. */ if (! ((*info->callbacks->multiple_definition) (info, (*sym_hash)->root.root.string, - (bfd *) NULL, (asection *) NULL, (bfd_vma) 0, + NULL, NULL, (bfd_vma) 0, (*sym_hash)->root.u.def.section->owner, (*sym_hash)->root.u.def.section, (*sym_hash)->root.u.def.value))) @@ -1882,7 +1770,7 @@ xcoff_link_add_symbols (abfd, info) last_real->next = NULL; if (! (_bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value, - (const char *) NULL, copy, TRUE, + NULL, copy, TRUE, (struct bfd_link_hash_entry **) sym_hash))) goto error_return; last_real->next = first_csect; @@ -1891,15 +1779,11 @@ xcoff_link_add_symbols (abfd, info) { if ((*sym_hash)->root.type != bfd_link_hash_common || (*sym_hash)->root.u.c.p->section != csect) - { - /* We don't need the common csect we just created. */ - csect->size = 0; - } + /* We don't need the common csect we just created. */ + csect->size = 0; else - { - (*sym_hash)->root.u.c.p->alignment_power - = csect->alignment_power; - } + (*sym_hash)->root.u.c.p->alignment_power + = csect->alignment_power; } if (info->hash->creator == abfd->xvec) @@ -1949,7 +1833,6 @@ xcoff_link_add_symbols (abfd, info) for (i = 0; i < o->reloc_count; i++, rel++, rel_csect++) { - if (*rel_csect == NULL) { (*_bfd_error_handler) @@ -1998,7 +1881,7 @@ xcoff_link_add_symbols (abfd, info) if (! (_bfd_generic_link_add_one_symbol (info, abfd, hds->root.root.string, (flagword) 0, bfd_und_section_ptr, - (bfd_vma) 0, (const char *) NULL, FALSE, + (bfd_vma) 0, NULL, FALSE, TRUE, &bh))) goto error_return; hds = (struct xcoff_link_hash_entry *) bh; @@ -2065,81 +1948,62 @@ xcoff_link_add_symbols (abfd, info) #undef N_TMASK #undef N_BTSHFT -/* This function is used to add symbols from a dynamic object to the - global symbol table. */ +/* Add symbols from an XCOFF object file. */ static bfd_boolean -xcoff_link_add_dynamic_symbols (abfd, info) - bfd *abfd; - struct bfd_link_info *info; +xcoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info) +{ + if (! _bfd_coff_get_external_symbols (abfd)) + return FALSE; + if (! xcoff_link_add_symbols (abfd, info)) + return FALSE; + if (! info->keep_memory) + { + if (! _bfd_coff_free_symbols (abfd)) + return FALSE; + } + return TRUE; +} + +/* Look through the loader symbols to see if this dynamic object + should be included in the link. The native linker uses the loader + symbols, not the normal symbol table, so we do too. */ + +static bfd_boolean +xcoff_link_check_dynamic_ar_symbols (bfd *abfd, + struct bfd_link_info *info, + bfd_boolean *pneeded) { asection *lsec; bfd_byte *contents; struct internal_ldhdr ldhdr; const char *strings; bfd_byte *elsym, *elsymend; - struct xcoff_import_file *n; - const char *bname; - const char *mname; - const char *s; - unsigned int c; - struct xcoff_import_file **pp; - - /* We can only handle a dynamic object if we are generating an XCOFF - output file. */ - if (info->hash->creator != abfd->xvec) - { - (*_bfd_error_handler) - (_("%s: XCOFF shared object when not producing XCOFF output"), - bfd_get_filename (abfd)); - bfd_set_error (bfd_error_invalid_operation); - return FALSE; - } - /* The symbols we use from a dynamic object are not the symbols in - the normal symbol table, but, rather, the symbols in the export - table. If there is a global symbol in a dynamic object which is - not in the export table, the loader will not be able to find it, - so we don't want to find it either. Also, on AIX 4.1.3, shr.o in - libc.a has symbols in the export table which are not in the - symbol table. */ + *pneeded = FALSE; - /* Read in the .loader section. FIXME: We should really use the - o_snloader field in the a.out header, rather than grabbing the - section by name. */ lsec = bfd_get_section_by_name (abfd, ".loader"); if (lsec == NULL) - { - (*_bfd_error_handler) - (_("%s: dynamic object with no .loader section"), - bfd_get_filename (abfd)); - bfd_set_error (bfd_error_no_symbols); - return FALSE; - } - + /* There are no symbols, so don't try to include it. */ + return TRUE; if (! xcoff_get_section_contents (abfd, lsec)) return FALSE; contents = coff_section_data (abfd, lsec)->contents; - /* Remove the sections from this object, so that they do not get - included in the link. */ - bfd_section_list_clear (abfd); - bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr); strings = (char *) contents + ldhdr.l_stoff; - elsym = contents + bfd_xcoff_loader_symbol_offset(abfd, &ldhdr); + elsym = contents + bfd_xcoff_loader_symbol_offset (abfd, &ldhdr); - elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz(abfd); - - for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz(abfd)) + elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz (abfd); + for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz (abfd)) { struct internal_ldsym ldsym; char nambuf[SYMNMLEN + 1]; const char *name; - struct xcoff_link_hash_entry *h; + struct bfd_link_hash_entry *h; bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym); @@ -2156,169 +2020,192 @@ xcoff_link_add_dynamic_symbols (abfd, info) name = nambuf; } - /* Normally we could not call xcoff_link_hash_lookup in an add - symbols routine, since we might not be using an XCOFF hash - table. However, we verified above that we are using an XCOFF - hash table. */ - - h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE, - TRUE, TRUE); - if (h == NULL) - return FALSE; - - h->flags |= XCOFF_DEF_DYNAMIC; - - /* If the symbol is undefined, and the BFD it was found in is - not a dynamic object, change the BFD to this dynamic object, - so that we can get the correct import file ID. */ - if ((h->root.type == bfd_link_hash_undefined - || h->root.type == bfd_link_hash_undefweak) - && (h->root.u.undef.abfd == NULL - || (h->root.u.undef.abfd->flags & DYNAMIC) == 0)) - h->root.u.undef.abfd = abfd; + h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); - if (h->root.type == bfd_link_hash_new) + /* We are only interested in symbols that are currently + undefined. At this point we know that we are using an XCOFF + hash table. */ + if (h != NULL + && h->type == bfd_link_hash_undefined + && (((struct xcoff_link_hash_entry *) h)->flags + & XCOFF_DEF_DYNAMIC) == 0) { - h->root.type = bfd_link_hash_undefined; - h->root.u.undef.abfd = abfd; - /* We do not want to add this to the undefined symbol list. */ + if (! (*info->callbacks->add_archive_element) (info, abfd, name)) + return FALSE; + *pneeded = TRUE; + return TRUE; } + } - if (h->smclas == XMC_UA - || h->root.type == bfd_link_hash_undefined - || h->root.type == bfd_link_hash_undefweak) - h->smclas = ldsym.l_smclas; + /* We do not need this shared object. */ + if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents) + { + free (coff_section_data (abfd, lsec)->contents); + coff_section_data (abfd, lsec)->contents = NULL; + } - /* Unless this is an XMC_XO symbol, we don't bother to actually - define it, since we don't have a section to put it in anyhow. - Instead, the relocation routines handle the DEF_DYNAMIC flag - correctly. */ + return TRUE; +} - if (h->smclas == XMC_XO - && (h->root.type == bfd_link_hash_undefined - || h->root.type == bfd_link_hash_undefweak)) - { - /* This symbol has an absolute value. */ - h->root.type = bfd_link_hash_defined; - h->root.u.def.section = bfd_abs_section_ptr; - h->root.u.def.value = ldsym.l_value; - } +/* Look through the symbols to see if this object file should be + included in the link. */ - /* If this symbol defines a function descriptor, then it - implicitly defines the function code as well. */ - if (h->smclas == XMC_DS - || (h->smclas == XMC_XO && name[0] != '.')) - h->flags |= XCOFF_DESCRIPTOR; - if ((h->flags & XCOFF_DESCRIPTOR) != 0) - { - struct xcoff_link_hash_entry *hds; +static bfd_boolean +xcoff_link_check_ar_symbols (bfd *abfd, + struct bfd_link_info *info, + bfd_boolean *pneeded) +{ + bfd_size_type symesz; + bfd_byte *esym; + bfd_byte *esym_end; - hds = h->descriptor; - if (hds == NULL) - { - char *dsnm; + *pneeded = FALSE; - dsnm = bfd_malloc ((bfd_size_type) strlen (name) + 2); - if (dsnm == NULL) - return FALSE; - dsnm[0] = '.'; - strcpy (dsnm + 1, name); - hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm, - TRUE, TRUE, TRUE); - free (dsnm); - if (hds == NULL) - return FALSE; + if ((abfd->flags & DYNAMIC) != 0 + && ! info->static_link + && info->hash->creator == abfd->xvec) + return xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded); - if (hds->root.type == bfd_link_hash_new) - { - hds->root.type = bfd_link_hash_undefined; - hds->root.u.undef.abfd = abfd; - /* We do not want to add this to the undefined - symbol list. */ - } + symesz = bfd_coff_symesz (abfd); + esym = (bfd_byte *) obj_coff_external_syms (abfd); + esym_end = esym + obj_raw_syment_count (abfd) * symesz; + while (esym < esym_end) + { + struct internal_syment sym; - hds->descriptor = h; - h->descriptor = hds; - } + bfd_coff_swap_sym_in (abfd, (void *) esym, (void *) &sym); - hds->flags |= XCOFF_DEF_DYNAMIC; - if (hds->smclas == XMC_UA) - hds->smclas = XMC_PR; + if (sym.n_sclass == C_EXT && sym.n_scnum != N_UNDEF) + { + const char *name; + char buf[SYMNMLEN + 1]; + struct bfd_link_hash_entry *h; - /* An absolute symbol appears to actually define code, not a - function descriptor. This is how some math functions are - implemented on AIX 4.1. */ - if (h->smclas == XMC_XO - && (hds->root.type == bfd_link_hash_undefined - || hds->root.type == bfd_link_hash_undefweak)) + /* This symbol is externally visible, and is defined by this + object file. */ + name = _bfd_coff_internal_syment_name (abfd, &sym, buf); + + if (name == NULL) + return FALSE; + h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE); + + /* We are only interested in symbols that are currently + undefined. If a symbol is currently known to be common, + XCOFF linkers do not bring in an object file which + defines it. We also don't bring in symbols to satisfy + undefined references in shared objects. */ + if (h != NULL + && h->type == bfd_link_hash_undefined + && (info->hash->creator != abfd->xvec + || (((struct xcoff_link_hash_entry *) h)->flags + & XCOFF_DEF_DYNAMIC) == 0)) { - hds->smclas = XMC_XO; - hds->root.type = bfd_link_hash_defined; - hds->root.u.def.section = bfd_abs_section_ptr; - hds->root.u.def.value = ldsym.l_value; + if (! (*info->callbacks->add_archive_element) (info, abfd, name)) + return FALSE; + *pneeded = TRUE; + return TRUE; } } - } - if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents) - { - free (coff_section_data (abfd, lsec)->contents); - coff_section_data (abfd, lsec)->contents = NULL; + esym += (sym.n_numaux + 1) * symesz; } - /* Record this file in the import files. */ + /* We do not need this object file. */ + return TRUE; +} - n = ((struct xcoff_import_file *) - bfd_alloc (abfd, (bfd_size_type) sizeof (struct xcoff_import_file))); - if (n == NULL) +/* Check a single archive element to see if we need to include it in + the link. *PNEEDED is set according to whether this element is + needed in the link or not. This is called via + _bfd_generic_link_add_archive_symbols. */ + +static bfd_boolean +xcoff_link_check_archive_element (bfd *abfd, + struct bfd_link_info *info, + bfd_boolean *pneeded) +{ + if (! _bfd_coff_get_external_symbols (abfd)) return FALSE; - n->next = NULL; - /* For some reason, the path entry in the import file list for a - shared object appears to always be empty. The file name is the - base name. */ - n->path = ""; - if (abfd->my_archive == NULL) + if (! xcoff_link_check_ar_symbols (abfd, info, pneeded)) + return FALSE; + + if (*pneeded) { - bname = bfd_get_filename (abfd); - mname = ""; + if (! xcoff_link_add_symbols (abfd, info)) + return FALSE; } - else + + if (! info->keep_memory || ! *pneeded) { - bname = bfd_get_filename (abfd->my_archive); - mname = bfd_get_filename (abfd); + if (! _bfd_coff_free_symbols (abfd)) + return FALSE; } - s = strrchr (bname, '/'); - if (s != NULL) - bname = s + 1; - n->file = bname; - n->member = mname; - /* We start c at 1 because the first import file number is reserved - for LIBPATH. */ - for (pp = &xcoff_hash_table (info)->imports, c = 1; - *pp != NULL; - pp = &(*pp)->next, ++c) - ; - *pp = n; + return TRUE; +} - xcoff_data (abfd)->import_file_id = c; +/* Given an XCOFF BFD, add symbols to the global hash table as + appropriate. */ - return TRUE; +bfd_boolean +_bfd_xcoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info) +{ + switch (bfd_get_format (abfd)) + { + case bfd_object: + return xcoff_link_add_object_symbols (abfd, info); + + case bfd_archive: + /* If the archive has a map, do the usual search. We then need + to check the archive for dynamic objects, because they may not + appear in the archive map even though they should, perhaps, be + included. If the archive has no map, we just consider each object + file in turn, since that apparently is what the AIX native linker + does. */ + if (bfd_has_map (abfd)) + { + if (! (_bfd_generic_link_add_archive_symbols + (abfd, info, xcoff_link_check_archive_element))) + return FALSE; + } + + { + bfd *member; + + member = bfd_openr_next_archived_file (abfd, NULL); + while (member != NULL) + { + if (bfd_check_format (member, bfd_object) + && (info->hash->creator == member->xvec) + && (! bfd_has_map (abfd) || (member->flags & DYNAMIC) != 0)) + { + bfd_boolean needed; + + if (! xcoff_link_check_archive_element (member, info, + &needed)) + return FALSE; + if (needed) + member->archive_pass = -1; + } + member = bfd_openr_next_archived_file (abfd, member); + } + } + + return TRUE; + + default: + bfd_set_error (bfd_error_wrong_format); + return FALSE; + } } -/* Routines that are called after all the input files have been - handled, but before the sections are laid out in memory. */ - /* Mark a symbol as not being garbage, including the section in which it is defined. */ -static INLINE bfd_boolean -xcoff_mark_symbol (info, h) - struct bfd_link_info *info; - struct xcoff_link_hash_entry *h; +static inline bfd_boolean +xcoff_mark_symbol (struct bfd_link_info *info, struct xcoff_link_hash_entry *h) { - if ((h->flags & XCOFF_MARK) != 0) return TRUE; @@ -2354,9 +2241,7 @@ xcoff_mark_symbol (info, h) section. */ static bfd_boolean -xcoff_mark (info, sec) - struct bfd_link_info *info; - asection *sec; +xcoff_mark (struct bfd_link_info *info, asection *sec) { if (bfd_is_abs_section (sec) || (sec->flags & SEC_MARK) != 0) @@ -2368,18 +2253,17 @@ xcoff_mark (info, sec) && coff_section_data (sec->owner, sec) != NULL && xcoff_section_data (sec->owner, sec) != NULL) { - register struct xcoff_link_hash_entry **hp, **hpend; + struct xcoff_link_hash_entry **hp, **hpend; struct internal_reloc *rel, *relend; /* Mark all the symbols in this section. */ - hp = (obj_xcoff_sym_hashes (sec->owner) + xcoff_section_data (sec->owner, sec)->first_symndx); hpend = (obj_xcoff_sym_hashes (sec->owner) + xcoff_section_data (sec->owner, sec)->last_symndx); for (; hp < hpend; hp++) { - register struct xcoff_link_hash_entry *h; + struct xcoff_link_hash_entry *h; h = *hp; if (h != NULL @@ -2391,13 +2275,11 @@ xcoff_mark (info, sec) } /* Look through the section relocs. */ - if ((sec->flags & SEC_RELOC) != 0 && sec->reloc_count > 0) { rel = xcoff_read_internal_relocs (sec->owner, sec, TRUE, - (bfd_byte *) NULL, FALSE, - (struct internal_reloc *) NULL); + NULL, FALSE, NULL); if (rel == NULL) return FALSE; relend = rel + sec->reloc_count; @@ -2479,12 +2361,14 @@ xcoff_mark (info, sec) return TRUE; } +/* Routines that are called after all the input files have been + handled, but before the sections are laid out in memory. */ + /* The sweep phase of garbage collection. Remove all garbage sections. */ static void -xcoff_sweep (info) - struct bfd_link_info *info; +xcoff_sweep (struct bfd_link_info *info) { bfd *sub; @@ -2522,11 +2406,10 @@ xcoff_sweep (info) correct csect length. */ bfd_boolean -bfd_xcoff_link_record_set (output_bfd, info, harg, size) - bfd *output_bfd; - struct bfd_link_info *info; - struct bfd_link_hash_entry *harg; - bfd_size_type size; +bfd_xcoff_link_record_set (bfd *output_bfd, + struct bfd_link_info *info, + struct bfd_link_hash_entry *harg, + bfd_size_type size) { struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg; struct xcoff_link_size_list *n; @@ -2538,9 +2421,8 @@ bfd_xcoff_link_record_set (output_bfd, info, harg, size) /* This will hardly ever be called. I don't want to burn four bytes per global symbol, so instead the size is kept on a linked list attached to the hash table. */ - - amt = sizeof (struct xcoff_link_size_list); - n = (struct xcoff_link_size_list *) bfd_alloc (output_bfd, amt); + amt = sizeof (* n); + n = bfd_alloc (output_bfd, amt); if (n == NULL) return FALSE; n->next = xcoff_hash_table (info)->size_list; @@ -2556,16 +2438,14 @@ bfd_xcoff_link_record_set (output_bfd, info, harg, size) /* Import a symbol. */ bfd_boolean -bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile, - impmember, syscall_flag) - bfd *output_bfd; - struct bfd_link_info *info; - struct bfd_link_hash_entry *harg; - bfd_vma val; - const char *imppath; - const char *impfile; - const char *impmember; - unsigned int syscall_flag; +bfd_xcoff_import_symbol (bfd *output_bfd, + struct bfd_link_info *info, + struct bfd_link_hash_entry *harg, + bfd_vma val, + const char *imppath, + const char *impfile, + const char *impmember, + unsigned int syscall_flag) { struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg; @@ -2654,9 +2534,9 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile, if (*pp == NULL) { struct xcoff_import_file *n; - bfd_size_type amt = sizeof (struct xcoff_import_file); + bfd_size_type amt = sizeof (* n); - n = (struct xcoff_import_file *) bfd_alloc (output_bfd, amt); + n = bfd_alloc (output_bfd, amt); if (n == NULL) return FALSE; n->next = NULL; @@ -2675,10 +2555,9 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile, /* Export a symbol. */ bfd_boolean -bfd_xcoff_export_symbol (output_bfd, info, harg) - bfd *output_bfd; - struct bfd_link_info *info; - struct bfd_link_hash_entry *harg; +bfd_xcoff_export_symbol (bfd *output_bfd, + struct bfd_link_info *info, + struct bfd_link_hash_entry *harg) { struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg; @@ -2699,7 +2578,7 @@ bfd_xcoff_export_symbol (output_bfd, info, harg) struct xcoff_link_hash_entry *hfn; bfd_size_type amt = strlen (h->root.root.string) + 2; - fnname = (char *) bfd_malloc (amt); + fnname = bfd_malloc (amt); if (fnname == NULL) return FALSE; fnname[0] = '.'; @@ -2741,10 +2620,9 @@ bfd_xcoff_export_symbol (output_bfd, info, harg) and destructors. */ bfd_boolean -bfd_xcoff_link_count_reloc (output_bfd, info, name) - bfd *output_bfd; - struct bfd_link_info *info; - const char *name; +bfd_xcoff_link_count_reloc (bfd *output_bfd, + struct bfd_link_info *info, + const char *name) { struct xcoff_link_hash_entry *h; @@ -2775,10 +2653,9 @@ bfd_xcoff_link_count_reloc (output_bfd, info, name) assigns a value. */ bfd_boolean -bfd_xcoff_record_link_assignment (output_bfd, info, name) - bfd *output_bfd; - struct bfd_link_info *info; - const char *name; +bfd_xcoff_record_link_assignment (bfd *output_bfd, + struct bfd_link_info *info, + const char *name) { struct xcoff_link_hash_entry *h; @@ -2795,6 +2672,274 @@ bfd_xcoff_record_link_assignment (output_bfd, info, name) return TRUE; } +/* Add a symbol to the .loader symbols, if necessary. */ + +static bfd_boolean +xcoff_build_ldsyms (struct xcoff_link_hash_entry *h, void * p) +{ + struct xcoff_loader_info *ldinfo = (struct xcoff_loader_info *) p; + bfd_size_type amt; + + if (h->root.type == bfd_link_hash_warning) + h = (struct xcoff_link_hash_entry *) h->root.u.i.link; + + /* __rtinit, this symbol has special handling. */ + if (h->flags & XCOFF_RTINIT) + return TRUE; + + /* If this is a final link, and the symbol was defined as a common + symbol in a regular object file, and there was no definition in + any dynamic object, then the linker will have allocated space for + the symbol in a common section but the XCOFF_DEF_REGULAR flag + will not have been set. */ + if (h->root.type == bfd_link_hash_defined + && (h->flags & XCOFF_DEF_REGULAR) == 0 + && (h->flags & XCOFF_REF_REGULAR) != 0 + && (h->flags & XCOFF_DEF_DYNAMIC) == 0 + && (bfd_is_abs_section (h->root.u.def.section) + || (h->root.u.def.section->owner->flags & DYNAMIC) == 0)) + h->flags |= XCOFF_DEF_REGULAR; + + /* If all defined symbols should be exported, mark them now. We + don't want to export the actual functions, just the function + descriptors. */ + if (ldinfo->export_defineds + && (h->flags & XCOFF_DEF_REGULAR) != 0 + && h->root.root.string[0] != '.') + { + bfd_boolean export; + + /* We don't export a symbol which is being defined by an object + included from an archive which contains a shared object. The + rationale is that if an archive contains both an unshared and + a shared object, then there must be some reason that the + unshared object is unshared, and we don't want to start + providing a shared version of it. In particular, this solves + a bug involving the _savefNN set of functions. gcc will call + those functions without providing a slot to restore the TOC, + so it is essential that these functions be linked in directly + and not from a shared object, which means that a shared + object which also happens to link them in must not export + them. This is confusing, but I haven't been able to think of + a different approach. Note that the symbols can, of course, + be exported explicitly. */ + export = TRUE; + if ((h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + && h->root.u.def.section->owner != NULL + && h->root.u.def.section->owner->my_archive != NULL) + { + bfd *arbfd, *member; + + arbfd = h->root.u.def.section->owner->my_archive; + member = bfd_openr_next_archived_file (arbfd, NULL); + while (member != NULL) + { + if ((member->flags & DYNAMIC) != 0) + { + export = FALSE; + break; + } + member = bfd_openr_next_archived_file (arbfd, member); + } + } + + if (export) + h->flags |= XCOFF_EXPORT; + } + + /* We don't want to garbage collect symbols which are not defined in + XCOFF files. This is a convenient place to mark them. */ + if (xcoff_hash_table (ldinfo->info)->gc + && (h->flags & XCOFF_MARK) == 0 + && (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + && (h->root.u.def.section->owner == NULL + || (h->root.u.def.section->owner->xvec + != ldinfo->info->hash->creator))) + h->flags |= XCOFF_MARK; + + /* If this symbol is called and defined in a dynamic object, or it + is imported, then we need to set up global linkage code for it. + (Unless we did garbage collection and we didn't need this + symbol.) */ + if ((h->flags & XCOFF_CALLED) != 0 + && (h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak) + && h->root.root.string[0] == '.' + && h->descriptor != NULL + && ((h->descriptor->flags & XCOFF_DEF_DYNAMIC) != 0 + || ((h->descriptor->flags & XCOFF_IMPORT) != 0 + && (h->descriptor->flags & XCOFF_DEF_REGULAR) == 0)) + && (! xcoff_hash_table (ldinfo->info)->gc + || (h->flags & XCOFF_MARK) != 0)) + { + asection *sec; + struct xcoff_link_hash_entry *hds; + + sec = xcoff_hash_table (ldinfo->info)->linkage_section; + h->root.type = bfd_link_hash_defined; + h->root.u.def.section = sec; + h->root.u.def.value = sec->size; + h->smclas = XMC_GL; + h->flags |= XCOFF_DEF_REGULAR; + sec->size += bfd_xcoff_glink_code_size(ldinfo->output_bfd); + + /* The global linkage code requires a TOC entry for the + descriptor. */ + hds = h->descriptor; + BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined + || hds->root.type == bfd_link_hash_undefweak) + && (hds->flags & XCOFF_DEF_REGULAR) == 0); + hds->flags |= XCOFF_MARK; + if (hds->toc_section == NULL) + { + int byte_size; + + /* 32 vs 64 + xcoff32 uses 4 bytes in the toc. + xcoff64 uses 8 bytes in the toc. */ + if (bfd_xcoff_is_xcoff64 (ldinfo->output_bfd)) + byte_size = 8; + else if (bfd_xcoff_is_xcoff32 (ldinfo->output_bfd)) + byte_size = 4; + else + return FALSE; + + hds->toc_section = xcoff_hash_table (ldinfo->info)->toc_section; + hds->u.toc_offset = hds->toc_section->size; + hds->toc_section->size += byte_size; + ++xcoff_hash_table (ldinfo->info)->ldrel_count; + ++hds->toc_section->reloc_count; + hds->indx = -2; + hds->flags |= XCOFF_SET_TOC | XCOFF_LDREL; + + /* We need to call xcoff_build_ldsyms recursively here, + because we may already have passed hds on the traversal. */ + xcoff_build_ldsyms (hds, p); + } + } + + /* If this symbol is exported, but not defined, we need to try to + define it. */ + if ((h->flags & XCOFF_EXPORT) != 0 + && (h->flags & XCOFF_IMPORT) == 0 + && (h->flags & XCOFF_DEF_REGULAR) == 0 + && (h->flags & XCOFF_DEF_DYNAMIC) == 0 + && (h->root.type == bfd_link_hash_undefined + || h->root.type == bfd_link_hash_undefweak)) + { + if ((h->flags & XCOFF_DESCRIPTOR) != 0 + && (h->descriptor->root.type == bfd_link_hash_defined + || h->descriptor->root.type == bfd_link_hash_defweak)) + { + asection *sec; + + /* This is an undefined function descriptor associated with + a defined entry point. We can build up a function + descriptor ourselves. Believe it or not, the AIX linker + actually does this, and there are cases where we need to + do it as well. */ + sec = xcoff_hash_table (ldinfo->info)->descriptor_section; + h->root.type = bfd_link_hash_defined; + h->root.u.def.section = sec; + h->root.u.def.value = sec->size; + h->smclas = XMC_DS; + h->flags |= XCOFF_DEF_REGULAR; + + /* The size of the function descriptor depends if this is an + xcoff32 (12) or xcoff64 (24). */ + sec->size += + bfd_xcoff_function_descriptor_size(ldinfo->output_bfd); + + /* A function descriptor uses two relocs: one for the + associated code, and one for the TOC address. */ + xcoff_hash_table (ldinfo->info)->ldrel_count += 2; + sec->reloc_count += 2; + + /* We handle writing out the contents of the descriptor in + xcoff_write_global_symbol. */ + } + else + { + (*_bfd_error_handler) + (_("warning: attempt to export undefined symbol `%s'"), + h->root.root.string); + h->ldsym = NULL; + return TRUE; + } + } + + /* If this is still a common symbol, and it wasn't garbage + collected, we need to actually allocate space for it in the .bss + section. */ + if (h->root.type == bfd_link_hash_common + && (! xcoff_hash_table (ldinfo->info)->gc + || (h->flags & XCOFF_MARK) != 0) + && h->root.u.c.p->section->size == 0) + { + BFD_ASSERT (bfd_is_com_section (h->root.u.c.p->section)); + h->root.u.c.p->section->size = h->root.u.c.size; + } + + /* We need to add a symbol to the .loader section if it is mentioned + in a reloc which we are copying to the .loader section and it was + not defined or common, or if it is the entry point, or if it is + being exported. */ + + if (((h->flags & XCOFF_LDREL) == 0 + || h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak + || h->root.type == bfd_link_hash_common) + && (h->flags & XCOFF_ENTRY) == 0 + && (h->flags & XCOFF_EXPORT) == 0) + { + h->ldsym = NULL; + return TRUE; + } + + /* We don't need to add this symbol if we did garbage collection and + we did not mark this symbol. */ + if (xcoff_hash_table (ldinfo->info)->gc + && (h->flags & XCOFF_MARK) == 0) + { + h->ldsym = NULL; + return TRUE; + } + + /* We may have already processed this symbol due to the recursive + call above. */ + if ((h->flags & XCOFF_BUILT_LDSYM) != 0) + return TRUE; + + /* We need to add this symbol to the .loader symbols. */ + + BFD_ASSERT (h->ldsym == NULL); + amt = sizeof (struct internal_ldsym); + h->ldsym = bfd_zalloc (ldinfo->output_bfd, amt); + if (h->ldsym == NULL) + { + ldinfo->failed = TRUE; + return FALSE; + } + + if ((h->flags & XCOFF_IMPORT) != 0) + h->ldsym->l_ifile = h->ldindx; + + /* The first 3 symbol table indices are reserved to indicate the + data, text and bss sections. */ + h->ldindx = ldinfo->ldsym_count + 3; + + ++ldinfo->ldsym_count; + + if (! bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo, + h->ldsym, h->root.root.string)) + return FALSE; + + h->flags |= XCOFF_BUILT_LDSYM; + + return TRUE; +} /* Build the .loader section. This is called by the XCOFF linker emulation before_allocation routine. We must set the size of the .loader section before the linker lays out the output file. @@ -2813,23 +2958,19 @@ bfd_xcoff_record_link_assignment (output_bfd, info, name) magic names like _end. */ bfd_boolean -bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, - file_align, maxstack, maxdata, gc, - modtype, textro, export_defineds, - special_sections, rtld) - bfd *output_bfd; - struct bfd_link_info *info; - const char *libpath; - const char *entry; - unsigned long file_align; - unsigned long maxstack; - unsigned long maxdata; - bfd_boolean gc; - int modtype; - bfd_boolean textro; - bfd_boolean export_defineds; - asection **special_sections; - bfd_boolean rtld; +bfd_xcoff_size_dynamic_sections (bfd *output_bfd, + struct bfd_link_info *info, + const char *libpath, + const char *entry, + unsigned long file_align, + unsigned long maxstack, + unsigned long maxdata, + bfd_boolean gc, + int modtype, + bfd_boolean textro, + bfd_boolean export_defineds, + asection **special_sections, + bfd_boolean rtld) { struct xcoff_link_hash_entry *hentry; asection *lsec; @@ -2839,7 +2980,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, struct xcoff_import_file *fl; struct internal_ldhdr *ldhdr; bfd_size_type stoff; - register char *out; + char *out; asection *sec; bfd *sub; struct bfd_strtab_hash *debug_strtab; @@ -2896,16 +3037,16 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, xcoff_mark_symbol (info, hsym); hsym->flags |= (XCOFF_DEF_REGULAR | XCOFF_RTINIT); - /* __rtinit initialized */ - amt = sizeof (struct internal_ldsym); - ldsym = (struct internal_ldsym *) bfd_malloc (amt); + /* __rtinit initialized. */ + amt = sizeof (* ldsym); + ldsym = bfd_malloc (amt); - ldsym->l_value = 0; /* will be filled in later */ - ldsym->l_scnum = 2; /* data section */ - ldsym->l_smtype = XTY_SD; /* csect section definition */ - ldsym->l_smclas = 5; /* .rw */ - ldsym->l_ifile = 0; /* special system loader symbol */ - ldsym->l_parm = 0; /* NA */ + ldsym->l_value = 0; /* Will be filled in later. */ + ldsym->l_scnum = 2; /* Data section. */ + ldsym->l_smtype = XTY_SD; /* Csect section definition. */ + ldsym->l_smclas = 5; /* .rw. */ + ldsym->l_ifile = 0; /* Special system loader symbol. */ + ldsym->l_parm = 0; /* NA. */ /* Force __rtinit to be the first symbol in the loader symbol table See xcoff_build_ldsyms @@ -2971,20 +3112,17 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, if (sec != NULL && gc && (sec->flags & SEC_MARK) == 0) - { - sec = NULL; - } + sec = NULL; + special_sections[i] = sec; } if (info->input_bfds == NULL) - { - /* I'm not sure what to do in this bizarre case. */ - return TRUE; - } + /* I'm not sure what to do in this bizarre case. */ + return TRUE; xcoff_link_hash_traverse (xcoff_hash_table (info), xcoff_build_ldsyms, - (PTR) &ldinfo); + (void *) &ldinfo); if (ldinfo.failed) goto error_return; @@ -3034,7 +3172,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, space for it. */ lsec = xcoff_hash_table (info)->loader_section; lsec->size = stoff + ldhdr->l_stlen; - lsec->contents = (bfd_byte *) bfd_zalloc (output_bfd, lsec->size); + lsec->contents = bfd_zalloc (output_bfd, lsec->size); if (lsec->contents == NULL) goto error_return; @@ -3049,7 +3187,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, *out++ = '\0'; for (fl = xcoff_hash_table (info)->imports; fl != NULL; fl = fl->next) { - register const char *s; + const char *s; s = fl->path; while ((*out++ = *s++) != '\0') @@ -3078,28 +3216,27 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, symbols are written out in xcoff_link_input_bfd or xcoff_write_global_symbol. The .loader relocs are written out when the corresponding normal relocs are handled in - xcoff_link_input_bfd. - */ + xcoff_link_input_bfd. */ /* Allocate space for the magic sections. */ sec = xcoff_hash_table (info)->linkage_section; if (sec->size > 0) { - sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->size); + sec->contents = bfd_zalloc (output_bfd, sec->size); if (sec->contents == NULL) goto error_return; } sec = xcoff_hash_table (info)->toc_section; if (sec->size > 0) { - sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->size); + sec->contents = bfd_zalloc (output_bfd, sec->size); if (sec->contents == NULL) goto error_return; } sec = xcoff_hash_table (info)->descriptor_section; if (sec->size > 0) { - sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->size); + sec->contents = bfd_zalloc (output_bfd, sec->size); if (sec->contents == NULL) goto error_return; } @@ -3135,8 +3272,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, goto error_return; symcount = obj_raw_syment_count (sub); - debug_index = ((unsigned long *) - bfd_zalloc (sub, symcount * sizeof (unsigned long))); + debug_index = bfd_zalloc (sub, symcount * sizeof (unsigned long)); if (debug_index == NULL) goto error_return; xcoff_data (sub)->debug_indices = debug_index; @@ -3146,7 +3282,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, bfd_alloc, because I expect that, when linking many files together, many of the strings will be the same. Storing the strings in the hash table should save space in this case. */ - if (!bfd_malloc_and_get_section (sub, subdeb, &debug_contents)) + if (! bfd_malloc_and_get_section (sub, subdeb, &debug_contents)) goto error_return; csectpp = xcoff_data (sub)->csects; @@ -3162,7 +3298,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, { struct internal_syment sym; - bfd_coff_swap_sym_in (sub, (PTR) esym, (PTR) &sym); + bfd_coff_swap_sym_in (sub, (void *) esym, (void *) &sym); *debug_index = (unsigned long) -1; @@ -3218,16 +3354,14 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry, } bfd_boolean -bfd_xcoff_link_generate_rtinit (abfd, init, fini, rtld) - bfd *abfd; - const char *init; - const char *fini; - bfd_boolean rtld; +bfd_xcoff_link_generate_rtinit (bfd *abfd, + const char *init, + const char *fini, + bfd_boolean rtld) { struct bfd_in_memory *bim; - bim = ((struct bfd_in_memory *) - bfd_malloc ((bfd_size_type) sizeof (struct bfd_in_memory))); + bim = bfd_malloc ((bfd_size_type) sizeof (* bim)); if (bim == NULL) return FALSE; @@ -3236,7 +3370,7 @@ bfd_xcoff_link_generate_rtinit (abfd, init, fini, rtld) abfd->link_next = 0; abfd->format = bfd_object; - abfd->iostream = (PTR) bim; + abfd->iostream = (void *) bim; abfd->flags = BFD_IN_MEMORY; abfd->direction = write_direction; abfd->where = 0; @@ -3251,936 +3385,13 @@ bfd_xcoff_link_generate_rtinit (abfd, init, fini, rtld) return TRUE; } - - -/* Add a symbol to the .loader symbols, if necessary. */ - -static bfd_boolean -xcoff_build_ldsyms (h, p) - struct xcoff_link_hash_entry *h; - PTR p; -{ - struct xcoff_loader_info *ldinfo = (struct xcoff_loader_info *) p; - bfd_size_type amt; - - if (h->root.type == bfd_link_hash_warning) - h = (struct xcoff_link_hash_entry *) h->root.u.i.link; - - /* __rtinit, this symbol has special handling. */ - if (h->flags & XCOFF_RTINIT) - return TRUE; - - /* If this is a final link, and the symbol was defined as a common - symbol in a regular object file, and there was no definition in - any dynamic object, then the linker will have allocated space for - the symbol in a common section but the XCOFF_DEF_REGULAR flag - will not have been set. */ - if (h->root.type == bfd_link_hash_defined - && (h->flags & XCOFF_DEF_REGULAR) == 0 - && (h->flags & XCOFF_REF_REGULAR) != 0 - && (h->flags & XCOFF_DEF_DYNAMIC) == 0 - && (bfd_is_abs_section (h->root.u.def.section) - || (h->root.u.def.section->owner->flags & DYNAMIC) == 0)) - h->flags |= XCOFF_DEF_REGULAR; - - /* If all defined symbols should be exported, mark them now. We - don't want to export the actual functions, just the function - descriptors. */ - if (ldinfo->export_defineds - && (h->flags & XCOFF_DEF_REGULAR) != 0 - && h->root.root.string[0] != '.') - { - bfd_boolean export; - - /* We don't export a symbol which is being defined by an object - included from an archive which contains a shared object. The - rationale is that if an archive contains both an unshared and - a shared object, then there must be some reason that the - unshared object is unshared, and we don't want to start - providing a shared version of it. In particular, this solves - a bug involving the _savefNN set of functions. gcc will call - those functions without providing a slot to restore the TOC, - so it is essential that these functions be linked in directly - and not from a shared object, which means that a shared - object which also happens to link them in must not export - them. This is confusing, but I haven't been able to think of - a different approach. Note that the symbols can, of course, - be exported explicitly. */ - export = TRUE; - if ((h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - && h->root.u.def.section->owner != NULL - && h->root.u.def.section->owner->my_archive != NULL) - { - bfd *arbfd, *member; - - arbfd = h->root.u.def.section->owner->my_archive; - member = bfd_openr_next_archived_file (arbfd, (bfd *) NULL); - while (member != NULL) - { - if ((member->flags & DYNAMIC) != 0) - { - export = FALSE; - break; - } - member = bfd_openr_next_archived_file (arbfd, member); - } - } - - if (export) - h->flags |= XCOFF_EXPORT; - } - - /* We don't want to garbage collect symbols which are not defined in - XCOFF files. This is a convenient place to mark them. */ - if (xcoff_hash_table (ldinfo->info)->gc - && (h->flags & XCOFF_MARK) == 0 - && (h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak) - && (h->root.u.def.section->owner == NULL - || (h->root.u.def.section->owner->xvec - != ldinfo->info->hash->creator))) - h->flags |= XCOFF_MARK; - - /* If this symbol is called and defined in a dynamic object, or it - is imported, then we need to set up global linkage code for it. - (Unless we did garbage collection and we didn't need this - symbol.) */ - if ((h->flags & XCOFF_CALLED) != 0 - && (h->root.type == bfd_link_hash_undefined - || h->root.type == bfd_link_hash_undefweak) - && h->root.root.string[0] == '.' - && h->descriptor != NULL - && ((h->descriptor->flags & XCOFF_DEF_DYNAMIC) != 0 - || ((h->descriptor->flags & XCOFF_IMPORT) != 0 - && (h->descriptor->flags & XCOFF_DEF_REGULAR) == 0)) - && (! xcoff_hash_table (ldinfo->info)->gc - || (h->flags & XCOFF_MARK) != 0)) - { - asection *sec; - struct xcoff_link_hash_entry *hds; - - sec = xcoff_hash_table (ldinfo->info)->linkage_section; - h->root.type = bfd_link_hash_defined; - h->root.u.def.section = sec; - h->root.u.def.value = sec->size; - h->smclas = XMC_GL; - h->flags |= XCOFF_DEF_REGULAR; - sec->size += bfd_xcoff_glink_code_size(ldinfo->output_bfd); - - /* The global linkage code requires a TOC entry for the - descriptor. */ - hds = h->descriptor; - BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined - || hds->root.type == bfd_link_hash_undefweak) - && (hds->flags & XCOFF_DEF_REGULAR) == 0); - hds->flags |= XCOFF_MARK; - if (hds->toc_section == NULL) - { - int byte_size; - - /* 32 vs 64 - xcoff32 uses 4 bytes in the toc. - xcoff64 uses 8 bytes in the toc. */ - if (bfd_xcoff_is_xcoff64 (ldinfo->output_bfd)) - byte_size = 8; - else if (bfd_xcoff_is_xcoff32 (ldinfo->output_bfd)) - byte_size = 4; - else - return FALSE; - - hds->toc_section = xcoff_hash_table (ldinfo->info)->toc_section; - hds->u.toc_offset = hds->toc_section->size; - hds->toc_section->size += byte_size; - ++xcoff_hash_table (ldinfo->info)->ldrel_count; - ++hds->toc_section->reloc_count; - hds->indx = -2; - hds->flags |= XCOFF_SET_TOC | XCOFF_LDREL; - - /* We need to call xcoff_build_ldsyms recursively here, - because we may already have passed hds on the traversal. */ - xcoff_build_ldsyms (hds, p); - } - } - - /* If this symbol is exported, but not defined, we need to try to - define it. */ - if ((h->flags & XCOFF_EXPORT) != 0 - && (h->flags & XCOFF_IMPORT) == 0 - && (h->flags & XCOFF_DEF_REGULAR) == 0 - && (h->flags & XCOFF_DEF_DYNAMIC) == 0 - && (h->root.type == bfd_link_hash_undefined - || h->root.type == bfd_link_hash_undefweak)) - { - if ((h->flags & XCOFF_DESCRIPTOR) != 0 - && (h->descriptor->root.type == bfd_link_hash_defined - || h->descriptor->root.type == bfd_link_hash_defweak)) - { - asection *sec; - - /* This is an undefined function descriptor associated with - a defined entry point. We can build up a function - descriptor ourselves. Believe it or not, the AIX linker - actually does this, and there are cases where we need to - do it as well. */ - sec = xcoff_hash_table (ldinfo->info)->descriptor_section; - h->root.type = bfd_link_hash_defined; - h->root.u.def.section = sec; - h->root.u.def.value = sec->size; - h->smclas = XMC_DS; - h->flags |= XCOFF_DEF_REGULAR; - - /* The size of the function descriptor depends if this is an - xcoff32 (12) or xcoff64 (24). */ - sec->size += - bfd_xcoff_function_descriptor_size(ldinfo->output_bfd); - - /* A function descriptor uses two relocs: one for the - associated code, and one for the TOC address. */ - xcoff_hash_table (ldinfo->info)->ldrel_count += 2; - sec->reloc_count += 2; - - /* We handle writing out the contents of the descriptor in - xcoff_write_global_symbol. */ - } - else - { - (*_bfd_error_handler) - (_("warning: attempt to export undefined symbol `%s'"), - h->root.root.string); - h->ldsym = NULL; - return TRUE; - } - } - - /* If this is still a common symbol, and it wasn't garbage - collected, we need to actually allocate space for it in the .bss - section. */ - if (h->root.type == bfd_link_hash_common - && (! xcoff_hash_table (ldinfo->info)->gc - || (h->flags & XCOFF_MARK) != 0) - && h->root.u.c.p->section->size == 0) - { - BFD_ASSERT (bfd_is_com_section (h->root.u.c.p->section)); - h->root.u.c.p->section->size = h->root.u.c.size; - } - - /* We need to add a symbol to the .loader section if it is mentioned - in a reloc which we are copying to the .loader section and it was - not defined or common, or if it is the entry point, or if it is - being exported. */ - - if (((h->flags & XCOFF_LDREL) == 0 - || h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak - || h->root.type == bfd_link_hash_common) - && (h->flags & XCOFF_ENTRY) == 0 - && (h->flags & XCOFF_EXPORT) == 0) - { - h->ldsym = NULL; - return TRUE; - } - - /* We don't need to add this symbol if we did garbage collection and - we did not mark this symbol. */ - if (xcoff_hash_table (ldinfo->info)->gc - && (h->flags & XCOFF_MARK) == 0) - { - h->ldsym = NULL; - return TRUE; - } - - /* We may have already processed this symbol due to the recursive - call above. */ - if ((h->flags & XCOFF_BUILT_LDSYM) != 0) - return TRUE; - - /* We need to add this symbol to the .loader symbols. */ - - BFD_ASSERT (h->ldsym == NULL); - amt = sizeof (struct internal_ldsym); - h->ldsym = (struct internal_ldsym *) bfd_zalloc (ldinfo->output_bfd, amt); - if (h->ldsym == NULL) - { - ldinfo->failed = TRUE; - return FALSE; - } - - if ((h->flags & XCOFF_IMPORT) != 0) - h->ldsym->l_ifile = h->ldindx; - - /* The first 3 symbol table indices are reserved to indicate the - data, text and bss sections. */ - h->ldindx = ldinfo->ldsym_count + 3; - - ++ldinfo->ldsym_count; - - if (! bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo, - h->ldsym, h->root.root.string)) - { - return FALSE; - } - - h->flags |= XCOFF_BUILT_LDSYM; - - return TRUE; -} -/* Do the final link step. */ - -bfd_boolean -_bfd_xcoff_bfd_final_link (abfd, info) - bfd *abfd; - struct bfd_link_info *info; -{ - bfd_size_type symesz; - struct xcoff_final_link_info finfo; - asection *o; - struct bfd_link_order *p; - bfd_size_type max_contents_size; - bfd_size_type max_sym_count; - bfd_size_type max_lineno_count; - bfd_size_type max_reloc_count; - bfd_size_type max_output_reloc_count; - file_ptr rel_filepos; - unsigned int relsz; - file_ptr line_filepos; - unsigned int linesz; - bfd *sub; - bfd_byte *external_relocs = NULL; - char strbuf[STRING_SIZE_SIZE]; - file_ptr pos; - bfd_size_type amt; - - if (info->shared) - abfd->flags |= DYNAMIC; - - symesz = bfd_coff_symesz (abfd); - - finfo.info = info; - finfo.output_bfd = abfd; - finfo.strtab = NULL; - finfo.section_info = NULL; - finfo.last_file_index = -1; - finfo.toc_symindx = -1; - finfo.internal_syms = NULL; - finfo.sym_indices = NULL; - finfo.outsyms = NULL; - finfo.linenos = NULL; - finfo.contents = NULL; - finfo.external_relocs = NULL; - - finfo.ldsym = (xcoff_hash_table (info)->loader_section->contents - + bfd_xcoff_ldhdrsz (abfd)); - finfo.ldrel = (xcoff_hash_table (info)->loader_section->contents - + bfd_xcoff_ldhdrsz(abfd) - + (xcoff_hash_table (info)->ldhdr.l_nsyms - * bfd_xcoff_ldsymsz(abfd))); - - xcoff_data (abfd)->coff.link_info = info; - - finfo.strtab = _bfd_stringtab_init (); - if (finfo.strtab == NULL) - goto error_return; - - /* Count the line number and relocation entries required for the - output file. Determine a few maximum sizes. */ - max_contents_size = 0; - max_lineno_count = 0; - max_reloc_count = 0; - for (o = abfd->sections; o != NULL; o = o->next) - { - o->reloc_count = 0; - o->lineno_count = 0; - for (p = o->link_order_head; p != NULL; p = p->next) - { - if (p->type == bfd_indirect_link_order) - { - asection *sec; - - sec = p->u.indirect.section; - - /* Mark all sections which are to be included in the - link. This will normally be every section. We need - to do this so that we can identify any sections which - the linker has decided to not include. */ - sec->linker_mark = TRUE; - - if (info->strip == strip_none - || info->strip == strip_some) - o->lineno_count += sec->lineno_count; - - o->reloc_count += sec->reloc_count; - - if (sec->rawsize > max_contents_size) - max_contents_size = sec->rawsize; - if (sec->size > max_contents_size) - max_contents_size = sec->size; - if (sec->lineno_count > max_lineno_count) - max_lineno_count = sec->lineno_count; - if (coff_section_data (sec->owner, sec) != NULL - && xcoff_section_data (sec->owner, sec) != NULL - && (xcoff_section_data (sec->owner, sec)->lineno_count - > max_lineno_count)) - max_lineno_count = - xcoff_section_data (sec->owner, sec)->lineno_count; - if (sec->reloc_count > max_reloc_count) - max_reloc_count = sec->reloc_count; - } - else if (p->type == bfd_section_reloc_link_order - || p->type == bfd_symbol_reloc_link_order) - ++o->reloc_count; - } - } - - /* Compute the file positions for all the sections. */ - if (abfd->output_has_begun) - { - if (xcoff_hash_table (info)->file_align != 0) - abort (); - } - else - { - bfd_vma file_align; - - file_align = xcoff_hash_table (info)->file_align; - if (file_align != 0) - { - bfd_boolean saw_contents; - int indx; - asection **op; - file_ptr sofar; - - /* Insert .pad sections before every section which has - contents and is loaded, if it is preceded by some other - section which has contents and is loaded. */ - saw_contents = TRUE; - for (op = &abfd->sections; *op != NULL; op = &(*op)->next) - { - if (strcmp ((*op)->name, ".pad") == 0) - saw_contents = FALSE; - else if (((*op)->flags & SEC_HAS_CONTENTS) != 0 - && ((*op)->flags & SEC_LOAD) != 0) - { - if (! saw_contents) - saw_contents = TRUE; - else - { - asection *n, **st; - - /* Create a pad section and place it before the section - that needs padding. This requires unlinking and - relinking the bfd's section list. */ - - st = abfd->section_tail; - n = bfd_make_section_anyway (abfd, ".pad"); - n->flags = SEC_HAS_CONTENTS; - n->alignment_power = 0; - - BFD_ASSERT (*st == n); - bfd_section_list_remove (abfd, st); - bfd_section_list_insert (abfd, op, n); - - op = &n->next; - saw_contents = FALSE; - } - } - } - - /* Reset the section indices after inserting the new - sections. */ - indx = 0; - for (o = abfd->sections; o != NULL; o = o->next) - { - ++indx; - o->target_index = indx; - } - BFD_ASSERT ((unsigned int) indx == abfd->section_count); - - /* Work out appropriate sizes for the .pad sections to force - each section to land on a page boundary. This bit of - code knows what compute_section_file_positions is going - to do. */ - sofar = bfd_coff_filhsz (abfd); - sofar += bfd_coff_aoutsz (abfd); - sofar += abfd->section_count * bfd_coff_scnhsz (abfd); - for (o = abfd->sections; o != NULL; o = o->next) - if ((bfd_xcoff_is_reloc_count_overflow - (abfd, (bfd_vma) o->reloc_count)) - || (bfd_xcoff_is_lineno_count_overflow - (abfd, (bfd_vma) o->lineno_count))) - /* 64 does not overflow, need to check if 32 does */ - sofar += bfd_coff_scnhsz (abfd); - - for (o = abfd->sections; o != NULL; o = o->next) - { - if (strcmp (o->name, ".pad") == 0) - { - bfd_vma pageoff; - - BFD_ASSERT (o->size == 0); - pageoff = sofar & (file_align - 1); - if (pageoff != 0) - { - o->size = file_align - pageoff; - sofar += file_align - pageoff; - o->flags |= SEC_HAS_CONTENTS; - } - } - else - { - if ((o->flags & SEC_HAS_CONTENTS) != 0) - sofar += BFD_ALIGN (o->size, - 1 << o->alignment_power); - } - } - } - - if (! bfd_coff_compute_section_file_positions (abfd)) - goto error_return; - } - - /* Allocate space for the pointers we need to keep for the relocs. */ - { - unsigned int i; - - /* We use section_count + 1, rather than section_count, because - the target_index fields are 1 based. */ - amt = abfd->section_count + 1; - amt *= sizeof (struct xcoff_link_section_info); - finfo.section_info = (struct xcoff_link_section_info *) bfd_malloc (amt); - if (finfo.section_info == NULL) - goto error_return; - for (i = 0; i <= abfd->section_count; i++) - { - finfo.section_info[i].relocs = NULL; - finfo.section_info[i].rel_hashes = NULL; - finfo.section_info[i].toc_rel_hashes = NULL; - } - } - - /* Set the file positions for the relocs. */ - rel_filepos = obj_relocbase (abfd); - relsz = bfd_coff_relsz (abfd); - max_output_reloc_count = 0; - for (o = abfd->sections; o != NULL; o = o->next) - { - if (o->reloc_count == 0) - o->rel_filepos = 0; - else - { - /* A stripped file has no relocs. However, we still - allocate the buffers, so that later code doesn't have to - worry about whether we are stripping or not. */ - if (info->strip == strip_all) - o->rel_filepos = 0; - else - { - o->flags |= SEC_RELOC; - o->rel_filepos = rel_filepos; - rel_filepos += o->reloc_count * relsz; - } - - /* We don't know the indices of global symbols until we have - written out all the local symbols. For each section in - the output file, we keep an array of pointers to hash - table entries. Each entry in the array corresponds to a - reloc. When we find a reloc against a global symbol, we - set the corresponding entry in this array so that we can - fix up the symbol index after we have written out all the - local symbols. - - Because of this problem, we also keep the relocs in - memory until the end of the link. This wastes memory. - We could backpatch the file later, I suppose, although it - would be slow. */ - amt = o->reloc_count; - amt *= sizeof (struct internal_reloc); - finfo.section_info[o->target_index].relocs = - (struct internal_reloc *) bfd_malloc (amt); - - amt = o->reloc_count; - amt *= sizeof (struct xcoff_link_hash_entry *); - finfo.section_info[o->target_index].rel_hashes = - (struct xcoff_link_hash_entry **) bfd_malloc (amt); - - if (finfo.section_info[o->target_index].relocs == NULL - || finfo.section_info[o->target_index].rel_hashes == NULL) - goto error_return; - - if (o->reloc_count > max_output_reloc_count) - max_output_reloc_count = o->reloc_count; - } - } - - /* We now know the size of the relocs, so we can determine the file - positions of the line numbers. */ - line_filepos = rel_filepos; - finfo.line_filepos = line_filepos; - linesz = bfd_coff_linesz (abfd); - for (o = abfd->sections; o != NULL; o = o->next) - { - if (o->lineno_count == 0) - o->line_filepos = 0; - else - { - o->line_filepos = line_filepos; - line_filepos += o->lineno_count * linesz; - } - - /* Reset the reloc and lineno counts, so that we can use them to - count the number of entries we have output so far. */ - o->reloc_count = 0; - o->lineno_count = 0; - } - - obj_sym_filepos (abfd) = line_filepos; - - /* Figure out the largest number of symbols in an input BFD. Take - the opportunity to clear the output_has_begun fields of all the - input BFD's. We want at least 6 symbols, since that is the - number which xcoff_write_global_symbol may need. */ - max_sym_count = 6; - for (sub = info->input_bfds; sub != NULL; sub = sub->link_next) - { - bfd_size_type sz; - - sub->output_has_begun = FALSE; - sz = obj_raw_syment_count (sub); - if (sz > max_sym_count) - max_sym_count = sz; - } - - /* Allocate some buffers used while linking. */ - amt = max_sym_count * sizeof (struct internal_syment); - finfo.internal_syms = (struct internal_syment *) bfd_malloc (amt); - - amt = max_sym_count * sizeof (long); - finfo.sym_indices = (long *) bfd_malloc (amt); - - amt = (max_sym_count + 1) * symesz; - finfo.outsyms = (bfd_byte *) bfd_malloc (amt); - - amt = max_lineno_count * bfd_coff_linesz (abfd); - finfo.linenos = (bfd_byte *) bfd_malloc (amt); - - amt = max_contents_size; - finfo.contents = (bfd_byte *) bfd_malloc (amt); - - amt = max_reloc_count * relsz; - finfo.external_relocs = (bfd_byte *) bfd_malloc (amt); - - if ((finfo.internal_syms == NULL && max_sym_count > 0) - || (finfo.sym_indices == NULL && max_sym_count > 0) - || finfo.outsyms == NULL - || (finfo.linenos == NULL && max_lineno_count > 0) - || (finfo.contents == NULL && max_contents_size > 0) - || (finfo.external_relocs == NULL && max_reloc_count > 0)) - goto error_return; - - obj_raw_syment_count (abfd) = 0; - xcoff_data (abfd)->toc = (bfd_vma) -1; - - /* We now know the position of everything in the file, except that - we don't know the size of the symbol table and therefore we don't - know where the string table starts. We just build the string - table in memory as we go along. We process all the relocations - for a single input file at once. */ - for (o = abfd->sections; o != NULL; o = o->next) - { - for (p = o->link_order_head; p != NULL; p = p->next) - { - if (p->type == bfd_indirect_link_order - && p->u.indirect.section->owner->xvec == abfd->xvec) - { - sub = p->u.indirect.section->owner; - if (! sub->output_has_begun) - { - if (! xcoff_link_input_bfd (&finfo, sub)) - goto error_return; - sub->output_has_begun = TRUE; - } - } - else if (p->type == bfd_section_reloc_link_order - || p->type == bfd_symbol_reloc_link_order) - { - if (! xcoff_reloc_link_order (abfd, &finfo, o, p)) - goto error_return; - } - else - { - if (! _bfd_default_link_order (abfd, info, o, p)) - goto error_return; - } - } - } - - - /* Free up the buffers used by xcoff_link_input_bfd. */ - - if (finfo.internal_syms != NULL) - { - free (finfo.internal_syms); - finfo.internal_syms = NULL; - } - if (finfo.sym_indices != NULL) - { - free (finfo.sym_indices); - finfo.sym_indices = NULL; - } - if (finfo.linenos != NULL) - { - free (finfo.linenos); - finfo.linenos = NULL; - } - if (finfo.contents != NULL) - { - free (finfo.contents); - finfo.contents = NULL; - } - if (finfo.external_relocs != NULL) - { - free (finfo.external_relocs); - finfo.external_relocs = NULL; - } - - /* The value of the last C_FILE symbol is supposed to be -1. Write - it out again. */ - if (finfo.last_file_index != -1) - { - finfo.last_file.n_value = -(bfd_vma) 1; - bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file, - (PTR) finfo.outsyms); - pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz; - if (bfd_seek (abfd, pos, SEEK_SET) != 0 - || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz) - goto error_return; - } - - /* Write out all the global symbols which do not come from XCOFF - input files. */ - xcoff_link_hash_traverse (xcoff_hash_table (info), - xcoff_write_global_symbol, - (PTR) &finfo); - - if (finfo.outsyms != NULL) - { - free (finfo.outsyms); - finfo.outsyms = NULL; - } - - /* Now that we have written out all the global symbols, we know the - symbol indices to use for relocs against them, and we can finally - write out the relocs. */ - amt = max_output_reloc_count * relsz; - external_relocs = (bfd_byte *) bfd_malloc (amt); - if (external_relocs == NULL && max_output_reloc_count != 0) - goto error_return; - - for (o = abfd->sections; o != NULL; o = o->next) - { - struct internal_reloc *irel; - struct internal_reloc *irelend; - struct xcoff_link_hash_entry **rel_hash; - struct xcoff_toc_rel_hash *toc_rel_hash; - bfd_byte *erel; - bfd_size_type rel_size; - - /* A stripped file has no relocs. */ - if (info->strip == strip_all) - { - o->reloc_count = 0; - continue; - } - - if (o->reloc_count == 0) - continue; - - irel = finfo.section_info[o->target_index].relocs; - irelend = irel + o->reloc_count; - rel_hash = finfo.section_info[o->target_index].rel_hashes; - for (; irel < irelend; irel++, rel_hash++, erel += relsz) - { - if (*rel_hash != NULL) - { - if ((*rel_hash)->indx < 0) - { - if (! ((*info->callbacks->unattached_reloc) - (info, (*rel_hash)->root.root.string, - (bfd *) NULL, o, irel->r_vaddr))) - goto error_return; - (*rel_hash)->indx = 0; - } - irel->r_symndx = (*rel_hash)->indx; - } - } - - for (toc_rel_hash = finfo.section_info[o->target_index].toc_rel_hashes; - toc_rel_hash != NULL; - toc_rel_hash = toc_rel_hash->next) - { - if (toc_rel_hash->h->u.toc_indx < 0) - { - if (! ((*info->callbacks->unattached_reloc) - (info, toc_rel_hash->h->root.root.string, - (bfd *) NULL, o, toc_rel_hash->rel->r_vaddr))) - goto error_return; - toc_rel_hash->h->u.toc_indx = 0; - } - toc_rel_hash->rel->r_symndx = toc_rel_hash->h->u.toc_indx; - } - - /* XCOFF requires that the relocs be sorted by address. We tend - to produce them in the order in which their containing csects - appear in the symbol table, which is not necessarily by - address. So we sort them here. There may be a better way to - do this. */ - qsort ((PTR) finfo.section_info[o->target_index].relocs, - o->reloc_count, sizeof (struct internal_reloc), - xcoff_sort_relocs); - - irel = finfo.section_info[o->target_index].relocs; - irelend = irel + o->reloc_count; - erel = external_relocs; - for (; irel < irelend; irel++, rel_hash++, erel += relsz) - bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel); - - rel_size = relsz * o->reloc_count; - if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0 - || bfd_bwrite ((PTR) external_relocs, rel_size, abfd) != rel_size) - goto error_return; - } - - if (external_relocs != NULL) - { - free (external_relocs); - external_relocs = NULL; - } - - /* Free up the section information. */ - if (finfo.section_info != NULL) - { - unsigned int i; - - for (i = 0; i < abfd->section_count; i++) - { - if (finfo.section_info[i].relocs != NULL) - free (finfo.section_info[i].relocs); - if (finfo.section_info[i].rel_hashes != NULL) - free (finfo.section_info[i].rel_hashes); - } - free (finfo.section_info); - finfo.section_info = NULL; - } - - /* Write out the loader section contents. */ - BFD_ASSERT ((bfd_byte *) finfo.ldrel - == (xcoff_hash_table (info)->loader_section->contents - + xcoff_hash_table (info)->ldhdr.l_impoff)); - o = xcoff_hash_table (info)->loader_section; - if (! bfd_set_section_contents (abfd, o->output_section, o->contents, - (file_ptr) o->output_offset, o->size)) - goto error_return; - - /* Write out the magic sections. */ - o = xcoff_hash_table (info)->linkage_section; - if (o->size > 0 - && ! bfd_set_section_contents (abfd, o->output_section, o->contents, - (file_ptr) o->output_offset, - o->size)) - goto error_return; - o = xcoff_hash_table (info)->toc_section; - if (o->size > 0 - && ! bfd_set_section_contents (abfd, o->output_section, o->contents, - (file_ptr) o->output_offset, - o->size)) - goto error_return; - o = xcoff_hash_table (info)->descriptor_section; - if (o->size > 0 - && ! bfd_set_section_contents (abfd, o->output_section, o->contents, - (file_ptr) o->output_offset, - o->size)) - goto error_return; - - /* Write out the string table. */ - pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz; - if (bfd_seek (abfd, pos, SEEK_SET) != 0) - goto error_return; - H_PUT_32 (abfd, - _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE, - strbuf); - amt = STRING_SIZE_SIZE; - if (bfd_bwrite (strbuf, amt, abfd) != amt) - goto error_return; - if (! _bfd_stringtab_emit (abfd, finfo.strtab)) - goto error_return; - - _bfd_stringtab_free (finfo.strtab); - - /* Write out the debugging string table. */ - o = xcoff_hash_table (info)->debug_section; - if (o != NULL) - { - struct bfd_strtab_hash *debug_strtab; - - debug_strtab = xcoff_hash_table (info)->debug_strtab; - BFD_ASSERT (o->output_section->size - o->output_offset - >= _bfd_stringtab_size (debug_strtab)); - pos = o->output_section->filepos + o->output_offset; - if (bfd_seek (abfd, pos, SEEK_SET) != 0) - goto error_return; - if (! _bfd_stringtab_emit (abfd, debug_strtab)) - goto error_return; - } - - /* Setting bfd_get_symcount to 0 will cause write_object_contents to - not try to write out the symbols. */ - bfd_get_symcount (abfd) = 0; - - return TRUE; - - error_return: - if (finfo.strtab != NULL) - _bfd_stringtab_free (finfo.strtab); - - if (finfo.section_info != NULL) - { - unsigned int i; - - for (i = 0; i < abfd->section_count; i++) - { - if (finfo.section_info[i].relocs != NULL) - free (finfo.section_info[i].relocs); - if (finfo.section_info[i].rel_hashes != NULL) - free (finfo.section_info[i].rel_hashes); - } - free (finfo.section_info); - } - - if (finfo.internal_syms != NULL) - free (finfo.internal_syms); - if (finfo.sym_indices != NULL) - free (finfo.sym_indices); - if (finfo.outsyms != NULL) - free (finfo.outsyms); - if (finfo.linenos != NULL) - free (finfo.linenos); - if (finfo.contents != NULL) - free (finfo.contents); - if (finfo.external_relocs != NULL) - free (finfo.external_relocs); - if (external_relocs != NULL) - free (external_relocs); - return FALSE; -} - /* Link an input file into the linker output file. This function handles all the sections and relocations of the input file at once. */ static bfd_boolean -xcoff_link_input_bfd (finfo, input_bfd) - struct xcoff_final_link_info *finfo; - bfd *input_bfd; +xcoff_link_input_bfd (struct xcoff_final_link_info *finfo, + bfd *input_bfd) { bfd *output_bfd; const char *strings; @@ -4211,7 +3422,6 @@ xcoff_link_input_bfd (finfo, input_bfd) return TRUE; /* Move all the symbols to the output file. */ - output_bfd = finfo->output_bfd; strings = NULL; syment_base = obj_raw_syment_count (output_bfd); @@ -4251,7 +3461,6 @@ xcoff_link_input_bfd (finfo, input_bfd) while (esym < esym_end) { - struct internal_syment isym; union internal_auxent aux; int smtyp = 0; @@ -4259,7 +3468,7 @@ xcoff_link_input_bfd (finfo, input_bfd) bfd_boolean require; int add; - bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp); + bfd_coff_swap_sym_in (input_bfd, (void *) esym, (void *) isymp); /* If this is a C_EXT or C_HIDEXT symbol, we need the csect information. */ @@ -4267,10 +3476,10 @@ xcoff_link_input_bfd (finfo, input_bfd) { BFD_ASSERT (isymp->n_numaux > 0); bfd_coff_swap_aux_in (input_bfd, - (PTR) (esym + isymesz * isymp->n_numaux), + (void *) (esym + isymesz * isymp->n_numaux), isymp->n_type, isymp->n_sclass, isymp->n_numaux - 1, isymp->n_numaux, - (PTR) &aux); + (void *) &aux); smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp); } @@ -4556,8 +3765,7 @@ xcoff_link_input_bfd (finfo, input_bfd) const char *name; bfd_size_type indx; - name = _bfd_coff_internal_syment_name (input_bfd, &isym, - (char *) NULL); + name = _bfd_coff_internal_syment_name (input_bfd, &isym, NULL); if (name == NULL) return FALSE; @@ -4595,8 +3803,8 @@ xcoff_link_input_bfd (finfo, input_bfd) { /* The last C_FILE symbol is in this input file. */ bfd_coff_swap_sym_out (output_bfd, - (PTR) &finfo->last_file, - (PTR) (finfo->outsyms + (void *) &finfo->last_file, + (void *) (finfo->outsyms + ((finfo->last_file_index - syment_base) * osymesz))); @@ -4609,8 +3817,8 @@ xcoff_link_input_bfd (finfo, input_bfd) file_ptr pos; bfd_coff_swap_sym_out (output_bfd, - (PTR) &finfo->last_file, - (PTR) outsym); + (void *) &finfo->last_file, + (void *) outsym); pos = obj_sym_filepos (output_bfd); pos += finfo->last_file_index * osymesz; @@ -4637,7 +3845,7 @@ xcoff_link_input_bfd (finfo, input_bfd) /* Output the symbol. */ - bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym); + bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym); *indexp = output_index; @@ -4711,7 +3919,7 @@ xcoff_link_input_bfd (finfo, input_bfd) /* The value of a C_BSTAT symbol is the symbol table index of the containing csect. */ - bfd_coff_swap_sym_in (output_bfd, (PTR) outsym, (PTR) &isym); + bfd_coff_swap_sym_in (output_bfd, (void *) outsym, (void *) &isym); indx = isym.n_value; if (indx < obj_raw_syment_count (input_bfd)) { @@ -4722,8 +3930,8 @@ xcoff_link_input_bfd (finfo, input_bfd) isym.n_value = 0; else isym.n_value = symindx; - bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, - (PTR) outsym); + bfd_coff_swap_sym_out (output_bfd, (void *) &isym, + (void *) outsym); } } @@ -4734,9 +3942,9 @@ xcoff_link_input_bfd (finfo, input_bfd) { union internal_auxent aux; - bfd_coff_swap_aux_in (input_bfd, (PTR) esym, isymp->n_type, + bfd_coff_swap_aux_in (input_bfd, (void *) esym, isymp->n_type, isymp->n_sclass, i, isymp->n_numaux, - (PTR) &aux); + (void *) &aux); if (isymp->n_sclass == C_FILE) { @@ -4880,8 +4088,8 @@ xcoff_link_input_bfd (finfo, input_bfd) - enclosing->line_filepos); bfd_coff_swap_lineno_in (input_bfd, - (PTR) (finfo->linenos + linoff), - (PTR) &lin); + (void *) (finfo->linenos + linoff), + (void *) &lin); if (lin.l_lnno != 0 || ((bfd_size_type) lin.l_addr.l_symndx != ((esym @@ -4897,8 +4105,8 @@ xcoff_link_input_bfd (finfo, input_bfd) bfd_size_type count; lin.l_addr.l_symndx = *indexp; - bfd_coff_swap_lineno_out (output_bfd, (PTR) &lin, - (PTR) (finfo->linenos + bfd_coff_swap_lineno_out (output_bfd, (void *) &lin, + (void *) (finfo->linenos + linoff)); linpend = (finfo->linenos @@ -4910,14 +4118,14 @@ xcoff_link_input_bfd (finfo, input_bfd) linp < linpend; linp += linesz) { - bfd_coff_swap_lineno_in (input_bfd, (PTR) linp, - (PTR) &lin); + bfd_coff_swap_lineno_in (input_bfd, (void *) linp, + (void *) &lin); if (lin.l_lnno == 0) break; lin.l_addr.l_paddr += offset; bfd_coff_swap_lineno_out (output_bfd, - (PTR) &lin, - (PTR) linp); + (void *) &lin, + (void *) linp); } count = (linp - (finfo->linenos + linoff)) / linesz; @@ -4965,16 +4173,16 @@ xcoff_link_input_bfd (finfo, input_bfd) struct internal_syment iis; bfd_coff_swap_sym_in (output_bfd, - (PTR) oos, - (PTR) &iis); + (void *) oos, + (void *) &iis); iis.n_value = (iisp->n_value - enclosing->line_filepos - linoff + aux.x_sym.x_fcnary.x_fcn.x_lnnoptr); bfd_coff_swap_sym_out (output_bfd, - (PTR) &iis, - (PTR) oos); + (void *) &iis, + (void *) oos); --incls; } @@ -4989,9 +4197,9 @@ xcoff_link_input_bfd (finfo, input_bfd) } } - bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, isymp->n_type, + bfd_coff_swap_aux_out (output_bfd, (void *) &aux, isymp->n_type, isymp->n_sclass, i, isymp->n_numaux, - (PTR) outsym); + (void *) outsym); outsym += osymesz; esym += isymesz; } @@ -5010,8 +4218,8 @@ xcoff_link_input_bfd (finfo, input_bfd) && (bfd_size_type) finfo->last_file_index >= syment_base) { finfo->last_file.n_value = output_index; - bfd_coff_swap_sym_out (output_bfd, (PTR) &finfo->last_file, - (PTR) (finfo->outsyms + bfd_coff_swap_sym_out (output_bfd, (void *) &finfo->last_file, + (void *) (finfo->outsyms + ((finfo->last_file_index - syment_base) * osymesz))); } @@ -5039,14 +4247,11 @@ xcoff_link_input_bfd (finfo, input_bfd) /* Relocate the contents of each section. */ for (o = input_bfd->sections; o != NULL; o = o->next) { - bfd_byte *contents; if (! o->linker_mark) - { - /* This section was omitted from the link. */ - continue; - } + /* This section was omitted from the link. */ + continue; if ((o->flags & SEC_HAS_CONTENTS) == 0 || o->size == 0 @@ -5145,9 +4350,8 @@ xcoff_link_input_bfd (finfo, input_bfd) struct xcoff_link_section_info *si; bfd_size_type amt; - amt = sizeof (struct xcoff_toc_rel_hash); - n = ((struct xcoff_toc_rel_hash *) - bfd_alloc (finfo->output_bfd, amt)); + amt = sizeof (* n); + n = bfd_alloc (finfo->output_bfd, amt); if (n == NULL) return FALSE; si = finfo->section_info + target_index; @@ -5191,10 +4395,10 @@ xcoff_link_input_bfd (finfo, input_bfd) if (is->n_sclass == C_HIDEXT && is->n_numaux > 0) { - PTR auxptr; + void * auxptr; union internal_auxent aux; - auxptr = ((PTR) + auxptr = ((void *) (((bfd_byte *) obj_coff_external_syms (input_bfd)) + ((r_symndx + is->n_numaux) @@ -5203,7 +4407,7 @@ xcoff_link_input_bfd (finfo, input_bfd) is->n_type, is->n_sclass, is->n_numaux - 1, is->n_numaux, - (PTR) &aux); + (void *) &aux); if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_SD && aux.x_csect.x_smclas == XMC_TC0) indx = finfo->toc_symindx; @@ -5364,13 +4568,26 @@ xcoff_link_input_bfd (finfo, input_bfd) #undef N_TMASK #undef N_BTSHFT -/* Write out a non-XCOFF global symbol. */ +/* Sort relocs by VMA. This is called via qsort. */ +static int +xcoff_sort_relocs (const void * p1, const void * p2) +{ + const struct internal_reloc *r1 = (const struct internal_reloc *) p1; + const struct internal_reloc *r2 = (const struct internal_reloc *) p2; + + if (r1->r_vaddr > r2->r_vaddr) + return 1; + else if (r1->r_vaddr < r2->r_vaddr) + return -1; + else + return 0; +} + +/* Write out a non-XCOFF global symbol. */ static bfd_boolean -xcoff_write_global_symbol (h, inf) - struct xcoff_link_hash_entry *h; - PTR inf; +xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf) { struct xcoff_final_link_info *finfo = (struct xcoff_final_link_info *) inf; bfd *output_bfd; @@ -5417,7 +4634,6 @@ xcoff_write_global_symbol (h, inf) else if (h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) { - asection *sec; sec = h->root.u.def.section; @@ -5435,30 +4651,22 @@ xcoff_write_global_symbol (h, inf) if (((h->flags & XCOFF_DEF_REGULAR) == 0 && (h->flags & XCOFF_DEF_DYNAMIC) != 0) || (h->flags & XCOFF_IMPORT) != 0) - { - /* Clear l_smtype - Import symbols are defined so the check above will make - the l_smtype XTY_SD. But this is not correct, it should - be cleared. */ - ldsym->l_smtype |= L_IMPORT; - } + /* Clear l_smtype + Import symbols are defined so the check above will make + the l_smtype XTY_SD. But this is not correct, it should + be cleared. */ + ldsym->l_smtype |= L_IMPORT; if (((h->flags & XCOFF_DEF_REGULAR) != 0 && (h->flags & XCOFF_DEF_DYNAMIC) != 0) || (h->flags & XCOFF_EXPORT) != 0) - { - ldsym->l_smtype |= L_EXPORT; - } + ldsym->l_smtype |= L_EXPORT; if ((h->flags & XCOFF_ENTRY) != 0) - { - ldsym->l_smtype |= L_ENTRY; - } + ldsym->l_smtype |= L_ENTRY; if ((h->flags & XCOFF_RTINIT) != 0) - { - ldsym->l_smtype = XTY_SD; - } + ldsym->l_smtype = XTY_SD; ldsym->l_smclas = h->smclas; @@ -5467,22 +4675,17 @@ xcoff_write_global_symbol (h, inf) if ((h->root.type == bfd_link_hash_defined || h->root.type == bfd_link_hash_defweak) && (h->root.u.def.value != 0)) - { - ldsym->l_smclas = XMC_XO; - } + ldsym->l_smclas = XMC_XO; + else if ((h->flags & (XCOFF_SYSCALL32 | XCOFF_SYSCALL64)) == (XCOFF_SYSCALL32 | XCOFF_SYSCALL64)) - { - ldsym->l_smclas = XMC_SV3264; - } + ldsym->l_smclas = XMC_SV3264; + else if (h->flags & XCOFF_SYSCALL32) - { - ldsym->l_smclas = XMC_SV; - } + ldsym->l_smclas = XMC_SV; + else if (h->flags & XCOFF_SYSCALL64) - { - ldsym->l_smclas = XMC_SV64; - } + ldsym->l_smclas = XMC_SV64; } if (ldsym->l_ifile == -(bfd_size_type) 1) @@ -5492,13 +4695,9 @@ xcoff_write_global_symbol (h, inf) else if (ldsym->l_ifile == 0) { if ((ldsym->l_smtype & L_IMPORT) == 0) - { - ldsym->l_ifile = 0; - } + ldsym->l_ifile = 0; else if (impbfd == NULL) - { - ldsym->l_ifile = 0; - } + ldsym->l_ifile = 0; else { BFD_ASSERT (impbfd->xvec == output_bfd->xvec); @@ -5535,10 +4734,7 @@ xcoff_write_global_symbol (h, inf) - xcoff_data (output_bfd)->toc); if ((h->descriptor->flags & XCOFF_SET_TOC) != 0) - { - tocoff += h->descriptor->u.toc_offset; - } - + tocoff += h->descriptor->u.toc_offset; /* The first instruction in the glink code needs to be cooked to to hold the correct offset in the toc. The @@ -5550,11 +4746,9 @@ xcoff_write_global_symbol (h, inf) The /4 is because the glink code is in bytes and we are going 4 at a pop. */ for (i = 1; i < bfd_xcoff_glink_code_size(output_bfd) / 4; i++) - { - bfd_put_32 (output_bfd, - (bfd_vma) bfd_xcoff_glink_code(output_bfd, i), - &p[4 * i]); - } + bfd_put_32 (output_bfd, + (bfd_vma) bfd_xcoff_glink_code(output_bfd, i), + &p[4 * i]); } /* If we created a TOC entry for this symbol, write out the required @@ -5577,11 +4771,8 @@ xcoff_write_global_symbol (h, inf) + tocsec->output_offset + h->u.toc_offset); - if (h->indx >= 0) - { - irel->r_symndx = h->indx; - } + irel->r_symndx = h->indx; else { h->indx = -2; @@ -5595,7 +4786,7 @@ xcoff_write_global_symbol (h, inf) whether the output is 32 or 64 bit. */ memset (&iraux, 0, sizeof iraux); iraux.x_csect.x_smtyp = XTY_SD; - /* iraux.x_csect.x_scnlen.l = 4 or 8, see below */ + /* iraux.x_csect.x_scnlen.l = 4 or 8, see below. */ iraux.x_csect.x_smclas = XMC_TC; /* 32 bit uses a 32 bit R_POS to do the relocations @@ -5615,9 +4806,8 @@ xcoff_write_global_symbol (h, inf) iraux.x_csect.x_scnlen.l = 4; } else - { - return FALSE; - } + return FALSE; + irel->r_type = R_POS; finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL; ++osec->reloc_count; @@ -5633,7 +4823,6 @@ xcoff_write_global_symbol (h, inf) the reloc. */ if (finfo->info->strip != strip_all) { - result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &irsym, h->root.root.string); if (!result) @@ -5645,12 +4834,12 @@ xcoff_write_global_symbol (h, inf) irsym.n_type = T_NULL; irsym.n_numaux = 1; - bfd_coff_swap_sym_out (output_bfd, (PTR) &irsym, (PTR) outsym); + bfd_coff_swap_sym_out (output_bfd, (void *) &irsym, (void *) outsym); outsym += bfd_coff_symesz (output_bfd); - /* note : iraux is initialized above */ - bfd_coff_swap_aux_out (output_bfd, (PTR) &iraux, T_NULL, C_HIDEXT, - 0, 1, (PTR) outsym); + /* Note : iraux is initialized above. */ + bfd_coff_swap_aux_out (output_bfd, (void *) &iraux, T_NULL, C_HIDEXT, + 0, 1, (void *) outsym); outsym += bfd_coff_auxesz (output_bfd); if (h->indx >= 0) @@ -5709,9 +4898,7 @@ xcoff_write_global_symbol (h, inf) byte_size = 4; } else - { - return FALSE; - } + return FALSE; sec = h->root.u.def.section; osec = sec->output_section; @@ -5912,12 +5099,12 @@ xcoff_write_global_symbol (h, inf) isym.n_type = T_NULL; isym.n_numaux = 1; - bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym); + bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym); outsym += bfd_coff_symesz (output_bfd); aux.x_csect.x_smclas = h->smclas; - bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, T_NULL, isym.n_sclass, 0, 1, - (PTR) outsym); + bfd_coff_swap_aux_out (output_bfd, (void *) &aux, T_NULL, isym.n_sclass, 0, 1, + (void *) outsym); outsym += bfd_coff_auxesz (output_bfd); if ((h->root.type == bfd_link_hash_defined @@ -5925,17 +5112,16 @@ xcoff_write_global_symbol (h, inf) && h->smclas != XMC_XO) { /* We just output an SD symbol. Now output an LD symbol. */ - h->indx += 2; isym.n_sclass = C_EXT; - bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym); + bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym); outsym += bfd_coff_symesz (output_bfd); aux.x_csect.x_smtyp = XTY_LD; aux.x_csect.x_scnlen.l = obj_raw_syment_count (output_bfd); - bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, T_NULL, C_EXT, 0, 1, - (PTR) outsym); + bfd_coff_swap_aux_out (output_bfd, (void *) &aux, T_NULL, C_EXT, 0, 1, + (void *) outsym); outsym += bfd_coff_auxesz (output_bfd); } @@ -5954,11 +5140,10 @@ xcoff_write_global_symbol (h, inf) /* Handle a link order which is supposed to generate a reloc. */ static bfd_boolean -xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) - bfd *output_bfd; - struct xcoff_final_link_info *finfo; - asection *output_section; - struct bfd_link_order *link_order; +xcoff_reloc_link_order (bfd *output_bfd, + struct xcoff_final_link_info *finfo, + asection *output_section, + struct bfd_link_order *link_order) { reloc_howto_type *howto; struct xcoff_link_hash_entry *h; @@ -5970,13 +5155,11 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) struct internal_ldrel ldrel; if (link_order->type == bfd_section_reloc_link_order) - { - /* We need to somehow locate a symbol in the right section. The - symbol must either have a value of zero, or we must adjust - the addend by the value of the symbol. FIXME: Write this - when we need it. The old linker couldn't handle this anyhow. */ - abort (); - } + /* We need to somehow locate a symbol in the right section. The + symbol must either have a value of zero, or we must adjust + the addend by the value of the symbol. FIXME: Write this + when we need it. The old linker couldn't handle this anyhow. */ + abort (); howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc); if (howto == NULL) @@ -5992,8 +5175,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) if (h == NULL) { if (! ((*finfo->info->callbacks->unattached_reloc) - (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL, - (asection *) NULL, (bfd_vma) 0))) + (finfo->info, link_order->u.reloc.p->u.name, NULL, NULL, (bfd_vma) 0))) return FALSE; return TRUE; } @@ -6029,7 +5211,7 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) bfd_boolean ok; size = bfd_get_reloc_size (howto); - buf = (bfd_byte *) bfd_zmalloc (size); + buf = bfd_zmalloc (size); if (buf == NULL) return FALSE; @@ -6044,15 +5226,14 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) case bfd_reloc_overflow: if (! ((*finfo->info->callbacks->reloc_overflow) (finfo->info, NULL, link_order->u.reloc.p->u.name, - howto->name, addend, (bfd *) NULL, (asection *) NULL, - (bfd_vma) 0))) + howto->name, addend, NULL, NULL, (bfd_vma) 0))) { free (buf); return FALSE; } break; } - ok = bfd_set_section_contents (output_bfd, output_section, (PTR) buf, + ok = bfd_set_section_contents (output_bfd, output_section, (void *) buf, (file_ptr) link_order->offset, size); free (buf); if (! ok) @@ -6061,7 +5242,6 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) /* Store the reloc information in the right place. It will get swapped and written out at the end of the final_link routine. */ - irel = (finfo->section_info[output_section->target_index].relocs + output_section->reloc_count); rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes @@ -6136,24 +5316,644 @@ xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order) return TRUE; } -/* Sort relocs by VMA. This is called via qsort. */ +/* Do the final link step. */ -static int -xcoff_sort_relocs (p1, p2) - const PTR p1; - const PTR p2; +bfd_boolean +_bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info) { - const struct internal_reloc *r1 = (const struct internal_reloc *) p1; - const struct internal_reloc *r2 = (const struct internal_reloc *) p2; + bfd_size_type symesz; + struct xcoff_final_link_info finfo; + asection *o; + struct bfd_link_order *p; + bfd_size_type max_contents_size; + bfd_size_type max_sym_count; + bfd_size_type max_lineno_count; + bfd_size_type max_reloc_count; + bfd_size_type max_output_reloc_count; + file_ptr rel_filepos; + unsigned int relsz; + file_ptr line_filepos; + unsigned int linesz; + bfd *sub; + bfd_byte *external_relocs = NULL; + char strbuf[STRING_SIZE_SIZE]; + file_ptr pos; + bfd_size_type amt; - if (r1->r_vaddr > r2->r_vaddr) - return 1; - else if (r1->r_vaddr < r2->r_vaddr) - return -1; + if (info->shared) + abfd->flags |= DYNAMIC; + + symesz = bfd_coff_symesz (abfd); + + finfo.info = info; + finfo.output_bfd = abfd; + finfo.strtab = NULL; + finfo.section_info = NULL; + finfo.last_file_index = -1; + finfo.toc_symindx = -1; + finfo.internal_syms = NULL; + finfo.sym_indices = NULL; + finfo.outsyms = NULL; + finfo.linenos = NULL; + finfo.contents = NULL; + finfo.external_relocs = NULL; + + finfo.ldsym = (xcoff_hash_table (info)->loader_section->contents + + bfd_xcoff_ldhdrsz (abfd)); + finfo.ldrel = (xcoff_hash_table (info)->loader_section->contents + + bfd_xcoff_ldhdrsz(abfd) + + (xcoff_hash_table (info)->ldhdr.l_nsyms + * bfd_xcoff_ldsymsz(abfd))); + + xcoff_data (abfd)->coff.link_info = info; + + finfo.strtab = _bfd_stringtab_init (); + if (finfo.strtab == NULL) + goto error_return; + + /* Count the line number and relocation entries required for the + output file. Determine a few maximum sizes. */ + max_contents_size = 0; + max_lineno_count = 0; + max_reloc_count = 0; + for (o = abfd->sections; o != NULL; o = o->next) + { + o->reloc_count = 0; + o->lineno_count = 0; + for (p = o->link_order_head; p != NULL; p = p->next) + { + if (p->type == bfd_indirect_link_order) + { + asection *sec; + + sec = p->u.indirect.section; + + /* Mark all sections which are to be included in the + link. This will normally be every section. We need + to do this so that we can identify any sections which + the linker has decided to not include. */ + sec->linker_mark = TRUE; + + if (info->strip == strip_none + || info->strip == strip_some) + o->lineno_count += sec->lineno_count; + + o->reloc_count += sec->reloc_count; + + if (sec->rawsize > max_contents_size) + max_contents_size = sec->rawsize; + if (sec->size > max_contents_size) + max_contents_size = sec->size; + if (sec->lineno_count > max_lineno_count) + max_lineno_count = sec->lineno_count; + if (coff_section_data (sec->owner, sec) != NULL + && xcoff_section_data (sec->owner, sec) != NULL + && (xcoff_section_data (sec->owner, sec)->lineno_count + > max_lineno_count)) + max_lineno_count = + xcoff_section_data (sec->owner, sec)->lineno_count; + if (sec->reloc_count > max_reloc_count) + max_reloc_count = sec->reloc_count; + } + else if (p->type == bfd_section_reloc_link_order + || p->type == bfd_symbol_reloc_link_order) + ++o->reloc_count; + } + } + + /* Compute the file positions for all the sections. */ + if (abfd->output_has_begun) + { + if (xcoff_hash_table (info)->file_align != 0) + abort (); + } else - return 0; -} + { + bfd_vma file_align; + + file_align = xcoff_hash_table (info)->file_align; + if (file_align != 0) + { + bfd_boolean saw_contents; + int indx; + asection **op; + file_ptr sofar; + + /* Insert .pad sections before every section which has + contents and is loaded, if it is preceded by some other + section which has contents and is loaded. */ + saw_contents = TRUE; + for (op = &abfd->sections; *op != NULL; op = &(*op)->next) + { + if (strcmp ((*op)->name, ".pad") == 0) + saw_contents = FALSE; + else if (((*op)->flags & SEC_HAS_CONTENTS) != 0 + && ((*op)->flags & SEC_LOAD) != 0) + { + if (! saw_contents) + saw_contents = TRUE; + else + { + asection *n, **st; + + /* Create a pad section and place it before the section + that needs padding. This requires unlinking and + relinking the bfd's section list. */ + + st = abfd->section_tail; + n = bfd_make_section_anyway (abfd, ".pad"); + n->flags = SEC_HAS_CONTENTS; + n->alignment_power = 0; + + BFD_ASSERT (*st == n); + bfd_section_list_remove (abfd, st); + bfd_section_list_insert (abfd, op, n); + + op = &n->next; + saw_contents = FALSE; + } + } + } + + /* Reset the section indices after inserting the new + sections. */ + indx = 0; + for (o = abfd->sections; o != NULL; o = o->next) + { + ++indx; + o->target_index = indx; + } + BFD_ASSERT ((unsigned int) indx == abfd->section_count); + + /* Work out appropriate sizes for the .pad sections to force + each section to land on a page boundary. This bit of + code knows what compute_section_file_positions is going + to do. */ + sofar = bfd_coff_filhsz (abfd); + sofar += bfd_coff_aoutsz (abfd); + sofar += abfd->section_count * bfd_coff_scnhsz (abfd); + for (o = abfd->sections; o != NULL; o = o->next) + if ((bfd_xcoff_is_reloc_count_overflow + (abfd, (bfd_vma) o->reloc_count)) + || (bfd_xcoff_is_lineno_count_overflow + (abfd, (bfd_vma) o->lineno_count))) + /* 64 does not overflow, need to check if 32 does */ + sofar += bfd_coff_scnhsz (abfd); + + for (o = abfd->sections; o != NULL; o = o->next) + { + if (strcmp (o->name, ".pad") == 0) + { + bfd_vma pageoff; + + BFD_ASSERT (o->size == 0); + pageoff = sofar & (file_align - 1); + if (pageoff != 0) + { + o->size = file_align - pageoff; + sofar += file_align - pageoff; + o->flags |= SEC_HAS_CONTENTS; + } + } + else + { + if ((o->flags & SEC_HAS_CONTENTS) != 0) + sofar += BFD_ALIGN (o->size, + 1 << o->alignment_power); + } + } + } + + if (! bfd_coff_compute_section_file_positions (abfd)) + goto error_return; + } + + /* Allocate space for the pointers we need to keep for the relocs. */ + { + unsigned int i; + + /* We use section_count + 1, rather than section_count, because + the target_index fields are 1 based. */ + amt = abfd->section_count + 1; + amt *= sizeof (struct xcoff_link_section_info); + finfo.section_info = bfd_malloc (amt); + if (finfo.section_info == NULL) + goto error_return; + for (i = 0; i <= abfd->section_count; i++) + { + finfo.section_info[i].relocs = NULL; + finfo.section_info[i].rel_hashes = NULL; + finfo.section_info[i].toc_rel_hashes = NULL; + } + } + + /* Set the file positions for the relocs. */ + rel_filepos = obj_relocbase (abfd); + relsz = bfd_coff_relsz (abfd); + max_output_reloc_count = 0; + for (o = abfd->sections; o != NULL; o = o->next) + { + if (o->reloc_count == 0) + o->rel_filepos = 0; + else + { + /* A stripped file has no relocs. However, we still + allocate the buffers, so that later code doesn't have to + worry about whether we are stripping or not. */ + if (info->strip == strip_all) + o->rel_filepos = 0; + else + { + o->flags |= SEC_RELOC; + o->rel_filepos = rel_filepos; + rel_filepos += o->reloc_count * relsz; + } + + /* We don't know the indices of global symbols until we have + written out all the local symbols. For each section in + the output file, we keep an array of pointers to hash + table entries. Each entry in the array corresponds to a + reloc. When we find a reloc against a global symbol, we + set the corresponding entry in this array so that we can + fix up the symbol index after we have written out all the + local symbols. + + Because of this problem, we also keep the relocs in + memory until the end of the link. This wastes memory. + We could backpatch the file later, I suppose, although it + would be slow. */ + amt = o->reloc_count; + amt *= sizeof (struct internal_reloc); + finfo.section_info[o->target_index].relocs = bfd_malloc (amt); + + amt = o->reloc_count; + amt *= sizeof (struct xcoff_link_hash_entry *); + finfo.section_info[o->target_index].rel_hashes = bfd_malloc (amt); + + if (finfo.section_info[o->target_index].relocs == NULL + || finfo.section_info[o->target_index].rel_hashes == NULL) + goto error_return; + + if (o->reloc_count > max_output_reloc_count) + max_output_reloc_count = o->reloc_count; + } + } + + /* We now know the size of the relocs, so we can determine the file + positions of the line numbers. */ + line_filepos = rel_filepos; + finfo.line_filepos = line_filepos; + linesz = bfd_coff_linesz (abfd); + for (o = abfd->sections; o != NULL; o = o->next) + { + if (o->lineno_count == 0) + o->line_filepos = 0; + else + { + o->line_filepos = line_filepos; + line_filepos += o->lineno_count * linesz; + } + /* Reset the reloc and lineno counts, so that we can use them to + count the number of entries we have output so far. */ + o->reloc_count = 0; + o->lineno_count = 0; + } + obj_sym_filepos (abfd) = line_filepos; + /* Figure out the largest number of symbols in an input BFD. Take + the opportunity to clear the output_has_begun fields of all the + input BFD's. We want at least 6 symbols, since that is the + number which xcoff_write_global_symbol may need. */ + max_sym_count = 6; + for (sub = info->input_bfds; sub != NULL; sub = sub->link_next) + { + bfd_size_type sz; + + sub->output_has_begun = FALSE; + sz = obj_raw_syment_count (sub); + if (sz > max_sym_count) + max_sym_count = sz; + } + + /* Allocate some buffers used while linking. */ + amt = max_sym_count * sizeof (struct internal_syment); + finfo.internal_syms = bfd_malloc (amt); + + amt = max_sym_count * sizeof (long); + finfo.sym_indices = bfd_malloc (amt); + + amt = (max_sym_count + 1) * symesz; + finfo.outsyms = bfd_malloc (amt); + + amt = max_lineno_count * bfd_coff_linesz (abfd); + finfo.linenos = bfd_malloc (amt); + + amt = max_contents_size; + finfo.contents = bfd_malloc (amt); + amt = max_reloc_count * relsz; + finfo.external_relocs = bfd_malloc (amt); + + if ((finfo.internal_syms == NULL && max_sym_count > 0) + || (finfo.sym_indices == NULL && max_sym_count > 0) + || finfo.outsyms == NULL + || (finfo.linenos == NULL && max_lineno_count > 0) + || (finfo.contents == NULL && max_contents_size > 0) + || (finfo.external_relocs == NULL && max_reloc_count > 0)) + goto error_return; + + obj_raw_syment_count (abfd) = 0; + xcoff_data (abfd)->toc = (bfd_vma) -1; + + /* We now know the position of everything in the file, except that + we don't know the size of the symbol table and therefore we don't + know where the string table starts. We just build the string + table in memory as we go along. We process all the relocations + for a single input file at once. */ + for (o = abfd->sections; o != NULL; o = o->next) + { + for (p = o->link_order_head; p != NULL; p = p->next) + { + if (p->type == bfd_indirect_link_order + && p->u.indirect.section->owner->xvec == abfd->xvec) + { + sub = p->u.indirect.section->owner; + if (! sub->output_has_begun) + { + if (! xcoff_link_input_bfd (&finfo, sub)) + goto error_return; + sub->output_has_begun = TRUE; + } + } + else if (p->type == bfd_section_reloc_link_order + || p->type == bfd_symbol_reloc_link_order) + { + if (! xcoff_reloc_link_order (abfd, &finfo, o, p)) + goto error_return; + } + else + { + if (! _bfd_default_link_order (abfd, info, o, p)) + goto error_return; + } + } + } + + /* Free up the buffers used by xcoff_link_input_bfd. */ + if (finfo.internal_syms != NULL) + { + free (finfo.internal_syms); + finfo.internal_syms = NULL; + } + if (finfo.sym_indices != NULL) + { + free (finfo.sym_indices); + finfo.sym_indices = NULL; + } + if (finfo.linenos != NULL) + { + free (finfo.linenos); + finfo.linenos = NULL; + } + if (finfo.contents != NULL) + { + free (finfo.contents); + finfo.contents = NULL; + } + if (finfo.external_relocs != NULL) + { + free (finfo.external_relocs); + finfo.external_relocs = NULL; + } + + /* The value of the last C_FILE symbol is supposed to be -1. Write + it out again. */ + if (finfo.last_file_index != -1) + { + finfo.last_file.n_value = -(bfd_vma) 1; + bfd_coff_swap_sym_out (abfd, (void *) &finfo.last_file, + (void *) finfo.outsyms); + pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz; + if (bfd_seek (abfd, pos, SEEK_SET) != 0 + || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz) + goto error_return; + } + + /* Write out all the global symbols which do not come from XCOFF + input files. */ + xcoff_link_hash_traverse (xcoff_hash_table (info), + xcoff_write_global_symbol, + (void *) &finfo); + + if (finfo.outsyms != NULL) + { + free (finfo.outsyms); + finfo.outsyms = NULL; + } + + /* Now that we have written out all the global symbols, we know the + symbol indices to use for relocs against them, and we can finally + write out the relocs. */ + amt = max_output_reloc_count * relsz; + external_relocs = bfd_malloc (amt); + if (external_relocs == NULL && max_output_reloc_count != 0) + goto error_return; + + for (o = abfd->sections; o != NULL; o = o->next) + { + struct internal_reloc *irel; + struct internal_reloc *irelend; + struct xcoff_link_hash_entry **rel_hash; + struct xcoff_toc_rel_hash *toc_rel_hash; + bfd_byte *erel; + bfd_size_type rel_size; + + /* A stripped file has no relocs. */ + if (info->strip == strip_all) + { + o->reloc_count = 0; + continue; + } + + if (o->reloc_count == 0) + continue; + + irel = finfo.section_info[o->target_index].relocs; + irelend = irel + o->reloc_count; + rel_hash = finfo.section_info[o->target_index].rel_hashes; + for (; irel < irelend; irel++, rel_hash++, erel += relsz) + { + if (*rel_hash != NULL) + { + if ((*rel_hash)->indx < 0) + { + if (! ((*info->callbacks->unattached_reloc) + (info, (*rel_hash)->root.root.string, + NULL, o, irel->r_vaddr))) + goto error_return; + (*rel_hash)->indx = 0; + } + irel->r_symndx = (*rel_hash)->indx; + } + } + + for (toc_rel_hash = finfo.section_info[o->target_index].toc_rel_hashes; + toc_rel_hash != NULL; + toc_rel_hash = toc_rel_hash->next) + { + if (toc_rel_hash->h->u.toc_indx < 0) + { + if (! ((*info->callbacks->unattached_reloc) + (info, toc_rel_hash->h->root.root.string, + NULL, o, toc_rel_hash->rel->r_vaddr))) + goto error_return; + toc_rel_hash->h->u.toc_indx = 0; + } + toc_rel_hash->rel->r_symndx = toc_rel_hash->h->u.toc_indx; + } + + /* XCOFF requires that the relocs be sorted by address. We tend + to produce them in the order in which their containing csects + appear in the symbol table, which is not necessarily by + address. So we sort them here. There may be a better way to + do this. */ + qsort ((void *) finfo.section_info[o->target_index].relocs, + o->reloc_count, sizeof (struct internal_reloc), + xcoff_sort_relocs); + + irel = finfo.section_info[o->target_index].relocs; + irelend = irel + o->reloc_count; + erel = external_relocs; + for (; irel < irelend; irel++, rel_hash++, erel += relsz) + bfd_coff_swap_reloc_out (abfd, (void *) irel, (void *) erel); + + rel_size = relsz * o->reloc_count; + if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0 + || bfd_bwrite ((void *) external_relocs, rel_size, abfd) != rel_size) + goto error_return; + } + + if (external_relocs != NULL) + { + free (external_relocs); + external_relocs = NULL; + } + + /* Free up the section information. */ + if (finfo.section_info != NULL) + { + unsigned int i; + + for (i = 0; i < abfd->section_count; i++) + { + if (finfo.section_info[i].relocs != NULL) + free (finfo.section_info[i].relocs); + if (finfo.section_info[i].rel_hashes != NULL) + free (finfo.section_info[i].rel_hashes); + } + free (finfo.section_info); + finfo.section_info = NULL; + } + + /* Write out the loader section contents. */ + BFD_ASSERT ((bfd_byte *) finfo.ldrel + == (xcoff_hash_table (info)->loader_section->contents + + xcoff_hash_table (info)->ldhdr.l_impoff)); + o = xcoff_hash_table (info)->loader_section; + if (! bfd_set_section_contents (abfd, o->output_section, o->contents, + (file_ptr) o->output_offset, o->size)) + goto error_return; + + /* Write out the magic sections. */ + o = xcoff_hash_table (info)->linkage_section; + if (o->size > 0 + && ! bfd_set_section_contents (abfd, o->output_section, o->contents, + (file_ptr) o->output_offset, + o->size)) + goto error_return; + o = xcoff_hash_table (info)->toc_section; + if (o->size > 0 + && ! bfd_set_section_contents (abfd, o->output_section, o->contents, + (file_ptr) o->output_offset, + o->size)) + goto error_return; + o = xcoff_hash_table (info)->descriptor_section; + if (o->size > 0 + && ! bfd_set_section_contents (abfd, o->output_section, o->contents, + (file_ptr) o->output_offset, + o->size)) + goto error_return; + + /* Write out the string table. */ + pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz; + if (bfd_seek (abfd, pos, SEEK_SET) != 0) + goto error_return; + H_PUT_32 (abfd, + _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE, + strbuf); + amt = STRING_SIZE_SIZE; + if (bfd_bwrite (strbuf, amt, abfd) != amt) + goto error_return; + if (! _bfd_stringtab_emit (abfd, finfo.strtab)) + goto error_return; + + _bfd_stringtab_free (finfo.strtab); + + /* Write out the debugging string table. */ + o = xcoff_hash_table (info)->debug_section; + if (o != NULL) + { + struct bfd_strtab_hash *debug_strtab; + + debug_strtab = xcoff_hash_table (info)->debug_strtab; + BFD_ASSERT (o->output_section->size - o->output_offset + >= _bfd_stringtab_size (debug_strtab)); + pos = o->output_section->filepos + o->output_offset; + if (bfd_seek (abfd, pos, SEEK_SET) != 0) + goto error_return; + if (! _bfd_stringtab_emit (abfd, debug_strtab)) + goto error_return; + } + + /* Setting bfd_get_symcount to 0 will cause write_object_contents to + not try to write out the symbols. */ + bfd_get_symcount (abfd) = 0; + + return TRUE; + + error_return: + if (finfo.strtab != NULL) + _bfd_stringtab_free (finfo.strtab); + + if (finfo.section_info != NULL) + { + unsigned int i; + + for (i = 0; i < abfd->section_count; i++) + { + if (finfo.section_info[i].relocs != NULL) + free (finfo.section_info[i].relocs); + if (finfo.section_info[i].rel_hashes != NULL) + free (finfo.section_info[i].rel_hashes); + } + free (finfo.section_info); + } + + if (finfo.internal_syms != NULL) + free (finfo.internal_syms); + if (finfo.sym_indices != NULL) + free (finfo.sym_indices); + if (finfo.outsyms != NULL) + free (finfo.outsyms); + if (finfo.linenos != NULL) + free (finfo.linenos); + if (finfo.contents != NULL) + free (finfo.contents); + if (finfo.external_relocs != NULL) + free (finfo.external_relocs); + if (external_relocs != NULL) + free (external_relocs); + return FALSE; +} |