From: amodra <amodra>
Date: Wed, 4 Dec 2002 23:56:13 +0000 (+0000)
Subject: 	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Set
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=99eb07480256784632558c831dc8b75660c2f262;p=pf3gnuchains%2Fsourceware.git

	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Set
	load_base for orphans that follow a section with load_base set.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 37f1412dfb..09b9c7de1e 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-05  Alan Modra  <amodra@bigpond.net.au>
+
+	* emultempl/elf32.em (gld${EMULATION_NAME}_place_orphan): Set
+	load_base for orphans that follow a section with load_base set.
+
 2002-12-01  H.J. Lu <hjl@gnu.org>
 
 	* ld.texinfo: Remove the extra `;' in sample version script.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 60a789eb37..06fdd81360 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -1093,6 +1093,7 @@ gld${EMULATION_NAME}_place_orphan (file, s)
   const char *secname;
   const char *ps = NULL;
   lang_output_section_statement_type *os;
+  etree_type *load_base;
   int isdyn = 0;
 
   secname = bfd_get_section_name (s->owner, s);
@@ -1227,16 +1228,25 @@ gld${EMULATION_NAME}_place_orphan (file, s)
 	}
     }
 
+  address = NULL;
   if (link_info.relocateable || (s->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
     address = exp_intop ((bfd_vma) 0);
-  else
-    address = NULL;
+
+  load_base = NULL;
+  if (place != NULL && place->os->load_base != NULL)
+    {
+      etree_type *lma_from_vma;
+      lma_from_vma = exp_binop ('-', place->os->load_base,
+				exp_nameop (ADDR, place->os->name));
+      load_base = exp_binop ('+', lma_from_vma,
+			     exp_nameop (ADDR, secname));
+    }
 
   os = lang_enter_output_section_statement (secname, address, 0,
 					    (bfd_vma) 0,
 					    (etree_type *) NULL,
 					    (etree_type *) NULL,
-					    (etree_type *) NULL);
+					    load_base);
 
   lang_add_section (&os->children, s, os, file);