From f13a99db51c0ca487f4a0a41b14dc255d386c4ff Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
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.

---
 ld/emultempl/beos.em | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ld/emultempl/beos.em')

diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index 23d3849..ac27c5a 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -8,7 +8,7 @@ fi
 fragment <<EOF
 /* This file is part of GLD, the Gnu Linker.
    Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -382,13 +382,13 @@ gld_${EMULATION_NAME}_after_open (void)
   /* Pass the wacky PE command line options into the output bfd.
      FIXME: This should be done via a function, rather than by
      including an internal BFD header.  */
-  if (!coff_data(output_bfd)->pe)
+  if (!coff_data(link_info.output_bfd)->pe)
     {
       einfo ("%F%P: PE operations on non PE file.\n");
     }
 
-  pe_data(output_bfd)->pe_opthdr = pe;
-  pe_data(output_bfd)->dll = init[DLLOFF].value;
+  pe_data(link_info.output_bfd)->pe_opthdr = pe;
+  pe_data(link_info.output_bfd)->dll = init[DLLOFF].value;
 
 }
 
-- 
cgit v1.1