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.

7 files changed, 77 insertions, 16 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a4cc1f1..17a9ce0 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* 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.
+
 2002-09-19  Richard Henderson  <rth@redhat.com>
 
 	* config/tc-alpha.c (md_pcrel_from): Only adjust special for
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 1a9a30e..8bc88f7 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1228,6 +1228,8 @@ tc_i386_fix_adjustable (fixP)
       || fixP->fx_r_type == BFD_RELOC_386_TLS_LDM
       || fixP->fx_r_type == BFD_RELOC_386_TLS_LDO_32
       || fixP->fx_r_type == BFD_RELOC_386_TLS_IE_32
+      || fixP->fx_r_type == BFD_RELOC_386_TLS_IE
+      || fixP->fx_r_type == BFD_RELOC_386_TLS_GOTIE
       || fixP->fx_r_type == BFD_RELOC_386_TLS_LE_32
       || fixP->fx_r_type == BFD_RELOC_386_TLS_LE
       || fixP->fx_r_type == BFD_RELOC_X86_64_PLT32
@@ -1254,6 +1256,8 @@ tc_i386_fix_adjustable (fixP)
 #define BFD_RELOC_386_TLS_LDM		0
 #define BFD_RELOC_386_TLS_LDO_32	0
 #define BFD_RELOC_386_TLS_IE_32		0
+#define BFD_RELOC_386_TLS_IE		0
+#define BFD_RELOC_386_TLS_GOTIE		0
 #define BFD_RELOC_386_TLS_LE_32		0
 #define BFD_RELOC_386_TLS_LE		0
 #define BFD_RELOC_X86_64_PLT32		0
@@ -3485,6 +3489,8 @@ lex_got (reloc, adjust)
     { "TPOFF",    { BFD_RELOC_386_TLS_LE_32,  0, 0                         } },
     { "NTPOFF",   { BFD_RELOC_386_TLS_LE,     0, 0                         } },
     { "DTPOFF",   { BFD_RELOC_386_TLS_LDO_32, 0, 0                         } },
+    { "GOTNTPOFF",{ BFD_RELOC_386_TLS_GOTIE,  0, 0                         } },
+    { "INDNTPOFF",{ BFD_RELOC_386_TLS_IE,     0, 0                         } },
     { "GOT",      { BFD_RELOC_386_GOT32,      0, BFD_RELOC_X86_64_GOT32    } }
   };
   char *cp;
@@ -4658,6 +4664,8 @@ md_apply_fix3 (fixP, valP, seg)
       case BFD_RELOC_386_TLS_GD:
       case BFD_RELOC_386_TLS_LDM:
       case BFD_RELOC_386_TLS_IE_32:
+      case BFD_RELOC_386_TLS_IE:
+      case BFD_RELOC_386_TLS_GOTIE:
       case BFD_RELOC_X86_64_GOT32:
 	value = 0; /* Fully resolved at runtime.  No addend.  */
 	break;
@@ -5138,6 +5146,8 @@ tc_gen_reloc (section, fixp)
     case BFD_RELOC_386_TLS_LDM:
     case BFD_RELOC_386_TLS_LDO_32:
     case BFD_RELOC_386_TLS_IE_32:
+    case BFD_RELOC_386_TLS_IE:
+    case BFD_RELOC_386_TLS_GOTIE:
     case BFD_RELOC_386_TLS_LE_32:
     case BFD_RELOC_386_TLS_LE:
     case BFD_RELOC_X86_64_32S:
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index a949015..5707887 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-19  Jakub Jelinek  <jakub@redhat.com>
+
+	* gas/i386/tlspic.s: Add tests.
+	* gas/i386/tlspic.d: Regenerated.
+	* gas/i386/tlsnopic.s: Add tests.
+	* gas/i386/tlsnopic.d: Regenerated.
+
 2002-09-19  Richard Henderson  <rth@redhat.com>
 
 	* gas/alpha/elf-reloc-7.s: New.
diff --git a/gas/testsuite/gas/i386/tlsnopic.d b/gas/testsuite/gas/i386/tlsnopic.d
index 64ec6e6..68a2583 100644
--- a/gas/testsuite/gas/i386/tlsnopic.d
+++ b/gas/testsuite/gas/i386/tlsnopic.d
@@ -28,4 +28,10 @@ Disassembly of section .text:
   40:	90 [ 	]*nop    
   41:	8d 91 00 00 00 00    	lea    0x0\(%ecx\),%edx
 [ 	]+43: R_386_TLS_LE	var2
-  47:	c3 [ 	]*ret[ 	]*
+  47:	a1 00 00 00 00 [ 	]*mov    0x0,%eax
+[ 	]+48: R_386_TLS_IE	foo
+  4c:	65 8b 00 [ 	]*mov    %gs:\(%eax\),%eax
+  4f:	65 a1 00 00 00 00 [ 	]*mov    %gs:0x0,%eax
+  55:	03 05 00 00 00 00 [ 	]*add    0x0,%eax
+			57: R_386_TLS_IE	foo
+  5b:	c3 [ 	]*ret[ 	]*
diff --git a/gas/testsuite/gas/i386/tlsnopic.s b/gas/testsuite/gas/i386/tlsnopic.s
index 1b51b36..3a8b794 100644
--- a/gas/testsuite/gas/i386/tlsnopic.s
+++ b/gas/testsuite/gas/i386/tlsnopic.s
@@ -11,35 +11,44 @@ var2:	.long 33
 	.globl	fn
 	.type	fn,@function
 fn:
-	/* Main binary, no PIC  */
+	/* Main binary, no PIC.  */
 1:	movl	1b, %edx
 	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %edx
 
-	/* foo can be anywhere in startup TLS  */
+	/* foo can be anywhere in startup TLS.  */
 	movl	%gs:0, %eax
 	subl	foo@GOTTPOFF(%edx), %eax
-	/* %eax now contains &foo  */
+	/* %eax now contains &foo.  */
 
-	/* bar only in the main program  */
+	/* bar only in the main program.  */
 	movl	%gs:0, %eax
 	subl	$bar@TPOFF, %eax
-	/* %eax now contains &bar  */
+	/* %eax now contains &bar.  */
 
-	/* baz only in the main program  */
+	/* baz only in the main program.  */
 	movl	%gs:0, %ecx
-	/* Arbitrary instructions in between  */
+	/* Arbitrary instructions in between.  */
 	nop
 	subl	$baz@TPOFF, %ecx
-	/* %ecx now contains &baz  */
+	/* %ecx now contains &baz.  */
 
-	/* var and var2 only in the main program  */
+	/* var and var2 only in the main program.  */
 	movl	%gs:0, %ecx
-	/* Arbitrary instructions in between  */
+	/* Arbitrary instructions in between.  */
 	nop
 	nop
 	leal	var@NTPOFF(%ecx), %eax
-	/* Arbitrary instructions in between  */
+	/* Arbitrary instructions in between.  */
 	nop
 	leal	var2@NTPOFF(%ecx), %edx
 
+	/* foo can be anywhere in startup TLS.  */
+	movl	foo@INDNTPOFF, %eax
+	movl	%gs:(%eax), %eax
+	/* %eax now contains foo.  */
+
+	movl	%gs:0, %eax
+	addl	foo@INDNTPOFF, %eax
+	/* %eax now contains &foo.  */
+
 	ret
diff --git a/gas/testsuite/gas/i386/tlspic.d b/gas/testsuite/gas/i386/tlspic.d
index 2444113..fbe83a4 100644
--- a/gas/testsuite/gas/i386/tlspic.d
+++ b/gas/testsuite/gas/i386/tlspic.d
@@ -18,6 +18,13 @@ Disassembly of section .text:
   17:	8d 76 00 [ 	]*lea    0x0\(%esi\),%esi
   1a:	2b 83 00 00 00 00 [ 	]*sub    0x0\(%ebx\),%eax
 [ 	]+1c: R_386_TLS_IE_32	foo
-  20:	8b 5d fc [ 	]*mov    0xfffffffc\(%ebp\),%ebx
-  23:	c9 [ 	]*leave[ 	]*
-  24:	c3 [ 	]*ret[ 	]*
+  20:	8b 83 00 00 00 00 [ 	]*mov    0x0\(%ebx\),%eax
+[ 	]+22: R_386_TLS_GOTIE	foo
+  26:	8d 76 00 [ 	]*lea    0x0\(%esi\),%esi
+  29:	65 8b 00 [ 	]*mov    %gs:\(%eax\),%eax
+  2c:	65 8b 0d 00 00 00 00 [ 	]*mov    %gs:0x0,%ecx
+  33:	03 8b 00 00 00 00 [ 	]*add    0x0\(%ebx\),%ecx
+[ 	]+35: R_386_TLS_GOTIE	foo
+  39:	8b 5d fc [ 	]*mov    0xfffffffc\(%ebp\),%ebx
+  3c:	c9 [ 	]*leave[ 	]*
+  3d:	c3 [ 	]*ret[ 	]*
diff --git a/gas/testsuite/gas/i386/tlspic.s b/gas/testsuite/gas/i386/tlspic.s
index e445ab9..c9b9757 100644
--- a/gas/testsuite/gas/i386/tlspic.s
+++ b/gas/testsuite/gas/i386/tlspic.s
@@ -16,12 +16,24 @@ fn:
 	/* foo can be anywhere in the startup TLS  */
 	movl	%gs:0, %eax
 
-	/* Arbitrary instructions in between  */
+	/* Arbitrary instructions in between.  */
 	leal	0(%esi, 1), %esi
 
 	subl	foo@GOTTPOFF(%ebx), %eax
 	/* %eax now contains &foo  */
 
+	/* Now the GNU sequence.  */
+	movl	foo@GOTNTPOFF(%ebx), %eax
+
+	/* Arbitrary instructions in between.  */
+	leal	0(%esi, 1), %esi
+
+	movl	%gs:(%eax), %eax
+	/* %eax now contains foo  */
+
+	movl	%gs:0, %ecx
+	addl	foo@GOTNTPOFF(%ebx), %ecx
+
 	movl    -4(%ebp), %ebx
 	leave
 	ret