Convert #ifdef HAVE_NONSTEPPABLE_WATCHPOINT into C

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

diff --git a/ld/ldmain.c b/ld/ldmain.c
index eac23ae2762bc6c51e3718fd853c7b84ca2d40f4..84baa4ddf0aff3aa43bc4cae472e569e48864a45 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));
 
@@ -236,11 +239,14 @@ main (argc, argv)
   link_info.optimize = false;
   link_info.no_undefined = false;
   link_info.allow_shlib_undefined = false;
+  link_info.allow_multiple_definition = false;
+  link_info.allow_undefined_version = true;
   link_info.strip = strip_none;
   link_info.discard = discard_sec_merge;
   link_info.keep_memory = true;
   link_info.input_bfds = NULL;
   link_info.create_object_symbols_section = NULL;
+  link_info.gc_sym_list = NULL;
   link_info.hash = NULL;
   link_info.keep_hash = NULL;
   link_info.notice_all = false;
@@ -256,8 +262,10 @@ main (argc, argv)
   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.pei386_auto_import = -1;
+  link_info.combreloc = true;
   link_info.spare_dynamic_tags = 5;
+  link_info.common_skip_ar_aymbols = bfd_link_common_skip_none;
 
   ldfile_add_arch ("");
 
@@ -315,12 +323,12 @@ main (argc, argv)
   if (saved_script_handle == NULL)
     {
       int isfile;
-      char *s = ldemul_get_script (& isfile);
+      char *s = ldemul_get_script (&isfile);
 
       if (isfile)
        ldfile_open_command_file (s);
       else
-       {       
+       {
          lex_string = s;
          lex_redirect (s);
        }
@@ -346,7 +354,7 @@ main (argc, argv)
          rewind (saved_script_handle);
          while ((n = fread (buf, 1, ld_bufsz - 1, saved_script_handle)) > 0)
            {
-             buf [n] = 0;
+             buf[n] = 0;
              info_msg (buf);
            }
          rewind (saved_script_handle);
@@ -356,9 +364,9 @@ main (argc, argv)
        {
          int isfile;
 
-         info_msg (ldemul_get_script (& isfile));
+         info_msg (ldemul_get_script (&isfile));
        }
-      
+
       info_msg ("\n==================================================\n");
     }
 
@@ -401,20 +409,6 @@ main (argc, argv)
   /* Print error messages for any missing symbols, for any warning
      symbols, and possibly multiple definitions.  */
 
-  if (! link_info.relocateable)
-    {
-      /* Look for a text section and switch the readonly attribute in it.  */
-      asection *found = bfd_get_section_by_name (output_bfd, ".text");
-
-      if (found != (asection *) NULL)
-       {
-         if (config.text_read_only)
-           found->flags |= SEC_READONLY;
-         else
-           found->flags &= ~SEC_READONLY;
-       }
-    }
-
   if (link_info.relocateable)
     output_bfd->flags &= ~EXEC_P;
   else