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/vanilla.em | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em
index 8ed2a5a..bd8039a 100644
--- a/ld/emultempl/vanilla.em
+++ b/ld/emultempl/vanilla.em
@@ -2,7 +2,7 @@
 # It does some substitutions.
 fragment <<EOF
 /* A vanilla emulation with no defaults
-   Copyright 1991, 1992, 1994, 2000, 2001, 2002, 2003, 2007
+   Copyright 1991, 1992, 1994, 2000, 2001, 2002, 2003, 2007, 2008
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -25,6 +25,7 @@ fragment <<EOF
 
 #include "sysdep.h"
 #include "bfd.h"
+#include "bfdlink.h"
 
 #include "ld.h"
 #include "ldmisc.h"
@@ -44,7 +45,8 @@ vanilla_set_output_arch (void)
 {
   /* Set the output architecture and machine if possible */
   unsigned long  machine = 0;
-  bfd_set_arch_mach(output_bfd, ldfile_output_architecture, machine);
+  bfd_set_arch_mach (link_info.output_bfd,
+		     ldfile_output_architecture, machine);
 }
 
 static char *
-- 
cgit v1.1