orphan section logic
DJ Delorie
dj@redhat.com
Tue Jan 12 21:54:00 GMT 2010
I can't easily test PE; could someone test this patch?
Index: elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.207
diff -p -U3 -r1.207 elf32.em
--- elf32.em 11 Dec 2009 13:42:15 -0000 1.207
+++ elf32.em 12 Jan 2010 21:49:49 -0000
@@ -1782,6 +1782,7 @@ gld${EMULATION_NAME}_place_orphan (asect
struct orphan_save *place;
lang_output_section_statement_type *after;
lang_output_section_statement_type *os;
+ lang_output_section_statement_type *match_by_name = NULL;
int isdyn = 0;
int iself = s->owner->xvec->flavour == bfd_target_elf_flavour;
unsigned int sh_type = iself ? elf_section_type (s) : SHT_NULL;
@@ -1837,8 +1838,21 @@ gld${EMULATION_NAME}_place_orphan (asect
lang_add_section (&os->children, s, os);
return os;
}
+
+ /* Save unused output sections in case we can match them
+ against orphans later. */
+ if (os->bfd_section == NULL)
+ match_by_name = os;
}
+ /* If we didn't match an active output section, see if we matched an
+ unused one and use that. */
+ if (match_by_name)
+ {
+ lang_add_section (&match_by_name->children, s, match_by_name);
+ return match_by_name;
+ }
+
if (!orphan_init_done)
{
lang_output_section_statement_type *lookup;
Index: pe.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/pe.em,v
retrieving revision 1.155
diff -p -U3 -r1.155 pe.em
--- pe.em 15 Nov 2009 07:52:44 -0000 1.155
+++ pe.em 12 Jan 2010 21:49:50 -0000
@@ -1816,6 +1816,7 @@ gld_${EMULATION_NAME}_place_orphan (asec
char *dollar = NULL;
lang_output_section_statement_type *os;
lang_statement_list_type add_child;
+ lang_output_section_statement_type *match_by_name = NULL;
lang_statement_union_type **pl;
/* Look through the script to see where to place this section. */
@@ -1854,8 +1855,21 @@ gld_${EMULATION_NAME}_place_orphan (asec
lang_add_section (&add_child, s, os);
break;
}
+
+ /* Save unused output sections in case we can match them
+ against orphans later. */
+ if (os->bfd_section == NULL)
+ match_by_name = os;
}
+ /* If we didn't match an active output section, see if we matched an
+ unused one and use that. */
+ if (os == NULL && match_by_name)
+ {
+ lang_add_section (&match_by_name->children, s, match_by_name);
+ return match_by_name;
+ }
+
if (os == NULL)
{
static struct orphan_save hold[] =
Index: pep.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/pep.em,v
retrieving revision 1.32
diff -p -U3 -r1.32 pep.em
--- pep.em 15 Nov 2009 07:52:44 -0000 1.32
+++ pep.em 12 Jan 2010 21:49:50 -0000
@@ -1582,6 +1582,7 @@ gld_${EMULATION_NAME}_place_orphan (asec
char *dollar = NULL;
lang_output_section_statement_type *os;
lang_statement_list_type add_child;
+ lang_output_section_statement_type *match_by_name = NULL;
lang_statement_union_type **pl;
/* Look through the script to see where to place this section. */
@@ -1620,8 +1621,21 @@ gld_${EMULATION_NAME}_place_orphan (asec
lang_add_section (&add_child, s, os);
break;
}
+
+ /* Save unused output sections in case we can match them
+ against orphans later. */
+ if (os->bfd_section == NULL)
+ match_by_name = os;
}
+ /* If we didn't match an active output section, see if we matched an
+ unused one and use that. */
+ if (os == NULL && match_by_name)
+ {
+ lang_add_section (&match_by_name->children, s, match_by_name);
+ return match_by_name;
+ }
+
if (os == NULL)
{
static struct orphan_save hold[] =
More information about the Binutils
mailing list