PR46, cygwin: FAIL: cdtest with -Ur

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

diff --git a/ld/emultempl/v850elf.em b/ld/emultempl/v850elf.em
index 5bc82cceeb278e92bcbe4186599394eb91b180ae..3e3e09d4bbf4d7d2a0ebbffe23a1900ebe599796 100644 (file)
--- a/ld/emultempl/v850elf.em
+++ b/ld/emultempl/v850elf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright (C) 2013-2017 Free Software Foundation, Inc.
+#   Copyright (C) 2013-2019 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -19,11 +19,12 @@
 # MA 02110-1301, USA.
 #
 
-# This file is sourced from elf32.em, and defines extra cpu specific
+# This file is sourced from elf.em, and defines extra cpu specific
 # features.
 #
 fragment <<EOF
 #include "ldctor.h"
+#include "elf32-v850.h"
 
 static bfd_boolean
 is_v850_target (void)
@@ -62,8 +63,8 @@ v850_create_output_section_statements (void)
         These will only be created if the output format is an arm format,
         hence we do not support linking and changing output formats at the
         same time.  Use a link followed by objcopy to change output formats.  */
-      einfo (_("%F%X%P: error: Cannot change output format (to %s) whilst linking V850 binaries.\n"),
-            bfd_get_target (link_info.output_bfd));
+      einfo (_("%F%P: error: cannot change output format"
+              " whilst linking %s binaries\n"), "V850");
       return;
     }
 }