riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2010-09-22 Kai Tietz <kai.tietz@onevision.com> 

* emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Add
        idata to orphan set.
        * emultempl/pep.em: Likewise.
        * scripttempl/armcoff.sc: Separate idata
        and add __IAT_start__ and __IAT_end__ labels.
        * scripttempl/pe.sc: Likewise.
        * scripttempl/pep.sc: Likewise.
binutils-2_21-branch
Kai Tietz 16 years ago
parent
cb2f80e68a
commit
d487497340
6 changed files with 76 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ld/ChangeLog
  2. 9
      ld/emultempl/pe.em
  3. 9
      ld/emultempl/pep.em
  4. 27
      ld/scripttempl/armcoff.sc
  5. 17
      ld/scripttempl/pe.sc
  6. 17
      ld/scripttempl/pep.sc

10
ld/ChangeLog
View File

@ -1,3 +1,13 @@
2010-09-22 Kai Tietz <kai.tietz@onevision.com>
* emultempl/pe.em (gld_${EMULATION_NAME}_place_orphan): Add
idata to orphan set.
* emultempl/pep.em: Likewise.
* scripttempl/armcoff.sc: Separate idata
and add __IAT_start__ and __IAT_end__ labels.
* scripttempl/pe.sc: Likewise.
* scripttempl/pep.sc: Likewise.
2010-09-20 David S. Miller <davem@davemloft.net>
* emulparams/elf32_sparc.sh: Set NOP to 0x01000000

9
ld/emultempl/pe.em
View File

@ -1939,6 +1939,9 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
{ ".text",
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
0, 0, 0, 0 },
{ ".idata",
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
0, 0, 0, 0 },
{ ".rdata",
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
0, 0, 0, 0 },
@ -1952,6 +1955,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
enum orphan_save_index
{
orphan_text = 0,
orphan_idata,
orphan_rodata,
orphan_data,
orphan_bss
@ -1985,7 +1989,10 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
else if ((s->flags & SEC_READONLY) == 0)
place = &hold[orphan_data];
else if ((s->flags & SEC_CODE) == 0)
place = &hold[orphan_rodata];
{
place = (!strncmp (secname, ".idata\$", 7) ? &hold[orphan_idata]
: &hold[orphan_rodata]);
}
else
place = &hold[orphan_text];

9
ld/emultempl/pep.em
View File

@ -1677,6 +1677,9 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
{ ".text",
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE,
0, 0, 0, 0 },
{ ".idata",
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
0, 0, 0, 0 },
{ ".rdata",
SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_DATA,
0, 0, 0, 0 },
@ -1690,6 +1693,7 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
enum orphan_save_index
{
orphan_text = 0,
orphan_idata,
orphan_rodata,
orphan_data,
orphan_bss
@ -1723,7 +1727,10 @@ gld_${EMULATION_NAME}_place_orphan (asection *s,
else if ((s->flags & SEC_READONLY) == 0)
place = &hold[orphan_data];
else if ((s->flags & SEC_CODE) == 0)
place = &hold[orphan_rodata];
{
place = (!strncmp (secname, ".idata\$", 7) ? &hold[orphan_idata]
: &hold[orphan_rodata]);
}
else
place = &hold[orphan_text];

27
ld/scripttempl/armcoff.sc
View File

@ -17,7 +17,22 @@ DTOR='.dtor : {
*(SORT(.dtors.*))
*(.dtor)
}'
if test "${RELOCATING}"; then
R_IDATA234='
SORT(*)(.idata$2)
SORT(*)(.idata$3)
/* These zeroes mark the end of the import list. */
LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
SORT(*)(.idata$4)'
R_IDATA5='SORT(*)(.idata$5)'
R_IDATA67='
SORT(*)(.idata$6)
SORT(*)(.idata$7)'
else
R_IDATA234=
R_IDATA5=
R_IDATA67=
fi
cat <<EOF
OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", "${LITTLE_OUTPUT_FORMAT}")
${LIB_SEARCH_DIRS}
@ -60,6 +75,16 @@ SECTIONS
}
${CONSTRUCTING+${RELOCATING-$CTOR}}
${CONSTRUCTING+${RELOCATING-$DTOR}}
.idata ${RELOCATING+BLOCK(__section_alignment__)} :
{
/* This cannot currently be handled with grouped sections.
See pep.em:sort_sections. */
${R_IDATA234}
${RELOCATING+__IAT_start__ = .;}
${R_IDATA5}
${RELOCATING+__IAT_end__ = .;}
${R_IDATA67}
}
.bss ${RELOCATING+ ALIGN(0x8)} :
{
${RELOCATING+ __bss_start__ = . ;}

17
ld/scripttempl/pe.sc
View File

@ -23,13 +23,14 @@ if test "${RELOCATING}"; then
R_RDATA='*(.rdata)
*(SORT(.rdata$*))'
fi
R_IDATA='
R_IDATA234='
SORT(*)(.idata$2)
SORT(*)(.idata$3)
/* These zeroes mark the end of the import list. */
LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
SORT(*)(.idata$4)
SORT(*)(.idata$5)
SORT(*)(.idata$4)'
R_IDATA5='SORT(*)(.idata$5)'
R_IDATA67='
SORT(*)(.idata$6)
SORT(*)(.idata$7)'
R_CRT_XC='*(SORT(.CRT$XC*)) /* C initialization */'
@ -46,7 +47,9 @@ else
R_TEXT=
R_DATA=
R_RDATA='*(.rdata)'
R_IDATA=
R_IDATA234=
R_IDATA5=
R_IDATA67=
R_CRT=
R_RSRC=
fi
@ -147,7 +150,11 @@ SECTIONS
{
/* This cannot currently be handled with grouped sections.
See pe.em:sort_sections. */
${R_IDATA}
${R_IDATA234}
${RELOCATING+__IAT_start__ = .;}
${R_IDATA5}
${RELOCATING+__IAT_end__ = .;}
${R_IDATA67}
}
.CRT ${RELOCATING+BLOCK(__section_alignment__)} :
{

17
ld/scripttempl/pep.sc
View File

@ -23,13 +23,14 @@ if test "${RELOCATING}"; then
R_RDATA='*(.rdata)
*(SORT(.rdata$*))'
fi
R_IDATA='
R_IDATA234='
SORT(*)(.idata$2)
SORT(*)(.idata$3)
/* These zeroes mark the end of the import list. */
LONG (0); LONG (0); LONG (0); LONG (0); LONG (0);
SORT(*)(.idata$4)
SORT(*)(.idata$5)
SORT(*)(.idata$4)'
R_IDATA5='SORT(*)(.idata$5)'
R_IDATA67='
SORT(*)(.idata$6)
SORT(*)(.idata$7)'
R_CRT_XC='*(SORT(.CRT$XC*)) /* C initialization */'
@ -46,7 +47,9 @@ else
R_TEXT=
R_DATA=
R_RDATA='*(.rdata)'
R_IDATA=
R_IDATA234=
R_IDATA5=
R_IDATA67=
R_CRT=
R_RSRC=
fi
@ -153,7 +156,11 @@ SECTIONS
{
/* This cannot currently be handled with grouped sections.
See pep.em:sort_sections. */
${R_IDATA}
${R_IDATA234}
${RELOCATING+__IAT_start__ = .;}
${R_IDATA5}
${RELOCATING+__IAT_end__ = .;}
${R_IDATA67}
}
.CRT ${RELOCATING+BLOCK(__section_alignment__)} :
{

Write Preview
Loading…
Cancel
Save