Introduce program_space::remove_objfile

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

diff --git a/ld/emultempl/solaris2.em b/ld/emultempl/solaris2.em
index ae382636732151779e2efdda3ccddcc837c87e90..4cdfa8cc2307abbb08e2a98e8dca5936d6498a2e 100644 (file)
--- a/ld/emultempl/solaris2.em
+++ b/ld/emultempl/solaris2.em
@@ -9,7 +9,7 @@ fragment <<EOF
 /* This file is generated by a shell script.  DO NOT EDIT! */
 
 /* Solaris 2 emulation code for ${EMULATION_NAME}
-   Copyright (C) 2010-2016 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
    Written by Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
 
    This file is part of the GNU Binutils.
@@ -35,8 +35,12 @@ fragment <<EOF
    .dynsym table of executables and shared objects.  If generating a
    versioned shared object, they must always be bound to the base version.
 
+   The Solaris 2 ABI also requires two local symbols to be emitted for
+   every executable and shared object.
+
    Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
    File, p.63.  */
+
 static void
 elf_solaris2_before_allocation (void)
 {
@@ -50,6 +54,13 @@ elf_solaris2_before_allocation (void)
     "_etext",
     NULL
   };
+  /* Local symbols required by the Solaris 2 ABI.  Already emitted by
+     emulparams/solaris2.sh.  */
+  static const char *local_syms[] = {
+    "_START_",
+    "_END_",
+    NULL
+  };
   const char **sym;
 
   /* Do this for both executables and shared objects.  */
@@ -72,11 +83,28 @@ elf_solaris2_before_allocation (void)
          /* Emit it into the .dynamic section, too.  */
          bfd_elf_link_record_dynamic_symbol (&link_info, h);
        }
+
+      for (sym = local_syms; *sym != NULL; sym++)
+       {
+         struct elf_link_hash_entry *h;
+
+         /* Lookup symbol.  */
+         h = elf_link_hash_lookup (elf_hash_table (&link_info), *sym,
+                                   FALSE, FALSE, FALSE);
+         if (h == NULL)
+           continue;
+
+         /* Turn it local.  */
+         h->forced_local = 1;
+         /* Type should be STT_OBJECT, not STT_NOTYPE.  */
+         h->type = STT_OBJECT;
+       }
     }
 
   /* Only do this if emitting a shared object and versioning is in place. */
   if (bfd_link_dll (&link_info)
-      && (link_info.version_info != NULL
+      && ((link_info.version_info != NULL
+          && link_info.version_info->name[0] != '\0')
          || link_info.create_default_symver))
     {
       struct bfd_elf_version_expr *globals = NULL, *locals = NULL;
@@ -109,47 +137,6 @@ elf_solaris2_before_allocation (void)
   gld${EMULATION_NAME}_before_allocation ();
 }
 
-/* The Solaris 2 ABI requires two local symbols to be emitted for every
-   executable and shared object.
-
-   Cf. Linker and Libraries Guide, Ch. 2, Link-Editor, Generating the Output
-   File, p.63.  */
-static void
-elf_solaris2_after_allocation (void)
-{
-  /* Local symbols required by the Solaris 2 ABI.  Already emitted by
-     emulparams/solaris2.sh.  */
-  static const char *local_syms[] = {
-    "_START_",
-    "_END_",
-    NULL
-  };
-  const char **sym;
-
-  /* Do this for both executables and shared objects.  */
-  if (!bfd_link_relocatable (&link_info))
-    {
-      for (sym = local_syms; *sym != NULL; sym++)
-       {
-         struct elf_link_hash_entry *h;
-
-         /* Lookup symbol.  */
-         h = elf_link_hash_lookup (elf_hash_table (&link_info), *sym,
-                                   FALSE, FALSE, FALSE);
-         if (h == NULL)
-           continue;
-
-         /* Turn it local.  */
-         h->forced_local = 1;
-         /* Type should be STT_OBJECT, not STT_NOTYPE.  */
-         h->type = STT_OBJECT;
-       }
-    }
-
-  gld${EMULATION_NAME}_after_allocation ();
-}
-
 EOF
 
 LDEMUL_BEFORE_ALLOCATION=elf_solaris2_before_allocation
-LDEMUL_AFTER_ALLOCATION=elf_solaris2_after_allocation