*** empty log message ***

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

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 221f9d1f39d6606c9cc1a0cf1517f79b17233f32..2c406eb1a74d9c90a23b6506f2c3a101fac620ce 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -239,6 +239,7 @@ 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.strip = strip_none;
   link_info.discard = discard_sec_merge;
   link_info.keep_memory = true;
@@ -259,7 +260,8 @@ 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;
 
   ldfile_add_arch ("");
@@ -318,12 +320,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);
        }
@@ -349,7 +351,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);
@@ -359,9 +361,9 @@ main (argc, argv)
        {
          int isfile;
 
-         info_msg (ldemul_get_script (& isfile));
+         info_msg (ldemul_get_script (&isfile));
        }
-      
+
       info_msg ("\n==================================================\n");
     }