* mips-tdep.c (mips16_scan_prologue): Handle the MIPS16e SAVE

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

diff --git a/ld/ldexp.c b/ld/ldexp.c
index f57210ff8a03e8f974b2e7a896f229334302408f..5e2812d5baf039be0874f00dad2fc841d857156a 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -390,6 +390,7 @@ fold_binary (etree_type *tree)
              break;
 
            case DATA_SEGMENT_ALIGN:
+             expld.dataseg.relro = exp_dataseg_relro_start;
              if (expld.phase != lang_first_phase_enum
                  && expld.section == bfd_abs_section_ptr
                  && (expld.dataseg.phase == exp_dataseg_none
@@ -425,6 +426,7 @@ fold_binary (etree_type *tree)
              break;
 
            case DATA_SEGMENT_RELRO_END:
+             expld.dataseg.relro = exp_dataseg_relro_end;
              if (expld.phase != lang_first_phase_enum
                  && (expld.dataseg.phase == exp_dataseg_align_seen
                      || expld.dataseg.phase == exp_dataseg_adjust
@@ -1052,7 +1054,7 @@ exp_get_vma (etree_type *tree, bfd_vma def, char *name)
       if (expld.result.valid_p)
        return expld.result.value;
       else if (name != NULL && expld.phase != lang_mark_phase_enum)
-       einfo (_("%F%S nonconstant expression for %s\n"), name);
+       einfo (_("%F%S: nonconstant expression for %s\n"), name);
     }
   return def;
 }
@@ -1077,7 +1079,7 @@ exp_get_fill (etree_type *tree, fill_type *def, char *name)
   if (!expld.result.valid_p)
     {
       if (name != NULL && expld.phase != lang_mark_phase_enum)
-       einfo (_("%F%S nonconstant expression for %s\n"), name);
+       einfo (_("%F%S: nonconstant expression for %s\n"), name);
       return def;
     }