aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog8
-rw-r--r--bfd/elf32-i386.c59
-rw-r--r--bfd/elfxx-x86.c6
-rw-r--r--ld/ChangeLog12
-rw-r--r--ld/testsuite/ld-i386/i386.exp1
-rw-r--r--ld/testsuite/ld-i386/pr23189.d7
-rw-r--r--ld/testsuite/ld-i386/pr23189.s5
-rw-r--r--ld/testsuite/ld-i386/pr23189.t11
-rw-r--r--ld/testsuite/ld-x86-64/pr23189.d7
-rw-r--r--ld/testsuite/ld-x86-64/pr23189.s5
-rw-r--r--ld/testsuite/ld-x86-64/pr23189.t11
-rw-r--r--ld/testsuite/ld-x86-64/x86-64.exp1
12 files changed, 73 insertions, 60 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f0ea6f9..a9248e6 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/23189
+ * elf32-i386.c (elf_i386_relocate_section): Handle R_386_GOT32X
+ like R_386_GOT32.
+ * elfxx-x86.c (_bfd_x86_elf_link_symbol_references_local): Don't
+ set eh->local_ref to 1 for linker defined symbols.
+
2018-05-18 Alan Modra <amodra@gmail.com>
PR 23199
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 580a591..3dd709a 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -2451,66 +2451,7 @@ skip_ifunc:
switch (r_type)
{
case R_386_GOT32X:
- /* Avoid optimizing _DYNAMIC since ld.so may use its
- link-time address. */
- if (h == htab->elf.hdynamic)
- goto r_386_got32;
-
- if (bfd_link_pic (info))
- {
- /* It is OK to convert mov to lea and convert indirect
- branch to direct branch. It is OK to convert adc,
- add, and, cmp, or, sbb, sub, test, xor only when PIC
- is false. */
- unsigned int opcode, addend;
- addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
- if (addend != 0)
- goto r_386_got32;
- opcode = bfd_get_8 (input_bfd, contents + rel->r_offset - 2);
- if (opcode != 0x8b && opcode != 0xff)
- goto r_386_got32;
- }
-
- /* Resolve "mov GOT[(%reg)], %reg",
- "call/jmp *GOT[(%reg)]", "test %reg, foo@GOT[(%reg)]"
- and "binop foo@GOT[(%reg)], %reg". */
- if (h == NULL
- || (h->plt.offset == (bfd_vma) -1
- && h->got.offset == (bfd_vma) -1)
- || htab->elf.sgotplt == NULL)
- abort ();
-
- offplt = (htab->elf.sgotplt->output_section->vma
- + htab->elf.sgotplt->output_offset);
-
- /* It is relative to .got.plt section. */
- if (h->got.offset != (bfd_vma) -1)
- /* Use GOT entry. Mask off the least significant bit in
- GOT offset which may be set by R_386_GOT32 processing
- below. */
- relocation = (htab->elf.sgot->output_section->vma
- + htab->elf.sgot->output_offset
- + (h->got.offset & ~1) - offplt);
- else
- /* Use GOTPLT entry. */
- relocation = (h->plt.offset / plt_entry_size
- - htab->plt.has_plt0 + 3) * 4;
-
- if (!bfd_link_pic (info))
- {
- /* If not PIC, add the .got.plt section address for
- baseless addressing. */
- unsigned int modrm;
- modrm = bfd_get_8 (input_bfd, contents + rel->r_offset - 1);
- if ((modrm & 0xc7) == 0x5)
- relocation += offplt;
- }
-
- unresolved_reloc = FALSE;
- break;
-
case R_386_GOT32:
-r_386_got32:
/* Relocation is to the entry for this symbol in the global
offset table. */
if (htab->elf.sgot == NULL)
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 936b4c6..f4dbddf 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2047,7 +2047,11 @@ _bfd_x86_elf_link_symbol_references_local (struct bfd_link_info *info,
return TRUE;
}
- eh->local_ref = 1;
+ /* Symbols created by HIDDEN and PROVIDE_HIDDEN assignments in linker
+ script aren't forced local here yet. */
+ if (!h->root.ldscript_def)
+ eh->local_ref = 1;
+
return FALSE;
}
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 78c0d26..5986f3c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,15 @@
+2018-05-18 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/23189
+ * testsuite/ld-i386/i386.exp: Run pr23189.
+ * testsuite/ld-x86-64/x86-64.exp: Likewise.
+ * testsuite/ld-i386/pr23189.d: New file.
+ * testsuite/ld-i386/pr23189.s: Likewise.
+ * testsuite/ld-i386/pr23189.t: Likewise.
+ * testsuite/ld-x86-64/pr23189.d: Likewise.
+ * testsuite/ld-x86-64/pr23189.s: Likewise.
+ * testsuite/ld-x86-64/pr23189.t: Likewise.
+
2018-05-15 Alan Modra <amodra@gmail.com>
* testsuite/ld-elf/notes.exp: Restore LDFLAGS.
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 0d50b63..7aec534 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -479,6 +479,7 @@ run_dump_test "pr18815"
run_dump_test "pr19939a"
run_dump_test "pr19939b"
run_dump_test "tlsdesc2"
+run_dump_test "pr23189"
proc undefined_weak {cflags ldflags} {
set testname "Undefined weak symbol"
diff --git a/ld/testsuite/ld-i386/pr23189.d b/ld/testsuite/ld-i386/pr23189.d
new file mode 100644
index 0000000..9345b42
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr23189.d
@@ -0,0 +1,7 @@
+#as: --32 -mrelax-relocations=yes
+#ld: -shared -melf_i386 -T pr23189.t
+#readelf: -r --wide
+
+Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
+ Offset Info Type Sym. Value Symbol's Name
+[0-9a-f]+ +[0-9a-f]+ +R_386_RELATIVE +
diff --git a/ld/testsuite/ld-i386/pr23189.s b/ld/testsuite/ld-i386/pr23189.s
new file mode 100644
index 0000000..4a6c9cd
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr23189.s
@@ -0,0 +1,5 @@
+ .globl _start
+ .type _start, @function
+_start:
+ movl __hidden_sym@GOT(%eax), %eax
+ .size _start, .-_start
diff --git a/ld/testsuite/ld-i386/pr23189.t b/ld/testsuite/ld-i386/pr23189.t
new file mode 100644
index 0000000..0e6ff65
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr23189.t
@@ -0,0 +1,11 @@
+EXTERN(_start)
+ENTRY(_start)
+
+SECTIONS
+{
+ .text :
+ {
+ HIDDEN (__hidden_sym = .);
+ *(.text*)
+ }
+}
diff --git a/ld/testsuite/ld-x86-64/pr23189.d b/ld/testsuite/ld-x86-64/pr23189.d
new file mode 100644
index 0000000..7951c7a
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr23189.d
@@ -0,0 +1,7 @@
+#as: --64 -mrelax-relocations=yes
+#ld: -shared -melf_x86_64 -T pr23189.t
+#readelf: -r --wide
+
+Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entry:
+ Offset Info Type Symbol's Value Symbol's Name \+ Addend
+[0-9a-f]+ +[0-9a-f]+ +R_X86_64_RELATIVE +[0-9a-f]+
diff --git a/ld/testsuite/ld-x86-64/pr23189.s b/ld/testsuite/ld-x86-64/pr23189.s
new file mode 100644
index 0000000..971ad8f
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr23189.s
@@ -0,0 +1,5 @@
+ .globl _start
+ .type _start, @function
+_start:
+ movq __hidden_sym@GOTPCREL(%rip), %rax
+ .size _start, .-_start
diff --git a/ld/testsuite/ld-x86-64/pr23189.t b/ld/testsuite/ld-x86-64/pr23189.t
new file mode 100644
index 0000000..0e6ff65
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr23189.t
@@ -0,0 +1,11 @@
+EXTERN(_start)
+ENTRY(_start)
+
+SECTIONS
+{
+ .text :
+ {
+ HIDDEN (__hidden_sym = .);
+ *(.text*)
+ }
+}
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 5a06947..563e782 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -606,6 +606,7 @@ run_dump_test "pr20253-5b"
run_dump_test "tlsdesc2"
run_dump_test "pr22048"
run_dump_test "pr22929"
+run_dump_test "pr23189"
proc undefined_weak {cflags ldflags} {
set testname "Undefined weak symbol"
generated by cgit v1.1 at 2024-12-27 08:02:18 +0000