X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=ld%2Femultempl%2Fvanilla.em;fp=ld%2Femultempl%2Fvanilla.em;h=4a83dfd2a48629fb9db5de9b4f20b024239a77c8;hp=8ed2a5abea06cfb9d46ea3a9dfecf51ba2c931c8;hb=88750007d7869f178f0ba528f41efd3b74c424cf;hpb=6df9443a374e2b81278c61b8afc0a1eef7db280b

diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em
index 8ed2a5a..4a83dfd 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, 2005, 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 *