aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-03-05 06:34:39 -0800
committerH.J. Lu <hjl.tools@gmail.com>2015-03-05 06:34:53 -0800
commitca3fe95e469b9daec153caa2c90665f5daaec2b5 (patch)
treebb39e2b029b05c48bb5898ad2b0e79d91316e13f /ld
parenta26de52c63a8b4da94e8e1c8b308b938b2434808 (diff)
downloadgdb-ca3fe95e469b9daec153caa2c90665f5daaec2b5.zip
gdb-ca3fe95e469b9daec153caa2c90665f5daaec2b5.tar.gz
gdb-ca3fe95e469b9daec153caa2c90665f5daaec2b5.tar.bz2
Add extern_protected_data and set it for x86
With copy relocation, address of protected data defined in the shared library may be external. This patch adds extern_protected_data and changes _bfd_elf_symbol_refs_local_p to return false for protected data if extern_protected_data is true. bfd/ PR ld/pr15228 PR ld/pr17709 * elf-bfd.h (elf_backend_data): Add extern_protected_data. * elf32-i386.c (elf_backend_extern_protected_data): New. Defined to 1. * elf64-x86-64.c (elf_backend_extern_protected_data): Likewise. * elflink.c (_bfd_elf_adjust_dynamic_copy): Don't error on copy relocs against protected symbols if extern_protected_data is true. (_bfd_elf_symbol_refs_local_p): Don't return true on protected non-function symbols if extern_protected_data is true. * elfxx-target.h (elf_backend_extern_protected_data): New. Default to 0. (elfNN_bed): Initialize extern_protected_data with elf_backend_extern_protected_data. ld/testsuite/ PR ld/pr15228 PR ld/pr17709 * ld-i386/i386.exp (i386tests): Add a test for PR ld/17709. * ld-i386/pr17709-nacl.rd: New file. * ld-i386/pr17709.rd: Likewise. * ld-i386/pr17709a.s: Likewise. * ld-i386/pr17709b.s: Likewise. * ld-i386/protected3.d: Updated. * ld-i386/protected3.s: Likewise. * ld-x86-64/pr17709-nacl.rd: New file. * ld-x86-64/pr17709.rd: Likewise. * ld-x86-64/pr17709a.s: Likewise. * ld-x86-64/pr17709b.s: Likewise. * ld-x86-64/protected3.d: Updated. * ld-x86-64/protected3.s: Likewise. * ld-x86-64/x86-64.exp (x86_64tests): Add a test for PR ld/17709.
Diffstat (limited to 'ld')
-rw-r--r--ld/testsuite/ChangeLog19
-rw-r--r--ld/testsuite/ld-i386/i386.exp4
-rw-r--r--ld/testsuite/ld-i386/pr17709-nacl.rd4
-rw-r--r--ld/testsuite/ld-i386/pr17709.rd4
-rw-r--r--ld/testsuite/ld-i386/pr17709a.s8
-rw-r--r--ld/testsuite/ld-i386/pr17709b.s5
-rw-r--r--ld/testsuite/ld-i386/protected3.d3
-rw-r--r--ld/testsuite/ld-i386/protected3.s3
-rw-r--r--ld/testsuite/ld-x86-64/pr17709-nacl.rd4
-rw-r--r--ld/testsuite/ld-x86-64/pr17709.rd4
-rw-r--r--ld/testsuite/ld-x86-64/pr17709a.s8
-rw-r--r--ld/testsuite/ld-x86-64/pr17709b.s5
-rw-r--r--ld/testsuite/ld-x86-64/protected3.d3
-rw-r--r--ld/testsuite/ld-x86-64/protected3.s3
-rw-r--r--ld/testsuite/ld-x86-64/x86-64.exp4
15 files changed, 77 insertions, 4 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index acd6d81..b7defad 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2015-03-05 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/pr15228
+ PR ld/pr17709
+ * ld-i386/i386.exp (i386tests): Add a test for PR ld/17709.
+ * ld-i386/pr17709-nacl.rd: New file.
+ * ld-i386/pr17709.rd: Likewise.
+ * ld-i386/pr17709a.s: Likewise.
+ * ld-i386/pr17709b.s: Likewise.
+ * ld-i386/protected3.d: Updated.
+ * ld-i386/protected3.s: Likewise.
+ * ld-x86-64/pr17709-nacl.rd: New file.
+ * ld-x86-64/pr17709.rd: Likewise.
+ * ld-x86-64/pr17709a.s: Likewise.
+ * ld-x86-64/pr17709b.s: Likewise.
+ * ld-x86-64/protected3.d: Updated.
+ * ld-x86-64/protected3.s: Likewise.
+ * ld-x86-64/x86-64.exp (x86_64tests): Add a test for PR ld/17709.
+
2015-03-04 Richard Sandiford <richard.sandiford@arm.com>
PR gas/17843
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index 4fc2359..3fdd39c 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -191,6 +191,10 @@ set i386tests {
"--32" {pr17306b.s} {} ""}
{"PR ld/17306 (2)" "-melf_i386 -shared -Bsymbolic --just-symbols=tmpdir/pr17306b.o" ""
"--32" {pr17306a.s} {} "libpr17306.so"}
+ {"PR ld/17709 (1)" "-melf_i386 -shared" ""
+ "--32" {pr17709a.s} {} "libpr17709.so"}
+ {"PR ld/17709 (2)" "-melf_i386 tmpdir/libpr17709.so" ""
+ "--32" {pr17709b.s} {{readelf -r pr17709.rd}} "pr17709"}
}
# So as to avoid rewriting every last test case here in a nacl variant,
diff --git a/ld/testsuite/ld-i386/pr17709-nacl.rd b/ld/testsuite/ld-i386/pr17709-nacl.rd
new file mode 100644
index 0000000..ac9d174
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr17709-nacl.rd
@@ -0,0 +1,4 @@
+
+Relocation section '.rel\..*' at offset .* contains 1 entries:
+ Offset Info Type Sym\.Value Sym\. Name
+[0-9a-f ]+R_386_COPY +[0-9a-f]+ +foo
diff --git a/ld/testsuite/ld-i386/pr17709.rd b/ld/testsuite/ld-i386/pr17709.rd
new file mode 100644
index 0000000..ac9d174
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr17709.rd
@@ -0,0 +1,4 @@
+
+Relocation section '.rel\..*' at offset .* contains 1 entries:
+ Offset Info Type Sym\.Value Sym\. Name
+[0-9a-f ]+R_386_COPY +[0-9a-f]+ +foo
diff --git a/ld/testsuite/ld-i386/pr17709a.s b/ld/testsuite/ld-i386/pr17709a.s
new file mode 100644
index 0000000..8750f5e
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr17709a.s
@@ -0,0 +1,8 @@
+ .protected foo
+.globl foo
+ .data
+ .align 4
+ .type foo, @object
+ .size foo, 4
+foo:
+ .long 1
diff --git a/ld/testsuite/ld-i386/pr17709b.s b/ld/testsuite/ld-i386/pr17709b.s
new file mode 100644
index 0000000..c57f404
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr17709b.s
@@ -0,0 +1,5 @@
+ .text
+ .globl _start
+ .type _start, @function
+_start:
+ movl foo, %eax
diff --git a/ld/testsuite/ld-i386/protected3.d b/ld/testsuite/ld-i386/protected3.d
index aafa2d8..47ab4e1 100644
--- a/ld/testsuite/ld-i386/protected3.d
+++ b/ld/testsuite/ld-i386/protected3.d
@@ -8,6 +8,7 @@
Disassembly of section .text:
0+[a-f0-9]+ <bar>:
-[ ]*[a-f0-9]+: 8b 81 [a-f0-9][a-f0-9] [a-f0-9][a-f0-9] 00 00 mov 0x[a-f0-9]+\(%ecx\),%eax
+[ ]*[a-f0-9]+: 8b 81 [a-f0-9][a-f0-9] [a-f0-9][a-f0-9] ff ff mov -0x[a-f0-9]+\(%ecx\),%eax
+[ ]*[a-f0-9]+: 8b 00 mov \(%eax\),%eax
[ ]*[a-f0-9]+: c3 ret
#pass
diff --git a/ld/testsuite/ld-i386/protected3.s b/ld/testsuite/ld-i386/protected3.s
index 7a605a2..4dd2115 100644
--- a/ld/testsuite/ld-i386/protected3.s
+++ b/ld/testsuite/ld-i386/protected3.s
@@ -10,6 +10,7 @@ foo:
.globl bar
.type bar, @function
bar:
- movl foo@GOTOFF(%ecx), %eax
+ movl foo@GOT(%ecx), %eax
+ movl (%eax), %eax
ret
.size bar, .-bar
diff --git a/ld/testsuite/ld-x86-64/pr17709-nacl.rd b/ld/testsuite/ld-x86-64/pr17709-nacl.rd
new file mode 100644
index 0000000..f1baa38
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr17709-nacl.rd
@@ -0,0 +1,4 @@
+
+Relocation section '.rela\..*' at offset .* contains 1 entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+[0-9a-f ]+R_X86_64_COPY+[0-9a-f ]+ +foo \+ 0
diff --git a/ld/testsuite/ld-x86-64/pr17709.rd b/ld/testsuite/ld-x86-64/pr17709.rd
new file mode 100644
index 0000000..f1baa38
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr17709.rd
@@ -0,0 +1,4 @@
+
+Relocation section '.rela\..*' at offset .* contains 1 entries:
+ +Offset +Info +Type +Symbol's Value +Symbol's Name \+ Addend
+[0-9a-f ]+R_X86_64_COPY+[0-9a-f ]+ +foo \+ 0
diff --git a/ld/testsuite/ld-x86-64/pr17709a.s b/ld/testsuite/ld-x86-64/pr17709a.s
new file mode 100644
index 0000000..8750f5e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr17709a.s
@@ -0,0 +1,8 @@
+ .protected foo
+.globl foo
+ .data
+ .align 4
+ .type foo, @object
+ .size foo, 4
+foo:
+ .long 1
diff --git a/ld/testsuite/ld-x86-64/pr17709b.s b/ld/testsuite/ld-x86-64/pr17709b.s
new file mode 100644
index 0000000..c57f404
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr17709b.s
@@ -0,0 +1,5 @@
+ .text
+ .globl _start
+ .type _start, @function
+_start:
+ movl foo, %eax
diff --git a/ld/testsuite/ld-x86-64/protected3.d b/ld/testsuite/ld-x86-64/protected3.d
index 22a36ac..d8f09da 100644
--- a/ld/testsuite/ld-x86-64/protected3.d
+++ b/ld/testsuite/ld-x86-64/protected3.d
@@ -8,6 +8,7 @@
Disassembly of section .text:
0+[a-f0-9]+ <bar>:
-[ ]*[a-f0-9]+: 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%eax # [a-f0-9]+ <foo>
+[ ]*[a-f0-9]+: 48 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%rax # [a-f0-9]+ <_DYNAMIC\+0x[a-f0-9]+>
+[ ]*[a-f0-9]+: 8b 00 mov \(%rax\),%eax
[ ]*[a-f0-9]+: c3 retq *
#pass
diff --git a/ld/testsuite/ld-x86-64/protected3.s b/ld/testsuite/ld-x86-64/protected3.s
index e4af6e7..7538050 100644
--- a/ld/testsuite/ld-x86-64/protected3.s
+++ b/ld/testsuite/ld-x86-64/protected3.s
@@ -10,6 +10,7 @@ foo:
.globl bar
.type bar, @function
bar:
- movl foo(%rip), %eax
+ movq foo@GOTPCREL(%rip), %rax
+ movl (%rax), %eax
ret
.size bar, .-bar
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index 9bb08bd..43427be 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -144,6 +144,10 @@ set x86_64tests {
"--64" {pr17306b.s} {} ""}
{"PR ld/17306 (2)" "-melf_x86_64 -shared -Bsymbolic --just-symbols=tmpdir/pr17306b.o" ""
"--64" {pr17306a.s} {} "libpr17306.so"}
+ {"PR ld/17709 (1)" "-melf_x86_64 -shared" ""
+ "--64" {pr17709a.s} {} "libpr17709.so"}
+ {"PR ld/17709 (2)" "-melf_x86_64 tmpdir/libpr17709.so" ""
+ "--64" {pr17709b.s} {{readelf -rW pr17709.rd}} "pr17709"}
}
# So as to avoid rewriting every last test case here in a nacl variant,