* ldlex.l: Put pack -noinhibit-exec and -sort-common

	* ldlang.c (print_data_statement): print the right address.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e1d7a2d584327182bc72ac5654a2493f66328b25..6b3bd543ef1204d8fd472df28255771d42d03461 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,18 @@
+Tue Feb  4 15:28:01 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
+
+       * ldlex.l: Put pack -noinhibit-exec and -sort-common
+       * ldlang.c (print_data_statement): print the right address.
+
+Thu Jan 30 17:51:53 1992  Per Bothner  (bothner at cygnus.com)
+
+       * Makefile.in:  The rule for testing ld by re-linking itself
+       via an intermediate -r link was moved to the ld1 rule
+       instead of the ld2 rule.  This allows ld2 and ld3 to be identical,
+       which allows the bootstrap rule to work.
+       * ldctor.c (find_constructors):  Don't create a constructor
+       list if it is already defined (as would happen if ld is
+       invoked by collect).
+
 Wed Jan 29 08:35:39 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
 
        * config/mh-sparc.h: now uses libgcc.a

diff --git a/ld/ldlang.c b/ld/ldlang.c
index b99f1291bdee0b2517020529d298a2f91fa86a20..ef4fdf74fcb95b2b79b75e14dd358e5476cd9138 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1018,7 +1018,7 @@ DEFUN(print_input_section,(in),
       lang_input_section_type *in)
 {
   asection *i = in->section;
-  int size = i->flags & SEC_HAS_CONTENTS ?
+  int size = i->reloc_done ?
    bfd_get_section_size_after_reloc(i) :
     bfd_get_section_size_before_reloc(i);
   
@@ -1097,7 +1097,7 @@ DEFUN(print_data_statement,(data),
   print_space();
 /*  ASSERT(print_dot == data->output_vma);*/
 
-  print_address(data->output_vma);
+  print_address(data->output_vma + data->output_section->vma);
   print_space();
   print_address(data->value);
   print_space();
@@ -1136,6 +1136,7 @@ DEFUN(print_padding_statement,(s),
   print_space();
   print_fill(s->fill);
   print_nl();
+  print_dot = s->output_offset + s->output_section->vma + s->size;
 }
 
 static void