* corefile.c (core_create_syms_from): Use BFD_VMA_FMT when

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

diff --git a/ld/ldmain.c b/ld/ldmain.c
index 706058728403e78e99d9c0a5296f2c76595d9610..3b8fed63116774edec688d0b582b6278f7bf6ac5 100644 (file)
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -251,7 +251,7 @@ main (int argc, char **argv)
 
   command_line.warn_mismatch = TRUE;
   command_line.warn_search_mismatch = TRUE;
-  command_line.check_section_addresses = TRUE;
+  command_line.check_section_addresses = -1;
 
   /* We initialize DEMANGLING based on the environment variable
      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
@@ -292,8 +292,8 @@ main (int argc, char **argv)
 
   if (link_info.relocatable)
     {
-      if (command_line.relax)
-       einfo (_("%P%F: --relax and -r may not be used together\n"));
+      if (command_line.check_section_addresses < 0)
+       command_line.check_section_addresses = 0;
       if (link_info.shared)
        einfo (_("%P%F: -r and -shared may not be used together\n"));
     }
@@ -374,7 +374,7 @@ main (int argc, char **argv)
       char *s = ldemul_get_script (&isfile);
 
       if (isfile)
-       ldfile_open_command_file (s);
+       ldfile_open_default_command_file (s);
       else
        {
          lex_string = s;