From: Alan Modra Date: Thu, 9 Apr 2015 12:06:24 +0000 (+0930) Subject: Revert "Add extern_protected_data and set it for x86" X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=8d2ea2a80abad66250f2f4a1d38e3b8c796147f8;p=deliverable%2Fbinutils-gdb.git Revert "Add extern_protected_data and set it for x86" This reverts commit ca3fe95e469b9daec153caa2c90665f5daaec2b5. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 95cf8d7f53..f1d9343522 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,17 @@ +2015-04-10 Alan Modra + + Revert 2015-03-05 H.J. Lu + PR ld/pr15228 + PR ld/pr17709 + * elf-bfd.h (elf_backend_data): Delete extern_protected_data. + * elf32-i386.c (elf_backend_extern_protected_data): Delete. + * elf64-x86-64.c (elf_backend_extern_protected_data): Likewise. + * elflink.c (_bfd_elf_adjust_dynamic_copy): Remove + extern_protected_data test. + (_bfd_elf_symbol_refs_local_p): Likewise. + * elfxx-target.h (elf_backend_extern_protected_data): Delete. + (elfNN_bed): Delete elf_backend_extern_protected_data init. + 2015-04-09 H.J. Lu * compress.c (bfd_compress_section_contents): Update comments. diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h index e435e52cc0..8def41b92a 100644 --- a/bfd/elf-bfd.h +++ b/bfd/elf-bfd.h @@ -1363,10 +1363,6 @@ struct elf_backend_data in length rather than sec->size in length, if sec->rawsize is non-zero and smaller than sec->size. */ unsigned caches_rawsize : 1; - - /* Address of protected data defined in the shared library may be - external, i.e., due to copy relocation. */ - unsigned extern_protected_data : 1; }; /* Information about reloc sections associated with a bfd_elf_section_data diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 52f4d3343c..3f16fc1013 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -5292,7 +5292,6 @@ elf_i386_add_symbol_hook (bfd * abfd, #define elf_backend_want_plt_sym 0 #define elf_backend_got_header_size 12 #define elf_backend_plt_alignment 4 -#define elf_backend_extern_protected_data 1 /* Support RELA for objdump of prelink objects. */ #define elf_info_to_howto elf_i386_info_to_howto_rel diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index ab72306bca..6eb84718a5 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -5868,7 +5868,6 @@ static const struct bfd_elf_special_section #define elf_backend_got_header_size (GOT_ENTRY_SIZE*3) #define elf_backend_rela_normal 1 #define elf_backend_plt_alignment 4 -#define elf_backend_extern_protected_data 1 #define elf_info_to_howto elf_x86_64_info_to_howto diff --git a/bfd/elflink.c b/bfd/elflink.c index 022a5353bf..183b313e3f 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -2673,9 +2673,7 @@ _bfd_elf_adjust_dynamic_copy (struct bfd_link_info *info, /* Increment the size of DYNBSS to make room for the symbol. */ dynbss->size += h->size; - /* No error if extern_protected_data is true. */ - if (h->protected_def - && !get_elf_backend_data (dynbss->owner)->extern_protected_data) + if (h->protected_def) { info->callbacks->einfo (_("%P: copy reloc against protected `%T' is invalid\n"), @@ -2839,9 +2837,8 @@ _bfd_elf_symbol_refs_local_p (struct elf_link_hash_entry *h, bed = get_elf_backend_data (hash_table->dynobj); - /* If extern_protected_data is false, STV_PROTECTED non-function - symbols are local. */ - if (!bed->extern_protected_data && !bed->is_function_type (h->type)) + /* STV_PROTECTED non-function symbols are local. */ + if (!bed->is_function_type (h->type)) return TRUE; /* Function pointer equality tests may require that STV_PROTECTED diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h index 0085d6ccc2..9bfb6c8577 100644 --- a/bfd/elfxx-target.h +++ b/bfd/elfxx-target.h @@ -117,9 +117,6 @@ #ifndef elf_backend_caches_rawsize #define elf_backend_caches_rawsize 0 #endif -#ifndef elf_backend_extern_protected_data -#define elf_backend_extern_protected_data 0 -#endif #ifndef elf_backend_stack_align #define elf_backend_stack_align 16 #endif @@ -809,8 +806,7 @@ static struct elf_backend_data elfNN_bed = elf_backend_want_dynbss, elf_backend_want_p_paddr_set_to_zero, elf_backend_default_execstack, - elf_backend_caches_rawsize, - elf_backend_extern_protected_data + elf_backend_caches_rawsize }; /* Forward declaration for use when initialising alternative_target field. */ diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index cfa22f4ce4..8811a864b0 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,23 @@ +2015-04-10 Alan Modra + + Revert 2015-03-05 H.J. Lu + PR ld/pr15228 + PR ld/pr17709 + * ld-i386/i386.exp (i386tests): Remove test for PR ld/17709. + * ld-i386/pr17709-nacl.rd: Delete. + * 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: Delete. + * 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): Remove test for PR ld/17709. + 2015-04-08 H.J. Lu * ld-elf/compress.exp: Add a test for diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 3fdd39ca20..4fc2359879 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -191,10 +191,6 @@ 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 deleted file mode 100644 index ac9d17450c..0000000000 --- a/ld/testsuite/ld-i386/pr17709-nacl.rd +++ /dev/null @@ -1,4 +0,0 @@ - -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 deleted file mode 100644 index ac9d17450c..0000000000 --- a/ld/testsuite/ld-i386/pr17709.rd +++ /dev/null @@ -1,4 +0,0 @@ - -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 deleted file mode 100644 index 8750f5efeb..0000000000 --- a/ld/testsuite/ld-i386/pr17709a.s +++ /dev/null @@ -1,8 +0,0 @@ - .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 deleted file mode 100644 index c57f4047a5..0000000000 --- a/ld/testsuite/ld-i386/pr17709b.s +++ /dev/null @@ -1,5 +0,0 @@ - .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 47ab4e1a9e..aafa2d81b3 100644 --- a/ld/testsuite/ld-i386/protected3.d +++ b/ld/testsuite/ld-i386/protected3.d @@ -8,7 +8,6 @@ Disassembly of section .text: 0+[a-f0-9]+ : -[ ]*[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]+: 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]+: c3 ret #pass diff --git a/ld/testsuite/ld-i386/protected3.s b/ld/testsuite/ld-i386/protected3.s index 4dd21154d9..7a605a2929 100644 --- a/ld/testsuite/ld-i386/protected3.s +++ b/ld/testsuite/ld-i386/protected3.s @@ -10,7 +10,6 @@ foo: .globl bar .type bar, @function bar: - movl foo@GOT(%ecx), %eax - movl (%eax), %eax + movl foo@GOTOFF(%ecx), %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 deleted file mode 100644 index f1baa3894b..0000000000 --- a/ld/testsuite/ld-x86-64/pr17709-nacl.rd +++ /dev/null @@ -1,4 +0,0 @@ - -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 deleted file mode 100644 index f1baa3894b..0000000000 --- a/ld/testsuite/ld-x86-64/pr17709.rd +++ /dev/null @@ -1,4 +0,0 @@ - -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 deleted file mode 100644 index 8750f5efeb..0000000000 --- a/ld/testsuite/ld-x86-64/pr17709a.s +++ /dev/null @@ -1,8 +0,0 @@ - .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 deleted file mode 100644 index c57f4047a5..0000000000 --- a/ld/testsuite/ld-x86-64/pr17709b.s +++ /dev/null @@ -1,5 +0,0 @@ - .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 d8f09daa74..22a36ac4c8 100644 --- a/ld/testsuite/ld-x86-64/protected3.d +++ b/ld/testsuite/ld-x86-64/protected3.d @@ -8,7 +8,6 @@ Disassembly of section .text: 0+[a-f0-9]+ : -[ ]*[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]+: 8b 05 ([0-9a-f]{2} ){4} * mov 0x[a-f0-9]+\(%rip\),%eax # [a-f0-9]+ [ ]*[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 7538050174..e4af6e7fb3 100644 --- a/ld/testsuite/ld-x86-64/protected3.s +++ b/ld/testsuite/ld-x86-64/protected3.s @@ -10,7 +10,6 @@ foo: .globl bar .type bar, @function bar: - movq foo@GOTPCREL(%rip), %rax - movl (%rax), %eax + movl foo(%rip), %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 98514ed0ad..0b75ecd2db 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -144,10 +144,6 @@ 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,