2006-02-21 Andrew Stubbs <andrew.stubbs@st.com>

[deliverable/binutils-gdb.git] / ld / ldmain.c

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 2b58d63129d74de17ff564899093ed9dcbc8eba5..c8a75d6f9e18aee21ea323db056a8696f80e8b8d 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -1,6 +1,6 @@
 /* Main program of GNU linker.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004
+   2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GLD; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -50,7 +50,7 @@
 #include <string.h>
 
 #ifdef HAVE_SBRK
-#ifdef NEED_DECLARATION_SBRK
+#if !HAVE_DECL_SBRK
 extern void *sbrk ();
 #endif
 #endif
@@ -160,7 +160,8 @@ static struct bfd_link_callbacks link_callbacks =
   reloc_overflow,
   reloc_dangerous,
   unattached_reloc,
-  notice
+  notice,
+  einfo
 };
 
 struct bfd_link_info link_info;
@@ -173,7 +174,7 @@ remove_output (void)
       if (output_bfd)
        bfd_cache_close (output_bfd);
       if (delete_output_file_on_failure)
-       unlink (output_filename);
+       unlink_if_ordinary (output_filename);
     }
 }
 
@@ -197,6 +198,8 @@ main (int argc, char **argv)
 
   START_PROGRESS (program_name, 0);
 
+  expandargv (&argc, &argv);
+
   bfd_init ();
 
   bfd_set_error_program_name (program_name);
@@ -209,7 +212,7 @@ main (int argc, char **argv)
     {
       if (*TARGET_SYSTEM_ROOT == 0)
        {
-         einfo ("%P%F: this linker was not configured to use sysroots");
+         einfo ("%P%F: this linker was not configured to use sysroots\n");
          ld_sysroot = "";
        }
       else
@@ -312,6 +315,7 @@ main (int argc, char **argv)
   link_info.flags_1 = 0;
   link_info.need_relax_finalize = FALSE;
   link_info.warn_shared_textrel = FALSE;
+  link_info.gc_sections = FALSE;
 
   ldfile_add_arch ("");
 
@@ -335,7 +339,7 @@ main (int argc, char **argv)
 
   if (link_info.relocatable)
     {
-      if (command_line.gc_sections)
+      if (link_info.gc_sections)
        einfo ("%P%F: --gc-sections and -r may not be used together\n");
       else if (command_line.relax)
        einfo (_("%P%F: --relax and -r may not be used together\n"));
@@ -343,9 +347,6 @@ main (int argc, char **argv)
        einfo (_("%P%F: -r and -shared may not be used together\n"));
     }
 
-   if (!config.dynamic_link && link_info.shared)
-     einfo (_("%P%F: -static and -shared may not be used together\n"));
-
   if (! link_info.shared)
     {
       if (command_line.filter_shlib)
@@ -473,6 +474,8 @@ main (int argc, char **argv)
   if (nocrossref_list != NULL)
     check_nocrossrefs ();
 
+  lang_finish ();
+
   /* Even if we're producing relocatable output, some non-fatal errors should
      be reported in the exit status.  (What non-fatal errors, if any, do we
      want to ignore for relocatable output?)  */
@@ -872,7 +875,7 @@ add_keepsyms_file (const char *filename)
    a link.  */
 
 static bfd_boolean
-add_archive_element (struct bfd_link_info *info ATTRIBUTE_UNUSED,
+add_archive_element (struct bfd_link_info *info,
                     bfd *abfd,
                     const char *name)
 {
@@ -903,7 +906,7 @@ add_archive_element (struct bfd_link_info *info ATTRIBUTE_UNUSED,
       bfd *from;
       int len;
 
-      h = bfd_link_hash_lookup (link_info.hash, name, FALSE, FALSE, TRUE);
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
       if (h == NULL)
        from = NULL;
@@ -1144,7 +1147,7 @@ constructor_callback (struct bfd_link_info *info,
   /* Ensure that BFD_RELOC_CTOR exists now, so that we can give a
      useful error message.  */
   if (bfd_reloc_type_lookup (output_bfd, BFD_RELOC_CTOR) == NULL
-      && (link_info.relocatable
+      && (info->relocatable
          || bfd_reloc_type_lookup (abfd, BFD_RELOC_CTOR) == NULL))
     einfo (_("%P%F: BFD backend error: BFD_RELOC_CTOR unsupported\n"));
 
@@ -1200,11 +1203,11 @@ warning_callback (struct bfd_link_info *info ATTRIBUTE_UNUSED,
     return TRUE;
 
   if (section != NULL)
-    einfo ("%C: %s\n", abfd, section, address, warning);
+    einfo ("%C: %s%s\n", abfd, section, address, _("warning: "), warning);
   else if (abfd == NULL)
-    einfo ("%P: %s\n", warning);
+    einfo ("%P: %s%s\n", _("warning: "), warning);
   else if (symbol == NULL)
-    einfo ("%B: %s\n", abfd, warning);
+    einfo ("%B: %s%s\n", abfd, _("warning: "), warning);
   else
     {
       lang_input_statement_type *entry;
@@ -1242,7 +1245,7 @@ warning_callback (struct bfd_link_info *info ATTRIBUTE_UNUSED,
       bfd_map_over_sections (abfd, warning_find_reloc, &info);
 
       if (! info.found)
-       einfo ("%B: %s\n", abfd, warning);
+       einfo ("%B: %s%s\n", abfd, _("warning: "), warning);
 
       if (entry == NULL)
        free (asymbols);
@@ -1290,7 +1293,8 @@ warning_find_reloc (bfd *abfd, asection *sec, void *iarg)
          && strcmp (bfd_asymbol_name (*q->sym_ptr_ptr), info->symbol) == 0)
        {
          /* We found a reloc for the symbol we are looking for.  */
-         einfo ("%C: %s\n", abfd, sec, q->address, info->warning);
+         einfo ("%C: %s%s\n", abfd, sec, q->address, _("warning: "),
+                info->warning);
          info->found = TRUE;
          break;
        }
@@ -1420,10 +1424,7 @@ reloc_overflow (struct bfd_link_info *info ATTRIBUTE_UNUSED,
   if (overflow_cutoff_limit == -1)
     return TRUE;
 
-  if (abfd == NULL)
-    einfo (_("%P%X: generated"));
-  else
-    einfo ("%X%C:", abfd, section, address);
+  einfo ("%X%C:", abfd, section, address);
 
   if (overflow_cutoff_limit >= 0
       && overflow_cutoff_limit-- == 0)
@@ -1448,7 +1449,9 @@ reloc_overflow (struct bfd_link_info *info ATTRIBUTE_UNUSED,
        case bfd_link_hash_defweak:
          einfo (_(" relocation truncated to fit: %s against symbol `%T' defined in %A section in %B"),
                 reloc_name, entry->root.string,
-                entry->u.def.section, entry->u.def.section->owner);
+                entry->u.def.section,
+                entry->u.def.section == bfd_abs_section_ptr
+                ? output_bfd : entry->u.def.section->owner);
          break;
        default:
          abort ();
@@ -1473,11 +1476,8 @@ reloc_dangerous (struct bfd_link_info *info ATTRIBUTE_UNUSED,
                 asection *section,
                 bfd_vma address)
 {
-  if (abfd == NULL)
-    einfo (_("%P%X: generated"));
-  else
-    einfo ("%X%C:", abfd, section, address);
-  einfo (_("dangerous relocation: %s\n"), message);
+  einfo (_("%X%C: dangerous relocation: %s\n"),
+        abfd, section, address, message);
   return TRUE;
 }
 
@@ -1491,11 +1491,8 @@ unattached_reloc (struct bfd_link_info *info ATTRIBUTE_UNUSED,
                  asection *section,
                  bfd_vma address)
 {
-  if (abfd == NULL)
-    einfo (_("%P%X: generated"));
-  else
-    einfo ("%X%C:", abfd, section, address);
-  einfo (_(" reloc refers to symbol `%T' which is not being output\n"), name);
+  einfo (_("%X%C: reloc refers to symbol `%T' which is not being output\n"),
+        abfd, section, address, name);
   return TRUE;
 }