diff options
| author | Nick Clifton <nickc@redhat.com> | 2001-07-19 16:21:39 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2001-07-19 16:21:39 +0000 |
| commit | f8239024a5f7d482af5d2936191410d3f7eacc72 (patch) | |
| tree | 0cef1ce2e35a845f811446989b41b15f9f6ed868 | |
| parent | 173aa8171eaed5e01e2f8d61e0a3c13b6c104c91 (diff) | |
| download | binutils-redhat-f8239024a5f7d482af5d2936191410d3f7eacc72.tar.gz | |
If a region is specified assign it to all sections inside the overlay unless they have been assigned to the own, non-default, memory region.
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/ldlang.c | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 108f63fad1..63368ac7f3 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,9 @@ 2001-07-19 Nick Clifton <nickc@cambridge.redhat.com> + * ldlang.c (lang_leave_overlay): If a region is specified assign + it to all sections inside the overlay unless they have been + assigned to the own, non-default, memory region. + * README: Add header for consistency with other README files. 2001-07-14 H.J. Lu <hjl@gnu.org> diff --git a/ld/ldlang.c b/ld/ldlang.c index 2b88068b8a..3f3c1fe7ec 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -4818,10 +4818,13 @@ lang_leave_overlay (fill, memspec, phdrs, lma_memspec) const char *lma_memspec; { lang_memory_region_type *region; + lang_memory_region_type * default_region; lang_memory_region_type *lma_region; struct overlay_list *l; struct lang_nocrossref *nocrossref; + default_region = lang_memory_region_lookup ("*default*"); + if (memspec == NULL) region = NULL; else @@ -4841,8 +4844,15 @@ lang_leave_overlay (fill, memspec, phdrs, lma_memspec) if (fill != 0 && l->os->fill == 0) l->os->fill = fill; - if (region != NULL && l->os->region == NULL) + + /* Assign a region to the sections, if one has been specified. + Override the assignment of the default section, but not + other sections. */ + if (region != NULL && + (l->os->region == NULL || + l->os->region == default_region)) l->os->region = region; + /* We only set lma_region for the first overlay section, as subsequent overlay sections will have load_base set relative to the first section. Also, don't set lma_region if @@ -4852,6 +4862,7 @@ lang_leave_overlay (fill, memspec, phdrs, lma_memspec) if (lma_region != NULL && l->os->lma_region == NULL && l->next == NULL && l->os->load_base == NULL) l->os->lma_region = lma_region; + if (phdrs != NULL && l->os->phdrs == NULL) l->os->phdrs = phdrs; |