]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
Revert "Add extern_protected_data and set it for x86"
authorAlan Modra <amodra@gmail.com>
Fri, 10 Apr 2015 09:52:47 +0000 (19:22 +0930)
committerAlan Modra <amodra@gmail.com>
Fri, 10 Apr 2015 10:03:15 +0000 (19:33 +0930)
This reverts commit 031994d25c8c8dc392ceb43abc2dfd9a851bc384.

21 files changed:
bfd/ChangeLog
bfd/elf-bfd.h
bfd/elf32-i386.c
bfd/elf64-x86-64.c
bfd/elflink.c
bfd/elfxx-target.h
ld/testsuite/ChangeLog
ld/testsuite/ld-i386/i386.exp
ld/testsuite/ld-i386/pr17709-nacl.rd [deleted file]
ld/testsuite/ld-i386/pr17709.rd [deleted file]
ld/testsuite/ld-i386/pr17709a.s [deleted file]
ld/testsuite/ld-i386/pr17709b.s [deleted file]
ld/testsuite/ld-i386/protected3.d
ld/testsuite/ld-i386/protected3.s
ld/testsuite/ld-x86-64/pr17709-nacl.rd [deleted file]
ld/testsuite/ld-x86-64/pr17709.rd [deleted file]
ld/testsuite/ld-x86-64/pr17709a.s [deleted file]
ld/testsuite/ld-x86-64/pr17709b.s [deleted file]
ld/testsuite/ld-x86-64/protected3.d
ld/testsuite/ld-x86-64/protected3.s
ld/testsuite/ld-x86-64/x86-64.exp

index 4b5143ea213110f1b35d125b0fd4650cfbd4ede5..14aea85404b79f615cfd94e2645f61ce750c1075 100644 (file)
@@ -1,3 +1,17 @@
+2015-04-10  Alan Modra  <amodra@gmail.com>
+
+       Revert 2015-03-06  H.J. Lu  <hongjiu.lu@intel.com>
+       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-03-27  Alan Modra  <amodra@gmail.com>
 
        PR ld/15228
index fb1a892b12ba419c408d4da75e90ca4b0b9d85a3..6a87d71fb10c6ec0d9ccfdfb4ad6c5e6767c83f4 100644 (file)
@@ -1356,10 +1356,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
index c71ef04cea868a4127f00b1e4e157ab7b9bb43c7..69c0b540c3d03ea062aec2bc37a7be4bb913dd28 100644 (file)
@@ -5113,7 +5113,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
index e8305f8dd7d096be1b2bfec1f0d380a897c4d47d..18983e8b44e9287b10437185219c02799b64f964 100644 (file)
@@ -5700,7 +5700,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
 
index 0dd53c26ad13f07a517150ec3607e17b0fd74558..3d6d3ac3a1f446579f47a4e5fec4f432a7083a9f 100644 (file)
@@ -2674,9 +2674,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"),
@@ -2840,9 +2838,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
index 5fecf9ca6ac49df1fe2ff94a82eb1826abd9becd..64d2461635c4e6832ee237f2d59fd50f711cb725 100644 (file)
 #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
@@ -800,8 +797,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.  */
index a2ac7139064033c8345cbc12498354d2564c3d73..9aef68173f131d5b7f7da6cc638957d93118b8ec 100644 (file)
@@ -1,3 +1,23 @@
+2015-04-10  Alan Modra  <amodra@gmail.com>
+
+       Revert 2015-03-06  H.J. Lu  <hongjiu.lu@intel.com>
+       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-03-26  Tejas Belagod  <tejas.belagod@arm.com>
 
        * ld-aarch64/farcall-back-be.d: New.
index 477dd7b6cb4144ee153fd38cd744faa441a89bc5..30be98a3e5c87bef149325494478a20746cd54bb 100644 (file)
@@ -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 (file)
index ac9d174..0000000
+++ /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 (file)
index ac9d174..0000000
+++ /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 (file)
index 8750f5e..0000000
+++ /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 (file)
index c57f404..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-       .text
-       .globl  _start
-       .type   _start, @function
-_start:
-       movl    foo, %eax
index 47ab4e1a9e9a7234981320b39041520be8fc730e..aafa2d81b350c259be120a7f6bfd466489857e64 100644 (file)
@@ -8,7 +8,6 @@
 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] 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
index 4dd21154d90074cfab07b4b38a26faa6dfa8f37a..7a605a2929a9e3256157b494eabb42de6157ac26 100644 (file)
@@ -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 (file)
index f1baa38..0000000
+++ /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 (file)
index f1baa38..0000000
+++ /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 (file)
index 8750f5e..0000000
+++ /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 (file)
index c57f404..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-       .text
-       .globl  _start
-       .type   _start, @function
-_start:
-       movl    foo, %eax
index d8f09daa749527dcde1f1f3619a131be623b64f2..22a36ac4c8f404b8db69331d7411c769226949b8 100644 (file)
@@ -8,7 +8,6 @@
 Disassembly of section .text:
 
 0+[a-f0-9]+ <bar>:
-[      ]*[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]+ <foo>
 [      ]*[a-f0-9]+:    c3                      retq *
 #pass
index 75380501746a9ab96f99971eddbdf21b3c70d8e2..e4af6e7fb342e77aec9266aa5e10ae8de9663001 100644 (file)
@@ -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
index c4805302294f4e92d311580de5906ccf952c1d5e..28e81080cd74ba3cb5bec4205ce5d3a54b57912f 100644 (file)
@@ -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,