X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Favrelf.em;h=6ff8204bebb3fcd2fcf19066081202eaf28fd018;hb=a435742a7fb32f6320ce0e6074e2500e28378104;hp=4f33ad1f7b423717cb5e49993cff27bccc28fdd6;hpb=219d1afa89d0d53ca93a684cac341f16470f3ca0;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em
index 4f33ad1f7b..6ff8204beb 100644
--- a/ld/emultempl/avrelf.em
+++ b/ld/emultempl/avrelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright (C) 2006-2018 Free Software Foundation, Inc.
+#   Copyright (C) 2006-2020 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -19,7 +19,7 @@
 # MA 02110-1301, USA.
 
 
-# This file is sourced from elf32.em, and defines extra avr-elf specific
+# This file is sourced from elf.em, and defines extra avr-elf specific
 # routines.  It is used to generate the trampolines for the avr6 family
 # of devices where one needs to address the issue that it is not possible
 # to reach the whole program memory by using 16 bit pointers.
@@ -77,10 +77,10 @@ avr_elf_${EMULATION_NAME}_before_allocation (void)
       return;
     }
 
-  /* We only need stubs for avr6, avrxmega6, and avrxmega7. */
-  if (strcmp ("${EMULATION_NAME}","avr6")
-      && strcmp ("${EMULATION_NAME}","avrxmega6")
-      && strcmp ("${EMULATION_NAME}","avrxmega7") )
+  /* We only need stubs for avr6, avrxmega6, and avrxmega7.  */
+  if (strcmp ("${EMULATION_NAME}", "avr6") != 0
+      && strcmp ("${EMULATION_NAME}", "avrxmega6") != 0
+      && strcmp ("${EMULATION_NAME}", "avrxmega7") != 0)
     avr_no_stubs = TRUE;
 
   avr_elf_set_global_bfd_parameters ();
@@ -116,8 +116,8 @@ avr_elf_create_output_section_statements (void)
 
   if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour)
     {
-      einfo (_("%X%P: changing output format whilst linking "
-	       "is not supported\n"));
+      einfo (_("%F%P: error: cannot change output format "
+	       "whilst linking %s binaries\n"), "AVR");
       return;
     }
 
@@ -131,7 +131,7 @@ avr_elf_create_output_section_statements (void)
 			     bfd_get_arch (link_info.output_bfd),
 			     bfd_get_mach (link_info.output_bfd)))
     {
-      einfo (_("%X%P: can not create stub BFD %E\n"));
+      einfo (_("%X%P: can not create stub BFD: %E\n"));
       return;
     }
 
@@ -257,7 +257,7 @@ PARSE_AND_LIST_OPTIONS='
   fprintf (file, _("  --pmem-wrap-around=<val>    "
 		   "Make the linker relaxation machine assume that a\n"
 		   "                              "
-		   "  program counter wrap-around occures at address\n"
+		   "  program counter wrap-around occurs at address\n"
 		   "                              "
 		   "  <val>.  Supported values: 8k, 16k, 32k and 64k.\n"));
   fprintf (file, _("  --no-call-ret-replacement   "