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
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;
}
/* FIXME: Move .init, .fini, .ctors and .dtors to their own sections. */
${RELOCATING+ PROVIDE (_init_start = .);}
${RELOCATING+ PROVIDE (_init = .);}
- ${RELOCATING+ KEEP (*(.init))}
+ ${RELOCATING+ KEEP (*(SORT_NONE(.init)))}
${RELOCATING+ PROVIDE (_init_end = .);}
${RELOCATING+ PROVIDE (_fini_start = .);}
${RELOCATING+ PROVIDE (_fini = .);}
- ${RELOCATING+ KEEP (*(.fini))}
+ ${RELOCATING+ KEEP (*(SORT_NONE(.fini)))}
${RELOCATING+ PROVIDE (_fini_end = .);}
/* FIXME: Align ctors, dtors, ehframe. */
${RELOCATING+KEEP (*(.eh_frame))}
${RELOCATING+*(.gcc_except_table)}
- ${RELOCATING+ PROVIDE(etext = .);}
- ${RELOCATING+ PROVIDE(_etext = .);}
- ${RELOCATING+ PROVIDE(__etext = .);}
${RELOCATING+Main = DEFINED (Main) ? Main : (DEFINED (_start) ? _start : ADDR (.text));}
}
- .stab 0 : { *(.stab) }
- .stabstr 0 : { *(.stabstr) }
- .stab.excl 0 : { *(.stab.excl) }
- .stab.exclstr 0 : { *(.stab.exclstr) }
- .stab.index 0 : { *(.stab.index) }
- .stab.indexstr 0 : { *(.stab.indexstr) }
- .debug_aranges 0 : { *(.debug_aranges) }
- .debug_pubnames 0 : { *(.debug_pubnames) }
- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
- .debug_abbrev 0 : { *(.debug_abbrev) }
- .debug_line 0 : { *(.debug_line) }
- .debug_frame 0 : { *(.debug_frame) }
- .debug_str 0 : { *(.debug_str) }
- .debug_loc 0 : { *(.debug_loc) }
- .debug_macinfo 0 : { *(.debug_macinfo) }
- .debug_ranges 0 : { *(.debug_ranges) }
-
- /* DWARF 3 */
- .debug_pubtypes 0 : { *(.debug_pubtypes) }
- .debug_ranges 0 : { *(.debug_ranges) }
-
- /* DWARF Extension. */
- .debug_macro 0 : { *(.debug_macro) }
+ /* The following NOP assignment and those after .data and .bss, are
+ necessary to get orphan sections adopted by the .text inserted before
+ the following end-section symbols. An output section would also serve
+ this purpose, but we can't do that. */
+ . = .;
+ ${RELOCATING+ PROVIDE(etext = .);}
+ ${RELOCATING+ PROVIDE(_etext = .);}
+ ${RELOCATING+ PROVIDE(__etext = .);}
.data ${RELOCATING+ ${DATA_ADDR}}:
{
*(.data);
${RELOCATING+*(.data.*)}
${RELOCATING+*(.gnu.linkonce.d*)}
-
- ${RELOCATING+ PROVIDE(__Edata = .);}
-
- /* Deprecated, use __Edata. */
- ${RELOCATING+ PROVIDE(edata = .);}
- ${RELOCATING+ PROVIDE(_edata = .);}
- ${RELOCATING+ PROVIDE(__edata = .);}
}
+ . = .;
+ ${RELOCATING+ PROVIDE(__Edata = .);}
+ /* Deprecated, use __Edata. */
+ ${RELOCATING+ PROVIDE(edata = .);}
+ ${RELOCATING+ PROVIDE(_edata = .);}
+ ${RELOCATING+ PROVIDE(__edata = .);}
/* At the moment, although perhaps we should, we can't map sections
without contents to sections *with* contents due to FIXME: a BFD bug.
${RELOCATING+ *(.bss);}
${RELOCATING+*(.bss.*)}
${RELOCATING+ *(COMMON);}
- ${RELOCATING+ PROVIDE(__Ebss = .);}
}
+ . = .;
+ ${RELOCATING+ PROVIDE(__Ebss = .);}
/* Deprecated, use __Ebss or __Eall as appropriate. */
${RELOCATING+ PROVIDE(end = .);}
${RELOCATING+ PROVIDE(__end = .);}
${RELOCATING+ PROVIDE(__Eall = .);}
+ .stab 0 : { *(.stab) }
+ .stabstr 0 : { *(.stabstr) }
+ .stab.excl 0 : { *(.stab.excl) }
+ .stab.exclstr 0 : { *(.stab.exclstr) }
+ .stab.index 0 : { *(.stab.index) }
+ .stab.indexstr 0 : { *(.stab.indexstr) }
+ .debug_aranges 0 : { *(.debug_aranges) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame 0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
+ .debug_loc 0 : { *(.debug_loc) }
+ .debug_macinfo 0 : { *(.debug_macinfo) }
+ .debug_ranges 0 : { *(.debug_ranges) }
+
+ /* DWARF 3 */
+ .debug_pubtypes 0 : { *(.debug_pubtypes) }
+ .debug_ranges 0 : { *(.debug_ranges) }
+
+ /* DWARF Extension. */
+ .debug_macro 0 : { *(.debug_macro) }
+
.MMIX.reg_contents :
{
/* Note that this section always has a fixed VMA - that of its
It can probably be fixed with some amount of work. */
/DISCARD/ :
{ ${RELOCATING+ *(.gnu.warning.*);} }
+
+ .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }
}
EOF
projects / deliverable / binutils-gdb.git / commitdiff
