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

bfd/ 

* elf-eh-frame.c (make_pc_relative): New function.
	(_bfd_elf_write_section_eh_frame): Use it.

ld/testsuite/
	* ld-mips-elf/eh-frame1-n32.d: Expect PC-relative encodings
	to include DW_EH_PE_sdata4.
	* ld-mips-elf/eh-frame2-n32.d: Likewise.
	* ld-mips-elf/eh-frame1-n64.d: Expect PC-relative encodings
	to include DW_EH_PE_sdata8.
	* ld-mips-elf/eh-frame2-n64.d: Likewise.
This commit is contained in:
Richard Sandiford 2009-09-21 18:55:08 +00:00
parent ce0420dced
commit 30af59626b
7 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2009-09-21 Richard Sandiford <rdsandiford@googlemail.com>
* elf-eh-frame.c (make_pc_relative): New function.
(_bfd_elf_write_section_eh_frame): Use it.
2009-09-21 Alan Modra <amodra@bigpond.net.au>
* elf32-ppc.c (TLS_GET_ADDR_GLINK_SIZE): Define.

28
bfd/elf-eh-frame.c
View File

@ -423,6 +423,28 @@ skip_non_nops (bfd_byte *buf, bfd_byte *end, unsigned int encoded_ptr_width,
return last;
}
/* Convert absolute encoding ENCODING into PC-relative form.
SIZE is the size of a pointer. */
static unsigned char
make_pc_relative (unsigned char encoding, unsigned int ptr_size)
{
if ((encoding & 0x7f) == DW_EH_PE_absptr)
switch (ptr_size)
{
case 2:
encoding |= DW_EH_PE_sdata2;
break;
case 4:
encoding |= DW_EH_PE_sdata4;
break;
case 8:
encoding |= DW_EH_PE_sdata8;
break;
}
return encoding | DW_EH_PE_pcrel;
}
/* Called before calling _bfd_elf_parse_eh_frame on every input bfd's
.eh_frame section. */
@ -1454,7 +1476,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
{
BFD_ASSERT (action & 1);
*aug++ = 'R';
*buf++ = DW_EH_PE_pcrel;
*buf++ = make_pc_relative (DW_EH_PE_absptr, ptr_size);
action &= ~1;
}
@ -1465,7 +1487,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
if (action & 2)
{
BFD_ASSERT (*buf == ent->lsda_encoding);
*buf |= DW_EH_PE_pcrel;
*buf = make_pc_relative (*buf, ptr_size);
action &= ~2;
}
buf++;
@ -1506,7 +1528,7 @@ _bfd_elf_write_section_eh_frame (bfd *abfd,
if (action & 1)
{
BFD_ASSERT (*buf == ent->fde_encoding);
*buf |= DW_EH_PE_pcrel;
*buf = make_pc_relative (*buf, ptr_size);
action &= ~1;
}
buf++;

9
ld/testsuite/ChangeLog
View File

@ -1,3 +1,12 @@
2009-09-21 Richard Sandiford <rdsandiford@googlemail.com>
* ld-mips-elf/eh-frame1-n32.d: Expect PC-relative encodings
to include DW_EH_PE_sdata4.
* ld-mips-elf/eh-frame2-n32.d: Likewise.
* ld-mips-elf/eh-frame1-n64.d: Expect PC-relative encodings
to include DW_EH_PE_sdata8.
* ld-mips-elf/eh-frame2-n64.d: Likewise.
2009-09-21 Alan Modra <amodra@bigpond.net.au>
* ld-powerpc/tlslib.s: Delete dot-symbol entry syms. Add

6
ld/testsuite/ld-mips-elf/eh-frame1-n32.d
View File

@ -25,7 +25,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10
Augmentation data: 1b
DW_CFA_advance_loc: 0 to 00000000
DW_CFA_advance_loc: 0 to 00000000
@ -65,7 +65,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10 00 00 00 00 00
Augmentation data: 1b 00 00 00 00 00
DW_CFA_advance_loc: 0 to 00000000
DW_CFA_advance_loc: 0 to 00000000
@ -108,7 +108,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 00 00 00 00 00 10
Augmentation data: 00 00 00 00 00 1b
DW_CFA_advance_loc: 0 to 00000000

6
ld/testsuite/ld-mips-elf/eh-frame1-n64.d
View File

@ -41,7 +41,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10
Augmentation data: 1c
DW_CFA_advance_loc: 0 to 00000000
DW_CFA_advance_loc: 0 to 00000000
@ -105,7 +105,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10 00 00 00 00 00 00 00 00 00
Augmentation data: 1c 00 00 00 00 00 00 00 00 00
DW_CFA_advance_loc: 0 to 00000000
DW_CFA_advance_loc: 0 to 00000000
@ -172,7 +172,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 00 00 00 00 00 00 00 00 00 10
Augmentation data: 00 00 00 00 00 00 00 00 00 1c
DW_CFA_advance_loc: 0 to 00000000
DW_CFA_advance_loc: 0 to 00000000

6
ld/testsuite/ld-mips-elf/eh-frame2-n32.d
View File

@ -25,7 +25,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10
Augmentation data: 1b
DW_CFA_nop
DW_CFA_nop
@ -65,7 +65,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10 00 00 00 00 00
Augmentation data: 1b 00 00 00 00 00
DW_CFA_nop
@ -104,7 +104,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 00 00 00 00 00 10
Augmentation data: 00 00 00 00 00 1b
DW_CFA_nop

6
ld/testsuite/ld-mips-elf/eh-frame2-n64.d
View File

@ -41,7 +41,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10
Augmentation data: 1c
DW_CFA_nop
DW_CFA_nop
@ -105,7 +105,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 10 00 00 00 00 00 00 00 00 00
Augmentation data: 1c 00 00 00 00 00 00 00 00 00
DW_CFA_nop
DW_CFA_nop
@ -164,7 +164,7 @@ Contents of the \.eh_frame section:
Code alignment factor: 1
Data alignment factor: 4
Return address column: 31
Augmentation data: 00 00 00 00 00 00 00 00 00 10
Augmentation data: 00 00 00 00 00 00 00 00 00 1c
DW_CFA_nop
DW_CFA_nop