Fix fallout from splitting ldbuildid.[ch] off elf32.em.

[platform/upstream/binutils.git] / ld / emultempl / vanilla.em

diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em
index 2e26bd3..f53a4e3 100644 (file)
--- a/ld/emultempl/vanilla.em
+++ b/ld/emultempl/vanilla.em
@@ -1,9 +1,8 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
-cat >e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 /* A vanilla emulation with no defaults
-   Copyright 1991, 1992, 1994, 2000, 2001, 2002, 2003, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2014 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
    This file is part of the GNU Binutils.
@@ -25,6 +24,7 @@ cat >e${EMULATION_NAME}.c <<EOF
 
 #include "sysdep.h"
 #include "bfd.h"
+#include "bfdlink.h"
 
 #include "ld.h"
 #include "ldmisc.h"
@@ -44,7 +44,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 *