--- binutils.orig/gas/config/tc-i386.c	2017-10-25 12:52:19.977290474 +0100

+++ binutils-2.27/gas/config/tc-i386.c	2017-10-25 15:09:15.572415126 +0100

@@ -10655,14 +10655,7 @@ i386_validate_fix (fixS *fixp)

 	    {

 	      if (!object_64bit)

 		abort ();

-#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)

-	      if (fixp->fx_tcbit2)

-		fixp->fx_r_type = (fixp->fx_tcbit

-				   ? BFD_RELOC_X86_64_REX_GOTPCRELX

-				   : BFD_RELOC_X86_64_GOTPCRELX);

-	      else

-#endif

-		fixp->fx_r_type = BFD_RELOC_X86_64_GOTPCREL;

+	      fixp->fx_r_type = BFD_RELOC_X86_64_GOTPCREL;

 	    }

 	  else

 	    {

@@ -10674,14 +10667,6 @@ i386_validate_fix (fixS *fixp)

 	  fixp->fx_subsy = 0;

 	}

     }

-#if defined (OBJ_ELF) || defined (OBJ_MAYBE_ELF)

-  else if (!object_64bit)

-    {

-      if (fixp->fx_r_type == BFD_RELOC_386_GOT32

-	  && fixp->fx_tcbit2)

-	fixp->fx_r_type = BFD_RELOC_386_GOT32X;

-    }

-#endif

 }

 arelent *

diff -rup binutils.orig/gas/testsuite/gas/i386/got.d binutils-2.27/gas/testsuite/gas/i386/got.d

--- binutils.orig/gas/testsuite/gas/i386/got.d	2017-10-25 12:52:20.045289685 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/got.d	2017-10-25 15:19:02.458621604 +0100

@@ -8,23 +8,23 @@ Disassembly of section .text:

 0+ <_start>:

 [ 	]*[a-f0-9]+:	b8 00 00 00 00       	mov    \$0x0,%eax	1: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	7: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	8b 80 00 00 00 00    	mov    0x0\(%eax\),%eax	d: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	7: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	8b 80 00 00 00 00    	mov    0x0\(%eax\),%eax	d: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	05 00 00 00 00       	add    \$0x0,%eax	12: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	18: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	03 80 00 00 00 00    	add    0x0\(%eax\),%eax	1e: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	24: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff 90 00 00 00 00    	call   \*0x0\(%eax\)	2a: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	30: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff a0 00 00 00 00    	jmp    \*0x0\(%eax\)	36: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	18: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	03 80 00 00 00 00    	add    0x0\(%eax\),%eax	1e: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	24: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff 90 00 00 00 00    	call   \*0x0\(%eax\)	2a: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	30: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff a0 00 00 00 00    	jmp    \*0x0\(%eax\)	36: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	b8 00 00 00 00       	mov    \$0x0,%eax	3b: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	41: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	8b 80 00 00 00 00    	mov    0x0\(%eax\),%eax	47: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	41: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	8b 80 00 00 00 00    	mov    0x0\(%eax\),%eax	47: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	05 00 00 00 00       	add    \$0x0,%eax	4c: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	52: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	03 80 00 00 00 00    	add    0x0\(%eax\),%eax	58: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff 90 00 00 00 00    	call   \*0x0\(%eax\)	5e: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	64: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff a0 00 00 00 00    	jmp    \*0x0\(%eax\)	6a: R_386_GOT32X	foo

-[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	70: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	52: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	03 80 00 00 00 00    	add    0x0\(%eax\),%eax	58: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff 90 00 00 00 00    	call   \*0x0\(%eax\)	5e: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	64: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff a0 00 00 00 00    	jmp    \*0x0\(%eax\)	6a: R_386_GOT32	foo

+[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	70: R_386_GOT32	foo

 #pass

diff -rup binutils.orig/gas/testsuite/gas/i386/got-no-relax.d binutils-2.27/gas/testsuite/gas/i386/got-no-relax.d

--- binutils.orig/gas/testsuite/gas/i386/got-no-relax.d	2017-10-25 12:52:20.045289685 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/got-no-relax.d	2017-10-25 15:18:30.398991961 +0100

@@ -9,23 +9,23 @@ Disassembly of section .text:

 0+ <_start>:

 [ 	]*[a-f0-9]+:	b8 00 00 00 00       	mov    \$0x0,%eax	1: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	7: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	7: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	8b 80 00 00 00 00    	mov    0x0\(%eax\),%eax	d: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	05 00 00 00 00       	add    \$0x0,%eax	12: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	18: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	18: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	03 80 00 00 00 00    	add    0x0\(%eax\),%eax	1e: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	24: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	24: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	ff 90 00 00 00 00    	call   \*0x0\(%eax\)	2a: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	30: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	30: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	ff a0 00 00 00 00    	jmp    \*0x0\(%eax\)	36: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	b8 00 00 00 00       	mov    \$0x0,%eax	3b: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	41: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	8b 05 00 00 00 00    	mov    0x0,%eax	41: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	8b 80 00 00 00 00    	mov    0x0\(%eax\),%eax	47: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	05 00 00 00 00       	add    \$0x0,%eax	4c: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	52: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	03 05 00 00 00 00    	add    0x0,%eax	52: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	03 80 00 00 00 00    	add    0x0\(%eax\),%eax	58: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	ff 90 00 00 00 00    	call   \*0x0\(%eax\)	5e: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	64: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	ff 15 00 00 00 00    	call   \*0x0	64: R_386_GOT32	foo

 [ 	]*[a-f0-9]+:	ff a0 00 00 00 00    	jmp    \*0x0\(%eax\)	6a: R_386_GOT32	foo

-[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	70: R_386_GOT32X	foo

+[ 	]*[a-f0-9]+:	ff 25 00 00 00 00    	jmp    \*0x0	70: R_386_GOT32	foo

 #pass

diff -rup binutils.orig/gas/testsuite/gas/i386/ilp32/x86-64-gotpcrel.d binutils-2.27/gas/testsuite/gas/i386/ilp32/x86-64-gotpcrel.d

--- binutils.orig/gas/testsuite/gas/i386/ilp32/x86-64-gotpcrel.d	2017-10-25 12:52:20.047289662 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/ilp32/x86-64-gotpcrel.d	2017-10-25 15:12:35.549099037 +0100

@@ -2,6 +2,8 @@

 #as: --x32 -mrelax-relocations=yes

 #objdump: -dwr

 #name: x86-64 (ILP32) gotpcrel

+#skip: *-*-*

+# SKIPed because generation of the R_X86_64_REX_GOTPCRELX and R_X86_64_GOTPCRELX relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/gas/testsuite/gas/i386/ilp32/x86-64-localpic.d binutils-2.27/gas/testsuite/gas/i386/ilp32/x86-64-localpic.d

--- binutils.orig/gas/testsuite/gas/i386/ilp32/x86-64-localpic.d	2017-10-25 12:52:20.047289662 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/ilp32/x86-64-localpic.d	2017-10-25 15:12:35.549099037 +0100

@@ -2,6 +2,8 @@

 #as: --x32 -mrelax-relocations=yes

 #readelf: -rsW

 #name: x86-64 (ILP32) local PIC

+#skip: *-*-*

+# SKIPed because generation of the R_X86_64_REX_GOTPCRELX reloc is currently suppressed.

 Relocation section '.rela.text' at offset 0x[0-9a-f]+ contains 1 entries:

  +Offset +Info +Type +Sym. Value +Symbol's Name \+ Addend

diff -rup binutils.orig/gas/testsuite/gas/i386/localpic.d binutils-2.27/gas/testsuite/gas/i386/localpic.d

--- binutils.orig/gas/testsuite/gas/i386/localpic.d	2017-10-25 12:52:20.049289639 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/localpic.d	2017-10-25 15:18:13.799183724 +0100

@@ -4,7 +4,7 @@

 Relocation section '.rel.text' at offset 0x[0-9a-f]+ contains 1 entries:

  Offset     Info    Type            Sym.Value  Sym. Name

-[0-9a-f]+ +[0-9a-f]+ R_386_GOT32X +[0-9a-f]+ +foo

+[0-9a-f]+ +[0-9a-f]+ R_386_GOT32 +[0-9a-f]+ +foo

 #...

  +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +NOTYPE +LOCAL +DEFAULT +[0-9]+ +foo

 #pass

diff -rup binutils.orig/gas/testsuite/gas/i386/mixed-mode-reloc32.d binutils-2.27/gas/testsuite/gas/i386/mixed-mode-reloc32.d

--- binutils.orig/gas/testsuite/gas/i386/mixed-mode-reloc32.d	2017-10-25 12:52:20.050289627 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/mixed-mode-reloc32.d	2017-10-25 15:18:02.186317878 +0100

@@ -7,9 +7,9 @@

 RELOCATION RECORDS FOR \[.text\]:

 OFFSET[ 	]+TYPE[ 	]+VALUE[ 	]*

-[0-9a-f]+[ 	]+R_386_GOT32X[ 	]+xtrn[ 	]*

+[0-9a-f]+[ 	]+R_386_GOT32[ 	]+xtrn[ 	]*

 [0-9a-f]+[ 	]+R_386_PLT32[ 	]+xtrn[ 	]*

-[0-9a-f]+[ 	]+R_386_GOT32X[ 	]+xtrn[ 	]*

+[0-9a-f]+[ 	]+R_386_GOT32[ 	]+xtrn[ 	]*

 [0-9a-f]+[ 	]+R_386_PLT32[ 	]+xtrn[ 	]*

-[0-9a-f]+[ 	]+R_386_GOT32X[ 	]+xtrn[ 	]*

+[0-9a-f]+[ 	]+R_386_GOT32[ 	]+xtrn[ 	]*

 [0-9a-f]+[ 	]+R_386_PLT32[ 	]+xtrn[ 	]*

diff -rup binutils.orig/gas/testsuite/gas/i386/reloc32.d binutils-2.27/gas/testsuite/gas/i386/reloc32.d

--- binutils.orig/gas/testsuite/gas/i386/reloc32.d	2017-10-25 12:52:20.052289604 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/reloc32.d	2017-10-25 15:16:06.161659763 +0100

@@ -19,7 +19,7 @@ Disassembly of section \.text:

 .*[ 	]+R_386_PC32[ 	]+xtrn

 .*[ 	]+R_386_PC8[ 	]+xtrn

 .*[ 	]+R_386_GOT32[ 	]+xtrn

-.*[ 	]+R_386_GOT32X[ 	]+xtrn

+.*[ 	]+R_386_GOT32[ 	]+xtrn

 .*[ 	]+R_386_GOTOFF[ 	]+xtrn

 .*[ 	]+R_386_GOTOFF[ 	]+xtrn

 .*[ 	]+R_386_GOTPC[ 	]+_GLOBAL_OFFSET_TABLE_

diff -rup binutils.orig/gas/testsuite/gas/i386/x86-64-gotpcrel.d binutils-2.27/gas/testsuite/gas/i386/x86-64-gotpcrel.d

--- binutils.orig/gas/testsuite/gas/i386/x86-64-gotpcrel.d	2017-10-25 12:52:20.063289476 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/x86-64-gotpcrel.d	2017-10-25 15:12:35.549099037 +0100

@@ -1,5 +1,7 @@

 #as: -mrelax-relocations=yes

 #objdump: -dwr

+#skip: *-*-*

+# SKIPed because generation of the R_X86_64_REX_GOTPCRELX and R_X86_64_GOTPCRELX relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/gas/testsuite/gas/i386/x86-64-localpic.d binutils-2.27/gas/testsuite/gas/i386/x86-64-localpic.d

--- binutils.orig/gas/testsuite/gas/i386/x86-64-localpic.d	2017-10-25 12:52:20.064289465 +0100

+++ binutils-2.27/gas/testsuite/gas/i386/x86-64-localpic.d	2017-10-25 15:12:35.549099037 +0100

@@ -1,6 +1,8 @@

 #as: -mrelax-relocations=yes

 #readelf: -rsW

 #name: x86-64 local PIC

+#skip: *-*-*

+# SKIPed because generation of the R_X86_64_REX_GOTPCRELX reloc is currently suppressed.

 Relocation section '.rela.text' at offset 0x[0-9a-f]+ contains 1 entries:

  +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend

diff -rup binutils.orig/ld/testsuite/ld-cdtest/cdtest-foo.cc binutils-2.27/ld/testsuite/ld-cdtest/cdtest-foo.cc

--- binutils.orig/ld/testsuite/ld-cdtest/cdtest-foo.cc	2017-10-25 12:52:20.549283841 +0100

+++ binutils-2.27/ld/testsuite/ld-cdtest/cdtest-foo.cc	2017-10-25 15:12:35.549099037 +0100

@@ -8,7 +8,7 @@

 #if (__GNUG__ == 2)

 typedef __SIZE_TYPE__ size_t;

 #else

-typedef unsigned int size_t;

+typedef unsigned long size_t;

 #endif

 extern "C" {

diff -rup binutils.orig/ld/testsuite/ld-elf/shared.exp binutils-2.27/ld/testsuite/ld-elf/shared.exp

--- binutils.orig/ld/testsuite/ld-elf/shared.exp	2017-10-25 12:52:20.578283504 +0100

+++ binutils-2.27/ld/testsuite/ld-elf/shared.exp	2017-10-25 15:45:58.374968233 +0100

@@ -483,10 +483,10 @@ set build_cxx_tests {

    "-shared -Wl,--dynamic-list-cpp-typeinfo" "-fPIC"

    {dl3.cc} {} "libdl3c.so" "c++"}

   {"Build libdnew1a.so with --Bsymbolic-functions --dynamic-list-cpp-new"

-   "-shared -Wl,-Bsymbolic-functions,--dynamic-list-cpp-new" "-fPIC"

+   "-shared -Wl,-Bsymbolic-functions,--dynamic-list-cpp-new" "-fPIC -ansi"

    {del.cc new.cc} {} "libnew1a.so" "c++"}

   {"Build libdnew1b.so with --dynamic-list-data --dynamic-list-cpp-new"

-   "-shared -Wl,--dynamic-list-data,--dynamic-list-cpp-new" "-fPIC"

+   "-shared -Wl,--dynamic-list-data,--dynamic-list-cpp-new" "-fPIC -ansi"

    {del.cc new.cc} {} "libnew1b.so" "c++"}

 }

@@ -503,10 +503,10 @@ set run_cxx_tests {

      {dl3main.cc} "dl3c" "dl3a.out" "" "c++"}

     {"Run with libnew1a.so"

      "tmpdir/libnew1a.so" ""

-     {dl5.cc} "dl5a" "dl5.out" "" "c++"}

+     {dl5.cc} "dl5a" "dl5.out" "-ansi" "c++"}

     {"Run with libnew1b.so"

      "tmpdir/libnew1b.so" ""

-     {dl5.cc} "dl5b" "dl5.out" "" "c++"}

+     {dl5.cc} "dl5b" "dl5.out" "-ansi" "c++"}

 }

 run_cc_link_tests $build_cxx_tests

diff -rup binutils.orig/ld/testsuite/ld-i386/branch1.d binutils-2.27/ld/testsuite/ld-i386/branch1.d

--- binutils.orig/ld/testsuite/ld-i386/branch1.d	2017-10-25 12:52:20.657282588 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/branch1.d	2017-10-25 15:26:26.015497567 +0100

@@ -1,6 +1,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call1.d binutils-2.27/ld/testsuite/ld-i386/call1.d

--- binutils.orig/ld/testsuite/ld-i386/call1.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call1.d	2017-10-25 15:26:33.407412174 +0100

@@ -1,3 +1,5 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -shared -melf_i386

 #error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

diff -rup binutils.orig/ld/testsuite/ld-i386/call2.d binutils-2.27/ld/testsuite/ld-i386/call2.d

--- binutils.orig/ld/testsuite/ld-i386/call2.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call2.d	2017-10-25 15:26:43.024301080 +0100

@@ -1,3 +1,5 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -shared -melf_i386

 #error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

diff -rup binutils.orig/ld/testsuite/ld-i386/call3a.d binutils-2.27/ld/testsuite/ld-i386/call3a.d

--- binutils.orig/ld/testsuite/ld-i386/call3a.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3a.d	2017-10-25 15:29:17.042521838 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3b.d binutils-2.27/ld/testsuite/ld-i386/call3b.d

--- binutils.orig/ld/testsuite/ld-i386/call3b.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3b.d	2017-10-25 15:29:21.756467382 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=prefix-addr

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3c.d binutils-2.27/ld/testsuite/ld-i386/call3c.d

--- binutils.orig/ld/testsuite/ld-i386/call3c.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3c.d	2017-10-25 15:29:26.457413076 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=prefix-nop

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3d.d binutils-2.27/ld/testsuite/ld-i386/call3d.d

--- binutils.orig/ld/testsuite/ld-i386/call3d.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3d.d	2017-10-25 15:29:30.925361461 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=suffix-nop

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3e.d binutils-2.27/ld/testsuite/ld-i386/call3e.d

--- binutils.orig/ld/testsuite/ld-i386/call3e.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3e.d	2017-10-25 15:29:38.894269403 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=prefix-0x67

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3f.d binutils-2.27/ld/testsuite/ld-i386/call3f.d

--- binutils.orig/ld/testsuite/ld-i386/call3f.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3f.d	2017-10-25 15:29:47.134174215 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=prefix-0x90

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3g.d binutils-2.27/ld/testsuite/ld-i386/call3g.d

--- binutils.orig/ld/testsuite/ld-i386/call3g.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3g.d	2017-10-25 15:29:52.341114063 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=suffix-0x90

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/call3h.d binutils-2.27/ld/testsuite/ld-i386/call3h.d

--- binutils.orig/ld/testsuite/ld-i386/call3h.d	2017-10-25 12:52:20.658282576 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/call3h.d	2017-10-25 15:29:57.237057504 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -z call-nop=suffix-144

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/i386.exp binutils-2.27/ld/testsuite/ld-i386/i386.exp

--- binutils.orig/ld/testsuite/ld-i386/i386.exp	2017-10-25 12:52:20.661282542 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/i386.exp	2017-10-25 15:42:06.083647050 +0100

@@ -133,13 +133,6 @@ set i386tests {

      {{readelf -Ssrl tlspic.rd} {objdump -drj.text tlspic.dd}

       {objdump -sj.got tlspic.sd} {objdump -sj.tdata tlspic.td}}

       "libtlspic.so"}

-    {"TLS -fpic -shared transitions without PLT"

-     "-shared -melf_i386 --no-ld-generated-unwind-info" ""

-     "-mrelax-relocations=yes --32"

-     {tlspic3.s tlspic2.s}

-     {{readelf -Ssrl tlspic2.rd} {objdump -drj.text tlspic2.dd}

-      {objdump -sj.got tlspic2.sd} {objdump -sj.tdata tlspic2.td}}

-      "libtlspic2.so"}

     {"TLS descriptor -fpic -shared transitions"

      "-shared -melf_i386 --no-ld-generated-unwind-info" ""

      "--32" {tlsdesc.s tlspic2.s}

@@ -154,13 +147,6 @@ set i386tests {

      {{readelf -Ssrl tlsbin.rd} {objdump -drj.text tlsbin.dd}

       {objdump -sj.got tlsbin.sd} {objdump -sj.tdata tlsbin.td}}

       "tlsbin"}

-    {"TLS -fpic and -fno-pic exec transitions without PLT"

-     "-melf_i386 tmpdir/libtlslib.so --no-ld-generated-unwind-info" ""

-     "-mrelax-relocations=yes --32"

-     {tlsbinpic2.s tlsbin.s}

-     {{readelf -Ssrl tlsbin2.rd} {objdump -drj.text tlsbin2.dd}

-      {objdump -sj.got tlsbin2.sd} {objdump -sj.tdata tlsbin2.td}}

-      "tlsbin2"}

     {"TLS descriptor -fpic and -fno-pic exec transitions"

      "-melf_i386 tmpdir/libtlslib.so --no-ld-generated-unwind-info" ""

      "--32" {tlsbindesc.s tlsbin.s}

@@ -191,17 +177,9 @@ set i386tests {

     {"TLS GD->LE transition" "-melf_i386" ""

      "--32" {tlsgd1.s}

      {{objdump -dwr tlsgd1.dd}} "tlsgd1"}

-    {"TLS GD->LE transition without PLT" "-melf_i386" ""

-     "-mrelax-relocations=yes --32"

-     {tlsgd3.s}

-     {{objdump -dwr tlsgd3.dd}} "tlsgd3"}

     {"TLS LD->LE transition" "-melf_i386" ""

      "--32" {tlsld1.s}

      {{objdump -dwr tlsld1.dd}} "tlsld1"}

-    {"TLS LD->LE transition without PLT" "-melf_i386" ""

-     "-mrelax-relocations=yes --32"

-     {tlsld2.s}

-     {{objdump -dwr tlsld2.dd}} "tlsld2"}

     {"TLS IE->LE transition" "-melf_i386" ""

      "--32" {tlsie1.s}

      {{objdump -dwr tlsie1.dd}} "tlsie1"}

diff -rup binutils.orig/ld/testsuite/ld-i386/jmp1.d binutils-2.27/ld/testsuite/ld-i386/jmp1.d

--- binutils.orig/ld/testsuite/ld-i386/jmp1.d	2017-10-25 12:52:20.661282542 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/jmp1.d	2017-10-25 15:30:06.805946963 +0100

@@ -1,3 +1,5 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -shared -melf_i386

 #error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

diff -rup binutils.orig/ld/testsuite/ld-i386/jmp2.d binutils-2.27/ld/testsuite/ld-i386/jmp2.d

--- binutils.orig/ld/testsuite/ld-i386/jmp2.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/jmp2.d	2017-10-25 15:30:14.181861755 +0100

@@ -1,3 +1,5 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -shared -melf_i386

 #error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

diff -rup binutils.orig/ld/testsuite/ld-i386/lea1a.d binutils-2.27/ld/testsuite/ld-i386/lea1a.d

--- binutils.orig/ld/testsuite/ld-i386/lea1a.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/lea1a.d	2017-10-25 15:25:33.592103171 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -Bsymbolic -shared -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/lea1b.d binutils-2.27/ld/testsuite/ld-i386/lea1b.d

--- binutils.orig/ld/testsuite/ld-i386/lea1b.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/lea1b.d	2017-10-25 15:25:39.289037359 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/lea1c.d binutils-2.27/ld/testsuite/ld-i386/lea1c.d

--- binutils.orig/ld/testsuite/ld-i386/lea1c.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/lea1c.d	2017-10-25 15:25:46.777950846 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/lea1d.d binutils-2.27/ld/testsuite/ld-i386/lea1d.d

--- binutils.orig/ld/testsuite/ld-i386/lea1d.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/lea1d.d	2017-10-25 15:25:55.802846589 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -Bsymbolic -shared -melf_i386

 #readelf: -Sw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 #failif

 #...

diff -rup binutils.orig/ld/testsuite/ld-i386/lea1e.d binutils-2.27/ld/testsuite/ld-i386/lea1e.d

--- binutils.orig/ld/testsuite/ld-i386/lea1e.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/lea1e.d	2017-10-25 15:26:03.115762109 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -melf_i386

 #readelf: -Sw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 #failif

 #...

diff -rup binutils.orig/ld/testsuite/ld-i386/lea1f.d binutils-2.27/ld/testsuite/ld-i386/lea1f.d

--- binutils.orig/ld/testsuite/ld-i386/lea1f.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/lea1f.d	2017-10-25 15:26:09.485688523 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386

 #readelf: -Sw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 #failif

 #...

diff -rup binutils.orig/ld/testsuite/ld-i386/load1.d binutils-2.27/ld/testsuite/ld-i386/load1.d

--- binutils.orig/ld/testsuite/ld-i386/load1.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load1.d	2017-10-25 15:30:23.543753605 +0100

@@ -2,6 +2,8 @@

 #ld: -melf_i386

 #objdump: -dw --sym

 #notarget: i?86-*-nacl* x86_64-*-nacl*

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/load2.d binutils-2.27/ld/testsuite/ld-i386/load2.d

--- binutils.orig/ld/testsuite/ld-i386/load2.d	2017-10-25 12:52:20.662282530 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load2.d	2017-10-25 15:31:10.090215894 +0100

@@ -1,3 +1,3 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -shared

-#error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#error: direct GOT relocation R_386_GOT32 against `foo' without base register can not be used when making a shared object

diff -rup binutils.orig/ld/testsuite/ld-i386/load3.d binutils-2.27/ld/testsuite/ld-i386/load3.d

--- binutils.orig/ld/testsuite/ld-i386/load3.d	2017-10-25 12:52:20.663282518 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load3.d	2017-10-25 15:31:24.220052664 +0100

@@ -1,3 +1,3 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386 -shared

-#error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#error: direct GOT relocation R_386_GOT32 against `foo' without base register can not be used when making a shared object

diff -rup binutils.orig/ld/testsuite/ld-i386/load4a.d binutils-2.27/ld/testsuite/ld-i386/load4a.d

--- binutils.orig/ld/testsuite/ld-i386/load4a.d	2017-10-25 12:52:20.663282518 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load4a.d	2017-10-25 15:31:33.802941960 +0100

@@ -1,4 +1,4 @@

 #source: load4.s

 #as: --32 -mrelax-relocations=yes

 #ld: -Bsymbolic -shared -melf_i386

-#error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#error: direct GOT relocation R_386_GOT32 against `foo' without base register can not be used when making a shared object

diff -rup binutils.orig/ld/testsuite/ld-i386/load4b.d binutils-2.27/ld/testsuite/ld-i386/load4b.d

--- binutils.orig/ld/testsuite/ld-i386/load4b.d	2017-10-25 12:52:20.663282518 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load4b.d	2017-10-25 15:31:50.701746743 +0100

@@ -2,6 +2,8 @@

 #as: --32

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/load5a.d binutils-2.27/ld/testsuite/ld-i386/load5a.d

--- binutils.orig/ld/testsuite/ld-i386/load5a.d	2017-10-25 12:52:20.663282518 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load5a.d	2017-10-25 15:31:59.182648770 +0100

@@ -1,4 +1,4 @@

 #source: load5.s

 #as: --32 -mrelax-relocations=yes

 #ld: -Bsymbolic -shared -melf_i386

-#error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#error: direct GOT relocation R_386_GOT32 against `foo' without base register can not be used when making a shared object

diff -rup binutils.orig/ld/testsuite/ld-i386/load5b.d binutils-2.27/ld/testsuite/ld-i386/load5b.d

--- binutils.orig/ld/testsuite/ld-i386/load5b.d	2017-10-25 12:52:20.663282518 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load5b.d	2017-10-25 15:32:05.614574468 +0100

@@ -2,6 +2,8 @@

 #as: --32

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/load7.d binutils-2.27/ld/testsuite/ld-i386/load7.d

--- binutils.orig/ld/testsuite/ld-i386/load7.d	2017-10-25 12:52:20.663282518 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/load7.d	2017-10-25 15:32:15.231463372 +0100

@@ -1,6 +1,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -shared -melf_i386 --version-script load7.map

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/mov1b.d binutils-2.27/ld/testsuite/ld-i386/mov1b.d

--- binutils.orig/ld/testsuite/ld-i386/mov1b.d	2017-10-25 12:52:20.664282507 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/mov1b.d	2017-10-25 15:26:17.582594986 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -melf_i386 --no-dynamic-linker

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19175.d binutils-2.27/ld/testsuite/ld-i386/pr19175.d

--- binutils.orig/ld/testsuite/ld-i386/pr19175.d	2017-10-25 12:52:20.671282426 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19175.d	2017-10-25 15:34:05.638187937 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -Bsymbolic -shared -melf_i386 -T pr19175.t

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-1a.d binutils-2.27/ld/testsuite/ld-i386/pr19609-1a.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-1a.d	2017-10-25 12:52:20.672282414 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-1a.d	2017-10-25 15:34:17.143055031 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-1b.d binutils-2.27/ld/testsuite/ld-i386/pr19609-1b.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-1b.d	2017-10-25 12:52:20.672282414 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-1b.d	2017-10-25 15:34:25.735955848 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -melf_i386 --no-dynamic-linker

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-1d.d binutils-2.27/ld/testsuite/ld-i386/pr19609-1d.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-1d.d	2017-10-25 12:52:20.673282403 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-1d.d	2017-10-25 15:35:05.258500067 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -E -melf_i386 --no-dynamic-linker

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-1f.d binutils-2.27/ld/testsuite/ld-i386/pr19609-1f.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-1f.d	2017-10-25 12:52:20.673282403 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-1f.d	2017-10-25 15:35:18.620345975 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie --dynamic-list-data -melf_i386 --no-dynamic-linker

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-1g.d binutils-2.27/ld/testsuite/ld-i386/pr19609-1g.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-1g.d	2017-10-25 12:52:20.673282403 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-1g.d	2017-10-25 15:35:26.379256499 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -E -melf_i386 --no-dynamic-linker

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-1h.d binutils-2.27/ld/testsuite/ld-i386/pr19609-1h.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-1h.d	2017-10-25 12:52:20.673282403 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-1h.d	2017-10-25 15:35:33.308176593 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -E -Bsymbolic-functions -melf_i386 --no-dynamic-linker

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr19609-2a.d binutils-2.27/ld/testsuite/ld-i386/pr19609-2a.d

--- binutils.orig/ld/testsuite/ld-i386/pr19609-2a.d	2017-10-25 12:52:20.673282403 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr19609-2a.d	2017-10-25 15:35:46.253027313 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -melf_i386

 #objdump: -dw

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 .*: +file format .*

diff -rup binutils.orig/ld/testsuite/ld-i386/pr20244-2d.d binutils-2.27/ld/testsuite/ld-i386/pr20244-2d.d

--- binutils.orig/ld/testsuite/ld-i386/pr20244-2d.d	2017-10-25 12:52:20.677282356 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr20244-2d.d	2017-10-25 15:38:34.521086821 +0100

@@ -1,4 +1,4 @@

 #source: pr20244-2.s

 #as: --32

 #ld: -pie -m elf_i386

-#error: direct GOT relocation R_386_GOT32X against `foo' without base register can not be used when making a shared object

+#error: direct GOT relocation R_386_GOT32 against `foo' without base register can not be used when making a shared object

diff -rup binutils.orig/ld/testsuite/ld-i386/pr20253-4b.d binutils-2.27/ld/testsuite/ld-i386/pr20253-4b.d

--- binutils.orig/ld/testsuite/ld-i386/pr20253-4b.d	2017-10-25 12:52:20.678282345 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/pr20253-4b.d	2017-10-25 15:36:45.185347695 +0100

@@ -2,6 +2,8 @@

 #as: --32 -mrelax-relocations=yes

 #ld: -pie -melf_i386

 #readelf: -r --wide

+#xfail: *-*-*

+# XFAILed because generation of the R_386_GOT32X relocs is currently suppressed.

 Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entries:

  +Offset +Info +Type +Sym.* Value +Symbol's Name

diff -rup binutils.orig/ld/testsuite/ld-i386/tlspie3a.d binutils-2.27/ld/testsuite/ld-i386/tlspie3a.d

--- binutils.orig/ld/testsuite/ld-i386/tlspie3a.d	2017-10-25 12:52:20.682282298 +0100

+++ binutils-2.27/ld/testsuite/ld-i386/tlspie3a.d	2017-10-25 15:25:02.726459735 +0100

@@ -2,5 +2,7 @@