* emultempl/mmo.em (mmo_place_orphan): Rewrite to also attach

	orphan sections to .data and .bss output sections, not just .text.
	When giving up on finding a suitable output section, attach to any
	output section other than .MMIX.reg_contents, if it exists.
	* scripttempl/mmo.sc: Move output debug sections to just before
	.MMIX.reg_contents.  Add .gnu.attributes.  Add new . = . NOP
	assignments and move end-of-section provide-symbols after them
	to force the end-of-section symbols to the address after orphan
	placement.  Add SORT_NONE to .init and .fini sections.

1 files changed, 92 insertions, 30 deletions

diff --git a/ld/emultempl/mmo.em b/ld/emultempl/mmo.em
index a1d5472f27..b895a9aaf1 100644
--- a/ld/emultempl/mmo.em
+++ b/ld/emultempl/mmo.em
@@ -53,22 +53,49 @@ mmo_place_orphan (asection *s,
 		  const char *secname,
 		  int constraint ATTRIBUTE_UNUSED)
 {
-  static struct orphan_save hold_text =
-    {
-      MMO_TEXT_SECTION_NAME,
-      SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
-      0, 0, 0, 0
-    };
-  struct orphan_save *place;
+  static struct
+  {
+    flagword nonzero_flags;
+    struct orphan_save orphansave;
+  } holds[] =
+      {
+	{
+	  SEC_CODE | SEC_READONLY,
+	  {
+	    MMO_TEXT_SECTION_NAME,
+	    SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
+	    0, 0, 0, 0
+	  }
+	},
+	{
+	  SEC_LOAD | SEC_DATA,
+	  {
+	    MMO_DATA_SECTION_NAME,
+	    SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_DATA,
+	    0, 0, 0, 0
+	  }
+	},
+	{
+	  SEC_ALLOC,
+	  {
+	    ".bss",
+	    SEC_ALLOC,
+	    0, 0, 0, 0
+	  }
+	}
+      };
+
+  struct orphan_save *place = NULL;
   lang_output_section_statement_type *after;
   lang_output_section_statement_type *os;
+  size_t i;
 
-  /* We have nothing to say for anything other than a final link.  */
+  /* We have nothing to say for anything other than a final link or
+     for sections that are excluded.  */
   if (link_info.relocatable
-      || (s->flags & (SEC_EXCLUDE | SEC_LOAD)) != SEC_LOAD)
+      || (s->flags & SEC_EXCLUDE) != 0)
     return NULL;
 
-  /* Only care for sections we're going to load.  */
   os = lang_output_section_find (secname);
 
   /* We have an output section by this name.  Place the section inside it
@@ -79,30 +106,65 @@ mmo_place_orphan (asection *s,
       return os;
     }
 
-  /* If this section does not have .text-type section flags or there's no
-     MMO_TEXT_SECTION_NAME, we don't have anything to say.  */
-  if ((s->flags & (SEC_CODE | SEC_READONLY)) == 0)
-    return NULL;
+  /* Check for matching section type flags for sections we care about.
+     A section without contents can have SEC_LOAD == 0, but we still
+     want it attached to a sane section so the symbols appear as
+     expected.  */
+  if ((s->flags & (SEC_ALLOC | SEC_READONLY)) != SEC_READONLY)
+    for (i = 0; i < sizeof (holds) / sizeof (holds[0]); i++)
+      if ((s->flags & holds[i].nonzero_flags) != 0)
+	{
+	  place = &holds[i].orphansave;
+	  if (place->os == NULL)
+	    place->os = lang_output_section_find (place->name);
+	  break;
+	}
 
-  if (hold_text.os == NULL)
-    hold_text.os = lang_output_section_find (hold_text.name);
+  if (place == NULL)
+    {
+      /* For other combinations, we have to give up, except we make
+	 sure not to place the orphan section after the
+	 linker-generated register section; that'd make it continue
+	 the reg section and we never want that to happen for orphan
+	 sections.  */
+      lang_output_section_statement_type *before;
+      lang_output_section_statement_type *lookup;
+      static struct orphan_save hold_nonreg =
+	{
+	  NULL,
+	  SEC_READONLY,
+	  0, 0, 0, 0
+	};
 
-  place = &hold_text;
-  if (hold_text.os != NULL)
-    after = hold_text.os;
-  else
-    after = &lang_output_section_statement.head->output_section_statement;
+      if (hold_nonreg.os == NULL)
+	{
+	  before = lang_output_section_find (MMIX_REG_CONTENTS_SECTION_NAME);
 
-  /* If there's an output section by this name, we'll use it, regardless
-     of section flags, in contrast to what's done in elf32.em.  */
-  os = lang_insert_orphan (s, secname, 0, after, place, NULL, NULL);
+	  /* If we have no such section, all fine; we don't care where
+	     it's placed.  */
+	  if (before == NULL)
+	    return NULL;
+
+	  /* We have to find the oss before this one, so we can use that as
+	     "after".  */
+	  for (lookup = &lang_output_section_statement.head->output_section_statement;
+	       lookup != NULL && lookup->next != before;
+	       lookup = lookup->next)
+	    ;
+
+	  hold_nonreg.os = lookup;
+	}
 
-  /* We need an output section for .text as a root, so if there was none
-     (might happen with a peculiar linker script such as in "map
-     addresses", map-address.exp), we grab the output section created
-     above.  */
-  if (hold_text.os == NULL)
-    hold_text.os = os;
+      place = &hold_nonreg;
+    }
+
+  after = place->os;
+  if (after == NULL)
+    return NULL;
+
+  /* If there's an output section by *this* name, we'll use it, regardless
+     of actual section flags, in contrast to what's done in elf32.em.  */
+  os = lang_insert_orphan (s, secname, 0, after, place, NULL, NULL);
 
   return os;
 }