bfd/

	* reloc.c (BFD_RELOC_386_TLS_TPOFF, BFD_RELOC_386_TLS_IE,
	BFD_RELOC_386_TLS_GOTIE): Add.
	* bfd-in2.h, libbfd.h: Rebuilt.
	* elf32-i386.c (elf_howto_table): Add R_386_TLS_TPOFF, R_386_TLS_IE
	and R_386_TLS_GOTIE.
	(elf_i386_reloc_type_lookup): Handle it.
	(struct elf_i386_link_hash_entry): Change tls_type type to unsigned
	char instead of enum, change GOT_* into defines.
	(GOT_TLS_IE_POS, GOT_TLS_IE_NEG, GOT_TLS_IE_BOTH): Define.
	(elf_i386_tls_transition): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
	(elf_i386_check_relocs): Likewise.  Avoid crash if local symbol is
	accessed both as normal and TLS symbol.  Move R_386_TLS_LDM and
	R_386_PLT32 cases so that R_386_TLS_IE can fall through.
	Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
	(elf_i386_gc_sweep_hook): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
	Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
	(allocate_dynrelocs): Allocate 2 .got and 2 .rel.got entries if
	tls_type is GOT_TLS_IE_BOTH.
	(elf_i386_size_dynamic_sections): Likewise.
	(elf_i386_relocate_section): Handle R_386_TLS_IE and R_386_TLS_GOTIE.
	Handle R_386_TLS_LE_32 and R_386_TLS_LE in shared libs.
	(elf_i386_finish_dynamic_symbol): Use tls_type & GOT_TLS_IE to catch
	all 4 GOT_TLS_* TLS types.
gas/
	* config/tc-i386.c (tc_i386_fix_adjustable): Handle
	BFD_RELOC_386_TLS_IE and BFD_RELOC_386_TLS_GOTIE.
	(BFD_RELOC_386_TLS_IE, BFD_RELOC_386_TLS_GOTIE): Define to 0
	if not defined.
	(lex_got): Handle @GOTNTPOFF and @INDNTPOFF.
	(md_apply_fix3, tc_gen_reloc): Handle BFD_RELOC_386_TLS_IE and
	BFD_RELOC_386_TLS_GOTIE.
gas/testsuite/
	* gas/i386/tlspic.s: Add tests.
	* gas/i386/tlspic.d: Regenerated.
	* gas/i386/tlsnopic.s: Add tests.
	* gas/i386/tlsnopic.d: Regenerated.
include/
	* elf/i386.h (R_386_TLS_TPOFF, R_386_TLS_IE, R_386_TLS_GOTIE):
	Define.
ld/testsuite/
	* ld-i386/i386.exp: New.
	* ld-i386/tlsbin.dd: New test.
	* ld-i386/tlsbinpic.s: New test.
	* ld-i386/tlsbin.rd: New test.
	* ld-i386/tlsbin.s: New test.
	* ld-i386/tlsbin.sd: New test.
	* ld-i386/tlsbin.td: New test.
	* ld-i386/tlslib.s: New test.
	* ld-i386/tlsnopic1.s: New test.
	* ld-i386/tlsnopic2.s: New test.
	* ld-i386/tlsnopic.dd: New test.
	* ld-i386/tlsnopic.rd: New test.
	* ld-i386/tlsnopic.sd: New test.
	* ld-i386/tlspic1.s: New test.
	* ld-i386/tlspic2.s: New test.
	* ld-i386/tlspic.dd: New test.
	* ld-i386/tlspic.rd: New test.
	* ld-i386/tlspic.sd: New test.
	* ld-i386/tlspic.td: New test.

1 files changed, 165 insertions, 0 deletions

diff --git a/ld/testsuite/ld-i386/tlsbin.s b/ld/testsuite/ld-i386/tlsbin.s
new file mode 100644
index 0000000000..db80e0984f
--- /dev/null
+++ b/ld/testsuite/ld-i386/tlsbin.s
@@ -0,0 +1,165 @@
+	.section ".tbss", "awT", @nobits
+	.globl bg1, bg2, bg3, bg4, bg5, bg6, bg7, bg8
+bg1:	.space 4
+bg2:	.space 4
+bg3:	.space 4
+bg4:	.space 4
+bg5:	.space 4
+bg6:	.space 4
+bg7:	.space 4
+bg8:	.space 4
+bl1:	.space 4
+bl2:	.space 4
+bl3:	.space 4
+bl4:	.space 4
+bl5:	.space 4
+bl6:	.space 4
+bl7:	.space 4
+bl8:	.space 4
+	.text
+	.globl	_start
+	.type	_start,@function
+_start:
+	pushl	%ebp
+	movl	%esp, %ebp
+	/* Set up .GOT pointer for non-pic @gottpoff sequences */
+	call	1f
+1:	popl	%ecx
+	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ecx
+	nop;nop;nop;nop
+
+	/* @gottpoff IE against global var  */
+	movl	%gs:0, %edx
+	nop;nop
+	subl	sG6@gottpoff(%ecx), %edx
+	nop;nop;nop;nop
+
+	/* @indntpoff IE against global var  */
+	movl	%gs:0, %eax
+	nop;nop
+	addl	sG7@indntpoff, %eax
+	nop;nop;nop;nop
+
+	/* @indntpoff direct %gs access IE against global var  */
+	movl	sG8@indntpoff, %edx
+	nop;nop
+	movl	%gs:(%edx), %eax
+	nop;nop;nop;nop
+
+	/* @gottpoff IE -> LE against global var defined in exec  */
+	movl	%gs:0, %edx
+	nop;nop
+	subl	bg6@gottpoff(%ecx), %edx
+	nop;nop;nop;nop
+
+	/* @indntpoff IE -> LE against global var defined in exec */
+	movl	%gs:0, %eax
+	nop;nop
+	addl	bg7@indntpoff, %eax
+	nop;nop;nop;nop
+
+	/* @indntpoff direct %gs access IE -> LE against global var defined
+	   in exec  */
+	movl	bg8@indntpoff, %edx
+	nop;nop
+	movl	%gs:(%edx), %eax
+	nop;nop;nop;nop
+
+	/* @gottpoff IE -> LE against local var  */
+	movl	%gs:0, %edx
+	nop;nop
+	subl	bl6@gottpoff(%ecx), %edx
+	nop;nop;nop;nop
+
+	/* @indntpoff IE -> LE against local var  */
+	movl	%gs:0, %eax
+	nop;nop
+	addl	bl7@indntpoff, %eax
+	nop;nop;nop;nop
+
+	/* @indntpoff direct %gs access IE -> LE against local var  */
+	movl	bl8@indntpoff, %edx
+	nop;nop
+	movl	%gs:(%edx), %eax
+	nop;nop;nop;nop
+
+	/* @gottpoff IE -> LE against hidden but not local var  */
+	movl	%gs:0, %edx
+	nop;nop
+	subl	sh6@gottpoff(%ecx), %edx
+	nop;nop;nop;nop
+
+	/* @indntpoff IE -> LE against hidden but not local var  */
+	movl	%gs:0, %eax
+	nop;nop
+	addl	sh7@indntpoff, %eax
+	nop;nop;nop;nop
+
+	/* @indntpoff direct %gs access IE -> LE against hidden but not
+	   local var  */
+	movl	sh8@indntpoff, %edx
+	nop;nop
+	movl	%gs:(%edx), %eax
+	nop;nop;nop;nop
+
+	/* LE @tpoff, global var defined in exec  */
+	movl	$sg1@tpoff, %edx
+	nop;nop
+	movl	%gs:0, %eax
+	nop;nop
+	subl	%edx, %eax
+	nop;nop;nop;nop
+
+	/* LE @tpoff, local var  */
+	movl	$-1+bl1@tpoff, %eax
+	nop;nop
+	movl	%gs:0, %edx
+	nop;nop
+	subl	%eax, %edx
+	nop;nop;nop;nop
+
+	/* LE @tpoff, hidden var defined in exec  */
+	movl	$sh1@tpoff-3, %eax
+	nop;nop
+	movl	%gs:0, %edx
+	nop;nop
+	subl	%eax, %edx
+	nop;nop;nop;nop
+
+	/* LE @ntpoff, global var defined in exec  */
+	movl	%gs:0, %eax
+	nop;nop
+	leal	sg2@ntpoff(%eax), %edx
+	nop;nop;nop;nop
+
+	/* LE @ntpoff, local var, non-canonical sequence  */
+	movl	$2+bl2@ntpoff, %eax
+	nop;nop
+	movl	%gs:0, %edx
+	nop;nop
+	addl	%eax, %edx
+	nop;nop;nop;nop
+
+	/* LE @ntpoff, hidden var defined in exec, non-canonical sequence */
+	movl	%gs:0, %edx
+	nop;nop
+	addl	$sh2@ntpoff+1, %edx
+	nop;nop;nop;nop
+
+	/* Direct %gs access  */
+
+	/* LE @ntpoff, global var defined in exec  */
+	movl	%gs:sg3@ntpoff, %eax
+	nop;nop;nop;nop
+
+	/* LE @ntpoff, local var  */
+	movl	%gs:bl3@ntpoff+3, %edx
+	nop;nop;nop;nop
+
+	/* LE @ntpoff, hidden var defined in exec  */
+	movl	%gs:1+sh3@ntpoff, %edx
+	nop;nop;nop;nop
+
+	movl    -4(%ebp), %ebx
+	leave
+	ret