Apply H.J.'s patch to fix NOLOAD section sizes and dot updates

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 4b8107f6239e941ba20349c195a98a0aaadb7cde..0ff05f686ee2b435c2d74de7560dfed2e47f6298 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-18  H.J. Lu  <hjl@gnu.org>
+
+       * ldlang.c (lang_size_sections): Also update the current
+       address of a region if the SEC_NEVER_LOAD bit is not set.
+
 2000-01-10  Philip Blundell  <pb@futuretv.com>
 
        * configure.tgt (arm*-*-conix*): New target.

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 5e93f947fb62ec29bb3f5f97749b13fffb77faf6..d38d83791403df846eb23f9435b9f965bbb76668 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -2823,10 +2823,15 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax)
            /* Update dot in the region ?
               We only do this if the section is going to be allocated,
               since unallocated sections do not contribute to the region's
-              overall size in memory.  */
+              
+              If the SEC_NEVER_LOAD bit is not set, it will affect the
+              addresses of sections after it. We have to update
+              dot.  */
            if (os->region != (lang_memory_region_type *) NULL
-               && (bfd_get_section_flags (output_bfd, os->bfd_section)
-                   & (SEC_ALLOC | SEC_LOAD)))
+               && ((bfd_get_section_flags (output_bfd, os->bfd_section)
+                    & SEC_NEVER_LOAD) == 0
+                   || (bfd_get_section_flags (output_bfd, os->bfd_section)
+                       & (SEC_ALLOC | SEC_LOAD))))
              {
                os->region->current = dot;