76bffb9
diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d
76bffb9
--- binutils.orig/ld/testsuite/ld-i386/pltgot-1.d	2017-11-15 13:32:39.335065263 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-1.d	2017-11-15 15:03:55.649727195 +0000
76bffb9
@@ -2,6 +2,7 @@
76bffb9
 #readelf: -S --wide
76bffb9
 #as: --32
76bffb9
 
76bffb9
+#pass
76bffb9
 #...
76bffb9
  +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
76bffb9
 #...
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-i386/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d
76bffb9
--- binutils.orig/ld/testsuite/ld-i386/pltgot-2.d	2017-11-15 13:32:39.329065335 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-i386/pltgot-2.d	2017-11-15 15:04:20.803430034 +0000
76bffb9
@@ -3,7 +3,6 @@
76bffb9
 #readelf: -d --wide
76bffb9
 #as: --32
76bffb9
 
76bffb9
-#failif
76bffb9
 #...
76bffb9
  +0x[0-9a-f]+ +\(PLTREL.*
76bffb9
 #...
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d
76bffb9
--- binutils.orig/ld/testsuite/ld-i386/pr19636-2d.d	2017-11-15 13:32:39.336065251 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2d.d	2017-11-15 15:03:00.413379749 +0000
76bffb9
@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse
76bffb9
 [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
76bffb9
 [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
76bffb9
 [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
76bffb9
-
76bffb9
+#...
76bffb9
 Symbol table '\.dynsym' contains [0-9]+ entries:
76bffb9
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
76bffb9
 #...
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d
76bffb9
--- binutils.orig/ld/testsuite/ld-i386/pr19636-2e.d	2017-11-15 13:32:39.330065323 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-i386/pr19636-2e.d	2017-11-15 15:03:28.928042882 +0000
76bffb9
@@ -9,7 +9,7 @@ Relocation section '\.rel\.dyn' at offse
76bffb9
 [0-9a-f]+ +[0-9a-f]+ +R_386_32 +0+ +func
76bffb9
 [0-9a-f]+ +[0-9a-f]+ +R_386_PC32 +0+ +func
76bffb9
 [0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +0+ +func
76bffb9
-
76bffb9
+#...
76bffb9
 Symbol table '\.dynsym' contains [0-9]+ entries:
76bffb9
  +Num: +Value +Size Type +Bind +Vis +Ndx Name
76bffb9
 #...
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/pltgot-1.d	2017-11-15 13:32:39.415064300 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-1.d	2017-11-15 15:08:39.333375801 +0000
76bffb9
@@ -2,8 +2,4 @@
76bffb9
 #readelf: -S --wide
76bffb9
 #as: --64
76bffb9
 
76bffb9
-#...
76bffb9
- +\[ *[0-9]+\] \.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+10 +.*
76bffb9
-#...
76bffb9
- +\[ *[0-9]+\] \.got\.plt +PROGBITS +[0-9a-f]+ +[0-9a-f]+ +0+18 +.*
76bffb9
 #pass
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/pltgot-2.d	2017-11-15 13:32:39.404064432 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pltgot-2.d	2017-11-15 15:08:59.031143095 +0000
76bffb9
@@ -3,7 +3,6 @@
76bffb9
 #readelf: -d --wide
76bffb9
 #as: --64
76bffb9
 
76bffb9
-#failif
76bffb9
 #...
76bffb9
  +0x[0-9a-f]+ +\(PLTREL.*
76bffb9
 #...
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/plt-main.rd	2017-11-15 13:32:39.407064397 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/plt-main.rd	2017-11-15 15:06:17.244054423 +0000
76bffb9
@@ -1,4 +1,3 @@
76bffb9
-#failif
76bffb9
 #...
76bffb9
 [0-9a-f ]+R_X86_64_JUMP_SLOT +0+ +bar \+ 0
76bffb9
 #...
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830a.d	2017-11-15 13:32:39.412064336 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a.d	2017-11-15 15:15:09.918750288 +0000
76bffb9
@@ -20,6 +20,7 @@ Contents of the .eh_frame section:
76bffb9
   DW_CFA_offset: r16 \(rip\) at cfa-8
76bffb9
   DW_CFA_nop
76bffb9
   DW_CFA_nop
76bffb9
+#pass
76bffb9
 
3e6490c
 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
76bffb9
   DW_CFA_nop
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830a-now.d	2017-11-15 13:32:39.413064324 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830a-now.d	2017-11-15 15:16:08.227055104 +0000
76bffb9
@@ -20,6 +20,7 @@ Contents of the .eh_frame section:
76bffb9
   DW_CFA_offset: r16 \(rip\) at cfa-8
76bffb9
   DW_CFA_nop
76bffb9
   DW_CFA_nop
76bffb9
+#pass
76bffb9
 
3e6490c
 0+18 0000000000000014 0000001c FDE cie=00000000 pc=00000000000001c8..00000000000001d4
76bffb9
   DW_CFA_nop
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830b.d	2017-11-15 13:32:39.413064324 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b.d	2017-11-15 15:16:20.115913358 +0000
76bffb9
@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
76bffb9
   DW_CFA_offset: r16 \(rip\) at cfa-8
76bffb9
   DW_CFA_nop
76bffb9
   DW_CFA_nop
76bffb9
-
76bffb9
+#pass
76bffb9
+ 
3e6490c
 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
76bffb9
   DW_CFA_nop
76bffb9
   DW_CFA_nop
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/pr20830b-now.d	2017-11-15 13:32:39.411064348 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/pr20830b-now.d	2017-11-15 15:16:29.012807282 +0000
76bffb9
@@ -20,7 +20,8 @@ Contents of the .eh_frame section:
76bffb9
   DW_CFA_offset: r16 \(rip\) at cfa-8
76bffb9
   DW_CFA_nop
76bffb9
   DW_CFA_nop
76bffb9
-
76bffb9
+#pass
76bffb9
+ 
3e6490c
 0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000138..0000000000000144
76bffb9
   DW_CFA_nop
76bffb9
   DW_CFA_nop
76bffb9
diff -rup binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd
76bffb9
--- binutils.orig/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 13:32:39.417064276 +0000
76bffb9
+++ binutils-2.29.1/ld/testsuite/ld-x86-64/tlspic2.rd	2017-11-15 15:05:02.950932110 +0000
76bffb9
@@ -14,6 +14,7 @@ Section Headers:
76bffb9
  +\[[ 0-9]+\] .dynsym +.*
76bffb9
  +\[[ 0-9]+\] .dynstr +.*
76bffb9
  +\[[ 0-9]+\] .rela.dyn +.*
76bffb9
+#pass
76bffb9
  +\[[ 0-9]+\] .plt +.*
76bffb9
  +\[[ 0-9]+\] .plt.got +.*
76bffb9
  +\[[ 0-9]+\] .text +PROGBITS +0+1000 0+1000 0+31a 00 +AX +0 +0 4096
e0e1ae6
--- binutils.orig/bfd/elfxx-x86.c	2018-01-22 15:59:25.875788033 +0000
e0e1ae6
+++ binutils-2.30.0/bfd/elfxx-x86.c	2018-01-22 16:00:20.789146597 +0000
e0e1ae6
@@ -107,7 +107,7 @@ elf_x86_allocate_dynrelocs (struct elf_l
e0e1ae6
   plt_entry_size = htab->plt.plt_entry_size;
e0e1ae6
 
e0e1ae6
   resolved_to_zero = UNDEFINED_WEAK_RESOLVED_TO_ZERO (info, eh);
e0e1ae6
-
e0e1ae6
+#if 0
e0e1ae6
   /* We can't use the GOT PLT if pointer equality is needed since
e0e1ae6
      finish_dynamic_symbol won't clear symbol value and the dynamic
e0e1ae6
      linker won't update the GOT slot.  We will get into an infinite
e0e1ae6
@@ -125,7 +125,7 @@ elf_x86_allocate_dynrelocs (struct elf_l
e0e1ae6
       /* Use the GOT PLT.  */
e0e1ae6
       eh->plt_got.refcount = 1;
e0e1ae6
     }
e0e1ae6
-
e0e1ae6
+#endif
e0e1ae6
   /* Since STT_GNU_IFUNC symbol must go through PLT, we handle it
e0e1ae6
      here if it is defined and referenced in a non-shared object.  */
e0e1ae6
   if (h->type == STT_GNU_IFUNC
3e6490c
--- binutils.orig/ld/testsuite/ld-i386/pr20830.d	2018-07-09 09:49:51.277239857 +0100
3e6490c
+++ binutils-2.30.90/ld/testsuite/ld-i386/pr20830.d	2018-07-09 10:32:41.113356733 +0100
3e6490c
@@ -19,7 +19,7 @@ Contents of the .eh_frame section:
3e6490c
   DW_CFA_offset: r8 \(eip\) at cfa-4
3e6490c
   DW_CFA_nop
3e6490c
   DW_CFA_nop
3e6490c
-
3e6490c
+#pass
3e6490c
 0+18 00000010 0000001c FDE cie=00000000 pc=00000128..00000133
3e6490c
   DW_CFA_nop
3e6490c
   DW_CFA_nop