* 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 578e34f84e0d07f6eac11cb7bc221ded3a95349d..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, 2001
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+   2002
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -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));
 
@@ -196,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;
@@ -245,6 +255,7 @@ 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;
@@ -260,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;
@@ -323,9 +334,11 @@ 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)
        {
@@ -829,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;
        }