Fix compile time warning: bfd/elf32-arc.c:1537]: (warning) Redundant assignment of...

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

diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em
index 952d731bb414f917edf686d1ec7b1d5f44a98572..bfea49efc059e2daede62e9ecdeab2bdc395a074 100644 (file)
--- a/ld/emultempl/sunos.em
+++ b/ld/emultempl/sunos.em
@@ -9,7 +9,7 @@ fragment <<EOF
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* SunOS emulation code for ${EMULATION_NAME}
-   Copyright (C) 1991-2015 Free Software Foundation, Inc.
+   Copyright (C) 1991-2018 Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    SunOS shared library support by Ian Lance Taylor <ian@cygnus.com>
 
@@ -368,7 +368,7 @@ gld${EMULATION_NAME}_after_open (void)
   after_open_default ();
 
   /* We only need to worry about this when doing a final link.  */
-  if (link_info.relocatable || link_info.shared)
+  if (bfd_link_relocatable (&link_info) || bfd_link_pic (&link_info))
     return;
 
   /* Get the list of files which appear in ld_need entries in dynamic
@@ -427,11 +427,11 @@ gld${EMULATION_NAME}_after_open (void)
            {
              /* We've found the needed dynamic object.  */
              if (! bfd_link_add_symbols (abfd, &link_info))
-               einfo ("%F%B: error adding symbols: %E\n", abfd);
+               einfo (_("%F%B: error adding symbols: %E\n"), abfd);
            }
          else
            {
-             einfo ("%P: warning: %s, needed by %B, not found\n",
+             einfo (_("%P: warning: %s, needed by %B, not found\n"),
                     lname, l->by);
            }
 
@@ -491,7 +491,7 @@ fragment <<EOF
            continue;
        }
 
-      einfo ("%P: warning: %s, needed by %B, not found\n",
+      einfo (_("%P: warning: %s, needed by %B, not found\n"),
             l->name, l->by);
     }
 }
@@ -574,7 +574,7 @@ gld${EMULATION_NAME}_try_needed (const char *dir, const char *name)
 
   /* Add this file into the symbol table.  */
   if (! bfd_link_add_symbols (abfd, &link_info))
-    einfo ("%F%B: error adding symbols: %E\n", abfd);
+    einfo (_("%F%B: error adding symbols: %E\n"), abfd);
 
   return TRUE;
 }
@@ -669,7 +669,9 @@ gld${EMULATION_NAME}_before_allocation (void)
   /* The SunOS native linker creates a shared library whenever there
      are any undefined symbols in a link, unless -e is used.  This is
      pretty weird, but we are compatible.  */
-  if (! link_info.shared && ! link_info.relocatable && ! entry_from_cmdline)
+  if (! bfd_link_pic (&link_info)
+      && !bfd_link_relocatable (&link_info)
+      && ! entry_from_cmdline)
     {
       struct bfd_link_hash_entry *h;
 
@@ -686,14 +688,14 @@ gld${EMULATION_NAME}_before_allocation (void)
              lang_for_each_statement (gld${EMULATION_NAME}_find_assignment);
              if (! found_assign)
                {
-                 link_info.shared = TRUE;
+                 link_info.type = type_dll;
                  break;
                }
            }
        }
     }
 
-  if (link_info.shared)
+  if (bfd_link_pic (&link_info))
     {
       lang_output_section_statement_type *os;
 
@@ -710,15 +712,15 @@ gld${EMULATION_NAME}_before_allocation (void)
      one.  We need to create the symbol before calling
      size_dynamic_sections, although we can't set the value until
      afterward.  */
-  if (! link_info.relocatable)
+  if (!bfd_link_relocatable (&link_info))
     {
       hdyn = bfd_link_hash_lookup (link_info.hash, "__DYNAMIC", TRUE, FALSE,
                                   FALSE);
       if (hdyn == NULL)
-       einfo ("%P%F: bfd_link_hash_lookup: %E\n");
+       einfo (_("%P%F: bfd_link_hash_lookup: %E\n"));
       if (! bfd_sunos_record_link_assignment (link_info.output_bfd, &link_info,
                                              "__DYNAMIC"))
-       einfo ("%P%F: failed to record assignment to __DYNAMIC: %E\n");
+       einfo (_("%P%F: failed to record assignment to __DYNAMIC: %E\n"));
     }
 
   /* If we are going to make any variable assignments, we need to let
@@ -730,7 +732,7 @@ gld${EMULATION_NAME}_before_allocation (void)
      required by dynamic linking.  */
   if (! bfd_sunos_size_dynamic_sections (link_info.output_bfd, &link_info,
                                         &sdyn, &sneed, &srules))
-    einfo ("%P%F: failed to set dynamic section sizes: %E\n");
+    einfo (_("%P%F: failed to set dynamic section sizes: %E\n"));
 
   if (sneed != NULL)
     {
@@ -803,7 +805,7 @@ gld${EMULATION_NAME}_before_allocation (void)
   /* We must assign a value to __DYNAMIC.  It should be zero if we are
      not doing a dynamic link, or the start of the .dynamic section if
      we are doing one.  */
-  if (! link_info.relocatable)
+  if (!bfd_link_relocatable (&link_info))
     {
       hdyn->type = bfd_link_hash_defined;
       hdyn->u.def.value = 0;
@@ -851,7 +853,7 @@ gld${EMULATION_NAME}_find_exp_assignment (etree_type *exp)
          if (! bfd_sunos_record_link_assignment (link_info.output_bfd,
                                                  &link_info,
                                                  exp->assign.dst))
-           einfo ("%P%F: failed to record assignment to %s: %E\n",
+           einfo (_("%P%F: failed to record assignment to %s: %E\n"),
                   exp->assign.dst);
        }
       gld${EMULATION_NAME}_find_exp_assignment (exp->assign.src);
@@ -969,11 +971,11 @@ fragment <<EOF
 {
   *isfile = 0;
 
-  if (link_info.relocatable && config.build_constructors)
+  if (bfd_link_relocatable (&link_info) && config.build_constructors)
     return
 EOF
 sed $sc ldscripts/${EMULATION_NAME}.xu                     >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocatable) return'         >> e${EMULATION_NAME}.c
+echo '  ; else if (bfd_link_relocatable (&link_info)) return' >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xr                     >> e${EMULATION_NAME}.c
 echo '  ; else if (!config.text_read_only) return'         >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xbn                    >> e${EMULATION_NAME}.c
@@ -990,9 +992,9 @@ fragment <<EOF
 {
   *isfile = 1;
 
-  if (link_info.relocatable && config.build_constructors)
+  if (bfd_link_relocatable (&link_info) && config.build_constructors)
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocatable)
+  else if (bfd_link_relocatable (&link_info))
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
     return "ldscripts/${EMULATION_NAME}.xbn";
@@ -1014,6 +1016,7 @@ struct ld_emulation_xfer_struct ld_${EMULATION_NAME}_emulation =
   hll_default,
   after_parse_default,
   gld${EMULATION_NAME}_after_open,
+  after_check_relocs_default,
   after_allocation_default,
   set_output_arch_default,
   ldemul_default_target,