Fixes extern protected data handling testcases elf/tst-protected1a

and elf/tst-protected1b for Nios II.

diff --git a/ChangeLog b/ChangeLog
index 2603ad0cd948c1bb2ef7753ce5b6a613052052b7..3e202c4bf99e6ea13da636ba9105d5020c97148b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-26  Chung-Lin Tang  <cltang@codesourcery.com>
+
+       * sysdeps/nios2/dl-sysdep.h (DL_EXTERN_PROTECTED_DATA): Define.
+       * sysdeps/nios2/dl-machine.h (elf_machine_type_class): Handle
+       ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA.
+
 2015-07-26  Chung-Lin Tang  <cltang@codesourcery.com>
 
        * nptl/tst-join7mod.c: Add #include <string.h>.

diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h
index 1a8397ffc5ac5329aec46d87de9b338e5d6a5c30..10ec821bcbd0464dee08c9e17cdd48c6a073da04 100644 (file)
--- a/sysdeps/nios2/dl-machine.h
+++ b/sysdeps/nios2/dl-machine.h
@@ -193,7 +193,8 @@ _start:\n\
      || (type) == R_NIOS2_TLS_DTPMOD                           \
      || (type) == R_NIOS2_TLS_DTPREL                           \
      || (type) == R_NIOS2_TLS_TPREL) * ELF_RTYPE_CLASS_PLT)    \
-   | (((type) == R_NIOS2_COPY) * ELF_RTYPE_CLASS_COPY))
+   | (((type) == R_NIOS2_COPY) * ELF_RTYPE_CLASS_COPY)         \
+   | (((type) == R_NIOS2_GLOB_DAT) * ELF_RTYPE_CLASS_EXTERN_PROTECTED_DATA))
 
 /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.  */
 #define ELF_MACHINE_JMP_SLOT  R_NIOS2_JUMP_SLOT

diff --git a/sysdeps/nios2/dl-sysdep.h b/sysdeps/nios2/dl-sysdep.h
index 4f49c2d2ff039bd7f9297a6413f737fbe33df62d..ef6d3f39eb978205cd66660ccda01e84eba82367 100644 (file)
--- a/sysdeps/nios2/dl-sysdep.h
+++ b/sysdeps/nios2/dl-sysdep.h
@@ -21,3 +21,5 @@
 /* _dl_argv cannot be attribute_relro, because _dl_start_user
    might write into it after _dl_start returns.  */
 #define DL_ARGV_NOT_RELRO 1
+
+#define DL_EXTERN_PROTECTED_DATA