This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: Fix Thumb-2 shared libraries
- From: Daniel Jacobowitz <drow at false dot org>
- To: Christophe LYON <christophe dot lyon at st dot com>, binutils at sourceware dot org
- Date: Tue, 25 Aug 2009 18:14:33 -0400
- Subject: Re: Fix Thumb-2 shared libraries
- References: <4A3255D9.9030906@st.com> <20090612140642.GA31950@caradoc.them.org> <4A32626C.8090407@st.com> <4A3658C4.3000800@st.com> <20090615175935.GA22200@caradoc.them.org> <4A390CF5.3000505@st.com> <20090617162337.GA9315@caradoc.them.org> <4A3A4DEF.5070704@st.com> <4A3A4E62.8030603@st.com> <20090825185158.GA2712@caradoc.them.org>
On Tue, Aug 25, 2009 at 02:51:58PM -0400, Daniel Jacobowitz wrote:
> Here's a patch I'm testing for this failure.
This time, the whole patch.
--
Daniel Jacobowitz
CodeSourcery
2009-08-25 Daniel Jacobowitz <dan@codesourcery.com>
bfd/
* elf32-arm.c (elf32_arm_final_link_relocate): Set sym_flags
for the mode of target PLT entries.
(allocate_dynrelocs): Only adjust symbol type if setting its
value.
2009-08-25 Daniel Jacobowitz <dan@codesourcery.com>
ld/testsuite/
* ld-arm/farcall-mixed-lib.d: Update.
Index: ld/testsuite/ld-arm/farcall-mixed-lib.d
===================================================================
--- ld/testsuite/ld-arm/farcall-mixed-lib.d (revision 259133)
+++ ld/testsuite/ld-arm/farcall-mixed-lib.d (working copy)
@@ -39,9 +39,9 @@ Disassembly of section .text:
.* <lib_func2>:
.*: f000 e80e blx 1000350 <__app_func_from_thumb>
- .*: f000 e818 blx 1000368 <__app_func_weak_from_thumb>
- .*: f000 e810 blx 100035c <__lib_func3_from_thumb>
- .*: f000 e81a blx 1000374 <__lib_func4_from_thumb>
+ .*: f000 e81a blx 100036c <__app_func_weak_from_thumb>
+ .*: f000 e810 blx 100035c <__lib_func3_veneer>
+ .*: f000 e81c blx 1000378 <__lib_func4_from_thumb>
.*: 4770 bx lr
.*: 46c0 nop ; \(mov r8, r8\)
.*: 46c0 nop ; \(mov r8, r8\)
@@ -56,20 +56,21 @@ Disassembly of section .text:
.*: e08ff00c add pc, pc, ip
.*: feffff84 .word 0xfeffff84
-.* <__lib_func3_from_thumb>:
- .*: e59fc000 ldr ip, \[pc, #0\] ; 1000364 <__lib_func3_from_thumb\+0x8>
- .*: e08ff00c add pc, pc, ip
- .*: feffff90 .word 0xfeffff90
+.* <__lib_func3_veneer>:
+ .*: e59fc004 ldr ip, \[pc, #4\] ; 1000368 <__lib_func3_veneer\+0xc>
+ .*: e08fc00c add ip, pc, ip
+ .*: e12fff1c bx ip
+ .*: feffff91 .word 0xfeffff91
.* <__app_func_weak_from_thumb>:
- .*: e59fc000 ldr ip, \[pc, #0\] ; 1000370 <__app_func_weak_from_thumb\+0x8>
+ .*: e59fc000 ldr ip, \[pc, #0\] ; 1000374 <__app_func_weak_from_thumb\+0x8>
.*: e08ff00c add pc, pc, ip
- .*: feffff78 .word 0xfeffff78
+ .*: feffff74 .word 0xfeffff74
.* <__lib_func4_from_thumb>:
- .*: e59fc000 ldr ip, \[pc, #0\] ; 100037c <__lib_func4_from_thumb\+0x8>
+ .*: e59fc000 ldr ip, \[pc, #0\] ; 1000380 <__lib_func4_from_thumb\+0x8>
.*: e08ff00c add pc, pc, ip
- .*: feffff84 .word 0xfeffff84
+ .*: feffff80 .word 0xfeffff80
...
.* <lib_func3>:
Index: bfd/elf32-arm.c
===================================================================
--- bfd/elf32-arm.c (revision 259133)
+++ bfd/elf32-arm.c (working copy)
@@ -7330,6 +7330,9 @@ elf32_arm_final_link_relocate (reloc_how
+ splt->output_offset
+ h->plt.offset);
*unresolved_reloc_p = FALSE;
+ /* The PLT entry is in ARM mode, regardless of the
+ target function. */
+ sym_flags = STT_FUNC;
}
/* A branch to an undefined weak symbol is turned into a
@@ -7756,10 +7759,14 @@ elf32_arm_final_link_relocate (reloc_how
/* If the Thumb BLX instruction is available, convert the
BL to a BLX instruction to call the ARM-mode PLT entry. */
lower_insn = (lower_insn & ~0x1000) | 0x0800;
+ sym_flags = STT_FUNC;
}
else
- /* Target the Thumb stub before the ARM PLT entry. */
- value -= PLT_THUMB_STUB_SIZE;
+ {
+ /* Target the Thumb stub before the ARM PLT entry. */
+ value -= PLT_THUMB_STUB_SIZE;
+ sym_flags = STT_ARM_TFUNC;
+ }
*unresolved_reloc_p = FALSE;
}
@@ -11753,13 +11760,13 @@ allocate_dynrelocs (struct elf_link_hash
{
h->root.u.def.section = s;
h->root.u.def.value = h->plt.offset;
- }
- /* Make sure the function is not marked as Thumb, in case
- it is the target of an ABS32 relocation, which will
- point to the PLT entry. */
- if (ELF_ST_TYPE (h->type) == STT_ARM_TFUNC)
- h->type = ELF_ST_INFO (ELF_ST_BIND (h->type), STT_FUNC);
+ /* Make sure the function is not marked as Thumb, in case
+ it is the target of an ABS32 relocation, which will
+ point to the PLT entry. */
+ if (ELF_ST_TYPE (h->type) == STT_ARM_TFUNC)
+ h->type = ELF_ST_INFO (ELF_ST_BIND (h->type), STT_FUNC);
+ }
/* Make room for this entry. */
s->size += htab->plt_entry_size;