diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2008-02-15 03:35:53 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2008-02-15 03:35:53 +0000 |
| commit | d7dde66c50543d891eb2dcdde9e439b9b033e799 (patch) | |
| tree | a9305a7a80c31972a5ed5f54b5bb53d9c40b8ee2 /ld/ldexp.c | |
| parent | 63665287fc1495b903f61346158c7fd9bff11cc6 (diff) | |
| download | binutils-redhat-d7dde66c50543d891eb2dcdde9e439b9b033e799.tar.gz | |
include/
* bfdlink.h (struct bfd_link_hash_table): Delete creator field.
(struct bfd_link_info): Add output_bfd.
bfd/
* elflink.c: Replace all accesses to hash->creator field with
output_bfd->xvec.
* cofflink.c: Likewise.
* coff-h8300.c: Likewise.
* ecoff.c: Likewise.
* elf32-m68hc1x.c: Likewise.
* elf32-ppc.c: Likewise.
* elf64-alpha.c: Likewise.
* elf64-ppc.c: Likewise.
* elf64-sparc.c: Likewise.
* elfxx-mips.c: Likewise.
* i386linux.c: Likewise.
* m68klinux.c: Likewise.
* sparclinux.c: Likewise.
* sunos.c: Likewise.
* xcofflink.c: Likewise.
* linker.c: Likewise.
(_bfd_link_hash_table_init): Don't store creator.
ld/
* ldmain.h (output_bfd): Delete.
* ldmain.c (output_bfd): Delete.
Replace all occurrences of output_bfd with link_info.output_bfd.
* ldcref.c: Likewise.
* ldctor.c: Likewise.
* ldemul.c: Likewise.
* ldexp.c: Likewise.
* ldfile.c: Likewise.
* ldlang.c: Likewise.
* ldmisc.c: Likewise.
* ldwrite.c: Likewise.
* pe-dll.c: Likewise.
* emultempl/aix.em: Likewise.
* emultempl/alphaelf.em: Likewise.
* emultempl/armcoff.em: Likewise.
* emultempl/armelf.em: Likewise.
* emultempl/avrelf.em: Likewise.
* emultempl/beos.em: Likewise.
* emultempl/elf-generic.em: Likewise.
* emultempl/elf32.em: Likewise.
* emultempl/gld960.em: Likewise.
* emultempl/hppaelf.em: Likewise.
* emultempl/irix.em: Likewise.
* emultempl/linux.em: Likewise.
* emultempl/lnk960.em: Likewise.
* emultempl/m68hc1xelf.em: Likewise.
* emultempl/mmix-elfnmmo.em: Likewise.
* emultempl/mmo.em: Likewise.
* emultempl/pe.em: Likewise.
* emultempl/pep.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
* emultempl/scoreelf.em: Likewise.
* emultempl/sh64elf.em: Likewise.
* emultempl/spuelf.em: Likewise.
* emultempl/sunos.em: Likewise.
* emultempl/vanilla.em: Likewise.
* emultempl/vxworks.em: Likewise.
* emultempl/xtensaelf.em: Likewise.
* emultempl/z80.em: Likewise.
* ldlang.c (open_output): Don't return output, instead write
link_info_output_bfd directly.
* emultempl/alphaelf.em: Replace occurrences of link_info.hash->creator
with link_info.output_bfd->xvec.
* emultempl/hppaelf.em: Likewise.
* emultempl/ppc32elf.em: Likewise.
* emultempl/ppc64elf.em: Likewise.
* emultempl/spuelf.em: Likewise.
Diffstat (limited to 'ld/ldexp.c')
| -rw-r--r-- | ld/ldexp.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/ld/ldexp.c b/ld/ldexp.c index 5e2812d5ba..16ee5dd556 100644 --- a/ld/ldexp.c +++ b/ld/ldexp.c @@ -1,6 +1,6 @@ /* This module handles expression trees. Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>. @@ -489,7 +489,7 @@ fold_name (etree_type *tree) /* Don't find the real header size if only marking sections; The bfd function may cache incorrect data. */ if (expld.phase != lang_mark_phase_enum) - hdr_size = bfd_sizeof_headers (output_bfd, &link_info); + hdr_size = bfd_sizeof_headers (link_info.output_bfd, &link_info); new_abs (hdr_size); } break; @@ -503,7 +503,8 @@ fold_name (etree_type *tree) int def_iteration = lang_symbol_definition_iteration (tree->name.name); - h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info, + h = bfd_wrapped_link_hash_lookup (link_info.output_bfd, + &link_info, tree->name.name, FALSE, FALSE, TRUE); expld.result.value = (h != NULL @@ -526,7 +527,8 @@ fold_name (etree_type *tree) { struct bfd_link_hash_entry *h; - h = bfd_wrapped_link_hash_lookup (output_bfd, &link_info, + h = bfd_wrapped_link_hash_lookup (link_info.output_bfd, + &link_info, tree->name.name, TRUE, FALSE, TRUE); if (!h) @@ -628,7 +630,8 @@ fold_name (etree_type *tree) bfd_vma val; if (tree->type.node_code == SIZEOF) - val = os->bfd_section->size / bfd_octets_per_byte (output_bfd); + val = (os->bfd_section->size + / bfd_octets_per_byte (link_info.output_bfd)); else val = (bfd_vma)1 << os->bfd_section->alignment_power; |