MIPS: Add options to control branch ISA checks

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

diff --git a/ld/emultempl/solaris2.em b/ld/emultempl/solaris2.em
index 2c24467fd391f1c1ca81401a6cc92b275413b971..c5f2f31f9c0b6bf78336f46e2c8ec9ed2469f4e0 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 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010-2017 Free Software Foundation, Inc.
    Written by Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
 
    This file is part of the GNU Binutils.
@@ -53,7 +53,7 @@ elf_solaris2_before_allocation (void)
   const char **sym;
 
   /* Do this for both executables and shared objects.  */
-  if (!link_info.relocatable)
+  if (!bfd_link_relocatable (&link_info))
     {
       for (sym = global_syms; *sym != NULL; sym++)
        {
@@ -75,8 +75,9 @@ elf_solaris2_before_allocation (void)
     }
 
   /* Only do this if emitting a shared object and versioning is in place. */
-  if (link_info.shared
-      && (link_info.version_info != NULL
+  if (bfd_link_dll (&link_info)
+      && ((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;
@@ -127,7 +128,7 @@ elf_solaris2_after_allocation (void)
   const char **sym;
 
   /* Do this for both executables and shared objects.  */
-  if (!link_info.relocatable)
+  if (!bfd_link_relocatable (&link_info))
     {
       for (sym = local_syms; *sym != NULL; sym++)
        {