ld: Don't xfail ld-elf/warn[12] on 64-bit Solaris/SPARC

[deliverable/binutils-gdb.git] / ld / emultempl / vanilla.em

diff --git a/ld/emultempl/vanilla.em b/ld/emultempl/vanilla.em
index 8ed2a5abea06cfb9d46ea3a9dfecf51ba2c931c8..ae6f6e4175dcb1d788b4dd9346d3de5c0647a464 100644 (file)
--- a/ld/emultempl/vanilla.em
+++ b/ld/emultempl/vanilla.em
@@ -2,8 +2,7 @@
 # It does some substitutions.
 fragment <<EOF
 /* A vanilla emulation with no defaults
-   Copyright 1991, 1992, 1994, 2000, 2001, 2002, 2003, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
    This file is part of the GNU Binutils.
@@ -25,6 +24,8 @@ fragment <<EOF
 
 #include "sysdep.h"
 #include "bfd.h"
+#include "bfdlink.h"
+#include "ctf-api.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 *
@@ -61,6 +63,8 @@ struct ld_emulation_xfer_struct ld_vanilla_emulation =
   hll_default,
   after_parse_default,
   after_open_default,
+  after_check_relocs_default,
+  before_place_orphans_default,
   after_allocation_default,
   vanilla_set_output_arch,
   ldemul_default_target,
@@ -80,6 +84,9 @@ struct ld_emulation_xfer_struct ld_vanilla_emulation =
   NULL,        /* list options */
   NULL,        /* recognized file */
   NULL,        /* find_potential_libraries */
-  NULL /* new_vers_pattern */
+  NULL,        /* new_vers_pattern */
+  NULL,        /* extra_map_file_text */
+  NULL, /* emit_ctf_early */
+  NULL  /* examine_strtab_for_ctf */
 };
 EOF