OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep output orphan sections in the same order as input.

This commit is contained in:
Alan Modra 2000-04-12 02:43:37 +00:00
parent 1a8237e8c3
commit 6a345e871d
4 changed files with 167 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ld/ChangeLog
View File

@ -1,3 +1,15 @@
2000-04-12 Alan Modra <alan@linuxcare.com.au>
* emultempl/elf32.em (struct orphan_save): New.
(hold_text, hold_rodata, hold_data, hold_bss, hold_rel,
hold_interp): Make them struct orphan_save.
(gld${EMULATION_NAME}_place_section): Modify for new hold_*.
(gld${EMULATION_NAME}_place_orphan): Add new orphan sections to
the end of the relevant section list. Also add associated section
statements to the end of any previous orphan statements.
* emultempl/armelf.em: Similarly.
* emultempl/pe.em: Similarly.
2000-04-11 Alan Modra <alan@linuxcare.com.au>
* ld.texinfo (Simple Example): Remove extraneous paragraph.

93
ld/emultempl/armelf.em
View File

@ -785,12 +785,18 @@ gld${EMULATION_NAME}_vercheck (s)
static asection *hold_section;
static lang_output_section_statement_type *hold_use;
static lang_output_section_statement_type *hold_text;
static lang_output_section_statement_type *hold_rodata;
static lang_output_section_statement_type *hold_data;
static lang_output_section_statement_type *hold_bss;
static lang_output_section_statement_type *hold_rel;
static lang_output_section_statement_type *hold_interp;
struct orphan_save
{
lang_output_section_statement_type *os;
lang_statement_union_type **stmt;
};
static struct orphan_save hold_text;
static struct orphan_save hold_rodata;
static struct orphan_save hold_data;
static struct orphan_save hold_bss;
static struct orphan_save hold_rel;
static struct orphan_save hold_interp;
/*ARGSUSED*/
static boolean
@ -798,7 +804,7 @@ gld${EMULATION_NAME}_place_orphan (file, s)
lang_input_statement_type *file;
asection *s;
{
lang_output_section_statement_type *place;
struct orphan_save *place;
asection *snew, **pps;
lang_statement_list_type *old;
lang_statement_list_type add;
@ -829,9 +835,9 @@ gld${EMULATION_NAME}_place_orphan (file, s)
if (! link_info.shared
&& ! link_info.relocateable
&& strncmp (secname, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0
&& hold_text != NULL)
&& hold_text.os != NULL)
{
wild_doit (&hold_text->children, s, hold_text, file);
wild_doit (&hold_text.os->children, s, hold_text.os, file);
return true;
}
@ -840,30 +846,29 @@ gld${EMULATION_NAME}_place_orphan (file, s)
right after the .interp section, so that the PT_NOTE segment is
stored right after the program headers where the OS can read it
in the first page. */
place = NULL;
if (s->flags & SEC_EXCLUDE)
return false;
else if ((s->flags & SEC_LOAD) != 0
&& strncmp (secname, ".note", 4) == 0
&& hold_interp != NULL)
place = hold_interp;
&& strncmp (secname, ".note", 4) == 0
&& hold_interp.os != NULL)
place = &hold_interp;
else if ((s->flags & SEC_HAS_CONTENTS) == 0
&& hold_bss != NULL)
place = hold_bss;
&& hold_bss.os != NULL)
place = &hold_bss;
else if ((s->flags & SEC_READONLY) == 0
&& hold_data != NULL)
place = hold_data;
&& hold_data.os != NULL)
place = &hold_data;
else if (strncmp (secname, ".rel", 4) == 0
&& hold_rel != NULL)
place = hold_rel;
&& hold_rel.os != NULL)
place = &hold_rel;
else if ((s->flags & SEC_CODE) == 0
&& (s->flags & SEC_READONLY) != 0
&& hold_rodata != NULL)
place = hold_rodata;
&& hold_rodata.os != NULL)
place = &hold_rodata;
else if ((s->flags & SEC_READONLY) != 0
&& hold_text != NULL)
place = hold_text;
if (place == NULL)
&& hold_text.os != NULL)
place = &hold_text;
else
return false;
/* Choose a unique name for the section. This will be needed if the
@ -896,13 +901,17 @@ gld${EMULATION_NAME}_place_orphan (file, s)
if (snew == NULL)
einfo ("%P%F: output format %s cannot represent section called %s\n",
output_bfd->xvec->name, outsecname);
if (place->bfd_section != NULL)
if (place->os->bfd_section != NULL)
{
/* Unlink it first. */
for (pps = &output_bfd->sections; *pps != snew; pps = &(*pps)->next)
;
*pps = snew->next;
snew->next = place->bfd_section->next;
place->bfd_section->next = snew;
snew->next = NULL;
/* Now tack it on to the end of the "place->os" section list. */
for (pps = &place->os->bfd_section; *pps; pps = &(*pps)->next)
;
*pps = snew;
}
/* Start building a list of statements for this section. */
@ -956,9 +965,19 @@ gld${EMULATION_NAME}_place_orphan (file, s)
exp_nameop (NAME, ".")));
}
/* Now stick the new statement list right after PLACE. */
*add.tail = place->header.next;
place->header.next = add.head;
if (! place->stmt)
{
/* Put the new statement list right at the head. */
*add.tail = place->os->header.next;
place->os->header.next = add.head;
}
else
{
/* Put it after the last orphan statement we added. */
*add.tail = *place->stmt;
*place->stmt = add.head;
}
place->stmt = add.tail; /* Save the end of this list. */
stat_ptr = old;
@ -983,20 +1002,20 @@ gld${EMULATION_NAME}_place_section (s)
hold_use = os;
if (strcmp (os->name, ".text") == 0)
hold_text = os;
hold_text.os = os;
else if (strcmp (os->name, ".rodata") == 0)
hold_rodata = os;
hold_rodata.os = os;
else if (strcmp (os->name, ".data") == 0)
hold_data = os;
hold_data.os = os;
else if (strcmp (os->name, ".bss") == 0)
hold_bss = os;
else if (hold_rel == NULL
hold_bss.os = os;
else if (hold_rel.os == NULL
&& os->bfd_section != NULL
&& (os->bfd_section->flags & SEC_ALLOC) != 0
&& strncmp (os->name, ".rel", 4) == 0)
hold_rel = os;
hold_rel.os = os;
else if (strcmp (os->name, ".interp") == 0)
hold_interp = os;
hold_interp.os = os;
}
/* Look through an expression for an assignment statement. */

93
ld/emultempl/elf32.em
View File

@ -867,12 +867,18 @@ gld${EMULATION_NAME}_find_exp_assignment (exp)
static asection *hold_section;
static lang_output_section_statement_type *hold_use;
static lang_output_section_statement_type *hold_text;
static lang_output_section_statement_type *hold_rodata;
static lang_output_section_statement_type *hold_data;
static lang_output_section_statement_type *hold_bss;
static lang_output_section_statement_type *hold_rel;
static lang_output_section_statement_type *hold_interp;
struct orphan_save
{
lang_output_section_statement_type *os;
lang_statement_union_type **stmt;
};
static struct orphan_save hold_text;
static struct orphan_save hold_rodata;
static struct orphan_save hold_data;
static struct orphan_save hold_bss;
static struct orphan_save hold_rel;
static struct orphan_save hold_interp;
/*ARGSUSED*/
static boolean
@ -880,7 +886,7 @@ gld${EMULATION_NAME}_place_orphan (file, s)
lang_input_statement_type *file;
asection *s;
{
lang_output_section_statement_type *place;
struct orphan_save *place;
asection *snew, **pps;
lang_statement_list_type *old;
lang_statement_list_type add;
@ -911,9 +917,9 @@ gld${EMULATION_NAME}_place_orphan (file, s)
if (! link_info.shared
&& ! link_info.relocateable
&& strncmp (secname, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0
&& hold_text != NULL)
&& hold_text.os != NULL)
{
wild_doit (&hold_text->children, s, hold_text, file);
wild_doit (&hold_text.os->children, s, hold_text.os, file);
return true;
}
@ -922,30 +928,29 @@ gld${EMULATION_NAME}_place_orphan (file, s)
right after the .interp section, so that the PT_NOTE segment is
stored right after the program headers where the OS can read it
in the first page. */
place = NULL;
if (s->flags & SEC_EXCLUDE)
return false;
else if ((s->flags & SEC_LOAD) != 0
&& strncmp (secname, ".note", 4) == 0
&& hold_interp != NULL)
place = hold_interp;
&& strncmp (secname, ".note", 4) == 0
&& hold_interp.os != NULL)
place = &hold_interp;
else if ((s->flags & SEC_HAS_CONTENTS) == 0
&& hold_bss != NULL)
place = hold_bss;
&& hold_bss.os != NULL)
place = &hold_bss;
else if ((s->flags & SEC_READONLY) == 0
&& hold_data != NULL)
place = hold_data;
&& hold_data.os != NULL)
place = &hold_data;
else if (strncmp (secname, ".rel", 4) == 0
&& hold_rel != NULL)
place = hold_rel;
&& hold_rel.os != NULL)
place = &hold_rel;
else if ((s->flags & SEC_CODE) == 0
&& (s->flags & SEC_READONLY) != 0
&& hold_rodata != NULL)
place = hold_rodata;
&& hold_rodata.os != NULL)
place = &hold_rodata;
else if ((s->flags & SEC_READONLY) != 0
&& hold_text != NULL)
place = hold_text;
if (place == NULL)
&& hold_text.os != NULL)
place = &hold_text;
else
return false;
/* Choose a unique name for the section. This will be needed if the
@ -978,13 +983,17 @@ gld${EMULATION_NAME}_place_orphan (file, s)
if (snew == NULL)
einfo ("%P%F: output format %s cannot represent section called %s\n",
output_bfd->xvec->name, outsecname);
if (place->bfd_section != NULL)
if (place->os->bfd_section != NULL)
{
/* Unlink it first. */
for (pps = &output_bfd->sections; *pps != snew; pps = &(*pps)->next)
;
*pps = snew->next;
snew->next = place->bfd_section->next;
place->bfd_section->next = snew;
snew->next = NULL;
/* Now tack it on to the end of the "place->os" section list. */
for (pps = &place->os->bfd_section; *pps; pps = &(*pps)->next)
;
*pps = snew;
}
/* Start building a list of statements for this section. */
@ -1038,9 +1047,19 @@ gld${EMULATION_NAME}_place_orphan (file, s)
exp_nameop (NAME, ".")));
}
/* Now stick the new statement list right after PLACE. */
*add.tail = place->header.next;
place->header.next = add.head;
if (! place->stmt)
{
/* Put the new statement list right at the head. */
*add.tail = place->os->header.next;
place->os->header.next = add.head;
}
else
{
/* Put it after the last orphan statement we added. */
*add.tail = *place->stmt;
*place->stmt = add.head;
}
place->stmt = add.tail; /* Save the end of this list. */
stat_ptr = old;
@ -1065,20 +1084,20 @@ gld${EMULATION_NAME}_place_section (s)
hold_use = os;
if (strcmp (os->name, ".text") == 0)
hold_text = os;
hold_text.os = os;
else if (strcmp (os->name, ".rodata") == 0)
hold_rodata = os;
hold_rodata.os = os;
else if (strcmp (os->name, ".data") == 0)
hold_data = os;
hold_data.os = os;
else if (strcmp (os->name, ".bss") == 0)
hold_bss = os;
else if (hold_rel == NULL
hold_bss.os = os;
else if (hold_rel.os == NULL
&& os->bfd_section != NULL
&& (os->bfd_section->flags & SEC_ALLOC) != 0
&& strncmp (os->name, ".rel", 4) == 0)
hold_rel = os;
hold_rel.os = os;
else if (strcmp (os->name, ".interp") == 0)
hold_interp = os;
hold_interp.os = os;
}
static char *

66
ld/emultempl/pe.em
View File

@ -1077,10 +1077,16 @@ gld_${EMULATION_NAME}_finish ()
static asection *hold_section;
static char *hold_section_name;
static lang_output_section_statement_type *hold_use;
static lang_output_section_statement_type *hold_text;
static lang_output_section_statement_type *hold_rdata;
static lang_output_section_statement_type *hold_data;
static lang_output_section_statement_type *hold_bss;
struct orphan_save
{
lang_output_section_statement_type *os;
lang_statement_union_type **stmt;
};
static struct orphan_save hold_text;
static struct orphan_save hold_rdata;
static struct orphan_save hold_data;
static struct orphan_save hold_bss;
/* Place an orphan section. We use this to put random SHF_ALLOC
sections in the right segment. */
@ -1116,7 +1122,7 @@ gld_${EMULATION_NAME}_place_orphan (file, s)
if (hold_use == NULL)
{
lang_output_section_statement_type *place;
struct orphan_save *place;
char *outsecname;
asection *snew, **pps;
lang_statement_list_type *old;
@ -1127,18 +1133,18 @@ gld_${EMULATION_NAME}_place_orphan (file, s)
on the section name and section flags. */
place = NULL;
if ((s->flags & SEC_HAS_CONTENTS) == 0
&& hold_bss != NULL)
place = hold_bss;
&& hold_bss.os != NULL)
place = &hold_bss;
else if ((s->flags & SEC_READONLY) == 0
&& hold_data != NULL)
place = hold_data;
&& hold_data.os != NULL)
place = &hold_data;
else if ((s->flags & SEC_CODE) == 0
&& (s->flags & SEC_READONLY) != 0
&& hold_rdata != NULL)
place = hold_rdata;
&& hold_rdata.os != NULL)
place = &hold_rdata;
else if ((s->flags & SEC_READONLY) != 0
&& hold_text != NULL)
place = hold_text;
&& hold_text.os != NULL)
place = &hold_text;
/* Choose a unique name for the section. This will be needed if
the same section name appears in the input file with
@ -1175,13 +1181,17 @@ gld_${EMULATION_NAME}_place_orphan (file, s)
if (snew == NULL)
einfo ("%P%F: output format %s cannot represent section called %s\n",
output_bfd->xvec->name, outsecname);
if (place != NULL && place->bfd_section != NULL)
if (place != NULL && place->os->bfd_section != NULL)
{
/* Unlink it first. */
for (pps = &output_bfd->sections; *pps != snew; pps = &(*pps)->next)
;
*pps = snew->next;
snew->next = place->bfd_section->next;
place->bfd_section->next = snew;
snew->next = NULL;
/* Now tack it on to the end of the "place->os" section list. */
for (pps = &place->os->bfd_section; *pps; pps = &(*pps)->next)
;
*pps = snew;
}
/* Start building a list of statements for this section. */
@ -1212,11 +1222,21 @@ gld_${EMULATION_NAME}_place_orphan (file, s)
(struct lang_output_section_phdr_list *) NULL,
"*default*");
/* Now stick the new statement list right after PLACE. */
if (place != NULL)
{
*add.tail = place->header.next;
place->header.next = add.head;
if (! place->stmt)
{
/* Put the new statement list right at the head. */
*add.tail = place->os->header.next;
place->os->header.next = add.head;
}
else
{
/* Put it after the last orphan statement we added. */
*add.tail = *place->stmt;
*place->stmt = add.head;
}
place->stmt = add.tail; /* Save the end of this list. */
}
stat_ptr = old;
@ -1291,13 +1311,13 @@ gld${EMULATION_NAME}_place_section (s)
hold_use = os;
if (strcmp (os->name, ".text") == 0)
hold_text = os;
hold_text.os = os;
else if (strcmp (os->name, ".rdata") == 0)
hold_rdata = os;
hold_rdata.os = os;
else if (strcmp (os->name, ".data") == 0)
hold_data = os;
hold_data.os = os;
else if (strcmp (os->name, ".bss") == 0)
hold_bss = os;
hold_bss.os = os;
}
static int