From: Nick Clifton <nickc@redhat.com>
Date: Thu, 19 Jul 2001 16:23:30 +0000 (+0000)
Subject: If a region is specified assign it to all sections inside the overlay unless
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=98da22979bd1ac0557dd539d49415d51ad8fdcce;p=thirdparty%2Fbinutils-gdb.git

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
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3d930b9ac4d..54a9aa5c301 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +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.
+
 2001-07-14  matthew green  <mrg@eterna.com.au>
 
 	* configure.tgt (i386-*-netbsdelf*): New target.
diff --git a/ld/ldlang.c b/ld/ldlang.c
index f683abb1405..924e3ec32c5 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4766,10 +4766,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
@@ -4789,8 +4792,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
@@ -4800,6 +4810,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;