darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update elf_i386_compute_jump_table_size

Browse source 
Commit e1f987424b changed how
next_tls_desc_index was set up.  This patch updates
elf_i386_compute_jump_table_size to use elf.srelplt->reloc_count
instead of next_tls_desc_index.

bfd/

	PR ld/17057
	* elf32-i386.c (elf_i386_compute_jump_table_size): Replace
	next_tls_desc_index with elf.srelplt->reloc_count.

ld/testsuite/

	PR ld/17057
	* ld-i386/i386.exp: Run pr17057.
	* ld-i386/pr17057.d: New file.
	* ld-i386/pr17057.s: Likewise.
This commit is contained in:
H.J. Lu 2014-07-15 13:09:55 -07:00
parent 41e9956873
commit 998d811a23
6 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bfd/ChangeLog
View file

@ -1,3 +1,9 @@
2014-07-15 H.J. Lu <hongjiu.lu@intel.com>
PR ld/17057
* elf32-i386.c (elf_i386_compute_jump_table_size): Replace
next_tls_desc_index with elf.srelplt->reloc_count.
2014-07-15 Alan Modra <amodra@gmail.com>
* cache.c (cache_bread_1): Don't return -1 when fread returns

2
bfd/elf32-i386.c
View file

@ -826,7 +826,7 @@ struct elf_i386_link_hash_table
== I386_ELF_DATA ? ((struct elf_i386_link_hash_table *) ((p)->hash)) : NULL)
#define elf_i386_compute_jump_table_size(htab) \
((htab)->next_tls_desc_index * 4)
((htab)->elf.srelplt->reloc_count * 4)
/* Create an entry in an i386 ELF linker hash table. */

7
ld/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2014-07-15 H.J. Lu <hongjiu.lu@intel.com>
PR ld/17057
* ld-i386/i386.exp: Run pr17057.
* ld-i386/pr17057.d: New file.
* ld-i386/pr17057.s: Likewise.
2014-07-15 Jiong Wang <jiong.wang@arm.com>
* ld-aarch64/emit-relocs-local-addend.d: Use target linker script.

1
ld/testsuite/ld-i386/i386.exp
View file

@ -254,3 +254,4 @@ run_dump_test "compressed1"
run_dump_test "pr12627"
run_dump_test "pr13302"
run_dump_test "pr14215"
run_dump_test "pr17057"

9
ld/testsuite/ld-i386/pr17057.d Normal file
View file

@ -0,0 +1,9 @@
#name: PR ld/17057
#as: --32
#ld: -shared -melf_i386
#readelf: -r --wide
Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 2 entries:
Offset Info Type Sym. Value Symbol's Name
[0-9a-f ]+R_386_JUMP_SLOT +0+ +foo
[0-9a-f ]+R_386_TLS_DESC +0+ +my_tls

3
ld/testsuite/ld-i386/pr17057.s Normal file
View file

@ -0,0 +1,3 @@
.text
leal my_tls@TLSDESC(%ebx), %eax
call foo@PLT