* ld-sh/ld-r-1.d: Adjust to changes in readelf output.

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

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 849e0ae2ef74a42a923bfb624ac2f16662db193b..0579727289ba0be513bc3971ff05102dbfb67175 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -1,5 +1,6 @@
 /* Main program of GNU linker.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -23,7 +24,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "bfd.h"
 #include "sysdep.h"
 #include <stdio.h>
-#include <ctype.h>
+#include "safe-ctype.h"
 #include "libiberty.h"
 #include "progress.h"
 #include "bfdlink.h"
@@ -33,9 +34,9 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ldmain.h"
 #include "ldmisc.h"
 #include "ldwrite.h"
-#include "ldgram.h"
 #include "ldexp.h"
 #include "ldlang.h"
+#include "ldgram.h"
 #include "ldlex.h"
 #include "ldfile.h"
 #include "ldemul.h"
@@ -54,6 +55,8 @@ extern PTR sbrk ();
 #endif
 #endif
 
+int main PARAMS ((int, char **));
+
 static char *get_emulation PARAMS ((int, char **));
 static void set_scripts_dir PARAMS ((void));
 
@@ -168,6 +171,9 @@ main (argc, argv)
 
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
 #endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
@@ -193,6 +199,13 @@ main (argc, argv)
       xexit (1);
     }
 
+#if YYDEBUG
+  {
+    extern int yydebug;
+    yydebug = 1;
+  }
+#endif
+
   /* Initialize the data about options.  */
   trace_files = trace_file_tries = version_printed = false;
   whole_archive = false;
@@ -202,6 +215,7 @@ main (argc, argv)
   config.split_by_reloc = (unsigned) -1;
   config.split_by_file = (bfd_size_type) -1;
   command_line.force_common_definition = false;
+  command_line.inhibit_common_definition = false;
   command_line.interpreter = NULL;
   command_line.rpath = NULL;
   command_line.warn_mismatch = true;
@@ -241,9 +255,12 @@ main (argc, argv)
   link_info.init_function = "_init";
   link_info.fini_function = "_fini";
   link_info.new_dtags = false;
+  link_info.eh_frame_hdr = false;
   link_info.flags = (bfd_vma) 0;
   link_info.flags_1 = (bfd_vma) 0;
   link_info.pei386_auto_import = false;
+  link_info.combreloc = false;
+  link_info.spare_dynamic_tags = 5;
 
   ldfile_add_arch ("");
 
@@ -254,7 +271,7 @@ main (argc, argv)
 
   emulation = get_emulation (argc, argv);
   ldemul_choose_mode (emulation);
-  default_target = ldemul_choose_target ();
+  default_target = ldemul_choose_target (argc, argv);
   lang_init ();
   ldemul_before_parse ();
   lang_has_input_file = false;
@@ -298,7 +315,7 @@ main (argc, argv)
 
   /* If we have not already opened and parsed a linker script
      read the emulation's appropriate default script.  */
-  if (saved_script_handle == false)
+  if (saved_script_handle == NULL)
     {
       int isfile;
       char *s = ldemul_get_script (& isfile);
@@ -317,18 +334,20 @@ main (argc, argv)
 
   if (trace_file_tries)
     {
-      info_msg (_("using %s linker script:\n"),
-               saved_script_handle ? "external" : "internal");
-      info_msg ("==================================================\n");
+      if (saved_script_handle)
+       info_msg (_("using external linker script:"));
+      else
+       info_msg (_("using internal linker script:"));
+      info_msg ("\n==================================================\n");
 
       if (saved_script_handle)
        {
-         const int BSIZE = 8192;
+         static const int ld_bufsz = 8193;
          size_t n;
-         char *buf = xmalloc (BSIZE);
+         char *buf = xmalloc (ld_bufsz);
 
          rewind (saved_script_handle);
-         while ((n = fread (buf, 1, BSIZE - 1, saved_script_handle)) > 0)
+         while ((n = fread (buf, 1, ld_bufsz - 1, saved_script_handle)) > 0)
            {
              buf [n] = 0;
              info_msg (buf);
@@ -537,10 +556,12 @@ get_emulation (argc, argv)
          else if (strcmp (argv[i], "-mips1") == 0
                   || strcmp (argv[i], "-mips2") == 0
                   || strcmp (argv[i], "-mips3") == 0
+                  || strcmp (argv[i], "-mips32") == 0
+                  || strcmp (argv[i], "-mips64") == 0
                   || strcmp (argv[i], "-mips4") == 0
                   || strcmp (argv[i], "-mips5") == 0)
            {
-             /* FIXME: The arguments -mips1, -mips2 and -mips3 are
+             /* FIXME: The arguments -mips1, -mips2, -mips3, etc. are
                 passed to the linker by some MIPS compilers.  They
                 generally tell the linker to use a slightly different
                 library path.  Perhaps someday these should be
@@ -717,14 +738,14 @@ add_keepsyms_file (filename)
   c = getc (file);
   while (c != EOF)
     {
-      while (isspace (c))
+      while (ISSPACE (c))
        c = getc (file);
 
       if (c != EOF)
        {
          size_t len = 0;
 
-         while (! isspace (c) && c != EOF)
+         while (! ISSPACE (c) && c != EOF)
            {
              buf[len] = c;
              ++len;
@@ -821,8 +842,7 @@ add_archive_element (info, abfd, name)
        {
          char buf[100];
 
-         sprintf (buf, "%-29s %s\n\n", _("Archive member included"),
-                  _("because of file (symbol)"));
+         sprintf (buf, _("Archive member included because of file (symbol)\n\n"));
          minfo ("%s", buf);
          header_printed = true;
        }