Remove sh-symbianelf support

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

diff --git a/ld/emultempl/sh64elf.em b/ld/emultempl/sh64elf.em
index 794115a93386d0d8290b2c63ec91292231c87050..1fe94da9476077ecee04b253269a58e964221e57 100644 (file)
--- a/ld/emultempl/sh64elf.em
+++ b/ld/emultempl/sh64elf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright (C) 2000-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2018 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -29,7 +29,6 @@ LDEMUL_BEFORE_ALLOCATION=sh64_elf_${EMULATION_NAME}_before_allocation
 fragment <<EOF
 
 #include "libiberty.h"
-#include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/sh.h"
 #include "elf32-sh64.h"
@@ -67,7 +66,7 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
             also look through incoming relocs and kill the ones marking
             relaxation areas, but that wouldn't be TRT.  */
          einfo
-           (_("%P: Sorry, turning off relaxing: .cranges section in input.\n"));
+           (_("%P: sorry, turning off relaxing: .cranges section in input\n"));
          einfo (_(" A .cranges section is present in:\n"));
 
          {
@@ -77,7 +76,7 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
                  = bfd_get_section_by_name (f->the_bfd,
                                             SH64_CRANGES_SECTION_NAME);
                if (input_cranges != NULL)
-                 einfo (" %I\n", f);
+                 einfo (" %pI\n", f);
              }
          }
 
@@ -105,8 +104,8 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
                  if (elf_section_data (isec)->this_hdr.sh_flags
                      & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED))
                    {
-                     einfo (_("%P: Sorry, turning off relaxing: SHmedia sections present.\n"));
-                     einfo ("  %I\n", f);
+                     einfo (_("%P: sorry, turning off relaxing: SHmedia sections present\n"));
+                     einfo ("  %pI\n", f);
                      DISABLE_RELAXATION;
                      goto done_scanning_shmedia_sections;
                    }
@@ -128,7 +127,7 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
       bfd_vma iflags_isa = 0;
 
       if (bfd_get_flavour (link_info.output_bfd) != bfd_target_elf_flavour)
-       einfo (_("%FError: non-ELF output formats are not supported by this target's linker.\n"));
+       einfo (_("%F%P: error: non-ELF output formats are not supported by this target's linker\n"));
 
       sh64_sec_data = sh64_elf_section_data (osec)->sh64_info;
 
@@ -171,7 +170,7 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
     break_1:
 
       /* Check that all input sections have the same contents-type flags
-         as the first input section.  */
+        as the first input section.  */
       {
        LANG_FOR_EACH_INPUT_STATEMENT (f)
          {
@@ -211,7 +210,7 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
                                                             | SEC_DEBUGGING);
                            if (cranges == NULL)
                              einfo
-                               (_("%P%E%F: Can't make .cranges section\n"));
+                               (_("%F%P: can't make .cranges section: %E\n"));
                          }
 
                        /* We don't need to look at more input sections,
@@ -303,7 +302,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void)
     break_1:
 
       /* Check that all input sections have the same contents-type flags
-         as the first input section.  */
+        as the first input section.  */
       {
        LANG_FOR_EACH_INPUT_STATEMENT (f)
          {
@@ -332,7 +331,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void)
                      {
                        oflags_isa = SHF_SH5_ISA32_MIXED;
 
-                       BFD_ASSERT (sh64_elf_section_data (osec)->sh64_info);
+                       ASSERT (sh64_elf_section_data (osec)->sh64_info);
 
                        sh64_elf_section_data (osec)->sh64_info->contents_flags
                          = SHF_SH5_ISA32_MIXED;
@@ -382,7 +381,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void)
   if (cranges->contents != NULL)
     free (cranges->contents);
 
-  BFD_ASSERT (sh64_elf_section_data (cranges)->sh64_info != NULL);
+  ASSERT (sh64_elf_section_data (cranges)->sh64_info != NULL);
 
   /* Make sure we have .cranges in memory even if there were only
      assembler-generated .cranges.  */
@@ -485,7 +484,8 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void)
 
                    /* If we emit relocatable contents, we need a
                       relocation for the start address.  */
-                   if (link_info.relocatable || link_info.emitrelocations)
+                   if (bfd_link_relocatable (&link_info)
+                       || link_info.emitrelocations)
                      {
                        /* FIXME: We could perhaps use lang_add_reloc and
                           friends here, but I'm not really sure that
@@ -496,7 +496,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void)
 
                        if (cr_addr_order == NULL)
                          {
-                           einfo (_("%P%F: bfd_new_link_order failed\n"));
+                           einfo (_("%F%P: bfd_new_link_order failed\n"));
                            return;
                          }