Generic ELF target group signature symbol

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

diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em
index 441b4897fc8868116cdcd5715ee2d2ba5d2e9e46..5c87bf77ee826b0506369c27d0cf0742c93214e4 100644 (file)
--- a/ld/emultempl/m68kelf.em
+++ b/ld/emultempl/m68kelf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2019 Free Software Foundation, Inc.
 #   Written by Michael Sokolov <msokolov@ivan.Harhan.ORG>, based on armelf.em
 #
 # This file is part of the GNU Binutils.
@@ -67,7 +67,7 @@ m68k_elf_after_open (void)
 
 #ifdef SUPPORT_EMBEDDED_RELOCS
   if (command_line.embedded_relocs
-      && (! link_info.relocatable))
+      && (!bfd_link_relocatable (&link_info)))
     {
       bfd *abfd;
 
@@ -75,17 +75,13 @@ m68k_elf_after_open (void)
         input file with a nonzero .data section.  The BFD backend will fill in
         these sections with magic numbers which can be used to relocate the
         data section at run time.  */
-      for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
+      for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link.next)
        {
          asection *datasec;
 
-         /* As first-order business, make sure that each input BFD is either
-            COFF or ELF.  We need to call a special BFD backend function to
-            generate the embedded relocs, and we have such functions only for
-            COFF and ELF.  */
-         if (bfd_get_flavour (abfd) != bfd_target_coff_flavour
-             && bfd_get_flavour (abfd) != bfd_target_elf_flavour)
-           einfo ("%F%B: all input objects must be COFF or ELF for --embedded-relocs\n");
+         if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
+           einfo (_("%F%P: %pB: all input objects must be ELF "
+                    "for --embedded-relocs\n"));
 
          datasec = bfd_get_section_by_name (abfd, ".data");
 
@@ -109,7 +105,7 @@ m68k_elf_after_open (void)
                  || ! bfd_set_section_alignment (abfd, relsec, 2)
                  || ! bfd_set_section_size (abfd, relsec,
                                             datasec->reloc_count * 12))
-               einfo ("%F%B: can not create .emreloc section: %E\n");
+               einfo (_("%F%P: %pB: can not create .emreloc section: %E\n"));
            }
 
          /* Double check that all other data sections are empty, as is
@@ -130,7 +126,7 @@ check_sections (bfd *abfd, asection *sec, void *datasec)
   if ((bfd_get_section_flags (abfd, sec) & SEC_DATA)
       && sec != datasec
       && sec->reloc_count != 0)
-    einfo ("%B%X: section %s has relocs; can not use --embedded-relocs\n",
+    einfo (_("%X%P: %pB: section %s has relocs; can not use --embedded-relocs\n"),
           abfd, bfd_get_section_name (abfd, sec));
 }
 
@@ -143,17 +139,17 @@ static void
 m68k_elf_after_allocation (void)
 {
   /* Call the standard elf routine.  */
-  after_allocation_default ();
+  gld${EMULATION_NAME}_after_allocation ();
 
 #ifdef SUPPORT_EMBEDDED_RELOCS
   if (command_line.embedded_relocs
-      && (! link_info.relocatable))
+      && (!bfd_link_relocatable (&link_info)))
     {
       bfd *abfd;
 
       /* If we are generating embedded relocs, call a special BFD backend
         routine to do the work.  */
-      for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
+      for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link.next)
        {
          asection *datasec, *relsec;
          char *errmsg;
@@ -166,31 +162,19 @@ m68k_elf_after_allocation (void)
          relsec = bfd_get_section_by_name (abfd, ".emreloc");
          ASSERT (relsec != NULL);
 
-         if (bfd_get_flavour (abfd) == bfd_target_coff_flavour)
-           {
-             if (! bfd_m68k_coff_create_embedded_relocs (abfd, &link_info,
-                                                         datasec, relsec,
-                                                         &errmsg))
-               {
-                 if (errmsg == NULL)
-                   einfo ("%B%X: can not create runtime reloc information: %E\n",
-                          abfd);
-                 else
-                   einfo ("%X%B: can not create runtime reloc information: %s\n",
-                          abfd, errmsg);
-               }
-           }
-         else if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+         if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
            {
              if (! bfd_m68k_elf32_create_embedded_relocs (abfd, &link_info,
                                                           datasec, relsec,
                                                           &errmsg))
                {
                  if (errmsg == NULL)
-                   einfo ("%B%X: can not create runtime reloc information: %E\n",
+                   einfo (_("%X%P: %pB: can not create "
+                            "runtime reloc information: %E\n"),
                           abfd);
                  else
-                   einfo ("%X%B: can not create runtime reloc information: %s\n",
+                   einfo (_("%X%P: %pB: can not create "
+                            "runtime reloc information: %s\n"),
                           abfd, errmsg);
                }
            }
@@ -230,15 +214,15 @@ PARSE_AND_LIST_OPTIONS='
 PARSE_AND_LIST_ARGS_CASES='
     case OPTION_GOT:
       if (strcmp (optarg, "target") == 0)
-        got_handling = GOT_HANDLING_TARGET_DEFAULT;
+       got_handling = GOT_HANDLING_TARGET_DEFAULT;
       else if (strcmp (optarg, "single") == 0)
-        got_handling = 0;
+       got_handling = 0;
       else if (strcmp (optarg, "negative") == 0)
-        got_handling = 1;
+       got_handling = 1;
       else if (strcmp (optarg, "multigot") == 0)
-        got_handling = 2;
+       got_handling = 2;
       else
-        einfo (_("Unrecognized --got argument '\''%s'\''.\n"), optarg);
+       einfo (_("%P: unrecognized --got argument '\''%s'\''\n"), optarg);
       break;
 '