yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bfd/

Browse Source 
* elf32-arm.c (elf32_arm_stub_long_branch_any_any_pic): Rename
	to elf32_arm_stub_long_branch_any_arm_pic.
	(elf32_arm_stub_long_branch_any_thumb_pic): New.
	(enum elf32_arm_stub_type, arm_type_of_stub)
	(arm_size_one_stub): Handle any to ARM PIC and any to Thumb PIC
	separately.

	ld/testsuite/
	* ld-arm/farcall-arm-thumb-blx-pic-veneer.d,
	ld-arm/farcall-arm-thumb-pic-veneer.d,
	ld-arm/farcall-thumb-thumb-blx-pic-veneer.d: Update for fixed
	Thumb PIC stub.
This commit is contained in:
Daniel Jacobowitz 2009-02-24 22:44:18 +00:00
parent 07d72278cd
commit cf3eccff18
6 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bfd/ChangeLog
View File

@ -1,3 +1,12 @@
2009-02-24 Daniel Jacobowitz <dan@codesourcery.com>
* elf32-arm.c (elf32_arm_stub_long_branch_any_any_pic): Rename
to elf32_arm_stub_long_branch_any_arm_pic.
(elf32_arm_stub_long_branch_any_thumb_pic): New.
(enum elf32_arm_stub_type, arm_type_of_stub)
(arm_size_one_stub): Handle any to ARM PIC and any to Thumb PIC
separately.
2009-02-24 Joseph Myers <joseph@codesourcery.com> 2009-02-24 Joseph Myers <joseph@codesourcery.com>
* elf32-arm.c (PREV_SEC): Update comment. * elf32-arm.c (PREV_SEC): Update comment.

37
bfd/elf32-arm.c
View File

@ -2089,15 +2089,27 @@ static const insn_sequence elf32_arm_stub_short_branch_v4t_thumb_arm[] =
ARM_REL_INSN(0xea000000, -8), /* b (X-8) */ ARM_REL_INSN(0xea000000, -8), /* b (X-8) */
}; };
/* ARM/Thumb -> ARM/Thumb long branch stub, PIC. On V5T and above, use /* ARM/Thumb -> ARM long branch stub, PIC. On V5T and above, use
blx to reach the stub if necessary. */ blx to reach the stub if necessary. */
static const insn_sequence elf32_arm_stub_long_branch_any_any_pic[] = static const insn_sequence elf32_arm_stub_long_branch_any_arm_pic[] =
{ {
ARM_INSN(0xe59fc000), /* ldr r12, [pc] */ ARM_INSN(0xe59fc000), /* ldr r12, [pc] */
ARM_INSN(0xe08ff00c), /* add pc, pc, ip */ ARM_INSN(0xe08ff00c), /* add pc, pc, ip */
DATA_WORD(0, R_ARM_REL32, -4), /* dcd R_ARM_REL32(X-4) */ DATA_WORD(0, R_ARM_REL32, -4), /* dcd R_ARM_REL32(X-4) */
}; };
/* ARM/Thumb -> Thumb long branch stub, PIC. On V5T and above, use
blx to reach the stub if necessary. We can not add into pc;
it is not guaranteed to mode switch (different in ARMv6 and
ARMv7). */
static const insn_sequence elf32_arm_stub_long_branch_any_thumb_pic[] =
{
ARM_INSN(0xe59fc004), /* ldr r12, [pc, #4] */
ARM_INSN(0xe08fc00c), /* add ip, pc, ip */
ARM_INSN(0xe12fff1c), /* bx ip */
DATA_WORD(0, R_ARM_REL32, 0), /* dcd R_ARM_REL32(X) */
};
/* Section name for stubs is the associated section name plus this /* Section name for stubs is the associated section name plus this
string. */ string. */
#define STUB_SUFFIX ".stub" #define STUB_SUFFIX ".stub"
@ -2110,7 +2122,8 @@ enum elf32_arm_stub_type
arm_stub_long_branch_thumb_only, arm_stub_long_branch_thumb_only,
arm_stub_long_branch_v4t_thumb_arm, arm_stub_long_branch_v4t_thumb_arm,
arm_stub_short_branch_v4t_thumb_arm, arm_stub_short_branch_v4t_thumb_arm,
arm_stub_long_branch_any_any_pic, arm_stub_long_branch_any_arm_pic,
arm_stub_long_branch_any_thumb_pic,
}; };
struct elf32_arm_stub_hash_entry struct elf32_arm_stub_hash_entry
@ -2858,7 +2871,7 @@ arm_type_of_stub (struct bfd_link_info *info,
/* PIC stubs. */ /* PIC stubs. */
? ((globals->use_blx) ? ((globals->use_blx)
/* V5T and above. */ /* V5T and above. */
? arm_stub_long_branch_any_any_pic ? arm_stub_long_branch_any_thumb_pic
/* not yet supported on V4T. */ /* not yet supported on V4T. */
: arm_stub_none) : arm_stub_none)
@ -2895,7 +2908,7 @@ arm_type_of_stub (struct bfd_link_info *info,
/* PIC stubs. */ /* PIC stubs. */
? ((globals->use_blx) ? ((globals->use_blx)
/* V5T and above. */ /* V5T and above. */
? arm_stub_long_branch_any_any_pic ? arm_stub_long_branch_any_arm_pic
/* not yet supported on V4T. */ /* not yet supported on V4T. */
: arm_stub_none) : arm_stub_none)
@ -2938,7 +2951,7 @@ arm_type_of_stub (struct bfd_link_info *info,
{ {
stub_type = (info->shared | globals->pic_veneer) stub_type = (info->shared | globals->pic_veneer)
/* PIC stubs. */ /* PIC stubs. */
? arm_stub_long_branch_any_any_pic ? arm_stub_long_branch_any_thumb_pic
/* non-PIC stubs. */ /* non-PIC stubs. */
: ((globals->use_blx) : ((globals->use_blx)
/* V5T and above. */ /* V5T and above. */
@ -2955,7 +2968,7 @@ arm_type_of_stub (struct bfd_link_info *info,
{ {
stub_type = (info->shared | globals->pic_veneer) stub_type = (info->shared | globals->pic_veneer)
/* PIC stubs. */ /* PIC stubs. */
? arm_stub_long_branch_any_any_pic ? arm_stub_long_branch_any_arm_pic
/* non-PIC stubs. */ /* non-PIC stubs. */
: arm_stub_long_branch_any_any; : arm_stub_long_branch_any_any;
} }
@ -3277,9 +3290,13 @@ arm_size_one_stub (struct bfd_hash_entry *gen_entry,
template = elf32_arm_stub_short_branch_v4t_thumb_arm; template = elf32_arm_stub_short_branch_v4t_thumb_arm;
template_size = sizeof (elf32_arm_stub_short_branch_v4t_thumb_arm) / sizeof (insn_sequence); template_size = sizeof (elf32_arm_stub_short_branch_v4t_thumb_arm) / sizeof (insn_sequence);
break; break;
case arm_stub_long_branch_any_any_pic: case arm_stub_long_branch_any_arm_pic:
template = elf32_arm_stub_long_branch_any_any_pic; template = elf32_arm_stub_long_branch_any_arm_pic;
template_size = sizeof (elf32_arm_stub_long_branch_any_any_pic) / sizeof (insn_sequence); template_size = sizeof (elf32_arm_stub_long_branch_any_arm_pic) / sizeof (insn_sequence);
break;
case arm_stub_long_branch_any_thumb_pic:
template = elf32_arm_stub_long_branch_any_thumb_pic;
template_size = sizeof (elf32_arm_stub_long_branch_any_thumb_pic) / sizeof (insn_sequence);
break; break;
default: default:
BFD_FAIL (); BFD_FAIL ();

7
ld/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2009-02-24 Daniel Jacobowitz <dan@codesourcery.com>
* ld-arm/farcall-arm-thumb-blx-pic-veneer.d,
ld-arm/farcall-arm-thumb-pic-veneer.d,
ld-arm/farcall-thumb-thumb-blx-pic-veneer.d: Update for fixed
Thumb PIC stub.
2009-02-24 Daniel Jacobowitz <dan@codesourcery.com> 2009-02-24 Daniel Jacobowitz <dan@codesourcery.com>
* ld-arm/arm-elf.exp (armeabitests): Update duplicate test names. * ld-arm/arm-elf.exp (armeabitests): Update duplicate test names.

8
ld/testsuite/ld-arm/farcall-arm-thumb-blx-pic-veneer.d
View File

@ -7,10 +7,10 @@ Disassembly of section .text:
1004: 00000000 andeq r0, r0, r0 1004: 00000000 andeq r0, r0, r0
00001008 <__bar_from_arm>: 00001008 <__bar_from_arm>:
1008: e59fc000 ldr ip, \[pc, #0\] ; 1010 <__bar_from_arm\+0x8> 1008: e59fc004 ldr ip, \[pc, #4\] ; 1014 <__bar_from_arm\+0xc>
100c: e08ff00c add pc, pc, ip 100c: e08fc00c add ip, pc, ip
1010: 02000001 .word 0x02000001 1010: e12fff1c bx ip
1014: 00000000 .word 0x00000000 1014: 02000001 .word 0x02000001
Disassembly of section .foo: Disassembly of section .foo:
02001014 <bar>: 02001014 <bar>:

8
ld/testsuite/ld-arm/farcall-arm-thumb-pic-veneer.d
View File

@ -7,10 +7,10 @@ Disassembly of section .text:
1004: 00000000 andeq r0, r0, r0 1004: 00000000 andeq r0, r0, r0
00001008 <__bar_from_arm>: 00001008 <__bar_from_arm>:
1008: e59fc000 ldr ip, \[pc, #0\] ; 1010 <__bar_from_arm\+0x8> 1008: e59fc004 ldr ip, \[pc, #4\] ; 1014 <__bar_from_arm\+0xc>
100c: e08ff00c add pc, pc, ip 100c: e08fc00c add ip, pc, ip
1010: 02000001 .word 0x02000001 1010: e12fff1c bx ip
1014: 00000000 .word 0x00000000 1014: 02000001 .word 0x02000001
Disassembly of section .foo: Disassembly of section .foo:
02001014 <bar>: 02001014 <bar>:

8
ld/testsuite/ld-arm/farcall-thumb-thumb-blx-pic-veneer.d
View File

@ -8,10 +8,10 @@ Disassembly of section .text:
\.\.\. \.\.\.
00001008 <__bar_veneer>: 00001008 <__bar_veneer>:
1008: e59fc000 ldr ip, \[pc, #0\] ; 1010 <__bar_veneer\+0x8> 1008: e59fc004 ldr ip, \[pc, #4\] ; 1014 <__bar_veneer\+0xc>
100c: e08ff00c add pc, pc, ip 100c: e08fc00c add ip, pc, ip
1010: 02000001 .word 0x02000001 1010: e12fff1c bx ip
1014: 00000000 .word 0x00000000 1014: 02000001 .word 0x02000001
Disassembly of section .foo: Disassembly of section .foo:
02001014 <bar>: 02001014 <bar>: