From d7dde66c50543d891eb2dcdde9e439b9b033e799 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 15 Feb 2008 03:35:53 +0000 Subject: 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. --- bfd/sunos.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'bfd/sunos.c') diff --git a/bfd/sunos.c b/bfd/sunos.c index 1c17dce275..67880b2ce6 100644 --- a/bfd/sunos.c +++ b/bfd/sunos.c @@ -1,6 +1,7 @@ /* BFD backend for SunOS binaries. Copyright 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. Written by Cygnus Support. This file is part of BFD, the Binary File Descriptor library. @@ -829,7 +830,7 @@ sunos_add_dynamic_symbols (bfd *abfd, unsigned long need; /* Make sure we have all the required sections. */ - if (info->hash->creator == abfd->xvec) + if (info->output_bfd->xvec == abfd->xvec) { if (! sunos_create_dynamic_sections (abfd, info, ((abfd->flags & DYNAMIC) != 0 @@ -870,7 +871,7 @@ sunos_add_dynamic_symbols (bfd *abfd, /* There's no hope of using a dynamic object which does not exactly match the format of the output file. */ - if (info->hash->creator != abfd->xvec) + if (info->output_bfd->xvec != abfd->xvec) { bfd_set_error (bfd_error_invalid_operation); return FALSE; @@ -1121,7 +1122,7 @@ sunos_add_one_symbol (struct bfd_link_info *info, } if ((abfd->flags & DYNAMIC) != 0 - && abfd->xvec == info->hash->creator + && abfd->xvec == info->output_bfd->xvec && (h->flags & SUNOS_CONSTRUCTOR) != 0) /* The existing symbol is a constructor symbol, and this symbol is from a dynamic object. A constructor symbol is actually a @@ -1145,7 +1146,7 @@ sunos_add_one_symbol (struct bfd_link_info *info, hashp)) return FALSE; - if (abfd->xvec == info->hash->creator) + if (abfd->xvec == info->output_bfd->xvec) { /* Set a flag in the hash table entry indicating the type of reference or definition we just found. Keep a count of the @@ -1191,7 +1192,7 @@ struct bfd_link_needed_list * bfd_sunos_get_needed_list (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info) { - if (info->hash->creator != &MY (vec)) + if (info->output_bfd->xvec != &MY (vec)) return NULL; return sunos_hash_table (info)->needed; } -- cgit v1.2.1