* elf32-arm.c (elf32_arm_nacl_plt0_entry, elf32_arm_nacl_plt_entry):

author Nick Clifton <nickc@redhat.com>

Thu, 12 Apr 2012 13:01:15 +0000 (13:01 +0000)

committer Nick Clifton <nickc@redhat.com>

Thu, 12 Apr 2012 13:01:15 +0000 (13:01 +0000)
author Nick Clifton <nickc@redhat.com>
Thu, 12 Apr 2012 13:01:15 +0000 (13:01 +0000)
committer Nick Clifton <nickc@redhat.com>
Thu, 12 Apr 2012 13:01:15 +0000 (13:01 +0000)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog

index f84e7584b018e2ee5201c36119b0d08735be6cad..f53dcfda31172c6877531215796999c707c230e6 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,29 @@
+2012-04-12  Roland McGrath  <mcgrathr@google.com>
+
+       * elf32-arm.c (elf32_arm_nacl_plt0_entry, elf32_arm_nacl_plt_entry):
+       New variables.
+       (struct elf32_arm_link_hash_table): New member `nacl_p'.
+       (elf32_arm_link_hash_table_create): Initialize it.
+       (elf32_arm_nacl_link_hash_table_create): New function.
+       (arm_movw_immediate, arm_movt_immediate): New functions.
+       (elf32_arm_populate_plt_entry): Test HTAB->nacl_p.
+       (elf32_arm_finish_dynamic_sections): Likewise.
+       (elf32_arm_output_plt_map_1): Likewise.
+       (bfd_elf32_littlearm_nacl_vec, bfd_elf32_bigarm_nacl_vec):
+       New backend vector stanza.
+       (elf32_arm_nacl_modify_segment_map): New function.
+       * config.bfd: Handle arm-*-nacl*, armeb-*-nacl*.
+       * targets.c: Support bfd_elf32_{big,little}_nacl_vec.
+       * configure.in: Likewise.
+       (bfd_elf32_bigarm_nacl_vec): Add elf-nacl.lo here.
+       (bfd_elf32_littlearm_nacl_vec): Likewise.
+       (bfd_elf32_bigarm_vec, bfd_elf32_littlearm_vec): Likewise.
+       (bfd_elf32_bigarm_symbian_vec): Likewise.
+       (bfd_elf32_littlearm_symbian_vec): Likewise.
+       (bfd_elf32_bigarm_vxworks_vec): Likewise.
+       (bfd_elf32_littlearm_vxworks_vec): Likewise.
+       * configure: Regenerated.
+
  2012-04-12  Tristan Gingold  <gingold@adacore.com>
  
         * elflink.c (elf_link_output_extsym): Add a guard.
diff --git a/bfd/config.bfd b/bfd/config.bfd

index e84ba5853138216db48285e0fda029240b748570..ab72cf3c48eae3e33aa17f8d55ff1dda8462bffb 100644 (file)
--- a/bfd/config.bfd
+++ b/bfd/config.bfd
@@ -216,6 +216,18 @@ case "${targ}" in
      targ_selvecs=bfd_elf32_bigarc_vec
      ;;
  
+  arm-*-nacl*)
+    targ_defvec=bfd_elf32_littlearm_nacl_vec
+    targ_selvecs="bfd_elf32_bigarm_nacl_vec bfd_elf32_i386_nacl_vec"
+    targ64_selvecs="bfd_elf32_x86_64_nacl_vec bfd_elf64_x86_64_nacl_vec"
+    targ_archs="$targ_archs bfd_i386_arch"
+    ;;
+  armeb-*-nacl*)
+    targ_defvec=bfd_elf32_bigarm_nacl_vec
+    targ_selvecs="bfd_elf32_littlearm_nacl_vec bfd_elf32_i386_nacl_vec"
+    targ64_selvecs="bfd_elf32_x86_64_nacl_vec bfd_elf64_x86_64_nacl_vec"
+    targ_archs="$targ_archs bfd_i386_arch"
+    ;;
    armeb-*-netbsdelf*)
      targ_defvec=bfd_elf32_bigarm_vec
      targ_selvecs="bfd_elf32_littlearm_vec armnetbsd_vec"
@@ -573,8 +585,9 @@ case "${targ}" in
      ;;
    i[3-7]86-*-nacl*)
      targ_defvec=bfd_elf32_i386_nacl_vec
-    targ_selvecs="bfd_elf32_i386_vec"
+    targ_selvecs="bfd_elf32_bigarm_nacl_vec bfd_elf32_littlearm_nacl_vec"
      targ64_selvecs="bfd_elf64_x86_64_nacl_vec bfd_elf32_x86_64_nacl_vec"
+    targ_archs="$targ_archs bfd_arm_arch"
      ;;
  #ifdef BFD64
    x86_64-*-darwin*)
@@ -615,7 +628,8 @@ case "${targ}" in
      ;;
    x86_64-*-nacl*)
      targ_defvec=bfd_elf32_x86_64_nacl_vec
-    targ_selvecs="bfd_elf32_i386_nacl_vec bfd_elf64_x86_64_nacl_vec"
+    targ_selvecs="bfd_elf32_i386_nacl_vec bfd_elf64_x86_64_nacl_vec bfd_elf32_bigarm_nacl_vec bfd_elf32_littlearm_nacl_vec"
+    targ_archs="$targ_archs bfd_arm_arch"
      want64=true
      ;;
    x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep)
diff --git a/bfd/configure b/bfd/configure

index d90e52f2306bd1b978433d9d3fd8585d192dfa1e..fc5c9ad6af4f4a3f6184e938e6451d33351d8dd6 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -15200,11 +15200,12 @@ do
      bfd_elf32_bfinfdpic_vec)   tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
      bfd_elf32_big_generic_vec)         tb="$tb elf32-gen.lo elf32.lo $elf" ;;
      bfd_elf32_bigarc_vec)      tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_vec)      tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_vec)      tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_nacl_vec) tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_bigarm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_bigarm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_bigmips_vec)     tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
      bfd_elf32_bigmips_vxworks_vec)
                                 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
@@ -15242,10 +15243,11 @@ do
      bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
      bfd_elf32_littlearc_vec)   tb="$tb elf32-arc.lo elf32.lo $elf" ;;
      bfd_elf32_littlearm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_littlearm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_vec)   tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_vec)   tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_nacl_vec) tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_littlemips_vec)  tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
      bfd_elf32_littlemips_vxworks_vec)
                                 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
diff --git a/bfd/configure.in b/bfd/configure.in

index 37cc769290ade38117ebb1896a3c4b3f685c2937..3cb4b70e25de689426b35a5ed694618b48f061b3 100644 (file)
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -686,11 +686,12 @@ do
      bfd_elf32_bfinfdpic_vec)   tb="$tb elf32-bfin.lo elf32.lo $elf" ;;
      bfd_elf32_big_generic_vec)         tb="$tb elf32-gen.lo elf32.lo $elf" ;;
      bfd_elf32_bigarc_vec)      tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_vec)      tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_vec)      tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_bigarm_nacl_vec) tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_bigarm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_bigarm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_bigmips_vec)     tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
      bfd_elf32_bigmips_vxworks_vec)
                                 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
@@ -728,10 +729,11 @@ do
      bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
      bfd_elf32_littlearc_vec)   tb="$tb elf32-arc.lo elf32.lo $elf" ;;
      bfd_elf32_littlearm_symbian_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_littlearm_vxworks_vec)
-                                tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
-    bfd_elf32_littlearm_vec)   tb="$tb elf32-arm.lo elf32.lo elf-vxworks.lo $elf" ;;
+                                tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_vec)   tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
+    bfd_elf32_littlearm_nacl_vec) tb="$tb elf32-arm.lo elf32.lo elf-nacl.lo elf-vxworks.lo $elf" ;;
      bfd_elf32_littlemips_vec)  tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
      bfd_elf32_littlemips_vxworks_vec)
                                 tb="$tb elf32-mips.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo" ;;
diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c

index 8721f949b0369a01e676918d9d37c796468ce066..f5b5c4d1e557e6298559c9a3fb602089e903759b 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -26,6 +26,7 @@
  #include "libiberty.h"
  #include "libbfd.h"
  #include "elf-bfd.h"
+#include "elf-nacl.h"
  #include "elf-vxworks.h"
  #include "elf/arm.h"
  
@@ -2078,24 +2079,24 @@ typedef unsigned short int insn16;
  #define ELF_DYNAMIC_INTERPRETER     "/usr/lib/ld.so.1"
  
  static const unsigned long tls_trampoline [] =
-  {
-    0xe08e0000,                /* add r0, lr, r0 */
-    0xe5901004,                /* ldr r1, [r0,#4] */
-    0xe12fff11,                /* bx  r1 */
-  };
+{
+  0xe08e0000,          /* add r0, lr, r0 */
+  0xe5901004,          /* ldr r1, [r0,#4] */
+  0xe12fff11,          /* bx  r1 */
+};
  
  static const unsigned long dl_tlsdesc_lazy_trampoline [] =
-  {
-    0xe52d2004, /*     push    {r2}                    */
-    0xe59f200c, /*      ldr     r2, [pc, #3f - . - 8]  */
-    0xe59f100c, /*      ldr     r1, [pc, #4f - . - 8]  */
-    0xe79f2002, /* 1:   ldr     r2, [pc, r2]           */
-    0xe081100f, /* 2:   add     r1, pc                 */
-    0xe12fff12, /*      bx      r2                     */
-    0x00000014, /* 3:   .word  _GLOBAL_OFFSET_TABLE_ - 1b - 8
+{
+  0xe52d2004, /*       push    {r2}                    */
+  0xe59f200c, /*      ldr     r2, [pc, #3f - . - 8]    */
+  0xe59f100c, /*      ldr     r1, [pc, #4f - . - 8]    */
+  0xe79f2002, /* 1:   ldr     r2, [pc, r2]             */
+  0xe081100f, /* 2:   add     r1, pc                   */
+  0xe12fff12, /*      bx      r2                       */
+  0x00000014, /* 3:   .word  _GLOBAL_OFFSET_TABLE_ - 1b - 8
                                 + dl_tlsdesc_lazy_resolver(GOT)   */
-    0x00000018, /* 4:   .word  _GLOBAL_OFFSET_TABLE_ - 2b - 8 */ 
-  };
+  0x00000018, /* 4:   .word  _GLOBAL_OFFSET_TABLE_ - 2b - 8 */
+};
  
  #ifdef FOUR_WORD_PLT
  
@@ -2104,22 +2105,22 @@ static const unsigned long dl_tlsdesc_lazy_trampoline [] =
     called before the relocation has been set up calls the dynamic
     linker first.  */
  static const bfd_vma elf32_arm_plt0_entry [] =
-  {
-    0xe52de004,                /* str   lr, [sp, #-4]! */
-    0xe59fe010,                /* ldr   lr, [pc, #16]  */
-    0xe08fe00e,                /* add   lr, pc, lr     */
-    0xe5bef008,                /* ldr   pc, [lr, #8]!  */
-  };
+{
+  0xe52de004,          /* str   lr, [sp, #-4]! */
+  0xe59fe010,          /* ldr   lr, [pc, #16]  */
+  0xe08fe00e,          /* add   lr, pc, lr     */
+  0xe5bef008,          /* ldr   pc, [lr, #8]!  */
+};
  
  /* Subsequent entries in a procedure linkage table look like
     this.  */
  static const bfd_vma elf32_arm_plt_entry [] =
-  {
-    0xe28fc600,                /* add   ip, pc, #NN    */
-    0xe28cca00,                /* add   ip, ip, #NN    */
-    0xe5bcf000,                /* ldr   pc, [ip, #NN]! */
-    0x00000000,                /* unused               */
-  };
+{
+  0xe28fc600,          /* add   ip, pc, #NN    */
+  0xe28cca00,          /* add   ip, ip, #NN    */
+  0xe5bcf000,          /* ldr   pc, [ip, #NN]! */
+  0x00000000,          /* unused               */
+};
  
  #else
  
@@ -2128,72 +2129,111 @@ static const bfd_vma elf32_arm_plt_entry [] =
     called before the relocation has been set up calls the dynamic
     linker first.  */
  static const bfd_vma elf32_arm_plt0_entry [] =
-  {
-    0xe52de004,                /* str   lr, [sp, #-4]! */
-    0xe59fe004,                /* ldr   lr, [pc, #4]   */
-    0xe08fe00e,                /* add   lr, pc, lr     */
-    0xe5bef008,                /* ldr   pc, [lr, #8]!  */
-    0x00000000,                /* &GOT[0] - .          */
-  };
+{
+  0xe52de004,          /* str   lr, [sp, #-4]! */
+  0xe59fe004,          /* ldr   lr, [pc, #4]   */
+  0xe08fe00e,          /* add   lr, pc, lr     */
+  0xe5bef008,          /* ldr   pc, [lr, #8]!  */
+  0x00000000,          /* &GOT[0] - .          */
+};
  
  /* Subsequent entries in a procedure linkage table look like
     this.  */
  static const bfd_vma elf32_arm_plt_entry [] =
-  {
-    0xe28fc600,                /* add   ip, pc, #0xNN00000 */
-    0xe28cca00,                /* add   ip, ip, #0xNN000   */
-    0xe5bcf000,                /* ldr   pc, [ip, #0xNNN]!  */
-  };
+{
+  0xe28fc600,          /* add   ip, pc, #0xNN00000 */
+  0xe28cca00,          /* add   ip, ip, #0xNN000   */
+  0xe5bcf000,          /* ldr   pc, [ip, #0xNNN]!  */
+};
  
  #endif
  
  /* The format of the first entry in the procedure linkage table
     for a VxWorks executable.  */
  static const bfd_vma elf32_arm_vxworks_exec_plt0_entry[] =
-  {
-    0xe52dc008,                /* str    ip,[sp,#-8]!                  */
-    0xe59fc000,         /* ldr    ip,[pc]                      */
-    0xe59cf008,         /* ldr    pc,[ip,#8]                   */
-    0x00000000,         /* .long  _GLOBAL_OFFSET_TABLE_                */
-  };
+{
+  0xe52dc008,          /* str    ip,[sp,#-8]!                  */
+  0xe59fc000,          /* ldr    ip,[pc]                       */
+  0xe59cf008,          /* ldr    pc,[ip,#8]                    */
+  0x00000000,          /* .long  _GLOBAL_OFFSET_TABLE_         */
+};
  
  /* The format of subsequent entries in a VxWorks executable.  */
  static const bfd_vma elf32_arm_vxworks_exec_plt_entry[] =
-  {
-    0xe59fc000,         /* ldr    ip,[pc]                      */
-    0xe59cf000,         /* ldr    pc,[ip]                      */
-    0x00000000,         /* .long  @got                         */
-    0xe59fc000,         /* ldr    ip,[pc]                      */
-    0xea000000,         /* b      _PLT                         */
-    0x00000000,         /* .long  @pltindex*sizeof(Elf32_Rela) */
-  };
+{
+  0xe59fc000,         /* ldr    ip,[pc]                        */
+  0xe59cf000,         /* ldr    pc,[ip]                        */
+  0x00000000,         /* .long  @got                           */
+  0xe59fc000,         /* ldr    ip,[pc]                        */
+  0xea000000,         /* b      _PLT                           */
+  0x00000000,         /* .long  @pltindex*sizeof(Elf32_Rela)   */
+};
  
  /* The format of entries in a VxWorks shared library.  */
  static const bfd_vma elf32_arm_vxworks_shared_plt_entry[] =
-  {
-    0xe59fc000,         /* ldr    ip,[pc]                      */
-    0xe79cf009,         /* ldr    pc,[ip,r9]                   */
-    0x00000000,         /* .long  @got                         */
-    0xe59fc000,         /* ldr    ip,[pc]                      */
-    0xe599f008,         /* ldr    pc,[r9,#8]                   */
-    0x00000000,         /* .long  @pltindex*sizeof(Elf32_Rela) */
-  };
+{
+  0xe59fc000,         /* ldr    ip,[pc]                        */
+  0xe79cf009,         /* ldr    pc,[ip,r9]                     */
+  0x00000000,         /* .long  @got                           */
+  0xe59fc000,         /* ldr    ip,[pc]                        */
+  0xe599f008,         /* ldr    pc,[r9,#8]                     */
+  0x00000000,         /* .long  @pltindex*sizeof(Elf32_Rela)   */
+};
  
  /* An initial stub used if the PLT entry is referenced from Thumb code.  */
  #define PLT_THUMB_STUB_SIZE 4
  static const bfd_vma elf32_arm_plt_thumb_stub [] =
-  {
-    0x4778,            /* bx pc */
-    0x46c0             /* nop   */
-  };
+{
+  0x4778,              /* bx pc */
+  0x46c0               /* nop   */
+};
  
  /* The entries in a PLT when using a DLL-based target with multiple
     address spaces.  */
  static const bfd_vma elf32_arm_symbian_plt_entry [] =
-  {
-    0xe51ff004,         /* ldr   pc, [pc, #-4] */
-    0x00000000,         /* dcd   R_ARM_GLOB_DAT(X) */
-  };
+{
+  0xe51ff004,         /* ldr   pc, [pc, #-4] */
+  0x00000000,         /* dcd   R_ARM_GLOB_DAT(X) */
+};
+
+/* The first entry in a procedure linkage table looks like
+   this.  It is set up so that any shared library function that is
+   called before the relocation has been set up calls the dynamic
+   linker first.  */
+static const bfd_vma elf32_arm_nacl_plt0_entry [] =
+{
+  /* First bundle: */
+  0xe300c000,          /* movw ip, #:lower16:&GOT[2]-.+8       */
+  0xe340c000,          /* movt ip, #:upper16:&GOT[2]-.+8       */
+  0xe08cc00f,          /* add  ip, ip, pc                      */
+  0xe52dc008,          /* str  ip, [sp, #-8]!                  */
+  /* Second bundle: */
+  0xe7dfcf1f,  /* bfc  ip, #30, #2                     */
+  0xe59cc000,  /* ldr  ip, [ip]                        */
+  0xe3ccc13f,          /* bic  ip, ip, #0xc000000f             */
+  0xe12fff1c,  /* bx   ip                              */
+  /* Third bundle: */
+  0xe320f000,  /* nop                                  */
+  0xe320f000,  /* nop                                  */
+  0xe320f000,  /* nop                                  */
+  /* .Lplt_tail: */
+  0xe50dc004,          /* str  ip, [sp, #-4]                   */
+  /* Fourth bundle: */
+  0xe7dfcf1f,          /* bfc  ip, #30, #2                     */
+  0xe59cc000,  /* ldr  ip, [ip]                        */
+  0xe3ccc13f,          /* bic  ip, ip, #0xc000000f             */
+  0xe12fff1c,  /* bx   ip                              */
+};
+#define ARM_NACL_PLT_TAIL_OFFSET       (11 * 4)
+
+/* Subsequent entries in a procedure linkage table look like this.  */
+static const bfd_vma elf32_arm_nacl_plt_entry [] =
+{
+  0xe300c000,          /* movw ip, #:lower16:&GOT[n]-.+8       */
+  0xe340c000,          /* movt ip, #:upper16:&GOT[n]-.+8       */
+  0xe08cc00f,          /* add  ip, ip, pc                      */
+  0xea000000,          /* b    .Lplt_tail                      */
+};
  
  #define ARM_MAX_FWD_BRANCH_OFFSET  ((((1 << 23) - 1) << 2) + 8)
  #define ARM_MAX_BWD_BRANCH_OFFSET  ((-((1 << 23) << 2)) + 8)
@@ -2203,12 +2243,12 @@ static const bfd_vma elf32_arm_symbian_plt_entry [] =
  #define THM2_MAX_BWD_BRANCH_OFFSET (-(1 << 24) + 4)
  
  enum stub_insn_type
-  {
-    THUMB16_TYPE = 1,
-    THUMB32_TYPE,
-    ARM_TYPE,
-    DATA_TYPE
-  };
+{
+  THUMB16_TYPE = 1,
+  THUMB32_TYPE,
+  ARM_TYPE,
+  DATA_TYPE
+};
  
  #define THUMB16_INSN(X)                {(X), THUMB16_TYPE, R_ARM_NONE, 0}
  /* A bit of a hack.  A Thumb conditional branch, in which the proper condition
@@ -2222,154 +2262,154 @@ enum stub_insn_type
  
  typedef struct
  {
-  bfd_vma data;
-  enum stub_insn_type type;
-  unsigned int r_type;
-  int reloc_addend;
+  bfd_vma              data;
+  enum stub_insn_type  type;
+  unsigned int         r_type;
+  int                  reloc_addend;
  }  insn_sequence;
  
  /* Arm/Thumb -> Arm/Thumb long branch stub. On V5T and above, use blx
     to reach the stub if necessary.  */
  static const insn_sequence elf32_arm_stub_long_branch_any_any[] =
-  {
-    ARM_INSN(0xe51ff004),            /* ldr   pc, [pc, #-4] */
-    DATA_WORD(0, R_ARM_ABS32, 0),    /* dcd   R_ARM_ABS32(X) */
-  };
+{
+  ARM_INSN (0xe51ff004),            /* ldr   pc, [pc, #-4] */
+  DATA_WORD (0, R_ARM_ABS32, 0),    /* dcd   R_ARM_ABS32(X) */
+};
  
  /* V4T Arm -> Thumb long branch stub. Used on V4T where blx is not
     available.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_arm_thumb[] =
-  {
-    ARM_INSN(0xe59fc000),            /* ldr   ip, [pc, #0] */
-    ARM_INSN(0xe12fff1c),            /* bx    ip */
-    DATA_WORD(0, R_ARM_ABS32, 0),    /* dcd   R_ARM_ABS32(X) */
-  };
+{
+  ARM_INSN (0xe59fc000),            /* ldr   ip, [pc, #0] */
+  ARM_INSN (0xe12fff1c),            /* bx    ip */
+  DATA_WORD (0, R_ARM_ABS32, 0),    /* dcd   R_ARM_ABS32(X) */
+};
  
  /* Thumb -> Thumb long branch stub. Used on M-profile architectures.  */
  static const insn_sequence elf32_arm_stub_long_branch_thumb_only[] =
-  {
-    THUMB16_INSN(0xb401),             /* push {r0} */
-    THUMB16_INSN(0x4802),             /* ldr  r0, [pc, #8] */
-    THUMB16_INSN(0x4684),             /* mov  ip, r0 */
-    THUMB16_INSN(0xbc01),             /* pop  {r0} */
-    THUMB16_INSN(0x4760),             /* bx   ip */
-    THUMB16_INSN(0xbf00),             /* nop */
-    DATA_WORD(0, R_ARM_ABS32, 0),     /* dcd  R_ARM_ABS32(X) */
-  };
+{
+  THUMB16_INSN (0xb401),             /* push {r0} */
+  THUMB16_INSN (0x4802),             /* ldr  r0, [pc, #8] */
+  THUMB16_INSN (0x4684),             /* mov  ip, r0 */
+  THUMB16_INSN (0xbc01),             /* pop  {r0} */
+  THUMB16_INSN (0x4760),             /* bx   ip */
+  THUMB16_INSN (0xbf00),             /* nop */
+  DATA_WORD (0, R_ARM_ABS32, 0),     /* dcd  R_ARM_ABS32(X) */
+};
  
  /* V4T Thumb -> Thumb long branch stub. Using the stack is not
     allowed.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_thumb[] =
-  {
-    THUMB16_INSN(0x4778),             /* bx   pc */
-    THUMB16_INSN(0x46c0),             /* nop */
-    ARM_INSN(0xe59fc000),             /* ldr  ip, [pc, #0] */
-    ARM_INSN(0xe12fff1c),             /* bx   ip */
-    DATA_WORD(0, R_ARM_ABS32, 0),     /* dcd  R_ARM_ABS32(X) */
-  };
+{
+  THUMB16_INSN (0x4778),             /* bx   pc */
+  THUMB16_INSN (0x46c0),             /* nop */
+  ARM_INSN (0xe59fc000),             /* ldr  ip, [pc, #0] */
+  ARM_INSN (0xe12fff1c),             /* bx   ip */
+  DATA_WORD (0, R_ARM_ABS32, 0),     /* dcd  R_ARM_ABS32(X) */
+};
  
  /* V4T Thumb -> ARM long branch stub. Used on V4T where blx is not
     available.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_arm[] =
-  {
-    THUMB16_INSN(0x4778),             /* bx   pc */
-    THUMB16_INSN(0x46c0),             /* nop   */
-    ARM_INSN(0xe51ff004),             /* ldr   pc, [pc, #-4] */
-    DATA_WORD(0, R_ARM_ABS32, 0),     /* dcd   R_ARM_ABS32(X) */
-  };
+{
+  THUMB16_INSN (0x4778),             /* bx   pc */
+  THUMB16_INSN (0x46c0),             /* nop   */
+  ARM_INSN (0xe51ff004),             /* ldr   pc, [pc, #-4] */
+  DATA_WORD (0, R_ARM_ABS32, 0),     /* dcd   R_ARM_ABS32(X) */
+};
  
  /* V4T Thumb -> ARM short branch stub. Shorter variant of the above
     one, when the destination is close enough.  */
  static const insn_sequence elf32_arm_stub_short_branch_v4t_thumb_arm[] =
-  {
-    THUMB16_INSN(0x4778),             /* bx   pc */
-    THUMB16_INSN(0x46c0),             /* nop   */
-    ARM_REL_INSN(0xea000000, -8),     /* b    (X-8) */
-  };
+{
+  THUMB16_INSN (0x4778),             /* bx   pc */
+  THUMB16_INSN (0x46c0),             /* nop   */
+  ARM_REL_INSN (0xea000000, -8),     /* b    (X-8) */
+};
  
  /* ARM/Thumb -> ARM long branch stub, PIC.  On V5T and above, use
     blx to reach the stub if necessary.  */
  static const insn_sequence elf32_arm_stub_long_branch_any_arm_pic[] =
-  {
-    ARM_INSN(0xe59fc000),             /* ldr   ip, [pc] */
-    ARM_INSN(0xe08ff00c),             /* add   pc, pc, ip */
-    DATA_WORD(0, R_ARM_REL32, -4),    /* dcd   R_ARM_REL32(X-4) */
-  };
+{
+  ARM_INSN (0xe59fc000),             /* ldr   ip, [pc] */
+  ARM_INSN (0xe08ff00c),             /* add   pc, pc, ip */
+  DATA_WORD (0, R_ARM_REL32, -4),    /* dcd   R_ARM_REL32(X-4) */
+};
  
  /* ARM/Thumb -> Thumb long branch stub, PIC.  On V5T and above, use
     blx to reach the stub if necessary.  We can not add into pc;
     it is not guaranteed to mode switch (different in ARMv6 and
     ARMv7).  */
  static const insn_sequence elf32_arm_stub_long_branch_any_thumb_pic[] =
-  {
-    ARM_INSN(0xe59fc004),             /* ldr   ip, [pc, #4] */
-    ARM_INSN(0xe08fc00c),             /* add   ip, pc, ip */
-    ARM_INSN(0xe12fff1c),             /* bx    ip */
-    DATA_WORD(0, R_ARM_REL32, 0),     /* dcd   R_ARM_REL32(X) */
-  };
+{
+  ARM_INSN (0xe59fc004),             /* ldr   ip, [pc, #4] */
+  ARM_INSN (0xe08fc00c),             /* add   ip, pc, ip */
+  ARM_INSN (0xe12fff1c),             /* bx    ip */
+  DATA_WORD (0, R_ARM_REL32, 0),     /* dcd   R_ARM_REL32(X) */
+};
  
  /* V4T ARM -> ARM long branch stub, PIC.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_arm_thumb_pic[] =
-  {
-    ARM_INSN(0xe59fc004),             /* ldr   ip, [pc, #4] */
-    ARM_INSN(0xe08fc00c),             /* add   ip, pc, ip */
-    ARM_INSN(0xe12fff1c),             /* bx    ip */
-    DATA_WORD(0, R_ARM_REL32, 0),     /* dcd   R_ARM_REL32(X) */
-  };
+{
+  ARM_INSN (0xe59fc004),             /* ldr   ip, [pc, #4] */
+  ARM_INSN (0xe08fc00c),             /* add   ip, pc, ip */
+  ARM_INSN (0xe12fff1c),             /* bx    ip */
+  DATA_WORD (0, R_ARM_REL32, 0),     /* dcd   R_ARM_REL32(X) */
+};
  
  /* V4T Thumb -> ARM long branch stub, PIC.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_arm_pic[] =
-  {
-    THUMB16_INSN(0x4778),             /* bx   pc */
-    THUMB16_INSN(0x46c0),             /* nop  */
-    ARM_INSN(0xe59fc000),             /* ldr  ip, [pc, #0] */
-    ARM_INSN(0xe08cf00f),             /* add  pc, ip, pc */
-    DATA_WORD(0, R_ARM_REL32, -4),     /* dcd  R_ARM_REL32(X) */
-  };
+{
+  THUMB16_INSN (0x4778),             /* bx   pc */
+  THUMB16_INSN (0x46c0),             /* nop  */
+  ARM_INSN (0xe59fc000),             /* ldr  ip, [pc, #0] */
+  ARM_INSN (0xe08cf00f),             /* add  pc, ip, pc */
+  DATA_WORD (0, R_ARM_REL32, -4),     /* dcd  R_ARM_REL32(X) */
+};
  
  /* Thumb -> Thumb long branch stub, PIC. Used on M-profile
     architectures.  */
  static const insn_sequence elf32_arm_stub_long_branch_thumb_only_pic[] =
-  {
-    THUMB16_INSN(0xb401),             /* push {r0} */
-    THUMB16_INSN(0x4802),             /* ldr  r0, [pc, #8] */
-    THUMB16_INSN(0x46fc),             /* mov  ip, pc */
-    THUMB16_INSN(0x4484),             /* add  ip, r0 */
-    THUMB16_INSN(0xbc01),             /* pop  {r0} */
-    THUMB16_INSN(0x4760),             /* bx   ip */
-    DATA_WORD(0, R_ARM_REL32, 4),     /* dcd  R_ARM_REL32(X) */
-  };
+{
+  THUMB16_INSN (0xb401),             /* push {r0} */
+  THUMB16_INSN (0x4802),             /* ldr  r0, [pc, #8] */
+  THUMB16_INSN (0x46fc),             /* mov  ip, pc */
+  THUMB16_INSN (0x4484),             /* add  ip, r0 */
+  THUMB16_INSN (0xbc01),             /* pop  {r0} */
+  THUMB16_INSN (0x4760),             /* bx   ip */
+  DATA_WORD (0, R_ARM_REL32, 4),     /* dcd  R_ARM_REL32(X) */
+};
  
  /* V4T Thumb -> Thumb long branch stub, PIC. Using the stack is not
     allowed.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_thumb_pic[] =
-  {
-    THUMB16_INSN(0x4778),             /* bx   pc */
-    THUMB16_INSN(0x46c0),             /* nop */
-    ARM_INSN(0xe59fc004),             /* ldr  ip, [pc, #4] */
-    ARM_INSN(0xe08fc00c),             /* add   ip, pc, ip */
-    ARM_INSN(0xe12fff1c),             /* bx   ip */
-    DATA_WORD(0, R_ARM_REL32, 0),     /* dcd  R_ARM_REL32(X) */
-  };
+{
+  THUMB16_INSN (0x4778),             /* bx   pc */
+  THUMB16_INSN (0x46c0),             /* nop */
+  ARM_INSN (0xe59fc004),             /* ldr  ip, [pc, #4] */
+  ARM_INSN (0xe08fc00c),             /* add   ip, pc, ip */
+  ARM_INSN (0xe12fff1c),             /* bx   ip */
+  DATA_WORD (0, R_ARM_REL32, 0),     /* dcd  R_ARM_REL32(X) */
+};
  
  /* Thumb2/ARM -> TLS trampoline.  Lowest common denominator, which is a
     long PIC stub.  We can use r1 as a scratch -- and cannot use ip.  */
  static const insn_sequence elf32_arm_stub_long_branch_any_tls_pic[] =
  {
-    ARM_INSN(0xe59f1000),             /* ldr   r1, [pc] */
-    ARM_INSN(0xe08ff001),             /* add   pc, pc, r1 */
-    DATA_WORD(0, R_ARM_REL32, -4),    /* dcd   R_ARM_REL32(X-4) */
+  ARM_INSN (0xe59f1000),             /* ldr   r1, [pc] */
+  ARM_INSN (0xe08ff001),             /* add   pc, pc, r1 */
+  DATA_WORD (0, R_ARM_REL32, -4),    /* dcd   R_ARM_REL32(X-4) */
  };
  
  /* V4T Thumb -> TLS trampoline.  lowest common denominator, which is a
     long PIC stub.  We can use r1 as a scratch -- and cannot use ip.  */
  static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_tls_pic[] =
  {
-    THUMB16_INSN(0x4778),             /* bx   pc */
-    THUMB16_INSN(0x46c0),             /* nop */
-    ARM_INSN(0xe59f1000),             /* ldr  r1, [pc, #0] */
-    ARM_INSN(0xe081f00f),             /* add  pc, r1, pc */
-    DATA_WORD(0, R_ARM_REL32, -4),    /* dcd  R_ARM_REL32(X) */
+  THUMB16_INSN (0x4778),             /* bx   pc */
+  THUMB16_INSN (0x46c0),             /* nop */
+  ARM_INSN (0xe59f1000),             /* ldr  r1, [pc, #0] */
+  ARM_INSN (0xe081f00f),             /* add  pc, r1, pc */
+  DATA_WORD (0, R_ARM_REL32, -4),    /* dcd  R_ARM_REL32(X) */
  };
  
  /* Cortex-A8 erratum-workaround stubs.  */
@@ -2378,32 +2418,32 @@ static const insn_sequence elf32_arm_stub_long_branch_v4t_thumb_tls_pic[] =
     can't use a conditional branch to reach this stub).  */
  
  static const insn_sequence elf32_arm_stub_a8_veneer_b_cond[] =
-  {
-    THUMB16_BCOND_INSN(0xd001),         /* b<cond>.n true.  */
-    THUMB32_B_INSN(0xf000b800, -4),     /* b.w insn_after_original_branch.  */
-    THUMB32_B_INSN(0xf000b800, -4)      /* true: b.w original_branch_dest.  */
-  };
+{
+  THUMB16_BCOND_INSN (0xd001),         /* b<cond>.n true.  */
+  THUMB32_B_INSN (0xf000b800, -4),     /* b.w insn_after_original_branch.  */
+  THUMB32_B_INSN (0xf000b800, -4)      /* true: b.w original_branch_dest.  */
+};
  
  /* Stub used for b.w and bl.w instructions.  */
  
  static const insn_sequence elf32_arm_stub_a8_veneer_b[] =
-  {
-    THUMB32_B_INSN(0xf000b800, -4)     /* b.w original_branch_dest.  */
-  };
+{
+  THUMB32_B_INSN (0xf000b800, -4)      /* b.w original_branch_dest.  */
+};
  
  static const insn_sequence elf32_arm_stub_a8_veneer_bl[] =
-  {
-    THUMB32_B_INSN(0xf000b800, -4)     /* b.w original_branch_dest.  */
-  };
+{
+  THUMB32_B_INSN (0xf000b800, -4)      /* b.w original_branch_dest.  */
+};
  
  /* Stub used for Thumb-2 blx.w instructions.  We modified the original blx.w
     instruction (which switches to ARM mode) to point to this stub.  Jump to the
     real destination using an ARM-mode branch.  */
  
  static const insn_sequence elf32_arm_stub_a8_veneer_blx[] =
-  {
-    ARM_REL_INSN(0xea000000, -8)       /* b original_branch_dest.  */
-  };
+{
+  ARM_REL_INSN (0xea000000, -8)        /* b original_branch_dest.  */
+};
  
  /* For each section group there can be a specially created linker section
     to hold the stubs for that group.  The name of the stub section is based
@@ -2413,7 +2453,7 @@ static const insn_sequence elf32_arm_stub_a8_veneer_blx[] =
     PR 13049: STUB_SUFFIX used to be ".stub", but this allowed the user to
     create what appeared to be a linker stub section when it actually
     contained user code/data.  For example, consider this fragment:
-   
+
       const char * stubborn_problems[] = { "np" };
  
     If this is compiled with "-fPIC -fdata-sections" then gcc produces a
@@ -2454,7 +2494,8 @@ static const insn_sequence elf32_arm_stub_a8_veneer_blx[] =
    DEF_STUB(a8_veneer_blx)
  
  #define DEF_STUB(x) arm_stub_##x,
-enum elf32_arm_stub_type {
+enum elf32_arm_stub_type
+{
    arm_stub_none,
    DEF_STUBS
    /* Note the first a8_veneer type */
@@ -2469,7 +2510,8 @@ typedef struct
  } stub_def;
  
  #define DEF_STUB(x) {elf32_arm_stub_##x, ARRAY_SIZE(elf32_arm_stub_##x)},
-static const stub_def stub_definitions[] = {
+static const stub_def stub_definitions[] =
+{
    {NULL, 0},
    DEF_STUBS
  };
@@ -2622,7 +2664,8 @@ _arm_elf_section_data;
     relaxing which we can refresh easily, then create stubs for each potentially
     erratum-triggering instruction once we've settled on a solution.  */
  
-struct a8_erratum_fix {
+struct a8_erratum_fix
+{
    bfd *input_bfd;
    asection *section;
    bfd_vma offset;
@@ -2636,7 +2679,8 @@ struct a8_erratum_fix {
  /* A table of relocs applied to branches which might trigger Cortex-A8
     erratum.  */
  
-struct a8_erratum_reloc {
+struct a8_erratum_reloc
+{
    bfd_vma from;
    bfd_vma destination;
    struct elf32_arm_link_hash_entry *hash;
@@ -2651,7 +2695,8 @@ struct a8_erratum_reloc {
  
  /* ARM-specific information about a PLT entry, over and above the usual
     gotplt_union.  */
-struct arm_plt_info {
+struct arm_plt_info
+{
    /* We reference count Thumb references to a PLT entry separately,
       so that we can emit the Thumb trampoline only if needed.  */
    bfd_signed_vma thumb_refcount;
@@ -2674,7 +2719,8 @@ struct arm_plt_info {
  };
  
  /* Information about an .iplt entry for a local STT_GNU_IFUNC symbol.  */
-struct arm_local_iplt_info {
+struct arm_local_iplt_info
+{
    /* The information that is usually found in the generic ELF part of
       the hash table entry.  */
    union gotplt_union root;
@@ -2735,14 +2781,14 @@ elf32_arm_mkobject (bfd *abfd)
  
  /* Arm ELF linker hash entry.  */
  struct elf32_arm_link_hash_entry
-  {
-    struct elf_link_hash_entry root;
+{
+  struct elf_link_hash_entry root;
  
-    /* Track dynamic relocs copied for this symbol.  */
-    struct elf_dyn_relocs *dyn_relocs;
+  /* Track dynamic relocs copied for this symbol.  */
+  struct elf_dyn_relocs *dyn_relocs;
  
-    /* ARM-specific PLT information.  */
-    struct arm_plt_info plt;
+  /* ARM-specific PLT information.  */
+  struct arm_plt_info plt;
  
  #define GOT_UNKNOWN    0
  #define GOT_NORMAL     1
@@ -2750,25 +2796,25 @@ struct elf32_arm_link_hash_entry
  #define GOT_TLS_IE     4
  #define GOT_TLS_GDESC  8
  #define GOT_TLS_GD_ANY_P(type) ((type & GOT_TLS_GD) || (type & GOT_TLS_GDESC))
-    unsigned int tls_type : 8;
+  unsigned int tls_type : 8;
  
-    /* True if the symbol's PLT entry is in .iplt rather than .plt.  */
-    unsigned int is_iplt : 1;
+  /* True if the symbol's PLT entry is in .iplt rather than .plt.  */
+  unsigned int is_iplt : 1;
  
-    unsigned int unused : 23;
+  unsigned int unused : 23;
  
-    /* Offset of the GOTPLT entry reserved for the TLS descriptor,
-       starting at the end of the jump table.  */
-    bfd_vma tlsdesc_got;
+  /* Offset of the GOTPLT entry reserved for the TLS descriptor,
+     starting at the end of the jump table.  */
+  bfd_vma tlsdesc_got;
  
-    /* The symbol marking the real symbol location for exported thumb
-       symbols with Arm stubs.  */
-    struct elf_link_hash_entry *export_glue;
+  /* The symbol marking the real symbol location for exported thumb
+     symbols with Arm stubs.  */
+  struct elf_link_hash_entry *export_glue;
  
-   /* A pointer to the most recently used stub hash entry against this
+  /* A pointer to the most recently used stub hash entry against this
       symbol.  */
-    struct elf32_arm_stub_hash_entry *stub_cache;
-  };
+  struct elf32_arm_stub_hash_entry *stub_cache;
+};
  
  /* Traverse an arm ELF linker hash table.  */
  #define elf32_arm_link_hash_traverse(table, func, info)                        \
@@ -2878,6 +2924,9 @@ struct elf32_arm_link_hash_table
    /* True if the target system is Symbian OS.  */
    int symbian_p;
  
+  /* True if the target system is Native Client.  */
+  int nacl_p;
+
    /* True if the target uses REL relocations.  */
    int use_rel;
  
@@ -2902,7 +2951,7 @@ struct elf32_arm_link_hash_table
  
    /* The offset into sgot of the GOT entry used by the PLT entry
       above.  */
-  bfd_vma dt_tlsdesc_got;    
+  bfd_vma dt_tlsdesc_got;
  
    /* Offset in .plt section of tls_arm_trampoline.  */
    bfd_vma tls_trampoline;
@@ -3198,7 +3247,7 @@ create_ifunc_sections (struct bfd_link_info *info)
    bfd *dynobj;
    asection *s;
    flagword flags;
-  
+
    htab = elf32_arm_hash_table (info);
    dynobj = htab->root.dynobj;
    bed = get_elf_backend_data (dynobj);
@@ -3408,6 +3457,7 @@ elf32_arm_link_hash_table_create (bfd *abfd)
    ret->use_blx = 0;
    ret->vxworks_p = 0;
    ret->symbian_p = 0;
+  ret->nacl_p = 0;
    ret->use_rel = 1;
    ret->sym_cache.abfd = NULL;
    ret->obfd = abfd;
@@ -3576,7 +3626,7 @@ arm_type_of_stub (struct bfd_link_info *info,
        else
         splt = globals->root.splt;
        if (splt != NULL)
-       {       
+       {
           use_plt = 1;
  
           /* Note when dealing with PLT entries: the main PLT stub is in
@@ -3860,7 +3910,7 @@ elf32_arm_get_stub_entry (const asection *input_section,
  }
  
  /* Find or create a stub section.  Returns a pointer to the stub section, and
-   the section to which the stub section will be attached (in *LINK_SEC_P). 
+   the section to which the stub section will be attached (in *LINK_SEC_P).
     LINK_SEC_P may be NULL.  */
  
  static asection *
@@ -3898,10 +3948,10 @@ elf32_arm_create_or_find_stub_sec (asection **link_sec_p, asection *section,
         }
        htab->stub_group[section->id].stub_sec = stub_sec;
      }
-  
+
    if (link_sec_p)
      *link_sec_p = link_sec;
-  
+
    return stub_sec;
  }
  
@@ -3969,7 +4019,7 @@ put_thumb_insn (struct elf32_arm_link_hash_table * htab,
     model, return the new reloc type.  */
  
  static unsigned
-elf32_arm_tls_transition (struct bfd_link_info *info, int r_type, 
+elf32_arm_tls_transition (struct bfd_link_info *info, int r_type,
                           struct elf_link_hash_entry *h)
  {
    int is_local = (h == NULL);
@@ -3977,7 +4027,7 @@ elf32_arm_tls_transition (struct bfd_link_info *info, int r_type,
    if (info->shared || (h && h->root.type == bfd_link_hash_undefweak))
      return r_type;
  
-  /* We do not support relaxations for Old TLS models.  */ 
+  /* We do not support relaxations for Old TLS models.  */
    switch (r_type)
      {
      case R_ARM_TLS_GOTDESC:
@@ -4023,7 +4073,7 @@ arm_stub_required_alignment (enum elf32_arm_stub_type stub_type)
      case arm_stub_long_branch_v4t_thumb_tls_pic:
      case arm_stub_a8_veneer_blx:
        return 4;
-    
+
      default:
        abort ();  /* Should be unreachable.  */
      }
@@ -4996,13 +5046,13 @@ elf32_arm_size_stubs (bfd *output_bfd,
                         free (internal_relocs);
                       goto error_ret_free_local;
                     }
-                 
+
                   hash = NULL;
                   if (r_indx >= symtab_hdr->sh_info)
                     hash = elf32_arm_hash_entry
                       (elf_sym_hashes (input_bfd)
                        [r_indx - symtab_hdr->sh_info]);
-                 
+
                   /* Only look for stubs on branch instructions, or
                      non-relaxed TLSCALL  */
                   if ((r_type != (unsigned int) R_ARM_CALL)
@@ -5028,7 +5078,7 @@ elf32_arm_size_stubs (bfd *output_bfd,
                   sym_value = 0;
                   destination = 0;
                   sym_name = NULL;
-                 
+
                   if (r_type == (unsigned int) R_ARM_TLS_CALL
                       || r_type == (unsigned int) R_ARM_THM_TLS_CALL)
                     {
@@ -5573,9 +5623,9 @@ static const insn32 a2t3p_bx_r12_insn = 0xe12fff1c;
       .arm                               mov  lr, pc
       b func                             bx   r6
                                          .arm
-                                   ;; back_to_thumb       
+                                   ;; back_to_thumb
                                         ldmia r13! {r6, lr}
-                                       bx    lr           
+                                       bx    lr
                                      __func_addr:
                                          .word        func  */
  
@@ -6012,7 +6062,7 @@ check_use_blx (struct elf32_arm_link_hash_table *globals)
  {
    int cpu_arch;
  
-  cpu_arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC, 
+  cpu_arch = bfd_elf_get_obj_attr_int (globals->obfd, OBJ_ATTR_PROC,
                                        Tag_CPU_arch);
  
    if (globals->fix_arm1176)
@@ -7403,6 +7453,18 @@ elf32_arm_allocate_plt_entry (struct bfd_link_info *info,
      }
  }
  
+static bfd_vma
+arm_movw_immediate (bfd_vma value)
+{
+  return (value & 0x00000fff) | ((value & 0x0000f000) << 4);
+}
+
+static bfd_vma
+arm_movt_immediate (bfd_vma value)
+{
+  return ((value & 0x0fff0000) >> 16) | ((value & 0xf0000000) >> 12);
+}
+
  /* Fill in a PLT entry and its associated GOT slot.  If DYNINDX == -1,
     the entry lives in .iplt and resolves to (*SYM_VALUE)().
     Otherwise, DYNINDX is the index of the symbol in the dynamic
@@ -7563,6 +7625,44 @@ elf32_arm_populate_plt_entry (bfd *output_bfd, struct bfd_link_info *info,
           rel.r_addend = 0;
           SWAP_RELOC_OUT (htab) (output_bfd, &rel, loc);
         }
+      else if (htab->nacl_p)
+       {
+         /* Calculate the displacement between the PLT slot and the
+            common tail that's part of the special initial PLT slot.  */
+         bfd_vma tail_displacement
+           = ((splt->output_section->vma + splt->output_offset
+               + ARM_NACL_PLT_TAIL_OFFSET)
+              - (plt_address + htab->plt_entry_size + 4));
+         BFD_ASSERT ((tail_displacement & 3) == 0);
+         tail_displacement >>= 2;
+
+         BFD_ASSERT ((tail_displacement & 0xff000000) == 0
+                     || (-tail_displacement & 0xff000000) == 0);
+
+         /* Calculate the displacement between the PLT slot and the entry
+            in the GOT.  The offset accounts for the value produced by
+            adding to pc in the penultimate instruction of the PLT stub.  */
+         got_displacement = got_address - (plt_address + htab->plt_entry_size);
+
+         /* NaCl does not support interworking at all.  */
+         BFD_ASSERT (!elf32_arm_plt_needs_thumb_stub_p (info, arm_plt));
+
+         put_arm_insn (htab, output_bfd,
+                       elf32_arm_nacl_plt_entry[0]
+                       | arm_movw_immediate (got_displacement),
+                       ptr + 0);
+         put_arm_insn (htab, output_bfd,
+                       elf32_arm_nacl_plt_entry[1]
+                       | arm_movt_immediate (got_displacement),
+                       ptr + 4);
+         put_arm_insn (htab, output_bfd,
+                       elf32_arm_nacl_plt_entry[2],
+                       ptr + 8);
+         put_arm_insn (htab, output_bfd,
+                       elf32_arm_nacl_plt_entry[3]
+                       | (tail_displacement & 0x00ffffff),
+                       ptr + 12);
+       }
        else
         {
           /* Calculate the displacement between the PLT slot and the
@@ -7703,18 +7803,18 @@ elf32_arm_abs12_reloc (bfd *abfd, void *data, bfd_vma value)
     the pre-relaxed code.  It would be nice if the relocs were updated
     to match the optimization.   */
  
-static bfd_reloc_status_type 
+static bfd_reloc_status_type
  elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
-                    bfd *input_bfd, asection *input_sec, bfd_byte *contents, 
+                    bfd *input_bfd, asection *input_sec, bfd_byte *contents,
                      Elf_Internal_Rela *rel, unsigned long is_local)
  {
    unsigned long insn;
-  
+
    switch (ELF32_R_TYPE (rel->r_info))
      {
      default:
        return bfd_reloc_notsupported;
-      
+
      case R_ARM_TLS_GOTDESC:
        if (is_local)
         insn = 0;
@@ -7770,7 +7870,7 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
           return bfd_reloc_notsupported;
         }
        break;
-      
+
      case R_ARM_TLS_DESCSEQ:
        /* arm insn.  */
        insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
@@ -7816,7 +7916,7 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
        insn = is_local ? 0xe1a00000 : 0xe79f0000;
        bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
        break;
-      
+
      case R_ARM_THM_TLS_CALL:
        /* GD->IE relaxation */
        if (!is_local)
@@ -7828,7 +7928,7 @@ elf32_arm_tls_relax (struct elf32_arm_link_hash_table *globals,
        else
         /* nop; nop */
         insn = 0xbf00bf00;
-       
+
        bfd_put_16 (input_bfd, insn >> 16, contents + rel->r_offset);
        bfd_put_16 (input_bfd, insn & 0xffff, contents + rel->r_offset + 2);
        break;
@@ -9249,9 +9349,9 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
           }
  
         /* Linker relaxations happens from one of the
-          R_ARM_{GOTDESC,CALL,DESCSEQ} relocations to IE or LE.  */ 
+          R_ARM_{GOTDESC,CALL,DESCSEQ} relocations to IE or LE.  */
         if (ELF32_R_TYPE(rel->r_info) != r_type)
-         tls_type = GOT_TLS_IE; 
+         tls_type = GOT_TLS_IE;
  
         BFD_ASSERT (tls_type != GOT_UNKNOWN);
  
@@ -9292,7 +9392,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
                                    + globals->root.sgotplt->output_offset
                                    + offplt
                                    + globals->sgotplt_jump_table_size);
-               
+
                 outrel.r_info = ELF32_R_INFO (indx, R_ARM_TLS_DESC);
                 sreloc = globals->root.srelplt;
                 loc = sreloc->contents;
@@ -9310,13 +9410,13 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
                             !h ? value - elf_hash_table (info)->tls_sec->vma
                             : info->flags & DF_BIND_NOW ? 0
                             : 0x80000000 | ELF32_R_SYM (outrel.r_info),
-                           globals->root.sgotplt->contents + offplt +
-                           globals->sgotplt_jump_table_size);
-               
+                           globals->root.sgotplt->contents + offplt
+                           + globals->sgotplt_jump_table_size);
+
                 /* Second word in the relocation is always zero.  */
                 bfd_put_32 (output_bfd, 0,
-                           globals->root.sgotplt->contents + offplt +
-                           globals->sgotplt_jump_table_size + 4);
+                           globals->root.sgotplt->contents + offplt
+                           + globals->sgotplt_jump_table_size + 4);
               }
             if (tls_type & GOT_TLS_GD)
               {
@@ -9436,9 +9536,10 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
             if (ELF32_R_TYPE(rel->r_info) == R_ARM_TLS_CALL)
               {
                 unsigned long inst;
-               
-               offset -= (input_section->output_section->vma +
-                          input_section->output_offset + rel->r_offset + 8);
+
+               offset -= (input_section->output_section->vma
+                          + input_section->output_offset
+                          + rel->r_offset + 8);
  
                 inst = offset >> 2;
                 inst &= 0x00ffffff;
@@ -9451,10 +9552,10 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
                 unsigned upper_insn, lower_insn;
                 unsigned neg;
  
-               offset -= (input_section->output_section->vma + 
-                          input_section->output_offset
+               offset -= (input_section->output_section->vma
+                          + input_section->output_offset
                            + rel->r_offset + 4);
-           
+
                 if (stub_type != arm_stub_none
                     && arm_stub_is_thumb (stub_type))
                   {
@@ -9487,11 +9588,11 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
           {
             unsigned long data, insn;
             unsigned thumb;
-           
+
             data = bfd_get_32 (input_bfd, hit_data);
             thumb = data & 1;
             data &= ~1u;
-           
+
             if (thumb)
               {
                 insn = bfd_get_16 (input_bfd, contents + rel->r_offset - data);
@@ -9528,7 +9629,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
                   case 0xe0:    /* add */
                     value = -8;
                     break;
-                   
+
                   default:
                     (*_bfd_error_handler)
                       (_("%B(%A+0x%lx):unexpected ARM instruction '0x%x' referenced by TLS_GOTDESC"),
@@ -9537,7 +9638,7 @@ elf32_arm_final_link_relocate (reloc_howto_type *           howto,
                     return bfd_reloc_notsupported;
                   }
               }
- 
+
             value += ((globals->root.sgotplt->output_section->vma
                        + globals->root.sgotplt->output_offset + off)
                       - (input_section->output_section->vma
@@ -10271,7 +10372,7 @@ elf32_arm_relocate_section (bfd *                  output_bfd,
                    rel->r_offset, TRUE))
                 return FALSE;
             }
-         
+
           if (globals->use_rel)
             {
               relocation = (sec->output_section->vma
@@ -10436,7 +10537,7 @@ elf32_arm_relocate_section (bfd *                  output_bfd,
           both in relaxed and non-relaxed cases */
       if ((elf32_arm_tls_transition (info, r_type, h) != (unsigned)r_type)
          || (IS_ARM_TLS_GNU_RELOC (r_type)
-            && !((h ? elf32_arm_hash_entry (h)->tls_type : 
+            && !((h ? elf32_arm_hash_entry (h)->tls_type :
                    elf32_arm_local_got_tls_type (input_bfd)[r_symndx])
                   & GOT_TLS_GDESC)))
         {
@@ -10448,7 +10549,7 @@ elf32_arm_relocate_section (bfd *                  output_bfd,
         }
       else
         r = bfd_reloc_continue;
-     
+
       if (r == bfd_reloc_continue)
         r = elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
                                           input_section, contents, rel,
@@ -10544,11 +10645,11 @@ add_unwind_table_edit (arm_unwind_table_edit **head,
  {
    arm_unwind_table_edit *new_edit = (arm_unwind_table_edit *)
        xmalloc (sizeof (arm_unwind_table_edit));
-  
+
    new_edit->type = type;
    new_edit->linked_section = linked_section;
    new_edit->index = tindex;
-  
+
    if (tindex > 0)
      {
        new_edit->next = NULL;
@@ -10606,7 +10707,7 @@ insert_cantunwind_after(asection *text_sec, asection *exidx_sec)
  
  /* Scan .ARM.exidx tables, and create a list describing edits which should be
     made to those tables, such that:
-   
+
       1. Regions without unwind data are marked with EXIDX_CANTUNWIND entries.
       2. Duplicate entries are merged together (EXIDX_CANTUNWIND, or unwind
          codes which have been inlined into the index).
@@ -10614,8 +10715,7 @@ insert_cantunwind_after(asection *text_sec, asection *exidx_sec)
     If MERGE_EXIDX_ENTRIES is false, duplicate entries are not merged.
  
     The edits are applied when the tables are written
-   (in elf32_arm_write_section).
-*/
+   (in elf32_arm_write_section).  */
  
  bfd_boolean
  elf32_arm_fix_exidx_coverage (asection **text_section_order,
@@ -10634,15 +10734,15 @@ elf32_arm_fix_exidx_coverage (asection **text_section_order,
    for (inp = info->input_bfds; inp != NULL; inp = inp->link_next)
      {
        asection *sec;
-      
+
        for (sec = inp->sections; sec != NULL; sec = sec->next)
          {
           struct bfd_elf_section_data *elf_sec = elf_section_data (sec);
           Elf_Internal_Shdr *hdr = &elf_sec->this_hdr;
-         
+
           if (!hdr || hdr->sh_type != SHT_ARM_EXIDX)
             continue;
-         
+
           if (elf_sec->linked_to)
             {
               Elf_Internal_Shdr *linked_hdr
@@ -10704,13 +10804,13 @@ elf32_arm_fix_exidx_coverage (asection **text_section_order,
        hdr = &elf_section_data (exidx_sec)->this_hdr;
        if (hdr->sh_type != SHT_ARM_EXIDX)
          continue;
-      
+
        exidx_arm_data = get_arm_elf_section_data (exidx_sec);
        if (exidx_arm_data == NULL)
          continue;
-      
+
        ibfd = exidx_sec->owner;
-         
+
        if (hdr->contents != NULL)
         contents = hdr->contents;
        else if (! bfd_malloc_and_get_section (ibfd, exidx_sec, &contents))
@@ -10762,7 +10862,7 @@ elf32_arm_fix_exidx_coverage (asection **text_section_order,
        /* Record edits to be applied later (in elf32_arm_write_section).  */
        exidx_arm_data->u.exidx.unwind_edit_list = unwind_edit_head;
        exidx_arm_data->u.exidx.unwind_edit_tail = unwind_edit_tail;
-         
+
        if (deleted_exidx_bytes > 0)
         adjust_exidx_size(exidx_sec, -deleted_exidx_bytes);
  
@@ -11776,7 +11876,7 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
                 {
                   _bfd_error_handler
                     (_("%B has has both the current and legacy "
-                      "Tag_MPextension_use attributes"), 
+                      "Tag_MPextension_use attributes"),
                      ibfd);
                   result = FALSE;
                 }
@@ -12250,7 +12350,7 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
    symtab_hdr = & elf_symtab_hdr (abfd);
    sym_hashes = elf_sym_hashes (abfd);
    nsyms = NUM_SHDR_ENTRIES (symtab_hdr);
-  
+
    rel_end = relocs + sec->reloc_count;
    for (rel = relocs; rel < rel_end; rel++)
      {
@@ -12322,14 +12422,14 @@ elf32_arm_check_relocs (bfd *abfd, struct bfd_link_info *info,
               switch (r_type)
                 {
                 case R_ARM_TLS_GD32: tls_type = GOT_TLS_GD; break;
-                 
+
                 case R_ARM_TLS_IE32: tls_type = GOT_TLS_IE; break;
-                 
+
                 case R_ARM_TLS_GOTDESC:
                 case R_ARM_TLS_CALL: case R_ARM_THM_TLS_CALL:
                 case R_ARM_TLS_DESCSEQ: case R_ARM_THM_TLS_DESCSEQ:
                   tls_type = GOT_TLS_GDESC; break;
-                 
+
                 default: tls_type = GOT_NORMAL; break;
                 }
  
@@ -13089,7 +13189,7 @@ allocate_dynrelocs_for_symbol (struct elf_link_hash_entry *h, void * inf)
               if (tls_type & GOT_TLS_GD)
                 elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
  
-             if (tls_type & GOT_TLS_GDESC) 
+             if (tls_type & GOT_TLS_GDESC)
                 {
                   elf32_arm_allocate_dynrelocs (info, htab->root.srelplt, 1);
                   /* GDESC needs a trampoline to jump to.  */
@@ -13098,7 +13198,7 @@ allocate_dynrelocs_for_symbol (struct elf_link_hash_entry *h, void * inf)
  
               /* Only GD needs it.  GDESC just emits one relocation per
                  2 entries.  */
-             if ((tls_type & GOT_TLS_GD) && indx != 0)  
+             if ((tls_type & GOT_TLS_GD) && indx != 0)
                 elf32_arm_allocate_dynrelocs (info, htab->root.srelgot, 1);
             }
           else if (!SYMBOL_REFERENCES_LOCAL (info, h))
@@ -13553,10 +13653,10 @@ elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED,
      {
        if (htab->root.splt->size == 0)
         htab->root.splt->size += htab->plt_header_size;
-      
+
        htab->tls_trampoline = htab->root.splt->size;
        htab->root.splt->size += htab->plt_entry_size;
-      
+
        /* If we're not using lazy TLS relocations, don't generate the
           PLT and GOT entries they require.  */
        if (!(info->flags & DF_BIND_NOW))
@@ -13664,9 +13764,9 @@ elf32_arm_size_dynamic_sections (bfd * output_bfd ATTRIBUTE_UNUSED,
             return FALSE;
  
           if (htab->dt_tlsdesc_plt &&
-               (!add_dynamic_entry (DT_TLSDESC_PLT,0) 
+               (!add_dynamic_entry (DT_TLSDESC_PLT,0)
                  || !add_dynamic_entry (DT_TLSDESC_GOT,0)))
-           return FALSE; 
+           return FALSE;
         }
  
        if (relocs)
@@ -13739,7 +13839,7 @@ elf32_arm_always_size_sections (bfd *output_bfd,
                  tls_sec, 0, NULL, FALSE,
                  bed->collect, &bh)))
             return FALSE;
-         
+
           tlsbase->type = STT_TLS;
            tlsbase = (struct elf_link_hash_entry *)bh;
            tlsbase->def_regular = 1;
@@ -13840,7 +13940,7 @@ arm_put_trampoline (struct elf32_arm_link_hash_table *htab, bfd *output_bfd,
                     const unsigned long *template, unsigned count)
  {
    unsigned ix;
-  
+
    for (ix = 0; ix != count; ix++)
      {
        unsigned long insn = template[ix];
@@ -14082,6 +14182,25 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
               SWAP_RELOC_OUT (htab) (output_bfd, &rel,
                                      htab->srelplt2->contents);
             }
+         else if (htab->nacl_p)
+           {
+             unsigned int i;
+
+             got_displacement = got_address + 8 - (plt_address + 16);
+
+             put_arm_insn (htab, output_bfd,
+                           elf32_arm_nacl_plt0_entry[0]
+                           | arm_movw_immediate (got_displacement),
+                           splt->contents + 0);
+             put_arm_insn (htab, output_bfd,
+                           elf32_arm_nacl_plt0_entry[1]
+                           | arm_movt_immediate (got_displacement),
+                           splt->contents + 4);
+             for (i = 2; i < ARRAY_SIZE (elf32_arm_nacl_plt0_entry); ++i)
+               put_arm_insn (htab, output_bfd,
+                             elf32_arm_nacl_plt0_entry[i],
+                             splt->contents + (i * 4));
+           }
           else
             {
               got_displacement = got_address - (plt_address + 16);
@@ -14120,7 +14239,7 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
           bfd_vma plt_address
             = splt->output_section->vma + splt->output_offset;
  
-         arm_put_trampoline (htab, output_bfd, 
+         arm_put_trampoline (htab, output_bfd,
                               splt->contents + htab->dt_tlsdesc_plt,
                               dl_tlsdesc_lazy_trampoline, 6);
  
@@ -14137,13 +14256,13 @@ elf32_arm_finish_dynamic_sections (bfd * output_bfd, struct bfd_link_info * info
  
        if (htab->tls_trampoline)
         {
-         arm_put_trampoline (htab, output_bfd, 
+         arm_put_trampoline (htab, output_bfd,
                               splt->contents + htab->tls_trampoline,
                               tls_trampoline, 3);
  #ifdef FOUR_WORD_PLT
           bfd_put_32 (output_bfd, 0x00000000,
                       splt->contents + htab->tls_trampoline + 12);
-#endif 
+#endif
         }
  
        if (htab->vxworks_p && !info->shared && htab->root.splt->size > 0)
@@ -14399,6 +14518,11 @@ elf32_arm_output_plt_map_1 (output_arch_syminfo *osi,
        if (!elf32_arm_output_map_sym (osi, ARM_MAP_DATA, addr + 20))
         return FALSE;
      }
+  else if (htab->nacl_p)
+    {
+      if (!elf32_arm_output_map_sym (osi, ARM_MAP_ARM, addr))
+       return FALSE;
+    }
    else
      {
        bfd_boolean thumb_stub_p;
@@ -14725,6 +14849,11 @@ elf32_arm_output_arch_local_syms (bfd *output_bfd,
                 return FALSE;
             }
         }
+      else if (htab->nacl_p)
+       {
+         if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0))
+           return FALSE;
+       }
        else if (!htab->symbian_p)
         {
           if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, 0))
@@ -14764,7 +14893,7 @@ elf32_arm_output_arch_local_syms (bfd *output_bfd,
        /* Mapping symbols for the lazy tls trampoline.  */
        if (!elf32_arm_output_map_sym (&osi, ARM_MAP_ARM, htab->dt_tlsdesc_plt))
         return FALSE;
-       
+
        if (!elf32_arm_output_map_sym (&osi, ARM_MAP_DATA,
                                      htab->dt_tlsdesc_plt + 24))
         return FALSE;
@@ -14778,9 +14907,9 @@ elf32_arm_output_arch_local_syms (bfd *output_bfd,
        if (!elf32_arm_output_map_sym (&osi, ARM_MAP_DATA,
                                      htab->tls_trampoline + 12))
         return FALSE;
-#endif 
+#endif
      }
-  
+
    return TRUE;
  }
  
@@ -14843,23 +14972,24 @@ copy_exidx_entry (bfd *output_bfd, bfd_byte *to, bfd_byte *from, bfd_vma offset)
  {
    unsigned long first_word = bfd_get_32 (output_bfd, from);
    unsigned long second_word = bfd_get_32 (output_bfd, from + 4);
-  
+
    /* High bit of first word is supposed to be zero.  */
    if ((first_word & 0x80000000ul) == 0)
      first_word = offset_prel31 (first_word, offset);
-  
+
    /* If the high bit of the first word is clear, and the bit pattern is not 0x1
       (EXIDX_CANTUNWIND), this is an offset to an .ARM.extab entry.  */
    if ((second_word != 0x1) && ((second_word & 0x80000000ul) == 0))
      second_word = offset_prel31 (second_word, offset);
-  
+
    bfd_put_32 (output_bfd, first_word, to);
    bfd_put_32 (output_bfd, second_word, to + 4);
  }
  
  /* Data for make_branch_to_a8_stub().  */
  
-struct a8_branch_to_stub_data {
+struct a8_branch_to_stub_data
+{
    asection *writing_section;
    bfd_byte *contents;
  };
@@ -15097,7 +15227,7 @@ elf32_arm_write_section (bfd *output_bfd,
           if (edit_node)
             {
               unsigned int edit_index = edit_node->index;
-             
+
               if (in_index < edit_index && in_index * 8 < input_size)
                 {
                   copy_exidx_entry (output_bfd, edited_contents + out_index * 8,
@@ -15115,7 +15245,7 @@ elf32_arm_write_section (bfd *output_bfd,
                       in_index++;
                       add_to_offsets += 8;
                       break;
-                   
+
                     case INSERT_EXIDX_CANTUNWIND_AT_END:
                       {
                         asection *text_sec = edit_node->linked_section;
@@ -15145,7 +15275,7 @@ elf32_arm_write_section (bfd *output_bfd,
                       }
                       break;
                     }
-                 
+
                   edit_node = edit_node->next;
                 }
             }
@@ -15435,7 +15565,7 @@ const struct elf_size_info elf32_arm_size_info =
  #define bfd_elf32_bfd_link_hash_table_create    elf32_arm_link_hash_table_create
  #define bfd_elf32_bfd_link_hash_table_free      elf32_arm_hash_table_free
  #define bfd_elf32_bfd_reloc_type_lookup                elf32_arm_reloc_type_lookup
-#define bfd_elf32_bfd_reloc_name_lookup        elf32_arm_reloc_name_lookup
+#define bfd_elf32_bfd_reloc_name_lookup                elf32_arm_reloc_name_lookup
  #define bfd_elf32_find_nearest_line            elf32_arm_find_nearest_line
  #define bfd_elf32_find_inliner_info            elf32_arm_find_inliner_info
  #define bfd_elf32_new_section_hook             elf32_arm_new_section_hook
@@ -15489,11 +15619,78 @@ const struct elf_size_info elf32_arm_size_info =
  #define elf_backend_obj_attrs_arg_type         elf32_arm_obj_attrs_arg_type
  #undef  elf_backend_obj_attrs_section_type
  #define elf_backend_obj_attrs_section_type     SHT_ARM_ATTRIBUTES
-#define elf_backend_obj_attrs_order    elf32_arm_obj_attrs_order
-#define elf_backend_obj_attrs_handle_unknown elf32_arm_obj_attrs_handle_unknown
+#define elf_backend_obj_attrs_order            elf32_arm_obj_attrs_order
+#define elf_backend_obj_attrs_handle_unknown   elf32_arm_obj_attrs_handle_unknown
+
+#include "elf32-target.h"
+
+/* Native Client targets.  */
+
+#undef TARGET_LITTLE_SYM
+#define TARGET_LITTLE_SYM              bfd_elf32_littlearm_nacl_vec
+#undef TARGET_LITTLE_NAME
+#define TARGET_LITTLE_NAME             "elf32-littlearm-nacl"
+#undef TARGET_BIG_SYM
+#define TARGET_BIG_SYM                 bfd_elf32_bigarm_nacl_vec
+#undef TARGET_BIG_NAME
+#define TARGET_BIG_NAME                        "elf32-bigarm-nacl"
+
+/* Like elf32_arm_link_hash_table_create -- but overrides
+   appropriately for NaCl.  */
+
+static struct bfd_link_hash_table *
+elf32_arm_nacl_link_hash_table_create (bfd *abfd)
+{
+  struct bfd_link_hash_table *ret;
+
+  ret = elf32_arm_link_hash_table_create (abfd);
+  if (ret)
+    {
+      struct elf32_arm_link_hash_table *htab
+       = (struct elf32_arm_link_hash_table *) ret;
+
+      htab->nacl_p = 1;
+
+      htab->plt_header_size = 4 * ARRAY_SIZE (elf32_arm_nacl_plt0_entry);
+      htab->plt_entry_size = 4 * ARRAY_SIZE (elf32_arm_nacl_plt_entry);
+    }
+  return ret;
+}
+
+/* Since NaCl doesn't use the ARM-specific unwind format, we don't
+   really need to use elf32_arm_modify_segment_map.  But we do it
+   anyway just to reduce gratuitous differences with the stock ARM backend.  */
+
+static bfd_boolean
+elf32_arm_nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info)
+{
+  return (elf32_arm_modify_segment_map (abfd, info)
+         && nacl_modify_segment_map (abfd, info));
+}
+
+#undef elf32_bed
+#define elf32_bed                      elf32_arm_nacl_bed
+#undef  bfd_elf32_bfd_link_hash_table_create
+#define bfd_elf32_bfd_link_hash_table_create   \
+  elf32_arm_nacl_link_hash_table_create
+#undef elf_backend_plt_alignment
+#define elf_backend_plt_alignment      4
+#undef elf_backend_modify_segment_map
+#define        elf_backend_modify_segment_map          elf32_arm_nacl_modify_segment_map
+#undef elf_backend_modify_program_headers
+#define        elf_backend_modify_program_headers      nacl_modify_program_headers
+
+#undef ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE                        0x10000
  
  #include "elf32-target.h"
  
+/* Reset to defaults.  */
+#undef elf_backend_plt_alignment
+#undef elf_backend_modify_segment_map
+#define elf_backend_modify_segment_map         elf32_arm_modify_segment_map
+#undef elf_backend_modify_program_headers
+
  /* VxWorks Targets.  */
  
  #undef  TARGET_LITTLE_SYM
diff --git a/bfd/targets.c b/bfd/targets.c

index 112ac12552f302160bc753228c539e502d62e7ca..78b42888de2992877f3f9d4058e2ab6485729cea 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -596,6 +596,7 @@ extern const bfd_target bfd_elf32_bfinfdpic_vec;
  extern const bfd_target bfd_elf32_big_generic_vec;
  extern const bfd_target bfd_elf32_bigarc_vec;
  extern const bfd_target bfd_elf32_bigarm_vec;
+extern const bfd_target bfd_elf32_bigarm_nacl_vec;
  extern const bfd_target bfd_elf32_bigarm_symbian_vec;
  extern const bfd_target bfd_elf32_bigarm_vxworks_vec;
  extern const bfd_target bfd_elf32_bigmips_vec;
@@ -634,6 +635,7 @@ extern const bfd_target bfd_elf32_lm32fdpic_vec;
  extern const bfd_target bfd_elf32_little_generic_vec;
  extern const bfd_target bfd_elf32_littlearc_vec;
  extern const bfd_target bfd_elf32_littlearm_vec;
+extern const bfd_target bfd_elf32_littlearm_nacl_vec;
  extern const bfd_target bfd_elf32_littlearm_symbian_vec;
  extern const bfd_target bfd_elf32_littlearm_vxworks_vec;
  extern const bfd_target bfd_elf32_littlemips_vec;
diff --git a/gas/ChangeLog b/gas/ChangeLog

index b1d863af0f82665e5bc212a9556938ff5cfc27a8..6a9191eb7a10498013d855fa1d4ca08ec8f03000 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-12  Roland McGrath  <mcgrathr@google.com>
+
+       * configure.tgt (arm-*-nacl*): Match it.
+       * config/te-nacl.h (FPU_DEFAULT, EABI_DEFAULT): Define.
+       (LOCAL_LABELS_DOLLAR): Define.
+       * config/tc-arm.c (elf32_arm_target_format) [TE_NACL]:
+       Use nacl format variants.
+
  2012-04-12  Jie Zhang  <jie@codesourcery.com>
              Meador Inge  <meadori@codesourcery.com>
  
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c

index 545b7ec7a39c9e8bdc0f92a4e98af251090dab6d..6ff64a615bb355682abba9583258d4e8456eb624 100644 (file)
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -22284,6 +22284,10 @@ elf32_arm_target_format (void)
    return (target_big_endian
           ? "elf32-bigarm-vxworks"
           : "elf32-littlearm-vxworks");
+#elif defined (TE_NACL)
+  return (target_big_endian
+         ? "elf32-bigarm-nacl"
+         : "elf32-littlearm-nacl");
  #else
    if (target_big_endian)
      return "elf32-bigarm";
diff --git a/gas/config/te-nacl.h b/gas/config/te-nacl.h

index 65507568526227e837263b272babc848cd2f246a..d64a44d1fcc878f493ffc2733b97a6502c380a3f 100644 (file)
--- a/gas/config/te-nacl.h
+++ b/gas/config/te-nacl.h
@@ -18,6 +18,13 @@
     02110-1301, USA.  */
  
  #define TE_NACL
+
+#define LOCAL_LABELS_DOLLAR 1
  #define LOCAL_LABELS_FB 1
  
+/* These are for ARM but don't hurt other CPU targets.
+   They match the settings from te-armeabi.h; NaCl/ARM is based on EABI.  */
+#define FPU_DEFAULT FPU_ARCH_VFP
+#define EABI_DEFAULT EF_ARM_EABI_VER5
+
  #include "obj-format.h"
diff --git a/gas/configure.tgt b/gas/configure.tgt

index 99a276fcc0365afd7713461c25c4d276c546d628..781cc9dd0202a7bdd8b75c46cf81fe022f5eb760 100644 (file)
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -117,6 +117,7 @@ case ${generic_target} in
    arm-*-linux-*)                       fmt=elf  em=linux ;;
    arm-*-uclinux*eabi*)                 fmt=elf  em=armlinuxeabi ;;
    arm-*-uclinux*)                      fmt=elf  em=linux ;;
+  arm-*-nacl*)                         fmt=elf  em=nacl ;;
    arm-*-netbsdelf*)                    fmt=elf  em=nbsd ;;
    arm-*-*n*bsd*)                       fmt=aout em=nbsd ;;
    arm-*-nto*)                          fmt=elf ;;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog

index b9e884f903c4b7fdfed97858127e2694b489b9c6..8ad16059ad399e8a3631d694e103efaf9d6d060e 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,109 @@
+2012-04-12  Roland McGrath  <mcgrathr@google.com>
+
+       * gas/elf/elf.exp (run_elf_list_test): Treat arm-*-nacl* targets
+       as -armeabi.
+
+       * gas/arm/any-idiv.d: Match *-*-nacl* targets too.
+       * gas/arm/arch4t.d: Likewise.
+       * gas/arm/arch4t-eabi.d: Likewise.
+       * gas/arm/attr-any-armv4t.d: Likewise.
+       * gas/arm/attr-any-thumbv6.d: Likewise.
+       * gas/arm/attr-cpu-directive.d: Likewise.
+       * gas/arm/attr-default.d: Likewise.
+       * gas/arm/attr-march-all.d: Likewise.
+       * gas/arm/attr-march-armv1.d: Likewise.
+       * gas/arm/attr-march-armv2a.d: Likewise.
+       * gas/arm/attr-march-armv2.d: Likewise.
+       * gas/arm/attr-march-armv2s.d: Likewise.
+       * gas/arm/attr-march-armv3.d: Likewise.
+       * gas/arm/attr-march-armv3m.d: Likewise.
+       * gas/arm/attr-march-armv4.d: Likewise.
+       * gas/arm/attr-march-armv4t.d: Likewise.
+       * gas/arm/attr-march-armv4txm.d: Likewise.
+       * gas/arm/attr-march-armv4xm.d: Likewise.
+       * gas/arm/attr-march-armv5.d: Likewise.
+       * gas/arm/attr-march-armv5t.d: Likewise.
+       * gas/arm/attr-march-armv5te.d: Likewise.
+       * gas/arm/attr-march-armv5tej.d: Likewise.
+       * gas/arm/attr-march-armv5texp.d: Likewise.
+       * gas/arm/attr-march-armv5txm.d: Likewise.
+       * gas/arm/attr-march-armv6.d: Likewise.
+       * gas/arm/attr-march-armv6j.d: Likewise.
+       * gas/arm/attr-march-armv6k.d: Likewise.
+       * gas/arm/attr-march-armv6k+sec.d: Likewise.
+       * gas/arm/attr-march-armv6kt2.d: Likewise.
+       * gas/arm/attr-march-armv6-m.d: Likewise.
+       * gas/arm/attr-march-armv6-m+os.d: Likewise.
+       * gas/arm/attr-march-armv6s-m.d: Likewise.
+       * gas/arm/attr-march-armv6t2.d: Likewise.
+       * gas/arm/attr-march-armv6z.d: Likewise.
+       * gas/arm/attr-march-armv6zk.d: Likewise.
+       * gas/arm/attr-march-armv6zkt2.d: Likewise.
+       * gas/arm/attr-march-armv6zt2.d: Likewise.
+       * gas/arm/attr-march-armv7-a.d: Likewise.
+       * gas/arm/attr-march-armv7a.d: Likewise.
+       * gas/arm/attr-march-armv7-a+idiv.d: Likewise.
+       * gas/arm/attr-march-armv7-a+mp.d: Likewise.
+       * gas/arm/attr-march-armv7-a+sec.d: Likewise.
+       * gas/arm/attr-march-armv7-a+sec+virt.d: Likewise.
+       * gas/arm/attr-march-armv7-a+virt.d: Likewise.
+       * gas/arm/attr-march-armv7.d: Likewise.
+       * gas/arm/attr-march-armv7em.d: Likewise.
+       * gas/arm/attr-march-armv7-m.d: Likewise.
+       * gas/arm/attr-march-armv7m.d: Likewise.
+       * gas/arm/attr-march-armv7-r.d: Likewise.
+       * gas/arm/attr-march-armv7r.d: Likewise.
+       * gas/arm/attr-march-armv7-r+mp.d: Likewise.
+       * gas/arm/attr-march-iwmmxt2.d: Likewise.
+       * gas/arm/attr-march-iwmmxt.d: Likewise.
+       * gas/arm/attr-march-xscale.d: Likewise.
+       * gas/arm/attr-mcpu.d: Likewise.
+       * gas/arm/attr-mfpu-arm1020e.d: Likewise.
+       * gas/arm/attr-mfpu-arm1020t.d: Likewise.
+       * gas/arm/attr-mfpu-arm1136jf-s.d: Likewise.
+       * gas/arm/attr-mfpu-arm1136jfs.d: Likewise.
+       * gas/arm/attr-mfpu-arm7500fe.d: Likewise.
+       * gas/arm/attr-mfpu-fpa10.d: Likewise.
+       * gas/arm/attr-mfpu-fpa11.d: Likewise.
+       * gas/arm/attr-mfpu-fpa.d: Likewise.
+       * gas/arm/attr-mfpu-fpe2.d: Likewise.
+       * gas/arm/attr-mfpu-fpe3.d: Likewise.
+       * gas/arm/attr-mfpu-fpe.d: Likewise.
+       * gas/arm/attr-mfpu-maverick.d: Likewise.
+       * gas/arm/attr-mfpu-neon.d: Likewise.
+       * gas/arm/attr-mfpu-neon-fp16.d: Likewise.
+       * gas/arm/attr-mfpu-softfpa.d: Likewise.
+       * gas/arm/attr-mfpu-softvfp.d: Likewise.
+       * gas/arm/attr-mfpu-softvfp+vfp.d: Likewise.
+       * gas/arm/attr-mfpu-vfp10.d: Likewise.
+       * gas/arm/attr-mfpu-vfp10-r0.d: Likewise.
+       * gas/arm/attr-mfpu-vfp3.d: Likewise.
+       * gas/arm/attr-mfpu-vfp9.d: Likewise.
+       * gas/arm/attr-mfpu-vfp.d: Likewise.
+       * gas/arm/attr-mfpu-vfpv2.d: Likewise.
+       * gas/arm/attr-mfpu-vfpv3-d16.d: Likewise.
+       * gas/arm/attr-mfpu-vfpv3.d: Likewise.
+       * gas/arm/attr-mfpu-vfpv4-d16.d: Likewise.
+       * gas/arm/attr-mfpu-vfpv4.d: Likewise.
+       * gas/arm/attr-mfpu-vfpxd.d: Likewise.
+       * gas/arm/attr-names.d: Likewise.
+       * gas/arm/attr-order.d: Likewise.
+       * gas/arm/attr-override-cpu-directive.d: Likewise.
+       * gas/arm/attr-override-mcpu.d: Likewise.
+       * gas/arm/got_prel.d: Likewise.
+       * gas/arm/mapdir.d: Likewise.
+       * gas/arm/mapmisc.d: Likewise.
+       * gas/arm/mapsecs.d: Likewise.
+       * gas/arm/mapshort-eabi.d: Likewise.
+       * gas/arm/mapshort-elf.d: Likewise.
+       * gas/arm/mov-highregs-any.d: Likewise.
+       * gas/arm/mov-lowregs-any.d: Likewise.
+       * gas/arm/pr12198-1.d: Likewise.
+       * gas/arm/pr12198-2.d: Likewise.
+       * gas/arm/thumb.d: Likewise.
+       * gas/arm/thumb-eabi.d: Likewise.
+       * gas/arm/thumbrel.d: Likewise.
+
  2012-04-12  Jie Zhang  <jie@codesourcery.com>
              Meador Inge  <meadori@codesourcery.com>
  
diff --git a/gas/testsuite/gas/arm/any-idiv.d b/gas/testsuite/gas/arm/any-idiv.d

index 05a89dd0d7b2a7c5ae5cb3d495cb2bb4493cccb4..853dde74f167cd70c8fcb3141db8bd3883f0a2bb 100644 (file)
--- a/gas/testsuite/gas/arm/any-idiv.d
+++ b/gas/testsuite/gas/arm/any-idiv.d
@@ -2,7 +2,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/arch4t-eabi.d b/gas/testsuite/gas/arm/arch4t-eabi.d

index afd92f79ef26d1a07c91428ff40992a363425bab..4289d607d7e7778828dfb3db294f707dc30615fb 100644 (file)
--- a/gas/testsuite/gas/arm/arch4t-eabi.d
+++ b/gas/testsuite/gas/arm/arch4t-eabi.d
@@ -2,7 +2,7 @@
  # as: -march=armv4t
  # objdump: -dr --prefix-addresses --show-raw-insn
  # source: arch4t.s
-# target: *-*-*eabi *-*-symbianelf
+# target: *-*-*eabi *-*-symbianelf *-*-nacl*
  
  .*: +file format .*arm.*
  
diff --git a/gas/testsuite/gas/arm/arch4t.d b/gas/testsuite/gas/arm/arch4t.d

index 665585234fb2fa5ee6f6bcf50dc6eea66610d088..1f8c3208eb98968a98886fbf4ef2d21e80774240 100644 (file)
--- a/gas/testsuite/gas/arm/arch4t.d
+++ b/gas/testsuite/gas/arm/arch4t.d
@@ -2,7 +2,7 @@
  # as: -march=armv4t
  # objdump: -dr --prefix-addresses --show-raw-insn
  # EABI targets have their own variant.
-# not-target: *-*-*eabi *-*-symbianelf
+# not-target: *-*-*eabi *-*-symbianelf *-*-nacl*
  
  .*: +file format .*arm.*
  
diff --git a/gas/testsuite/gas/arm/attr-any-armv4t.d b/gas/testsuite/gas/arm/attr-any-armv4t.d

index 21e28dfbe6447bd378de1ff6dc667ac19d32a18f..ba0188e9f623e0afb3ea1f38c1e7fa261fd0cb76 100644 (file)
--- a/gas/testsuite/gas/arm/attr-any-armv4t.d
+++ b/gas/testsuite/gas/arm/attr-any-armv4t.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-any-thumbv6.d b/gas/testsuite/gas/arm/attr-any-thumbv6.d

index d2b427696ed5995cad9c21fe173faf1669d4cabc..c5aad0a2dd52abc2bf20e3c5df65312caea26192 100644 (file)
--- a/gas/testsuite/gas/arm/attr-any-thumbv6.d
+++ b/gas/testsuite/gas/arm/attr-any-thumbv6.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-cpu-directive.d b/gas/testsuite/gas/arm/attr-cpu-directive.d

index f3c1081d2ccff147c4ce614c172e99b2f6b34eaa..a9618669bcf7ecf01f69aeda37ff1265683d76c0 100644 (file)
--- a/gas/testsuite/gas/arm/attr-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-cpu-directive.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-default.d b/gas/testsuite/gas/arm/attr-default.d

index 4439180dfeb37b364d4699d79bc838c62dfa86af..53085af8d28639d6f618c00b363ce21e559df7e3 100644 (file)
--- a/gas/testsuite/gas/arm/attr-default.d
+++ b/gas/testsuite/gas/arm/attr-default.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-all.d b/gas/testsuite/gas/arm/attr-march-all.d

index e56f3173c5608a256e013946b809497b9acaf36f..ed4d6522f3933b9c4f5501359a68d1df9162e294 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-all.d
+++ b/gas/testsuite/gas/arm/attr-march-all.d
@@ -3,7 +3,7 @@
  # as: -march=all
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv1.d b/gas/testsuite/gas/arm/attr-march-armv1.d

index 4867087637cd2a853a5f53b05ebf208c5ce47c87..af978289d39c4932ba260ea63280f68da543f77f 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv1.d
+++ b/gas/testsuite/gas/arm/attr-march-armv1.d
@@ -3,7 +3,7 @@
  # as: -march=armv1
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv2.d b/gas/testsuite/gas/arm/attr-march-armv2.d

index 352e38f1f797a1712a621aa37dfca6cf6873b9c7..e470058044958fa2c29b722ae3f9a114022e0df9 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2.d
@@ -3,7 +3,7 @@
  # as: -march=armv2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv2a.d b/gas/testsuite/gas/arm/attr-march-armv2a.d

index 956f6fd3046d01a4958e74f5ccd2198e3e7cf445..80f79a73c245808c12a9a5767f0d4b4cda1e3ca9 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv2a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2a.d
@@ -3,7 +3,7 @@
  # as: -march=armv2a
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv2s.d b/gas/testsuite/gas/arm/attr-march-armv2s.d

index 67ba746148f41f39bd9d70119342dc6a3b5045ef..63869a2f3a02a3590c65e9ee23d0ad80bb53b228 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv2s.d
+++ b/gas/testsuite/gas/arm/attr-march-armv2s.d
@@ -3,7 +3,7 @@
  # as: -march=armv2s
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv3.d b/gas/testsuite/gas/arm/attr-march-armv3.d

index e3b606c1f771c280422b24f4b4b9b61988a8d389..ff519a37b2bf926dfefdb7163ab564c3ad62d060 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv3.d
+++ b/gas/testsuite/gas/arm/attr-march-armv3.d
@@ -3,7 +3,7 @@
  # as: -march=armv3
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv3m.d b/gas/testsuite/gas/arm/attr-march-armv3m.d

index b3878cdbba978573914ad6c133b1a4db207ad8af..2e4478ec8d930d7be53ea7276a64588f67526ea6 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv3m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv3m.d
@@ -3,7 +3,7 @@
  # as: -march=armv3m
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4.d b/gas/testsuite/gas/arm/attr-march-armv4.d

index c0c3b92bd4827a7ed6eb44bfb8b19805a8cd0042..e6383ba867b8f5e2804c0b2c40b9c8496edb22bd 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv4.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4.d
@@ -3,7 +3,7 @@
  # as: -march=armv4
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4t.d b/gas/testsuite/gas/arm/attr-march-armv4t.d

index c2a5d98a1d74b79dca5356bbdb8c8bf54189f14a..5584d094bcc9cb400f681bae1598242f21f9608f 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv4t.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4t.d
@@ -3,7 +3,7 @@
  # as: -march=armv4t
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4txm.d b/gas/testsuite/gas/arm/attr-march-armv4txm.d

index 2b29db5f8544a87bcecbd193d97910eea20d0f86..b1029fde5c1b915b9ff1b8d3cdd524491bec4d27 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv4txm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4txm.d
@@ -3,7 +3,7 @@
  # as: -march=armv4txm
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv4xm.d b/gas/testsuite/gas/arm/attr-march-armv4xm.d

index b1966019ccccfb5e9f4730893f949c3ddc5777e7..732b03aadf842cb9ae1095604932985ada47ae7a 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv4xm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv4xm.d
@@ -3,7 +3,7 @@
  # as: -march=armv4xm
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5.d b/gas/testsuite/gas/arm/attr-march-armv5.d

index 2ed81c9603b5fc6fccfcea39c455607bd1da5174..673500e279e7835787d803a21fb38ae165b87538 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv5.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5.d
@@ -3,7 +3,7 @@
  # as: -march=armv5
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5t.d b/gas/testsuite/gas/arm/attr-march-armv5t.d

index 23e132468e3041d28dbf45506a883a08ca87af49..81afa5e350eb94b439d4005aafb2ab4c20a25297 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv5t.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5t.d
@@ -3,7 +3,7 @@
  # as: -march=armv5t
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5te.d b/gas/testsuite/gas/arm/attr-march-armv5te.d

index 25699959cb68241473aa671c38ba7401da68f3ad..cf7a965489b8d23d44ab197e729c120d20805580 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv5te.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5te.d
@@ -3,7 +3,7 @@
  # as: -march=armv5te
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5tej.d b/gas/testsuite/gas/arm/attr-march-armv5tej.d

index 780a9f98a9c89676205f0069aa0f5e9c8d8e125e..e8cbbb8131b5374af881849b3138687cb85918d1 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv5tej.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5tej.d
@@ -3,7 +3,7 @@
  # as: -march=armv5tej
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5texp.d b/gas/testsuite/gas/arm/attr-march-armv5texp.d

index 4f3a75f013df5f60c40e5b269d9ef0cf315f2a7b..d5edf244e80d233d1605ce49dbd051356087fe9d 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv5texp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5texp.d
@@ -3,7 +3,7 @@
  # as: -march=armv5texp
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv5txm.d b/gas/testsuite/gas/arm/attr-march-armv5txm.d

index e78ca3fe7eea0397e6627a3013707c0880506348..a4b2dde990a9b22501a7381622e7d8cc337bc124 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv5txm.d
+++ b/gas/testsuite/gas/arm/attr-march-armv5txm.d
@@ -3,7 +3,7 @@
  # as: -march=armv5txm
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6-m+os.d b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d

index e5d320851ca37b391f23e2d8131c0851aa2ab848..ca560925f7730208ec61bec1e14615f573a53bbf 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6-m+os.d
@@ -3,7 +3,7 @@
  # as: -march=armv6-m+os
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6-m.d b/gas/testsuite/gas/arm/attr-march-armv6-m.d

index ad79347398411f7993b03471bf8724f8b75a6c95..5ed99542bfeee9af5fad4966f7661f909a29ed7c 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6-m.d
@@ -3,7 +3,7 @@
  # as: -march=armv6-m
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6.d b/gas/testsuite/gas/arm/attr-march-armv6.d

index f509d5faea647e91e9cd6c4959c3b266d3265487..0c9bad4cca6aff9e950e0c47879914d250420702 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6.d
@@ -3,7 +3,7 @@
  # as: -march=armv6
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6j.d b/gas/testsuite/gas/arm/attr-march-armv6j.d

index d8b37ec8cda6b3664f69d886022abc06d06e503e..b5e43c967ba624c9794195ee9d0bb9ccaa0cf087 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6j.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6j.d
@@ -3,7 +3,7 @@
  # as: -march=armv6j
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6k+sec.d b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d

index a50e8d4cb07a8fa655b9805e60c8427c171ec2ac..318ad1f84524965aad405cd928ac656b26286088 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6k+sec.d
@@ -3,7 +3,7 @@
  # as: -march=armv6k+sec
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6k.d b/gas/testsuite/gas/arm/attr-march-armv6k.d

index 4ff70574b0ad80a8cf5e8ee92c4371153c7098c8..cfdf2aa6e3e341def7932fd17833963d153fab5e 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6k.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6k.d
@@ -3,7 +3,7 @@
  # as: -march=armv6k
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6kt2.d b/gas/testsuite/gas/arm/attr-march-armv6kt2.d

index 43db36b19e76a82e1ec73c8e3cc04c96092205b2..e7e4a677ddb4ebfa219e37b3679d71d73f146810 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6kt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6kt2.d
@@ -3,7 +3,7 @@
  # as: -march=armv6kt2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6s-m.d b/gas/testsuite/gas/arm/attr-march-armv6s-m.d

index ad79347398411f7993b03471bf8724f8b75a6c95..5ed99542bfeee9af5fad4966f7661f909a29ed7c 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6s-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6s-m.d
@@ -3,7 +3,7 @@
  # as: -march=armv6-m
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6t2.d b/gas/testsuite/gas/arm/attr-march-armv6t2.d

index d0074f13a63fc1ed521ec3f52041c806ded866d2..1c82872d5cb07ea09d4eaa3016ebab2cab8c35bb 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6t2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6t2.d
@@ -3,7 +3,7 @@
  # as: -march=armv6t2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6z.d b/gas/testsuite/gas/arm/attr-march-armv6z.d

index 97b14df99139f76af245bf50d991bd42984dae03..2acb12e05ae8b898918dd684974af7c2671cc5a9 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6z.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6z.d
@@ -3,7 +3,7 @@
  # as: -march=armv6z
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zk.d b/gas/testsuite/gas/arm/attr-march-armv6zk.d

index 85f639b44bfb9c80425d7a1095dd1e15f681c746..684f685ea4ac310f50c96b8d6b689e43cf09966d 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6zk.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zk.d
@@ -3,7 +3,7 @@
  # as: -march=armv6zk
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zkt2.d b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d

index 5bc1c722b638981aee970a0b63348edd5b3f7a10..a9c84ee88a6299aa22cdfe45764b8700de16024c 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zkt2.d
@@ -3,7 +3,7 @@
  # as: -march=armv6zkt2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv6zt2.d b/gas/testsuite/gas/arm/attr-march-armv6zt2.d

index 14e2c1202fca81c53645724b61b7c049ceb614b7..2a7ecb11bda60c1034bcb43d7c1b278c840b6143 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv6zt2.d
+++ b/gas/testsuite/gas/arm/attr-march-armv6zt2.d
@@ -3,7 +3,7 @@
  # as: -march=armv6zt2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d b/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d

index 42ce50e205dc0dc29394dae216da31a92335250f..67491619f76048d3c441c4afcc3b9cad8e288160 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-a+idiv
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d

index 74ff80dc3d8aa9286f8498d9fa2bc6663ae5db38..5254306236e9c3123e8ba013469287b8efdbc4e7 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+mp.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-a+mp
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d

index c51e093368ed842490bcaedf2d3cdce2d58e25de..3e7cbef0bc7b1a654fa1b347e32368d93dccdcdf 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-a+sec+virt
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d

index 1d5ed4eb6afafa042469fab22a87a252526a6ca7..8bc332358945fe266f0f04d3d00b8b483fb800bd 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+sec.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-a+sec
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d b/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d

index 9329bc1514c75c0efc62b400bad21781ee0fc255..606f163c190c2bf9e89113182712be392af7cdb7 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a+virt.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-a+virt
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-a.d b/gas/testsuite/gas/arm/attr-march-armv7-a.d

index da687a75f0315f8826d8aac3110586c9a62fbef3..157c765b22f2090c2431e3ca515b1d9643e3b709 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-a.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-a
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-m.d b/gas/testsuite/gas/arm/attr-march-armv7-m.d

index 2fcd549b042d01544f5420fe93251ede4b8cef47..22f10fcced693bd0d277fbc2cb6a2ac2593d083f 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-m.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-m
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d b/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d

index a7fa3c62282afd364ac74275543244ae358aa03a..02308eed3b07d89c789ea8ab18f68f8619298802 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-r+mp.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-r+mp
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7-r.d b/gas/testsuite/gas/arm/attr-march-armv7-r.d

index 18be42d946a3ac3b4fa38e875b8024d8781d8017..b6866c15cdba1e801f82188346c0fe36d7e415d4 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7-r.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7-r.d
@@ -3,7 +3,7 @@
  # as: -march=armv7-r
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7.d b/gas/testsuite/gas/arm/attr-march-armv7.d

index 8ca9e7d6d54ee1cd9f8ef11657f02422551dd91e..fef4aa0d4435b9fe578f49e42580a3f1fd0bfa19 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7.d
@@ -3,7 +3,7 @@
  # as: -march=armv7
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7a.d b/gas/testsuite/gas/arm/attr-march-armv7a.d

index 055b3cfcad050c2b15e3dd7729b9f9d86d1d1a9e..0c2fa8e3b9f2e6cce10df0782d980457a354e097 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7a.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7a.d
@@ -3,7 +3,7 @@
  # as: -march=armv7a
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7em.d b/gas/testsuite/gas/arm/attr-march-armv7em.d

index 5c10c5018acb58eefe4b9f4c52dbe996db569a99..aaaa5082465997b73bce422d1d4fe1840832fd2b 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7em.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7em.d
@@ -3,7 +3,7 @@
  # as: -march=armv7e-m
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7m.d b/gas/testsuite/gas/arm/attr-march-armv7m.d

index ec561261e8c49eb99b678d0f5c57f162504ed630..166054aae364e221c02f3f9dd752780518eb9fd2 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7m.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7m.d
@@ -3,7 +3,7 @@
  # as: -march=armv7m
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-armv7r.d b/gas/testsuite/gas/arm/attr-march-armv7r.d

index 8683f9024f24161487e7c396ca4bea34250e62ab..507d0379e78bc32e3646d22a57681b06bdf593b7 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-armv7r.d
+++ b/gas/testsuite/gas/arm/attr-march-armv7r.d
@@ -3,7 +3,7 @@
  # as: -march=armv7r
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-iwmmxt.d b/gas/testsuite/gas/arm/attr-march-iwmmxt.d

index ccc496164afefcd73d0b40585748206f665673ab..7b72a92ae5d205a0dc574a6f273b285dc9458564 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-iwmmxt.d
+++ b/gas/testsuite/gas/arm/attr-march-iwmmxt.d
@@ -3,7 +3,7 @@
  # as: -march=iwmmxt
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-iwmmxt2.d b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d

index be46d2215347492a2f4295332c5525b0f844addf..279b948cae87732d5d96d64d0898e96ebb56d50b 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
+++ b/gas/testsuite/gas/arm/attr-march-iwmmxt2.d
@@ -3,7 +3,7 @@
  # as: -march=iwmmxt2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-march-xscale.d b/gas/testsuite/gas/arm/attr-march-xscale.d

index 5c80a6d86c47d6a130fa196ed7afd31984cfbde9..38ab9333b991c60dfee7b1a14a79ed7f5e952d3d 100644 (file)
--- a/gas/testsuite/gas/arm/attr-march-xscale.d
+++ b/gas/testsuite/gas/arm/attr-march-xscale.d
@@ -3,7 +3,7 @@
  # as: -march=xscale
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mcpu.d b/gas/testsuite/gas/arm/attr-mcpu.d

index 32da24887e46fefe4e90c68591d57a62189d9bfd..8dacc4f2dc7708fa98a0486b7c2590a91c80f124 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-mcpu.d
@@ -3,7 +3,7 @@
  # as: -mcpu=cortex-a8 -mfpu=neon
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d

index 95ea725dd032534de176671836a7a577ede7355f..9967a15878213510087cb4355fa2661aaa228560 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020e.d
@@ -3,7 +3,7 @@
  # as: -mfpu=arm1020e
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d

index 19b001b926b5164afb919019c8b4756e623315a7..3994381da8c76b39911ff91b7d742942d83c36d4 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1020t.d
@@ -3,7 +3,7 @@
  # as: -mfpu=arm1020t
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d

index f25aebe2122bd2fcf18df1e77398fd5175fb54ca..af3f81c6252b430016fd4af05b41d8431e6098d5 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d
@@ -3,7 +3,7 @@
  # as: -mfpu=arm1136jf-s
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d

index 4b8fce6bdfaf91847ae81602d3c41be1274bb7e2..aff8224ddfb939b0effe44cf2c88c70dc902c21d 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d
@@ -3,7 +3,7 @@
  # as: -mfpu=arm1136jfs
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d b/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d

index 5e14e3f69ce8cfbae7befa5d2b026bd75626e540..a9d967b9fd6714765da71b1d8f14c2bb248ad18f 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d
@@ -3,7 +3,7 @@
  # as: -mfpu=arm7500fe
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa.d b/gas/testsuite/gas/arm/attr-mfpu-fpa.d

index 425e44df1d7e47b658bb8075075e5cd9d0da34cc..8206d98efa6cb3dfbe1cd058e160810cca3b13ac 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpa.d
@@ -3,7 +3,7 @@
  # as: -mfpu=fpa
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa10.d b/gas/testsuite/gas/arm/attr-mfpu-fpa10.d

index 339daf08b44dc443cda6bb88dcc2253d90652509..1552eacd36e2fb754436159547ed6a6ada4a7bbe 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpa10.d
@@ -3,7 +3,7 @@
  # as: -mfpu=fpa10
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpa11.d b/gas/testsuite/gas/arm/attr-mfpu-fpa11.d

index 5b94ac51152595480c84d6fffbd10e70299b68d8..ba28a213b0ec72c038d7cff5a39a0919ce2a6750 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpa11.d
@@ -3,7 +3,7 @@
  # as: -mfpu=fpa11
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe.d b/gas/testsuite/gas/arm/attr-mfpu-fpe.d

index 416bb5bd0bfc630a29d0012f6bc6fc8b3359c8ac..d1e2c2ce0abd989b9bbc2f7a849e3c0461385069 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpe.d
@@ -3,7 +3,7 @@
  # as: -mfpu=fpe
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe2.d b/gas/testsuite/gas/arm/attr-mfpu-fpe2.d

index a34cc6f82b7a2b7122ef78c5d6d1b63bf30c1055..74dd2e8543a48bf079459f6a3a669b5b41b72843 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpe2.d
@@ -3,7 +3,7 @@
  # as: -mfpu=fpe2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-fpe3.d b/gas/testsuite/gas/arm/attr-mfpu-fpe3.d

index c9174549e9412e8e628d7e7ca177cb378de3fcc1..622ad19dc2f88bcaf4d5fc27640e1ce40af5a306 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-fpe3.d
@@ -3,7 +3,7 @@
  # as: -mfpu=fpe3
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-maverick.d b/gas/testsuite/gas/arm/attr-mfpu-maverick.d

index afbbc6ce2e3c445c443fffcb335979334890e28e..ad7142deef2e650f2c40fb36b63bdf1e54b96a5a 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-maverick.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-maverick.d
@@ -3,7 +3,7 @@
  # as: -mfpu=maverick
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d

index 3866572b2834d86bade940534f7d73fbc1227895..0727e49a00f6a43def45bcb0296d6f144cf6b59d 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d
@@ -3,7 +3,7 @@
  # as: -mfpu=neon-fp16
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-neon.d b/gas/testsuite/gas/arm/attr-mfpu-neon.d

index 1d7d33b801b2890893c412892e462a11dcdd55d1..933fdf5580dde3f0b3065188ceeca7884f7741b6 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-neon.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-neon.d
@@ -3,7 +3,7 @@
  # as: -mfpu=neon
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softfpa.d b/gas/testsuite/gas/arm/attr-mfpu-softfpa.d

index d46115bc35c473d5db09af341ab791b2be137028..46ccff67f18384f40293100d60f99f407eca9cbb 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softfpa.d
@@ -3,7 +3,7 @@
  # as: -mfpu=softfpa
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d

index d0524c29aeaba85393413e9f6928f17635d68cde..e6f463b70a3e858dfff218cd06899da619a15cac 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d
@@ -3,7 +3,7 @@
  # as: -mfpu=softvfp+vfp
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-softvfp.d b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d

index bab19b607d337f44dff3c5b0c05e0d40a3406d75..649433a8fa901e4a0fc1e48b4db3f6f7b21950ce 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-softvfp.d
@@ -3,7 +3,7 @@
  # as: -mfpu=softvfp
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp.d b/gas/testsuite/gas/arm/attr-mfpu-vfp.d

index 331b81a18039a85982f40d0a5434ea87a97351e7..303595e5cd71b02801156c4dd69aa3385e29417a 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfp
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d

index 6f89e6abe0985453a2e0aabc2d076616b122fe27..69bc3df6114d7fc7435068cd8130b60df15b96ef 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfp10-r0
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d

index 37af0758170e365750182a9a3384a3283769767b..969097ecd6ec97bb8cd1eceab3dd22e8850b4eb3 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp10.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfp10
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d

index f02d2cdb54beddeb788e62cbf729be7d6aebc911..4a8bf088aee195be39521028b8f91121d8eddcee 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp3.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfp3
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d

index 57f5df7eb22dcaa086fd513616800927b214d1f0..fd0b830ae613c1702ccb83e3e7a3c1bf06609728 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfp9.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfp9
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d

index 678eb9eeb609b3e5691347bde276c2e85d98141e..1e516bbe67e801c0c7b32b589b6300183d8231fc 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv2.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfpv2
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d

index 36d9914bdebab4b1192605cc4986bded92e5c663..16b257c664b72b4449bc7305a2d5ff4d43cc7373 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfpv3-d16
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d

index b6cf496d7dd1083da311419a1785181a4f5d17fe..40adc2f29faf1d58f66e1e1b31652dc7e8823d10 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv3.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfpv3
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d

index 967e912a5428fb3461329494f45cfac25f9b9561..1b0e297e0b06bf21ce0f25035f165aa720e2864a 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfpv4-d16
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d

index fd92773a6a648b7abb9fffd5edaa143829b66ff3..1be304842b7f9c5de87bc718eab3540273de8c56 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpv4.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfpv4
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d

index 6896d17669d4ab0d2bc89153b046a82868f5015f..5b6061cc0d4c013083876a8147c369177737a12b 100644 (file)
--- a/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
+++ b/gas/testsuite/gas/arm/attr-mfpu-vfpxd.d
@@ -3,7 +3,7 @@
  # as: -mfpu=vfpxd
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-names.d b/gas/testsuite/gas/arm/attr-names.d

index 1eddd93724660cfec914f43af98b9be10092e987..b78e79c0faeae674a21db31722c2e0147c8c8f31 100644 (file)
--- a/gas/testsuite/gas/arm/attr-names.d
+++ b/gas/testsuite/gas/arm/attr-names.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-order.d b/gas/testsuite/gas/arm/attr-order.d

index 83f9f68bffbef780358415613d54dff922339891..2451ad22e82c879c6140c65cd4f4db56cc6c46d2 100644 (file)
--- a/gas/testsuite/gas/arm/attr-order.d
+++ b/gas/testsuite/gas/arm/attr-order.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-override-cpu-directive.d b/gas/testsuite/gas/arm/attr-override-cpu-directive.d

index 54c5e37bb1486275912d82b98fe543802c5730f9..fb6333b70d6728bb7a8ba99b3f6a27524024d22e 100644 (file)
--- a/gas/testsuite/gas/arm/attr-override-cpu-directive.d
+++ b/gas/testsuite/gas/arm/attr-override-cpu-directive.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/attr-override-mcpu.d b/gas/testsuite/gas/arm/attr-override-mcpu.d

index cfa11b9d7fcc63bf56c91ddbf8dc228718e7d7a6..7af52e3acbb93a980427d9209067701a9ba74256 100644 (file)
--- a/gas/testsuite/gas/arm/attr-override-mcpu.d
+++ b/gas/testsuite/gas/arm/attr-override-mcpu.d
@@ -3,7 +3,7 @@
  # as: -mcpu=cortex-a8
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/got_prel.d b/gas/testsuite/gas/arm/got_prel.d

index ad74dfc3b2d5b7ad5a09f31e4ee16c1c10d8e457..74a0bb5d44c56769d8e17cadb6660af6a07abc0a 100644 (file)
--- a/gas/testsuite/gas/arm/got_prel.d
+++ b/gas/testsuite/gas/arm/got_prel.d
@@ -2,7 +2,7 @@
  # source: got_prel.s
  # as: -march=armv5te -meabi=5
  # readelf: -x 4 -r
-# target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf
+# target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
  
  Relocation section '.rel.text.foo' at offset 0x3f0 contains 1 entries:
   Offset     Info    Type            Sym.Value  Sym. Name
diff --git a/gas/testsuite/gas/arm/mapdir.d b/gas/testsuite/gas/arm/mapdir.d

index 549fe94cdcf8a3a115687590f1fa7affa8691ccd..bb37a6baa7361571d571e04e2b435e71fa59d354 100644 (file)
--- a/gas/testsuite/gas/arm/mapdir.d
+++ b/gas/testsuite/gas/arm/mapdir.d
@@ -2,7 +2,7 @@
  #objdump: --syms --special-syms -d
  #name: ARM Mapping Symbols for .arm/.thumb
  # This test is only valid on EABI based ports.
-#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf
+#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
  #source: mapdir.s
  
  
diff --git a/gas/testsuite/gas/arm/mapmisc.d b/gas/testsuite/gas/arm/mapmisc.d

index c130b65d3d907899dcabe2ba29eedec9ececb43a..6196b6bd301e3c51b8f6b3437b78ec626062b114 100644 (file)
--- a/gas/testsuite/gas/arm/mapmisc.d
+++ b/gas/testsuite/gas/arm/mapmisc.d
@@ -2,7 +2,7 @@
  #objdump: --syms --special-syms -d
  #name: ARM Mapping Symbols for miscellaneous directives
  # This test is only valid on EABI based ports.
-#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf
+#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
  #source: mapmisc.s
  
  
diff --git a/gas/testsuite/gas/arm/mapsecs.d b/gas/testsuite/gas/arm/mapsecs.d

index 8cd0baf235c72e461844c223ec55bb29b76df671..b0d0421ab330d3e5a059c4391484a0ba0212c0bd 100644 (file)
--- a/gas/testsuite/gas/arm/mapsecs.d
+++ b/gas/testsuite/gas/arm/mapsecs.d
@@ -2,7 +2,7 @@
  #objdump: --syms --special-syms -d
  #name: ARM Mapping Symbols with multiple sections
  # This test is only valid on EABI based ports.
-#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf
+#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
  #source: mapsecs.s
  
  
diff --git a/gas/testsuite/gas/arm/mapshort-eabi.d b/gas/testsuite/gas/arm/mapshort-eabi.d

index 1f920d3e1cfee7bdcb72472e062b69361f6f6730..69a5a223dfe966833fd97a0d68a1567b340e817d 100644 (file)
--- a/gas/testsuite/gas/arm/mapshort-eabi.d
+++ b/gas/testsuite/gas/arm/mapshort-eabi.d
@@ -1,7 +1,7 @@
  #objdump: --syms --special-syms -d
  #name: ARM Mapping Symbols for .short (EABI version)
  # This test is only valid on EABI based ports.
-#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf
+#target: *-*-*eabi *-*-symbianelf *-*-linux-* *-*-elf *-*-nacl*
  #source: mapshort.s
  
  # Test the generation and use of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/mapshort-elf.d b/gas/testsuite/gas/arm/mapshort-elf.d

index 38b290e687cfb0fd35cf1fd0e604317e1a39c4dc..b0b62cf876cfde962d8e1e2aa9a74b3ff0abde1f 100644 (file)
--- a/gas/testsuite/gas/arm/mapshort-elf.d
+++ b/gas/testsuite/gas/arm/mapshort-elf.d
@@ -1,7 +1,7 @@
  #objdump: --syms --special-syms -d
  #name: ARM Mapping Symbols for .short (ELF version)
  # This test is only valid on ELF based ports.
-#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf *-*-linux-* *-*-vxworks *-*-elf
+#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* *-*-*eabi *-*-syymbianelf *-*-linux-* *-*-vxworks *-*-elf *-*-nacl*
  #source: mapshort.s
  
  # Test the generation and use of ARM ELF Mapping Symbols
diff --git a/gas/testsuite/gas/arm/mov-highregs-any.d b/gas/testsuite/gas/arm/mov-highregs-any.d

index 0759de09eb1e370764b6404b6b02e43f9defff37..1f874be4d69022f59d128ae0ef344140591f3648 100644 (file)
--- a/gas/testsuite/gas/arm/mov-highregs-any.d
+++ b/gas/testsuite/gas/arm/mov-highregs-any.d
@@ -1,6 +1,6 @@
  # name: MOV highregs
  # readelf: -A
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  Attribute Section: aeabi
  File Attributes
    Tag_CPU_arch: v4T
diff --git a/gas/testsuite/gas/arm/mov-lowregs-any.d b/gas/testsuite/gas/arm/mov-lowregs-any.d

index a6382f17f4401d1d26bf6481f7cacec06c0170e7..8751335c861072bdfd5469c38a629d6770344364 100644 (file)
--- a/gas/testsuite/gas/arm/mov-lowregs-any.d
+++ b/gas/testsuite/gas/arm/mov-lowregs-any.d
@@ -1,8 +1,7 @@
  # name: MOV lowregs
  # readelf: -A
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  Attribute Section: aeabi
  File Attributes
    Tag_CPU_arch: v6
    Tag_THUMB_ISA_use: Thumb-1
-
diff --git a/gas/testsuite/gas/arm/pr12198-1.d b/gas/testsuite/gas/arm/pr12198-1.d

index 5bbd828b2dc20c992f8a901d80d2af2999c637b7..ec5f1390ff77bab47be5cce03d844491771003ec 100644 (file)
--- a/gas/testsuite/gas/arm/pr12198-1.d
+++ b/gas/testsuite/gas/arm/pr12198-1.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/pr12198-2.d b/gas/testsuite/gas/arm/pr12198-2.d

index 6935bcfea939eb4260ad17e88946d497a2dddae5..fc7cfa7ea8c87178a561a38c20dd3726349b7d45 100644 (file)
--- a/gas/testsuite/gas/arm/pr12198-2.d
+++ b/gas/testsuite/gas/arm/pr12198-2.d
@@ -3,7 +3,7 @@
  # as:
  # readelf: -A
  # This test is only valid on EABI based ports.
-# target: *-*-*eabi
+# target: *-*-*eabi *-*-nacl*
  
  Attribute Section: aeabi
  File Attributes
diff --git a/gas/testsuite/gas/arm/thumb-eabi.d b/gas/testsuite/gas/arm/thumb-eabi.d

index 9fd77d196743af1b71ad762a25346808b96c0d79..602dafb9f4c38807b51a5e80245c912a73f41516 100644 (file)
--- a/gas/testsuite/gas/arm/thumb-eabi.d
+++ b/gas/testsuite/gas/arm/thumb-eabi.d
@@ -2,7 +2,7 @@
  # as: -mcpu=arm7t
  # objdump: -dr --prefix-addresses --show-raw-insn
  # source: thumb.s
-# target: *-*-*eabi *-*-symbianelf
+# target: *-*-*eabi *-*-symbianelf *-*-nacl*
  
  .*: +file format .*arm.*
  
diff --git a/gas/testsuite/gas/arm/thumb.d b/gas/testsuite/gas/arm/thumb.d

index 6d88508a42a481d18dfd046b51650e5f54edf9d2..514152bba06bf46dcd7b085688c1495717975d82 100644 (file)
--- a/gas/testsuite/gas/arm/thumb.d
+++ b/gas/testsuite/gas/arm/thumb.d
@@ -3,7 +3,7 @@
  # objdump: -dr --prefix-addresses --show-raw-insn
  # The arm-aout and arm-pe ports do not support Thumb branch relocations.
  # EABI targets have their own variant.
-# not-target: *-*-*aout* *-*-pe *-*-*eabi *-*-symbianelf
+# not-target: *-*-*aout* *-*-pe *-*-*eabi *-*-symbianelf *-*-nacl*
  
  .*: +file format .*arm.*
  
diff --git a/gas/testsuite/gas/arm/thumbrel.d b/gas/testsuite/gas/arm/thumbrel.d

index fff41af9cc984ded5f148a86bc2a141d198e28c3..a87353ec6879ac2518bacac9f026687af5f6ed8f 100644 (file)
--- a/gas/testsuite/gas/arm/thumbrel.d
+++ b/gas/testsuite/gas/arm/thumbrel.d
@@ -1,6 +1,6 @@
  #objdump: -sr
  # This test is only valid on EABI based ports.
-#target: *-*-*eabi *-*-symbianelf
+#target: *-*-*eabi *-*-symbianelf *-*-nacl*
  
  .*:     file format.*
  
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp

index 9b7cc8f3892a318beb74ff443ec82bfc85f68fa1..15d4407aa791084ebabfdeb08791448a4f8331f7 100644 (file)
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -61,6 +61,7 @@ if { [is_elf_format] } then {
  
         if { ([istarget "*-*-*eabi"]
               || [istarget "*-*-linux-*"]
+             || [istarget "*-*-nacl*"]
               || [istarget "*-*-symbianelf"])} then {
             set target_machine -armeabi
         } else {
diff --git a/ld/ChangeLog b/ld/ChangeLog

index b97aa868a3c6b6f018cf7cadf460c98041dad59d..1a1b7298ae70c42f337c244217751bc75abcbb42 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2012-04-12  Roland McGrath  <mcgrathr@google.com>
+
+       * configure.tgt (arm*-*-nacl*, arm*b-*-nacl*): Handle them.
+       * emulparams/armelf_nacl.sh: New file.
+       * emulparams/armelfb_nacl.sh: New file.
+       * Makefile.am (ALL_EMULATION_SOURCES): Add earmelf_nacl.c
+       and earmelfb_nacl.c here.
+       (earmelf_nacl.c, earmelfb_nacl.c): New targets.
+       * Makefile.in: Regenerated.
+
  2012-04-11  Tristan Gingold  <gingold@adacore.com>
  
         * scripttempl/ia64vms.sc: New file.
diff --git a/ld/Makefile.am b/ld/Makefile.am

index df7ab98d22ee105e99a67c83377126b8c9130831..abb16aa02f07fde562397b1dc71c3ae7940cad04 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -143,11 +143,13 @@ ALL_EMULATION_SOURCES = \
         earmelf_fbsd.c \
         earmelf_linux.c \
         earmelf_linux_eabi.c \
+       earmelf_nacl.c \
         earmelf_nbsd.c \
         earmelf_vxworks.c \
         earmelfb.c \
         earmelfb_linux.c \
         earmelfb_linux_eabi.c \
+       earmelfb_nacl.c \
         earmelfb_nbsd.c \
         earmnbsd.c \
         earmnto.c \
@@ -712,6 +714,12 @@ earmelf_linux_eabi.c: $(srcdir)/emulparams/armelf_linux_eabi.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
         ${GENSCRIPTS} armelf_linux_eabi "$(tdir_armelf_linux_abi)"
+earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
+  $(srcdir)/emulparams/armelf_linux_eabi.sh \
+  $(srcdir)/emulparams/armelf_linux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+       ${GENSCRIPTS} armelf_nacl "$(tdir_armelf_nacl)"
  earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
    $(srcdir)/emulparams/armelf.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
@@ -738,6 +746,13 @@ earmelfb_linux_eabi.c: $(srcdir)/emulparams/armelfb_linux_eabi.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
         ${GENSCRIPTS} armelfb_linux_eabi "$(tdir_armelfb_linux_abi)"
+earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
+  $(srcdir)/emulparams/armelf_nacl.sh \
+  $(srcdir)/emulparams/armelf_linux_eabi.sh \
+  $(srcdir)/emulparams/armelf_linux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+       ${GENSCRIPTS} armelfb_nacl "$(tdir_armelfb_nacl)"
  earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
    $(srcdir)/emulparams/armelf_nbsd.sh \
    $(srcdir)/emulparams/armelf.sh \
diff --git a/ld/Makefile.in b/ld/Makefile.in

index af27d3f8f3368e3f2d9c80ff6c0cf9ad79ab00c6..2c001c7c15f001f8743489baca38e0c3f802d9b9 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -450,11 +450,13 @@ ALL_EMULATION_SOURCES = \
         earmelf_fbsd.c \
         earmelf_linux.c \
         earmelf_linux_eabi.c \
+       earmelf_nacl.c \
         earmelf_nbsd.c \
         earmelf_vxworks.c \
         earmelfb.c \
         earmelfb_linux.c \
         earmelfb_linux_eabi.c \
+       earmelfb_nacl.c \
         earmelfb_nbsd.c \
         earmnbsd.c \
         earmnto.c \
@@ -1065,11 +1067,13 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_fbsd.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_linux_eabi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nacl.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_nbsd.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelf_vxworks.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_linux_eabi.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nacl.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmelfb_nbsd.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnbsd.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/earmnto.Po@am__quote@
@@ -2175,6 +2179,12 @@ earmelf_linux_eabi.c: $(srcdir)/emulparams/armelf_linux_eabi.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
         ${GENSCRIPTS} armelf_linux_eabi "$(tdir_armelf_linux_abi)"
+earmelf_nacl.c: $(srcdir)/emulparams/armelf_nacl.sh \
+  $(srcdir)/emulparams/armelf_linux_eabi.sh \
+  $(srcdir)/emulparams/armelf_linux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+       ${GENSCRIPTS} armelf_nacl "$(tdir_armelf_nacl)"
  earmelf_nbsd.c: $(srcdir)/emulparams/armelf_nbsd.sh \
    $(srcdir)/emulparams/armelf.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
@@ -2201,6 +2211,13 @@ earmelfb_linux_eabi.c: $(srcdir)/emulparams/armelfb_linux_eabi.sh \
    $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
    $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
         ${GENSCRIPTS} armelfb_linux_eabi "$(tdir_armelfb_linux_abi)"
+earmelfb_nacl.c: $(srcdir)/emulparams/armelfb_nacl.sh \
+  $(srcdir)/emulparams/armelf_nacl.sh \
+  $(srcdir)/emulparams/armelf_linux_eabi.sh \
+  $(srcdir)/emulparams/armelf_linux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+       ${GENSCRIPTS} armelfb_nacl "$(tdir_armelfb_nacl)"
  earmelfb_nbsd.c: $(srcdir)/emulparams/armelfb_nbsd.sh \
    $(srcdir)/emulparams/armelf_nbsd.sh \
    $(srcdir)/emulparams/armelf.sh \
diff --git a/ld/configure.tgt b/ld/configure.tgt

index abb47065fe50267a3517ee9860a7dba8004fefbb..c36ec511a6a8ff7722ecda9990fbf8cec80d6284 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -87,6 +87,18 @@ arm*-*-linux-*)              targ_emul=armelf_linux
                         targ_extra_emuls="armelf armelfb armelfb_linux"
                         targ_extra_libpath="armelfb_linux"
                         ;;
+arm*b-*-nacl*)         targ_emul=armelfb_nacl
+                       targ_extra_emuls="armelf_nacl elf_i386_nacl"
+                       targ_extra_libpath=$targ_extra_emuls
+                       targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
+                       targ64_extra_libpath=$targ64_extra_emuls
+                       ;;
+arm*-*-nacl*)          targ_emul=armelf_nacl
+                       targ_extra_emuls="armelfb_nacl elf_i386_nacl"
+                       targ_extra_libpath=$targ_extra_emuls
+                       targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
+                       targ64_extra_libpath=$targ64_extra_emuls
+                       ;;
  arm*-*-uclinux*eabi*)  targ_emul=armelf_linux_eabi
                         targ_extra_emuls=armelfb_linux_eabi
                         targ_extra_libpath=$targ_extra_emuls
@@ -282,12 +294,14 @@ i[3-7]86-*-vxworks*)      targ_emul=elf_i386_vxworks ;;
  i[3-7]86-*-chaos)      targ_emul=elf_i386_chaos
                         ;;
  i[3-7]86-*-nacl*)      targ_emul=elf_i386_nacl
+                       targ_extra_emuls="armelf_nacl armelfb_nacl"
+                       targ_extra_libpath=$targ_extra_emuls
                         targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
-                       targ64_extra_libpath="elf32_x86_64_nacl elf_x86_64_nacl"
+                       targ64_extra_libpath=$targ64_extra_emuls
                         ;;
  x86_64-*-nacl*)                targ_emul=elf32_x86_64_nacl
-                       targ_extra_emuls="elf_i386_nacl elf_x86_64_nacl"
-                       targ_extra_libpath="elf_i386_nacl elf_x86_64_nacl"
+                       targ_extra_emuls="elf_i386_nacl elf_x86_64_nacl armelf_nacl armelfb_nacl"
+                       targ_extra_libpath=$targ_extra_emuls
                         tdir_elf_i386_nacl=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
                         ;;
  i860-*-coff)           targ_emul=coff_i860 ;;
diff --git a/ld/emulparams/armelf_nacl.sh b/ld/emulparams/armelf_nacl.sh

new file mode 100644 (file)

index 0000000..9319577
--- /dev/null
+++ b/ld/emulparams/armelf_nacl.sh
@@ -0,0 +1,5 @@
+. ${srcdir}/emulparams/armelf_linux_eabi.sh
+. ${srcdir}/emulparams/elf_nacl.sh
+BIG_OUTPUT_FORMAT="elf32-bigarm-nacl"
+LITTLE_OUTPUT_FORMAT="elf32-littlearm-nacl"
+OUTPUT_FORMAT="$LITTLE_OUTPUT_FORMAT"
diff --git a/ld/emulparams/armelfb_nacl.sh b/ld/emulparams/armelfb_nacl.sh

new file mode 100644 (file)

index 0000000..df4089a
--- /dev/null
+++ b/ld/emulparams/armelfb_nacl.sh
@@ -0,0 +1,2 @@
+. ${srcdir}/emulparams/armelf_nacl.sh
+OUTPUT_FORMAT="$BIG_OUTPUT_FORMAT"
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog

index 122924c12bb8459c2821bd052c80ec59d571654f..dfdda87c80bf402c757e4b42da8b188483441115 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,56 @@
+2012-04-12  Roland McGrath  <mcgrathr@google.com>
+
+       * ld-arm/arm-elf.exp (armelftests): Split out into ...
+       (armelftests_common, armelftests_nonacl): ... these two.
+       (armeabitests): Split out into ...
+       (armeabitests_common, armeabitests_nonacl): ... these two.
+       Omit _nonacl sets for arm*-*-nacl* targets.
+
+       * ld-arm/farcall-mix.d: Don't match exact addresses, only symbolic ones.
+       * ld-arm/farcall-mix2.d: Likewise.
+       * ld-arm/farcall-group.d: Likewise.
+
+       * ld-arm/tls-gdesc-got.d: Match variant file formats too.
+       Accept some variation in exact addresses.
+
+       * ld-arm/thumb2-b-interwork.d: Match variant file formats too.
+       Fix regexps not to care about exact addresses where not relevant.
+
+       * ld-arm/thumb2-bl-undefweak.d: Match any hex strings, not any
+       strings of particular exact lengths.
+       * ld-arm/thumb2-bl-undefweak1.d: Likewise.
+
+       * ld-arm/arm-app.r: Match variant file formats too.
+       * ld-arm/arm-app-abs32.r: Likewise.
+       * ld-arm/arm-lib.d: Likewise.
+       * ld-arm/arm-lib.r: Likewise.
+       * ld-arm/arm-static-app.r: Likewise.
+       * ld-arm/armv4-bx.d: Likewise.
+       * ld-arm/data-only-map.d: Likewise.
+       * ld-arm/group-relocs.d: Likewise.
+       * ld-arm/jump19.d: Likewise.
+       * ld-arm/reloc-boundaries.d: Likewise.
+       * ld-arm/thumb1-bl.d: Likewise.
+       * ld-arm/thumb2-bl.d: Likewise.
+       * ld-arm/tls-app.d: Likewise.
+       * ld-arm/tls-app.r: Likewise.
+       * ld-arm/tls-gdierelax.d: Likewise.
+       * ld-arm/tls-gdierelax2.d: Likewise.
+       * ld-arm/tls-gdlerelax.d: Likewise.
+       * ld-arm/tls-lib.d: Likewise.
+       * ld-arm/tls-lib.r: Likewise.
+       * ld-arm/tls-mixed.r: Likewise.
+       * ld-arm/vfp11-fix-none.d: Likewise.
+       * ld-arm/vfp11-fix-scalar.d: Likewise.
+       * ld-arm/vfp11-fix-vector.d: Likewise.
+       * ld-arm/arm-static-app.d: Likewise.
+       Fix regexps not to care about exact number of leading spaces.
+       * ld-arm/arm-app-abs32.d: Likewise.
+       * ld-arm/fix-arm1176-off.d: Likewise.
+       * ld-arm/fix-arm1176-on.d: Likewise.
+
+       * ld-arm/arm-elf.exp: Treat nacl targets like eabi targets.
+
  2012-04-09  Roland McGrath  <mcgrathr@google.com>
  
         * ld-elf/eh1.d: Add explicit --64 to as options, and explicit
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.d b/ld/testsuite/ld-arm/arm-app-abs32.d

index dbee189625bb2f99073ae795c4b119b7b9d65d37..dbfc7ede65b257832a77e5c52c353ace9edf4aa8 100644 (file)
--- a/ld/testsuite/ld-arm/arm-app-abs32.d
+++ b/ld/testsuite/ld-arm/arm-app-abs32.d
@@ -1,5 +1,5 @@
  
-tmpdir/arm-app-abs32:     file format elf32-(little|big)arm
+tmpdir/arm-app-abs32:     file format elf32-(little|big)arm.*
  architecture: arm, flags 0x00000112:
  EXEC_P, HAS_SYMS, D_PAGED
  start address .*
@@ -7,23 +7,23 @@ start address .*
  Disassembly of section .plt:
  
  .* <.plt>:
-    .*:        e52de004        push    {lr}            ; \(str lr, \[sp, #-4\]!\)
-    .*:        e59fe004        ldr     lr, \[pc, #4\]  ; .* <_start-0x10>
-    .*:        e08fe00e        add     lr, pc, lr
-    .*:        e5bef008        ldr     pc, \[lr, #8\]!
-    .*:        .*      .*
-    .*:        e28fc6.*        add     ip, pc, #.*
-    .*:        e28cca.*        add     ip, ip, #.*     ; .*
-    .*:        e5bcf.*         ldr     pc, \[ip, #.*\]!.*
+ +.*:  e52de004        push    {lr}            ; \(str lr, \[sp, #-4\]!\)
+ +.*:  e59fe004        ldr     lr, \[pc, #4\]  ; .* <_start-0x10>
+ +.*:  e08fe00e        add     lr, pc, lr
+ +.*:  e5bef008        ldr     pc, \[lr, #8\]!
+ +.*:  .*      .*
+ +.*:  e28fc6.*        add     ip, pc, #.*
+ +.*:  e28cca.*        add     ip, ip, #.*     ; .*
+ +.*:  e5bcf.*         ldr     pc, \[ip, #.*\]!.*
  Disassembly of section .text:
  
  .* <_start>:
-    .*:        e1a0c00d        mov     ip, sp
-    .*:        e92dd800        push    {fp, ip, lr, pc}
-    .*:        e59f0004        ldr     r0, \[pc, #4\]  ; .* <_start\+0x14>
-    .*:        e89d6800        ldm     sp, {fp, sp, lr}
-    .*:        e12fff1e        bx      lr
-    .*:        .*      .*
+ +.*:  e1a0c00d        mov     ip, sp
+ +.*:  e92dd800        push    {fp, ip, lr, pc}
+ +.*:  e59f0004        ldr     r0, \[pc, #4\]  ; .* <_start\+0x14>
+ +.*:  e89d6800        ldm     sp, {fp, sp, lr}
+ +.*:  e12fff1e        bx      lr
+ +.*:  .*      .*
  
  .* <app_func2>:
-    .*:        e12fff1e        bx      lr
+ +.*:  e12fff1e        bx      lr
diff --git a/ld/testsuite/ld-arm/arm-app-abs32.r b/ld/testsuite/ld-arm/arm-app-abs32.r

index 08d668c297953bd5919aa45feb4f06b2d66c1a6a..fd68a0cc36a991723e09ac833b2fd8fe27f2c10a 100644 (file)
--- a/ld/testsuite/ld-arm/arm-app-abs32.r
+++ b/ld/testsuite/ld-arm/arm-app-abs32.r
@@ -1,5 +1,5 @@
  
-tmpdir/arm-app-abs32:     file format elf32-(little|big)arm
+tmpdir/arm-app-abs32:     file format elf32-(little|big)arm.*
  
  DYNAMIC RELOCATION RECORDS
  OFFSET   TYPE              VALUE 
diff --git a/ld/testsuite/ld-arm/arm-app.r b/ld/testsuite/ld-arm/arm-app.r

index 4b25e70c0343c2e8e587647c47b3559dff6ca098..1b5cef2bab6e341d62d4cc7f2d9c554373d73f39 100644 (file)
--- a/ld/testsuite/ld-arm/arm-app.r
+++ b/ld/testsuite/ld-arm/arm-app.r
@@ -1,5 +1,5 @@
  
-tmpdir/arm-app.*:     file format elf32-(little|big)arm
+tmpdir/arm-app.*:     file format elf32-(little|big)arm.*
  
  DYNAMIC RELOCATION RECORDS
  OFFSET   TYPE              VALUE 
diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp

index 789c7425f2ffb5b3f528ffed41234c22216795bd..1ffe3441e1fb581d3a4d8993193fb7db5200e533 100644 (file)
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -1,5 +1,5 @@
  # Expect script for various ARM ELF tests.
-#   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012
  #   Free Software Foundation, Inc.
  #
  # This file is part of the GNU Binutils.
@@ -67,19 +67,13 @@ if { ![is_elf_format] || ![istarget "arm*-*-*"] } {
  # nm: Apply nm options on result.  Compare with regex (last arg).
  # readelf: Apply readelf options on result.  Compare with regex (last arg).
  
-set armelftests {
+set armelftests_common {
      {"Group relocations" "-Ttext 0x8000 --section-start zero=0x0 --section-start alpha=0xeef0 --section-start beta=0xffeef0" "" {group-relocs.s}
       {{objdump -dr group-relocs.d}}
       "group-relocs"}
      {"Thumb-1 BL" "-Ttext 0x1000 --section-start .foo=0x401000" "" {thumb1-bl.s}
       {{objdump -dr thumb1-bl.d}}
       "thumb1-bl"}
-    {"Simple non-PIC shared library" "-shared" "" {arm-lib.s}
-     {{objdump -fdw arm-lib.d} {objdump -Rw arm-lib.r}}
-     "arm-lib.so"}
-    {"Simple PIC shared library" "-shared" "" {arm-lib-plt32.s}
-     {{objdump -fdw arm-lib-plt32.d} {objdump -Rw arm-lib-plt32.r}}
-     "arm-lib-plt32.so"}
      {"Indirect cross-library function reference (set-up)"
       "-shared" "" {arm-lib-plt-2a.s}
       {}
@@ -88,34 +82,9 @@ set armelftests {
       "-shared tmpdir/arm-lib-plt-2a.so" "" {arm-lib-plt-2b.s}
       {{objdump -dr arm-lib-plt-2.dd} {readelf --relocs arm-lib-plt-2.rd}}
       "arm-lib-plt-2b.so"}
-    {"Simple dynamic application" "tmpdir/arm-lib.so" "" {arm-app.s}
-     {{objdump -fdw arm-app.d} {objdump -Rw arm-app.r}}
-     "arm-app"}
      {"Simple static application" "" "" {arm-static-app.s}
       {{objdump -fdw arm-static-app.d} {objdump -rw arm-static-app.r}}
       "arm-static-app"}
-    {"Non-pcrel function reference" "tmpdir/arm-lib.so" "" {arm-app-abs32.s}
-     {{objdump -fdw arm-app-abs32.d} {objdump -Rw arm-app-abs32.r}}
-     "arm-app-abs32"}
-    {"Thumb shared library with ARM entry points" "-shared -T arm-lib.ld" "-mthumb-interwork"
-     {mixed-lib.s}
-     {{objdump -fdw armthumb-lib.d} {readelf -Ds armthumb-lib.sym}}
-     "armthumb-lib.so"}
-    {"Mixed ARM/Thumb shared library" "-shared -T arm-lib.ld -use-blx" ""
-     {mixed-lib.s}
-     {{objdump -fdw mixed-lib.d} {objdump -Rw mixed-lib.r}
-      {readelf -Ds mixed-lib.sym}}
-     "mixed-lib.so"}
-    {"Mixed ARM/Thumb dynamic application" "tmpdir/mixed-lib.so -T arm-dyn.ld" ""
-     {mixed-app.s}
-     {{objdump -fdw mixed-app.d} {objdump -Rw mixed-app.r}
-      {readelf -Ds mixed-app.sym}}
-     "mixed-app"}
-    {"Mixed ARM/Thumb arch5 dynamic application" "tmpdir/mixed-lib.so -T arm-dyn.ld --use-blx" ""
-     {mixed-app.s}
-     {{objdump -fdw mixed-app-v5.d} {objdump -Rw mixed-app.r}
-      {readelf -Ds mixed-app.sym}}
-     "mixed-app-v5"}
      {"target1-abs" "-static --target1-abs -T arm.ld" "" {arm-target1.s}
       {{objdump -s arm-target1-abs.d}}
       "arm-target1-abs"}
@@ -149,12 +118,6 @@ set armelftests {
      {"TLS gnu shared library got" "-shared -T arm-dyn.ld" "" {tls-gdesc-got.s}
       {{objdump "-fDR -j .got" tls-gdesc-got.d}}
       "tls-lib2-got.so"}
-    {"TLS gnu shared library inlined trampoline" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" {tls-descseq.s}
-     {{objdump -fdw tls-descseq.d} {objdump -Rw tls-descseq.r}}
-     "tls-lib2inline.so"}
-    {"TLS shared library gdesc local" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" {tls-lib-loc.s}
-     {{objdump -fdw tls-lib-loc.d} {objdump -Rw tls-lib-loc.r}}
-     "tls-lib-loc.so"}
      {"TLS gnu GD to IE relaxation" "-static -T arm-dyn.ld" "" {tls-gdierelax.s}
       {{objdump -fdw tls-gdierelax.d}}
       "tls-app-rel-ie"}
@@ -210,38 +173,18 @@ set armelftests {
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-fix-b.s}
       {{objdump -dr cortex-a8-fix-b.d}}
       "cortex-a8-fix-b"}
-    {"Cortex-A8 erratum fix, b.w to PLT"
-     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
-     {cortex-a8-fix-b-plt.s}
-     {{objdump -dr cortex-a8-fix-b-plt.d}}
-     "cortex-a8-fix-b-plt"}
      {"Cortex-A8 erratum fix, bl.w"
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-fix-bl.s}
       {{objdump -dr cortex-a8-fix-bl.d}}
       "cortex-a8-fix-bl"}
-    {"Cortex-A8 erratum fix, bl.w to PLT"
-     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
-     {cortex-a8-fix-bl-plt.s}
-     {{objdump -dr cortex-a8-fix-bl-plt.d}}
-     "cortex-a8-fix-bl-plt"}
      {"Cortex-A8 erratum fix, bcc.w"
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-fix-bcc.s}
       {{objdump -dr cortex-a8-fix-bcc.d}}
       "cortex-a8-fix-bcc"}
-    {"Cortex-A8 erratum fix, bcc.w to PLT"
-     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
-     {cortex-a8-fix-bcc-plt.s}
-     {{objdump -dr cortex-a8-fix-bcc-plt.d}}
-     "cortex-a8-fix-bcc-plt"}
      {"Cortex-A8 erratum fix, blx.w"
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-fix-blx.s}
       {{objdump -dr cortex-a8-fix-blx.d}}
       "cortex-a8-fix-blx"}
-    {"Cortex-A8 erratum fix, blx.w to PLT"
-     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
-     {cortex-a8-fix-blx-plt.s}
-     {{objdump -dr cortex-a8-fix-blx-plt.d}}
-     "cortex-a8-fix-blx-plt"}
      {"Cortex-A8 erratum fix, relocate b.w to ARM"
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-arm-target.s cortex-a8-fix-b-rel.s}
       {{objdump -dr cortex-a8-fix-b-rel-arm.d}}
@@ -258,11 +201,6 @@ set armelftests {
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
       {{objdump -dr cortex-a8-fix-bl-rel-thumb.d}}
       "cortex-a8-fix-bl-rel-thumb"}
-    {"Cortex-A8 erratum fix, relocate bl.w to PLT"
-     "-EL --section-start=.plt=0x8e00 -Ttext=0x8f00 --fix-cortex-a8 -shared"
-     "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
-     {{objdump -dr cortex-a8-fix-bl-rel-plt.d}}
-     "cortex-a8-fix-bl-rel-thumb"}
      {"Cortex-A8 erratum fix, relocate b<cond>.w to Thumb"
       "-EL -Ttext=0x8f00 --fix-cortex-a8" "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bcc-rel.s}
       {{objdump -dr cortex-a8-fix-bcc-rel-thumb.d}}
@@ -334,6 +272,74 @@ set armelftests {
       "" {exec-got-1b.s}
       {{readelf --relocs exec-got-1.d}}
       "exec-got-1"}
+    {"abs call" "-T arm.ld" "" {abs-call-1.s}
+     {{objdump -d abs-call-1.d}}
+     "abs-call-1"}
+}
+
+set armelftests_nonacl {
+    {"Simple non-PIC shared library" "-shared" "" {arm-lib.s}
+     {{objdump -fdw arm-lib.d} {objdump -Rw arm-lib.r}}
+     "arm-lib.so"}
+    {"Simple PIC shared library" "-shared" "" {arm-lib-plt32.s}
+     {{objdump -fdw arm-lib-plt32.d} {objdump -Rw arm-lib-plt32.r}}
+     "arm-lib-plt32.so"}
+    {"Simple dynamic application" "tmpdir/arm-lib.so" "" {arm-app.s}
+     {{objdump -fdw arm-app.d} {objdump -Rw arm-app.r}}
+     "arm-app"}
+    {"Non-pcrel function reference" "tmpdir/arm-lib.so" "" {arm-app-abs32.s}
+     {{objdump -fdw arm-app-abs32.d} {objdump -Rw arm-app-abs32.r}}
+     "arm-app-abs32"}
+    {"Thumb shared library with ARM entry points" "-shared -T arm-lib.ld" "-mthumb-interwork"
+     {mixed-lib.s}
+     {{objdump -fdw armthumb-lib.d} {readelf -Ds armthumb-lib.sym}}
+     "armthumb-lib.so"}
+    {"Mixed ARM/Thumb shared library" "-shared -T arm-lib.ld -use-blx" ""
+     {mixed-lib.s}
+     {{objdump -fdw mixed-lib.d} {objdump -Rw mixed-lib.r}
+      {readelf -Ds mixed-lib.sym}}
+     "mixed-lib.so"}
+    {"Mixed ARM/Thumb dynamic application" "tmpdir/mixed-lib.so -T arm-dyn.ld" ""
+     {mixed-app.s}
+     {{objdump -fdw mixed-app.d} {objdump -Rw mixed-app.r}
+      {readelf -Ds mixed-app.sym}}
+     "mixed-app"}
+    {"Mixed ARM/Thumb arch5 dynamic application" "tmpdir/mixed-lib.so -T arm-dyn.ld --use-blx" ""
+     {mixed-app.s}
+     {{objdump -fdw mixed-app-v5.d} {objdump -Rw mixed-app.r}
+      {readelf -Ds mixed-app.sym}}
+     "mixed-app-v5"}
+    {"TLS gnu shared library inlined trampoline" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" {tls-descseq.s}
+     {{objdump -fdw tls-descseq.d} {objdump -Rw tls-descseq.r}}
+     "tls-lib2inline.so"}
+    {"TLS shared library gdesc local" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" {tls-lib-loc.s}
+     {{objdump -fdw tls-lib-loc.d} {objdump -Rw tls-lib-loc.r}}
+     "tls-lib-loc.so"}
+    {"Cortex-A8 erratum fix, b.w to PLT"
+     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
+     {cortex-a8-fix-b-plt.s}
+     {{objdump -dr cortex-a8-fix-b-plt.d}}
+     "cortex-a8-fix-b-plt"}
+    {"Cortex-A8 erratum fix, bl.w to PLT"
+     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
+     {cortex-a8-fix-bl-plt.s}
+     {{objdump -dr cortex-a8-fix-bl-plt.d}}
+     "cortex-a8-fix-bl-plt"}
+    {"Cortex-A8 erratum fix, bcc.w to PLT"
+     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
+     {cortex-a8-fix-bcc-plt.s}
+     {{objdump -dr cortex-a8-fix-bcc-plt.d}}
+     "cortex-a8-fix-bcc-plt"}
+    {"Cortex-A8 erratum fix, blx.w to PLT"
+     "-EL -Tcortex-a8-fix-plt.ld --fix-cortex-a8 -shared" "-EL"
+     {cortex-a8-fix-blx-plt.s}
+     {{objdump -dr cortex-a8-fix-blx-plt.d}}
+     "cortex-a8-fix-blx-plt"}
+    {"Cortex-A8 erratum fix, relocate bl.w to PLT"
+     "-EL --section-start=.plt=0x8e00 -Ttext=0x8f00 --fix-cortex-a8 -shared"
+     "-EL" {cortex-a8-thumb-target.s cortex-a8-fix-bl-rel.s}
+     {{objdump -dr cortex-a8-fix-bl-rel-plt.d}}
+     "cortex-a8-fix-bl-rel-thumb"}
      {"IFUNC test 1" "-T ifunc-static.ld" "" {ifunc-1.s}
       {{objdump -d ifunc-1.dd}
        {objdump {-s -j.data -j.got} ifunc-1.gd}
@@ -416,12 +422,13 @@ set armelftests {
        {objdump {-s -j.data -j.got} ifunc-16.gd}
        {readelf -r ifunc-16.rd}}
       "ifunc-16"}
-    {"abs call" "-T arm.ld" "" {abs-call-1.s}
-     {{objdump -d abs-call-1.d}}
-     "abs-call-1"}
  }
  
-run_ld_link_tests $armelftests
+run_ld_link_tests $armelftests_common
+if { ![istarget "arm*-*-nacl*"] } {
+    run_ld_link_tests $armelftests_nonacl
+}
+
  run_dump_test "group-relocs-alu-bad"
  run_dump_test "group-relocs-ldr-bad"
  run_dump_test "group-relocs-ldrs-bad"
@@ -436,7 +443,7 @@ run_dump_test "movw-shared-4"
  
  # Exclude non-ARM-EABI targets.
  
-if { ![istarget "arm*-*-*eabi"] } {
+if { ![istarget "arm*-*-*eabi"] && ![istarget "arm*-*-nacl*"] } {
      # Special variants of these tests, as a different farcall stub is
      # generated for a non-ARM-EABI target: indeed in such a case,
      # there are no attributes to indicate that blx can be used.
@@ -455,7 +462,7 @@ if { ![istarget "arm*-*-*eabi"] } {
  }
  
  # Farcalls stubs are fully supported for ARM-EABI only
-set armeabitests {
+set armeabitests_common {
       {"EABI attribute merging" "-r" "" {attr-merge.s attr-merge.s}
        {{readelf -A attr-merge.attr}}
        "attr-merge"}
@@ -530,6 +537,73 @@ set armeabitests {
       {{objdump -d farcall-arm-arm.d}}
       "farcall-arm-arm-be"}
  
+    {"Multiple farcalls" "-Ttext 0x1000 --section-start .foo=0x2002020" "" {farcall-mix.s}
+     {{objdump -d farcall-mix.d}}
+     "farcall-mix"}
+    {"Multiple farcalls from several sections" "-Ttext 0x1000 --section-start .mytext=0x2000 --section-start .foo=0x2003020" "" {farcall-mix2.s}
+     {{objdump -d farcall-mix2.d}}
+     "farcall-mix2"}
+
+    {"Default group size" "-Ttext 0x1000 --section-start .foo=0x2003020" "" {farcall-group.s farcall-group2.s}
+     {{objdump -d farcall-group.d}}
+     "farcall-group-default"}
+    {"Group size=2" "-Ttext 0x1000 --section-start .foo=0x2003020 --stub-group-size=2" "" {farcall-group.s farcall-group2.s}
+     {{objdump -d farcall-group-size2.d}}
+     "farcall-group-size2"}
+    {"Group size limit" "-Ttext 0x1000 --section-start .far=0x2003020" "" {farcall-group3.s farcall-group4.s}
+     {{objdump -d farcall-group-limit.d}}
+     "farcall-group-limit"}
+
+    {"Long branch with mixed text and data" "-T arm.ld" "" {farcall-data.s}
+     {{objdump -dr farcall-data.d}}
+     "farcall-data"}
+
+    {"R_ARM_THM_JUMP24 Relocation veneers: Short 1"
+     "--no-fix-arm1176 --section-start destsect=0x00009000 --section-start .text=0x8000"
+     "-march=armv7-a -mthumb"
+     {jump-reloc-veneers.s}
+     {{objdump -d jump-reloc-veneers-short1.d}}
+     "jump-reloc-veneers-short1"}
+    {"R_ARM_THM_JUMP24 Relocation veneers: Short 2"
+     "--no-fix-arm1176 --section-start destsect=0x00900000 --section-start .text=0x8000"
+     "-march=armv7-a -mthumb"
+     {jump-reloc-veneers.s}
+     {{objdump -d jump-reloc-veneers-short2.d}}
+     "jump-reloc-veneers-short2"}
+    {"R_ARM_THM_JUMP24 Relocation veneers: Long"
+     "--no-fix-arm1176 --section-start destsect=0x09000000 --section-start .text=0x8000"
+     "-march=armv7-a -mthumb"
+     {jump-reloc-veneers.s}
+     {{objdump -d jump-reloc-veneers-long.d}}
+     "jump-reloc-veneers-long"}
+
+    {"erratum 760522 fix (default for v6z)" "--section-start=.foo=0x2001014"
+     "-march=armv6z" {fix-arm1176.s}
+     {{objdump -d fix-arm1176-on.d}}
+     "fix-arm1176-1"}
+    {"erratum 760522 fix (explicitly on at v6z)" "--section-start=.foo=0x2001014 --fix-arm1176"
+     "-march=armv6z" {fix-arm1176.s}
+     {{objdump -d fix-arm1176-on.d}}
+     "fix-arm1176-2"}
+    {"erratum 760522 fix (explicitly off at v6z)" "--section-start=.foo=0x2001014 --no-fix-arm1176"
+     "-march=armv6z" {fix-arm1176.s}
+     {{objdump -d fix-arm1176-off.d}}
+     "fix-arm1176-3"}
+    {"erratum 760522 fix (default for v5)" "--section-start=.foo=0x2001014 "
+     "-march=armv5te" {fix-arm1176.s}
+     {{objdump -d fix-arm1176-on.d}}
+     "fix-arm1176-4"}
+    {"erratum 760522 fix (default for v7-a)" "--section-start=.foo=0x2001014 "
+     "-march=armv7-a" {fix-arm1176.s}
+     {{objdump -d fix-arm1176-off.d}}
+     "fix-arm1176-5"}
+    {"erratum 760522 fix (default for ARM1156)" "--section-start=.foo=0x2001014 "
+     "-mcpu=arm1156t2f-s" {fix-arm1176.s}
+     {{objdump -d fix-arm1176-off.d}}
+     "fix-arm1176-6"}
+}
+
+set armeabitests_nonacl {
      {"ARM-Thumb farcall" "-Ttext 0x1000 --section-start .foo=0x2001014" "" {farcall-arm-thumb.s}
       {{objdump -d farcall-arm-thumb.d}}
       "farcall-arm-thumb"}
@@ -587,23 +661,6 @@ set armeabitests {
       {{objdump -d farcall-thumb-arm-pic-veneer.d}}
       "farcall-thumb-arm-pic-veneer"}
  
-    {"Multiple farcalls" "-Ttext 0x1000 --section-start .foo=0x2002020" "" {farcall-mix.s}
-     {{objdump -d farcall-mix.d}}
-     "farcall-mix"}
-    {"Multiple farcalls from several sections" "-Ttext 0x1000 --section-start .mytext=0x2000 --section-start .foo=0x2003020" "" {farcall-mix2.s}
-     {{objdump -d farcall-mix2.d}}
-     "farcall-mix2"}
-
-    {"Default group size" "-Ttext 0x1000 --section-start .foo=0x2003020" "" {farcall-group.s farcall-group2.s}
-     {{objdump -d farcall-group.d}}
-     "farcall-group-default"}
-    {"Group size=2" "-Ttext 0x1000 --section-start .foo=0x2003020 --stub-group-size=2" "" {farcall-group.s farcall-group2.s}
-     {{objdump -d farcall-group-size2.d}}
-     "farcall-group-size2"}
-    {"Group size limit" "-Ttext 0x1000 --section-start .far=0x2003020" "" {farcall-group3.s farcall-group4.s}
-     {{objdump -d farcall-group-limit.d}}
-     "farcall-group-limit"}
-
      {"Mixed ARM/Thumb dynamic application with farcalls" "tmpdir/mixed-lib.so -T arm-dyn.ld --section-start .far_arm=0x2100000 --section-start .far_thumb=0x2200000" ""
       {farcall-mixed-app.s}
       {{objdump -fdw farcall-mixed-app.d} {objdump -Rw farcall-mixed-app.r}
@@ -625,28 +682,6 @@ set armeabitests {
       {{objdump -fdw farcall-mixed-lib.d}}
       "farcall-mixed-lib.so"}
  
-    {"Long branch with mixed text and data" "-T arm.ld" "" {farcall-data.s}
-     {{objdump -dr farcall-data.d}}
-     "farcall-data"}
-
-    {"R_ARM_THM_JUMP24 Relocation veneers: Short 1" 
-     "--no-fix-arm1176 --section-start destsect=0x00009000 --section-start .text=0x8000" 
-     "-march=armv7-a -mthumb" 
-     {jump-reloc-veneers.s}
-     {{objdump -d jump-reloc-veneers-short1.d}}
-     "jump-reloc-veneers-short1"}
-    {"R_ARM_THM_JUMP24 Relocation veneers: Short 2" 
-     "--no-fix-arm1176 --section-start destsect=0x00900000 --section-start .text=0x8000" 
-     "-march=armv7-a -mthumb" 
-     {jump-reloc-veneers.s}
-     {{objdump -d jump-reloc-veneers-short2.d}}
-     "jump-reloc-veneers-short2"}
-    {"R_ARM_THM_JUMP24 Relocation veneers: Long" 
-     "--no-fix-arm1176 --section-start destsect=0x09000000 --section-start .text=0x8000" 
-     "-march=armv7-a -mthumb" 
-     {jump-reloc-veneers.s}
-     {{objdump -d jump-reloc-veneers-long.d}}
-     "jump-reloc-veneers-long"}
      {"TLS gnu shared library" "--no-fix-arm1176 -shared -T arm-dyn.ld" "" {tls-gdesc.s}
       {{objdump -fdw tls-gdesc.d} {objdump -Rw tls-gdesc.r}}
       "tls-lib2.so"}
@@ -662,34 +697,13 @@ set armeabitests {
      {"TLS thumb1" "-shared -T arm-dyn.ld --section-start .foo=0x4001000" "" {tls-thumb1.s}
       {{objdump -fdw tls-thumb1.d}}
       "tls-thumb1"}
+}
  
-    {"erratum 760522 fix (default for v6z)" "--section-start=.foo=0x2001014" 
-     "-march=armv6z" {fix-arm1176.s}
-     {{objdump -d fix-arm1176-on.d}}
-     "fix-arm1176-1"}
-    {"erratum 760522 fix (explicitly on at v6z)" "--section-start=.foo=0x2001014 --fix-arm1176" 
-     "-march=armv6z" {fix-arm1176.s}
-     {{objdump -d fix-arm1176-on.d}}
-     "fix-arm1176-2"}
-    {"erratum 760522 fix (explicitly off at v6z)" "--section-start=.foo=0x2001014 --no-fix-arm1176" 
-     "-march=armv6z" {fix-arm1176.s}
-     {{objdump -d fix-arm1176-off.d}}
-     "fix-arm1176-3"}
-    {"erratum 760522 fix (default for v5)" "--section-start=.foo=0x2001014 " 
-     "-march=armv5te" {fix-arm1176.s}
-     {{objdump -d fix-arm1176-on.d}}
-     "fix-arm1176-4"}
-    {"erratum 760522 fix (default for v7-a)" "--section-start=.foo=0x2001014 " 
-     "-march=armv7-a" {fix-arm1176.s}
-     {{objdump -d fix-arm1176-off.d}}
-     "fix-arm1176-5"}
-    {"erratum 760522 fix (default for ARM1156)" "--section-start=.foo=0x2001014 " 
-     "-mcpu=arm1156t2f-s" {fix-arm1176.s}
-     {{objdump -d fix-arm1176-off.d}}
-     "fix-arm1176-6"}
+run_ld_link_tests $armeabitests_common
+if { ![istarget "arm*-*-nacl*"] } {
+    run_ld_link_tests $armeabitests_nonacl
  }
  
-run_ld_link_tests $armeabitests
  run_dump_test "attr-merge-div-00"
  run_dump_test "attr-merge-div-01"
  run_dump_test "attr-merge-div-10"
diff --git a/ld/testsuite/ld-arm/arm-lib.d b/ld/testsuite/ld-arm/arm-lib.d

index 3a1c777ca42b871a58988843616746ee97778829..75845fb423b46b131c00350e1d9a6d13aedc69d2 100644 (file)
--- a/ld/testsuite/ld-arm/arm-lib.d
+++ b/ld/testsuite/ld-arm/arm-lib.d
@@ -1,5 +1,5 @@
  
-tmpdir/arm-lib.so:     file format elf32-(little|big)arm
+tmpdir/arm-lib.so:     file format elf32-(little|big)arm.*
  architecture: arm, flags 0x00000150:
  HAS_SYMS, DYNAMIC, D_PAGED
  start address 0x.*
diff --git a/ld/testsuite/ld-arm/arm-lib.r b/ld/testsuite/ld-arm/arm-lib.r

index a7dde4745727138026dd0e202518d2f7474fd410..48749d449f1935962b886e3eac852d8b80ac5963 100644 (file)
--- a/ld/testsuite/ld-arm/arm-lib.r
+++ b/ld/testsuite/ld-arm/arm-lib.r
@@ -1,5 +1,5 @@
  
-tmpdir/arm-lib.so:     file format elf32-(little|big)arm
+tmpdir/arm-lib.so:     file format elf32-(little|big)arm.*
  
  DYNAMIC RELOCATION RECORDS
  OFFSET   TYPE              VALUE 
diff --git a/ld/testsuite/ld-arm/arm-static-app.d b/ld/testsuite/ld-arm/arm-static-app.d

index f18f3c6ceafa2c61df645ec67b495d4f458b59c6..de2f7d6f0dccadd91ffca7199d45734f7ece1ec2 100644 (file)
--- a/ld/testsuite/ld-arm/arm-static-app.d
+++ b/ld/testsuite/ld-arm/arm-static-app.d
@@ -1,5 +1,5 @@
  
-tmpdir/arm-static-app:     file format elf32-(little|big)arm
+tmpdir/arm-static-app:     file format elf32-(little|big)arm.*
  architecture: arm, flags 0x00000112:
  EXEC_P, HAS_SYMS, D_PAGED
  start address 0x.*
@@ -7,18 +7,18 @@ start address 0x.*
  Disassembly of section .text:
  
  .* <_start>:
-    .*:        e1a0c00d        mov     ip, sp
-    .*:        e92dd800        push    {fp, ip, lr, pc}
-    .*:        eb000001        bl      .* <app_func>
-    .*:        e89d6800        ldm     sp, {fp, sp, lr}
-    .*:        e12fff1e        bx      lr
+ +.*:  e1a0c00d        mov     ip, sp
+ +.*:  e92dd800        push    {fp, ip, lr, pc}
+ +.*:  eb000001        bl      .* <app_func>
+ +.*:  e89d6800        ldm     sp, {fp, sp, lr}
+ +.*:  e12fff1e        bx      lr
  
  .* <app_func>:
-    .*:        e1a0c00d        mov     ip, sp
-    .*:        e92dd800        push    {fp, ip, lr, pc}
-    .*:        eb000001        bl      .* <app_func2>
-    .*:        e89d6800        ldm     sp, {fp, sp, lr}
-    .*:        e12fff1e        bx      lr
+ +.*:  e1a0c00d        mov     ip, sp
+ +.*:  e92dd800        push    {fp, ip, lr, pc}
+ +.*:  eb000001        bl      .* <app_func2>
+ +.*:  e89d6800        ldm     sp, {fp, sp, lr}
+ +.*:  e12fff1e        bx      lr
  
  .* <app_func2>:
-    .*:        e12fff1e        bx      lr
+ +.*:  e12fff1e        bx      lr
diff --git a/ld/testsuite/ld-arm/arm-static-app.r b/ld/testsuite/ld-arm/arm-static-app.r

index 6034b7f8d85173530c7ab23954f955353cae6496..92df70ec17d1797db31f2d0557c57db1e5b00bb2 100644 (file)
--- a/ld/testsuite/ld-arm/arm-static-app.r
+++ b/ld/testsuite/ld-arm/arm-static-app.r
@@ -1,3 +1,3 @@
  
-tmpdir/arm-static-app:     file format elf32-(little|big)arm
+tmpdir/arm-static-app:     file format elf32-(little|big)arm.*
  
diff --git a/ld/testsuite/ld-arm/armv4-bx.d b/ld/testsuite/ld-arm/armv4-bx.d

index b30af8c349360fcae53695c299e669b6001eeb6a..be2a4da8c0b176493cecad4fbc1f7811a26a3681 100644 (file)
--- a/ld/testsuite/ld-arm/armv4-bx.d
+++ b/ld/testsuite/ld-arm/armv4-bx.d
@@ -1,5 +1,5 @@
  
-.*: .*file format elf32-(big|little)arm
+.*: .*file format elf32-(big|little)arm.*
  
  Disassembly of section \.text:
  
diff --git a/ld/testsuite/ld-arm/data-only-map.d b/ld/testsuite/ld-arm/data-only-map.d

index 39eed874bbd351dc378c6e3628bb2a182a2bf64e..706e7097e3db79c38ceacef0ef9ba0a117466f01 100644 (file)
--- a/ld/testsuite/ld-arm/data-only-map.d
+++ b/ld/testsuite/ld-arm/data-only-map.d
@@ -1,5 +1,5 @@
  
-[^:]*:     file format elf32-littlearm
+[^:]*:     file format elf32-littlearm.*
  
  
  Disassembly of section \.text:
diff --git a/ld/testsuite/ld-arm/farcall-group.d b/ld/testsuite/ld-arm/farcall-group.d

index 75514f45a3d726561f63b4b68129df0a2daedac5..da811e7191ac8ab7468f663ee9cd273b464db3d0 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-group.d
+++ b/ld/testsuite/ld-arm/farcall-group.d
@@ -3,54 +3,54 @@
  
  Disassembly of section .text:
  
-00001000 <_start>:
-    1000:      eb00000c        bl      1038 <__bar_from_arm>
-    1004:      eb00000e        bl      1044 <__bar2_veneer>
-
-00001008 <myfunc>:
-    1008:      eb000008        bl      1030 <__bar3_veneer>
-    100c:      eb000004        bl      1024 <__bar4_from_arm>
-    1010:      eb000000        bl      1018 <__bar5_from_arm>
-    1014:      00000000        andeq   r0, r0, r0
-
-00001018 <__bar5_from_arm>:
-    1018:      e59fc000        ldr     ip, \[pc\]      ; 1020 <__bar5_from_arm\+0x8>
-    101c:      e12fff1c        bx      ip
-    1020:      0200302f        .word   0x0200302f
-
-00001024 <__bar4_from_arm>:
-    1024:      e59fc000        ldr     ip, \[pc\]      ; 102c <__bar4_from_arm\+0x8>
-    1028:      e12fff1c        bx      ip
-    102c:      0200302d        .word   0x0200302d
-
-00001030 <__bar3_veneer>:
-    1030:      e51ff004        ldr     pc, \[pc, #-4\] ; 1034 <__bar3_veneer\+0x4>
-    1034:      02003028        .word   0x02003028
-
-00001038 <__bar_from_arm>:
-    1038:      e59fc000        ldr     ip, \[pc\]      ; 1040 <__bar_from_arm\+0x8>
-    103c:      e12fff1c        bx      ip
-    1040:      02003021        .word   0x02003021
-
-00001044 <__bar2_veneer>:
-    1044:      e51ff004        ldr     pc, \[pc, #-4\] ; 1048 <__bar2_veneer\+0x4>
-    1048:      02003024        .word   0x02003024
+[0-9a-f]+ <_start>:
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar_from_arm>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar2_veneer>
+
+[0-9a-f]+ <myfunc>:
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar3_veneer>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar4_from_arm>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar5_from_arm>
+ +[0-9a-f]+:   00000000        andeq   r0, r0, r0
+
+[0-9a-f]+ <__bar5_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar5_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   0200302f        .word   0x0200302f
+
+[0-9a-f]+ <__bar4_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar4_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   0200302d        .word   0x0200302d
+
+[0-9a-f]+ <__bar3_veneer>:
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; [0-9a-f]+ <__bar3_veneer\+0x4>
+ +[0-9a-f]+:   02003028        .word   0x02003028
+
+[0-9a-f]+ <__bar_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   02003021        .word   0x02003021
+
+[0-9a-f]+ <__bar2_veneer>:
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; [0-9a-f]+ <__bar2_veneer\+0x4>
+ +[0-9a-f]+:   02003024        .word   0x02003024
         ...
  
  Disassembly of section .foo:
  
-02003020 <bar>:
- 2003020:      4770            bx      lr
+[0-9a-f]+ <bar>:
+ +[0-9a-f]+:   4770            bx      lr
         ...
  
-02003024 <bar2>:
- 2003024:      e12fff1e        bx      lr
+[0-9a-f]+ <bar2>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-02003028 <bar3>:
- 2003028:      e12fff1e        bx      lr
+[0-9a-f]+ <bar3>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-0200302c <bar4>:
- 200302c:      4770            bx      lr
+[0-9a-f]+ <bar4>:
+ +[0-9a-f]+:   4770            bx      lr
  
-0200302e <bar5>:
- 200302e:      4770            bx      lr
+[0-9a-f]+ <bar5>:
+ +[0-9a-f]+:   4770            bx      lr
diff --git a/ld/testsuite/ld-arm/farcall-mix.d b/ld/testsuite/ld-arm/farcall-mix.d

index 227cd83233176baf7fdf7996d8cd0a6423743234..ffeffb935b1d0e4d3e3b9a868f7e8e79d47f6df0 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-mix.d
+++ b/ld/testsuite/ld-arm/farcall-mix.d
@@ -3,49 +3,49 @@
  
  Disassembly of section .text:
  
-00001000 <_start>:
-    1000:      eb000004        bl      1018 <__bar_from_arm>
-    1004:      eb00000e        bl      1044 <__bar2_veneer>
-    1008:      eb000005        bl      1024 <__bar3_veneer>
-    100c:      eb000009        bl      1038 <__bar4_from_arm>
-    1010:      eb000005        bl      102c <__bar5_from_arm>
-    1014:      00000000        andeq   r0, r0, r0
-
-00001018 <__bar_from_arm>:
-    1018:      e59fc000        ldr     ip, \[pc\]      ; 1020 <__bar_from_arm\+0x8>
-    101c:      e12fff1c        bx      ip
-    1020:      02002021        .word   0x02002021
-00001024 <__bar3_veneer>:
-    1024:      e51ff004        ldr     pc, \[pc, #-4\] ; 1028 <__bar3_veneer\+0x4>
-    1028:      02002028        .word   0x02002028
-0000102c <__bar5_from_arm>:
-    102c:      e59fc000        ldr     ip, \[pc\]      ; 1034 <__bar5_from_arm\+0x8>
-    1030:      e12fff1c        bx      ip
-    1034:      0200202f        .word   0x0200202f
-00001038 <__bar4_from_arm>:
-    1038:      e59fc000        ldr     ip, \[pc\]      ; 1040 <__bar4_from_arm\+0x8>
-    103c:      e12fff1c        bx      ip
-    1040:      0200202d        .word   0x0200202d
-
-00001044 <__bar2_veneer>:
-    1044:      e51ff004        ldr     pc, \[pc, #-4\] ; 1048 <__bar2_veneer\+0x4>
-    1048:      02002024        .word   0x02002024
+[0-9a-f]+ <_start>:
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar_from_arm>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar2_veneer>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar3_veneer>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar4_from_arm>
+ +[0-9a-f]+:   [0-9a-f]{8}     bl      [0-9a-f]+ <__bar5_from_arm>
+ +[0-9a-f]+:   00000000        andeq   r0, r0, r0
+
+[0-9a-f]+ <__bar_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   02002021        .word   0x02002021
+[0-9a-f]+ <__bar3_veneer>:
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; [0-9a-f]+ <__bar3_veneer\+0x4>
+ +[0-9a-f]+:   02002028        .word   0x02002028
+[0-9a-f]+ <__bar5_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar5_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   0200202f        .word   0x0200202f
+[0-9a-f]+ <__bar4_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar4_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   0200202d        .word   0x0200202d
+
+[0-9a-f]+ <__bar2_veneer>:
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; [0-9a-f]+ <__bar2_veneer\+0x4>
+ +[0-9a-f]+:   02002024        .word   0x02002024
         ...
  
  Disassembly of section .foo:
  
-02002020 <bar>:
- 2002020:      4770            bx      lr
+[0-9a-f]+ <bar>:
+ +[0-9a-f]+:   4770            bx      lr
         ...
  
-02002024 <bar2>:
- 2002024:      e12fff1e        bx      lr
+[0-9a-f]+ <bar2>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-02002028 <bar3>:
- 2002028:      e12fff1e        bx      lr
+[0-9a-f]+ <bar3>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-0200202c <bar4>:
- 200202c:      4770            bx      lr
+[0-9a-f]+ <bar4>:
+ +[0-9a-f]+:   4770            bx      lr
  
-0200202e <bar5>:
- 200202e:      4770            bx      lr
+[0-9a-f]+ <bar5>:
+ +[0-9a-f]+:   4770            bx      lr
diff --git a/ld/testsuite/ld-arm/farcall-mix2.d b/ld/testsuite/ld-arm/farcall-mix2.d

index f9b66a30229b2f8cb9193db6e175511f8eead81b..192a2a071a8aa9f8512d83ce4c396e3990bf08d1 100644 (file)
--- a/ld/testsuite/ld-arm/farcall-mix2.d
+++ b/ld/testsuite/ld-arm/farcall-mix2.d
@@ -3,54 +3,54 @@
  
  Disassembly of section .text:
  
-00001000 <_start>:
-    1000:      eb000000        bl      1008 <__bar_from_arm>
-    1004:      eb000002        bl      1014 <__bar2_veneer>
-
-00001008 <__bar_from_arm>:
-    1008:      e59fc000        ldr     ip, \[pc\]      ; 1010 <__bar_from_arm\+0x8>
-    100c:      e12fff1c        bx      ip
-    1010:      02003021        .word   0x02003021
-00001014 <__bar2_veneer>:
-    1014:      e51ff004        ldr     pc, \[pc, #-4\] ; 1018 <__bar2_veneer\+0x4>
-    1018:      02003024        .word   0x02003024
-    101c:      00000000        .word   0x00000000
+[0-9a-f]+ <_start>:
+ +[0-9a-f]+:   eb000000        bl      [0-9a-f]+ <__bar_from_arm>
+ +[0-9a-f]+:   eb000002        bl      [0-9a-f]+ <__bar2_veneer>
+
+[0-9a-f]+ <__bar_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   02003021        .word   0x02003021
+[0-9a-f]+ <__bar2_veneer>:
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; [0-9a-f]+ <__bar2_veneer\+0x4>
+ +[0-9a-f]+:   02003024        .word   0x02003024
+ +[0-9a-f]+:   00000000        .word   0x00000000
  Disassembly of section .mytext:
  
-00002000 <__bar3_veneer-0x10>:
-    2000:      eb000002        bl      2010 <__bar3_veneer>
-    2004:      eb000003        bl      2018 <__bar4_from_arm>
-    2008:      eb000005        bl      2024 <__bar5_from_arm>
-    200c:      00000000        andeq   r0, r0, r0
-
-00002010 <__bar3_veneer>:
-    2010:      e51ff004        ldr     pc, \[pc, #-4\] ; 2014 <__bar3_veneer\+0x4>
-    2014:      02003028        .word   0x02003028
-
-00002018 <__bar4_from_arm>:
-    2018:      e59fc000        ldr     ip, \[pc\]      ; 2020 <__bar4_from_arm\+0x8>
-    201c:      e12fff1c        bx      ip
-    2020:      0200302d        .word   0x0200302d
-
-00002024 <__bar5_from_arm>:
-    2024:      e59fc000        ldr     ip, \[pc\]      ; 202c <__bar5_from_arm\+0x8>
-    2028:      e12fff1c        bx      ip
-    202c:      0200302f        .word   0x0200302f
+[0-9a-f]+ <__bar3_veneer-0x10>:
+ +[0-9a-f]+:   eb000002        bl      [0-9a-f]+ <__bar3_veneer>
+ +[0-9a-f]+:   eb000003        bl      [0-9a-f]+ <__bar4_from_arm>
+ +[0-9a-f]+:   eb000005        bl      [0-9a-f]+ <__bar5_from_arm>
+ +[0-9a-f]+:   00000000        andeq   r0, r0, r0
+
+[0-9a-f]+ <__bar3_veneer>:
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; [0-9a-f]+ <__bar3_veneer\+0x4>
+ +[0-9a-f]+:   02003028        .word   0x02003028
+
+[0-9a-f]+ <__bar4_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar4_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   0200302d        .word   0x0200302d
+
+[0-9a-f]+ <__bar5_from_arm>:
+ +[0-9a-f]+:   e59fc000        ldr     ip, \[pc\]      ; [0-9a-f]+ <__bar5_from_arm\+0x8>
+ +[0-9a-f]+:   e12fff1c        bx      ip
+ +[0-9a-f]+:   0200302f        .word   0x0200302f
         ...
  Disassembly of section .foo:
  
-02003020 <bar>:
- 2003020:      4770            bx      lr
+[0-9a-f]+ <bar>:
+ +[0-9a-f]+:   4770            bx      lr
         ...
  
-02003024 <bar2>:
- 2003024:      e12fff1e        bx      lr
+[0-9a-f]+ <bar2>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-02003028 <bar3>:
- 2003028:      e12fff1e        bx      lr
+[0-9a-f]+ <bar3>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-0200302c <bar4>:
- 200302c:      4770            bx      lr
+[0-9a-f]+ <bar4>:
+ +[0-9a-f]+:   4770            bx      lr
  
-0200302e <bar5>:
- 200302e:      4770            bx      lr
+[0-9a-f]+ <bar5>:
+ +[0-9a-f]+:   4770            bx      lr
diff --git a/ld/testsuite/ld-arm/fix-arm1176-off.d b/ld/testsuite/ld-arm/fix-arm1176-off.d

index c19feed921721f4d2ec676cd178494a9a399ab13..89f01e2a05149f4f92c81c459d2b14d1854891c3 100644 (file)
--- a/ld/testsuite/ld-arm/fix-arm1176-off.d
+++ b/ld/testsuite/ld-arm/fix-arm1176-off.d
@@ -1,17 +1,17 @@
  
-.*:     file format elf32-littlearm
+.*:     file format elf32-littlearm.*
  
  
  Disassembly of section .foo:
  
  [0-9a-f]+ <_start>:
- [0-9a-f]+:    f000 e800       blx     2001018 <__func_to_branch_to_veneer>
+ +[0-9a-f]+:   f000 e800       blx     2001018 <__func_to_branch_to_veneer>
  
  [0-9a-f]+ <__func_to_branch_to_veneer>:
- [0-9a-f]+:    e51ff004        ldr     pc, \[pc, #-4\] ; 200101c <__func_to_branch_to_veneer\+0x4>
- [0-9a-f]+:    ........        .word   0x........
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; 200101c <__func_to_branch_to_veneer\+0x4>
+ +[0-9a-f]+:   ........        .word   0x........
  
  Disassembly of section .text:
  
  [0-9a-f]+ <func_to_branch_to>:
-    [0-9a-f]+: e12fff1e        bx      lr
+ +[0-9a-f]+:   e12fff1e        bx      lr
diff --git a/ld/testsuite/ld-arm/fix-arm1176-on.d b/ld/testsuite/ld-arm/fix-arm1176-on.d

index 2df197d4afb074ad3eb0f1817cb3a9114062ac3a..6417a33a21de565c9016774600d85d7a792af754 100644 (file)
--- a/ld/testsuite/ld-arm/fix-arm1176-on.d
+++ b/ld/testsuite/ld-arm/fix-arm1176-on.d
@@ -1,20 +1,20 @@
  
-.+:     file format elf32-littlearm
+.+:     file format elf32-littlearm.*
  
  
  Disassembly of section .foo:
  
  [0-9a-f]+ <_start>:
- [0-9a-f]+:    f000 f800       bl      2001018 <__func_to_branch_to_veneer>
+ +[0-9a-f]+:   f000 f800       bl      2001018 <__func_to_branch_to_veneer>
  
  [0-9a-f]+ <__func_to_branch_to_veneer>:
- [0-9a-f]+:    4778            bx      pc
- [0-9a-f]+:    46c0            nop                     ; \(mov r8, r8\)
- [0-9a-f]+:    e51ff004        ldr     pc, \[pc, #-4\] ; 2001020 <__func_to_branch_to_veneer\+0x8>
- [0-9a-f]+:    ........        .word   0x........
- [0-9a-f]+:    00000000        .word   0x00000000
+ +[0-9a-f]+:   4778            bx      pc
+ +[0-9a-f]+:   46c0            nop                     ; \(mov r8, r8\)
+ +[0-9a-f]+:   e51ff004        ldr     pc, \[pc, #-4\] ; 2001020 <__func_to_branch_to_veneer\+0x8>
+ +[0-9a-f]+:   ........        .word   0x........
+ +[0-9a-f]+:   00000000        .word   0x00000000
  
  Disassembly of section .text:
  
  [0-9a-f]+ <func_to_branch_to>:
-    [0-9a-f]+: e12fff1e        bx      lr
+ +[0-9a-f]+:   e12fff1e        bx      lr
diff --git a/ld/testsuite/ld-arm/group-relocs.d b/ld/testsuite/ld-arm/group-relocs.d

index e81739dc803568a4875ab468b87af3e779fa564b..7d6f10233d39f2a7e47b7d0344197ed1d71062eb 100644 (file)
--- a/ld/testsuite/ld-arm/group-relocs.d
+++ b/ld/testsuite/ld-arm/group-relocs.d
@@ -1,5 +1,5 @@
  
-tmpdir/group-relocs:     file format elf32-(little|big)arm
+tmpdir/group-relocs:     file format elf32-(little|big)arm.*
  
  Disassembly of section .text:
  
diff --git a/ld/testsuite/ld-arm/jump19.d b/ld/testsuite/ld-arm/jump19.d

index 303477f622b15be7bd034fef0155ae6960234e53..a631de2b2343b52557980554ff0fe2bc092acee2 100644 (file)
--- a/ld/testsuite/ld-arm/jump19.d
+++ b/ld/testsuite/ld-arm/jump19.d
@@ -1,5 +1,5 @@
  
-.*jump19:     file format elf32-(big|little)arm
+.*jump19:     file format elf32-(big|little)arm.*
  
  Disassembly of section .text:
  
diff --git a/ld/testsuite/ld-arm/reloc-boundaries.d b/ld/testsuite/ld-arm/reloc-boundaries.d

index bcc13d0f5a38ba81d2af0b27e1290a497ba3668e..4bfaf0a5e21b08aeae4d9510c83061354f58abb0 100644 (file)
--- a/ld/testsuite/ld-arm/reloc-boundaries.d
+++ b/ld/testsuite/ld-arm/reloc-boundaries.d
@@ -1,6 +1,6 @@
  
-[^:]*:     file format elf32-(little|big)arm
+[^:]*:     file format elf32-(little|big)arm.*
  
  Contents of section .text:
- 80.. 80ff0080 ffff                        ......          
+ [0-9a-f]+ 80ff0080 ffff                        ......          
  #...
diff --git a/ld/testsuite/ld-arm/thumb1-bl.d b/ld/testsuite/ld-arm/thumb1-bl.d

index 09d70959b68ec4f8a800a0729a9eb014a87c14be..a10db01d00624841d7b7b4ce1bce7de386a971ec 100644 (file)
--- a/ld/testsuite/ld-arm/thumb1-bl.d
+++ b/ld/testsuite/ld-arm/thumb1-bl.d
@@ -1,5 +1,5 @@
  
-.*thumb1-bl:     file format elf32-.*arm
+.*thumb1-bl:     file format elf32-.*arm.*
  
  Disassembly of section .text:
  
diff --git a/ld/testsuite/ld-arm/thumb2-b-interwork.d b/ld/testsuite/ld-arm/thumb2-b-interwork.d

index 431989c7f60a68686b895b2a32b11d9d946dc6bf..67cb8638ec32ff13daee4c31bcc9c77586e7c64c 100644 (file)
--- a/ld/testsuite/ld-arm/thumb2-b-interwork.d
+++ b/ld/testsuite/ld-arm/thumb2-b-interwork.d
@@ -1,16 +1,16 @@
  
-.*thumb2-b-interwork:     file format elf32-.*arm
+.*thumb2-b-interwork:     file format elf32-.*arm.*
  
  Disassembly of section .text:
  
-00008000 <_start>:
-    8000:      f000 b802       b.w     8008 <__bar_from_thumb>
+[0-9a-f]+ <_start>:
+ +[0-9a-f]+:   f000 b802       b.w     [0-9a-f]+ <__bar_from_thumb>
  
-00008004 <bar>:
-    8004:      e12fff1e        bx      lr
+[0-9a-f]+ <bar>:
+ +[0-9a-f]+:   e12fff1e        bx      lr
  
-00008008 <__bar_from_thumb>:
-    8008:      4778            bx      pc
-    800a:      46c0            nop                     ; \(mov r8, r8\)
-    800c:      eafffffc        b       8004 <bar>
+[0-9a-f]+ <__bar_from_thumb>:
+ +[0-9a-f]+:   4778            bx      pc
+ +[0-9a-f]+:   46c0            nop                     ; \(mov r8, r8\)
+ +[0-9a-f]+:   eafffffc        b       [0-9a-f]+ <bar>
  
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d

index 32f7cc15795b4bc95d33e3c8de0e08c5c869f1e5..5c286bee972e054910b3fb067446b8b72daf7c0a 100644 (file)
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak.d
@@ -6,4 +6,4 @@
  Disassembly of section .text:
  
  .* <foo>:
- .*:   .... ....       bl.     ... <foo-0x.*>
+ +[0-9a-f]+:   .... ....       bl.     [0-9a-f]+ <foo-0x[0-9a-f]+>
diff --git a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d

index 929d180be7abaf01d0684c1f1567d49ef1b3fc33..a6907f5e71e674b88515b283c9d7b1826305e37e 100644 (file)
--- a/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
+++ b/ld/testsuite/ld-arm/thumb2-bl-undefweak1.d
@@ -6,4 +6,4 @@
  Disassembly of section .text:
  
  .* <foo>:
- .*:   ........        bl      ... <foo-0x.*>
+ +[0-9a-f]+:   ........        bl      [0-9a-f]+ <foo-0x[0-9a-f]+>
diff --git a/ld/testsuite/ld-arm/thumb2-bl.d b/ld/testsuite/ld-arm/thumb2-bl.d

index bdfb9b79b7e645ef239659f29e9707654d109421..298a0446a0cefc26e45332c40146222340646ac4 100644 (file)
--- a/ld/testsuite/ld-arm/thumb2-bl.d
+++ b/ld/testsuite/ld-arm/thumb2-bl.d
@@ -1,5 +1,5 @@
  
-.*thumb2-bl:     file format elf32-.*arm
+.*thumb2-bl:     file format elf32-.*arm.*
  
  Disassembly of section .text:
  
diff --git a/ld/testsuite/ld-arm/tls-app.d b/ld/testsuite/ld-arm/tls-app.d

index 7d2a7094a28e67c77dfa18a0da6a02a1164d8f0d..f85d44367b2ad4c724622b9009cb3baed51f235c 100644 (file)
--- a/ld/testsuite/ld-arm/tls-app.d
+++ b/ld/testsuite/ld-arm/tls-app.d
@@ -1,5 +1,5 @@
  
-.*:     file format elf32-.*arm
+.*:     file format elf32-.*arm.*
  architecture: arm, flags 0x00000112:
  EXEC_P, HAS_SYMS, D_PAGED
  start address 0x000081c8
diff --git a/ld/testsuite/ld-arm/tls-app.r b/ld/testsuite/ld-arm/tls-app.r

index af6c2d7ac41ebdc25114cb01735ed95f247f7888..b156d5236866ab30483f285c7be8190fa85a766d 100644 (file)
--- a/ld/testsuite/ld-arm/tls-app.r
+++ b/ld/testsuite/ld-arm/tls-app.r
@@ -1,5 +1,5 @@
  
-.*:     file format elf32-.*arm
+.*:     file format elf32-.*arm.*
  
  DYNAMIC RELOCATION RECORDS
  OFFSET   TYPE              VALUE 
diff --git a/ld/testsuite/ld-arm/tls-gdesc-got.d b/ld/testsuite/ld-arm/tls-gdesc-got.d

index 3b4a83b181408e8173a283d81aeeaf8c648857aa..ab659362f4bdc82ebc09bf5e5400a183fb6861f3 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdesc-got.d
+++ b/ld/testsuite/ld-arm/tls-gdesc-got.d
@@ -1,30 +1,30 @@
  
-.*/tls-lib2-got.so:     file format elf32-.*arm
+.*/tls-lib2-got.so:     file format elf32-.*arm.*
  architecture: arm, flags 0x00000150:
  HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x00008210
+start address 0x000082.0
  
  
  Disassembly of section .got:
  
-00010310 <.*>:
-   10310:      00010288        .*
+000103.0 <.*>:
+   103.0:      000102.8        .*
         ...
-   1031c:      00000008        .*
-                       1031c: R_ARM_TLS_DESC   \*ABS\*
-   10320:      00000000        .*
-   10324:      0000000c        .*
-                       10324: R_ARM_TLS_DESC   \*ABS\*
-   10328:      00000000        .*
-   1032c:      80000004        .*
-                       1032c: R_ARM_TLS_DESC   glob1
-   10330:      00000000        .*
-   10334:      80000006        .*
-                       10334: R_ARM_TLS_DESC   ext2
-   10338:      00000000        .*
-   1033c:      80000007        .*
-                       1033c: R_ARM_TLS_DESC   ext1
-   10340:      00000000        .*
-   10344:      80000009        .*
-                       10344: R_ARM_TLS_DESC   glob2
+   103.c:      00000008        .*
+                       103.c: R_ARM_TLS_DESC   \*ABS\*
+   103.0:      00000000        .*
+   103.4:      0000000c        .*
+                       103.4: R_ARM_TLS_DESC   \*ABS\*
+   103.8:      00000000        .*
+   103.c:      80000004        .*
+                       103.c: R_ARM_TLS_DESC   glob1
+   103.0:      00000000        .*
+   103.4:      80000006        .*
+                       103.4: R_ARM_TLS_DESC   ext2
+   103.8:      00000000        .*
+   103.c:      80000007        .*
+                       103.c: R_ARM_TLS_DESC   ext1
+   103.0:      00000000        .*
+   103.4:      80000009        .*
+                       103.4: R_ARM_TLS_DESC   glob2
         ...
diff --git a/ld/testsuite/ld-arm/tls-gdierelax.d b/ld/testsuite/ld-arm/tls-gdierelax.d

index 8d965fc64aab4f9d1d8a5a4d02a59e8a064297e4..36d22f7c739aece13d3ea24a104169b11238df44 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdierelax.d
+++ b/ld/testsuite/ld-arm/tls-gdierelax.d
@@ -1,5 +1,5 @@
  
-tmpdir/tls-app-rel-ie:     file format elf32-.*arm
+tmpdir/tls-app-rel-ie:     file format elf32-.*arm.*
  architecture: arm, flags 0x[0-9a-f]+:
  EXEC_P, HAS_SYMS, D_PAGED
  start address 0x[0-9a-f]+
diff --git a/ld/testsuite/ld-arm/tls-gdierelax2.d b/ld/testsuite/ld-arm/tls-gdierelax2.d

index 055aad8c20b0bc24bfb24de6813767c2aa16bce3..e9a91dcdd9555e11f801042ffb7f988b556feeed 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdierelax2.d
+++ b/ld/testsuite/ld-arm/tls-gdierelax2.d
@@ -1,5 +1,5 @@
  
-tmpdir/tls-app-rel-ie2:     file format elf32-.*arm
+tmpdir/tls-app-rel-ie2:     file format elf32-.*arm.*
  architecture: arm, flags 0x[0-9a-f]+:
  HAS_SYMS, DYNAMIC, D_PAGED
  start address 0x[0-9a-f]+
diff --git a/ld/testsuite/ld-arm/tls-gdlerelax.d b/ld/testsuite/ld-arm/tls-gdlerelax.d

index 896aed781e5ffd144bc22bc6f4e96f651ac9aa2a..3499f6950ef376eff4bdc71c08d68c46e4f5cf00 100644 (file)
--- a/ld/testsuite/ld-arm/tls-gdlerelax.d
+++ b/ld/testsuite/ld-arm/tls-gdlerelax.d
@@ -1,5 +1,5 @@
  
-tmpdir/tls-app-rel-le:     file format elf32-.*arm
+tmpdir/tls-app-rel-le:     file format elf32-.*arm.*
  architecture: arm, flags 0x[0-9a-f]+:
  EXEC_P, HAS_SYMS, D_PAGED
  start address 0x[0-9a-f]+
diff --git a/ld/testsuite/ld-arm/tls-lib.d b/ld/testsuite/ld-arm/tls-lib.d

index 4580ead4fdd8615b97e58b813b92ff2a6590ff6b..8e99e9c0bd45907192aa1d6ea394ed4d3101ba7b 100644 (file)
--- a/ld/testsuite/ld-arm/tls-lib.d
+++ b/ld/testsuite/ld-arm/tls-lib.d
@@ -1,5 +1,5 @@
  
-.*:     file format elf32-.*arm
+.*:     file format elf32-.*arm.*
  architecture: arm, flags 0x00000150:
  HAS_SYMS, DYNAMIC, D_PAGED
  start address 0x.*
diff --git a/ld/testsuite/ld-arm/tls-lib.r b/ld/testsuite/ld-arm/tls-lib.r

index 279b80540e803ebad213cbfea68646a3968198bd..3847f7723f7fdab3e6a9eb76ffbf85e025414bad 100644 (file)
--- a/ld/testsuite/ld-arm/tls-lib.r
+++ b/ld/testsuite/ld-arm/tls-lib.r
@@ -1,5 +1,5 @@
  
-.*:     file format elf32-.*arm
+.*:     file format elf32-.*arm.*
  
  DYNAMIC RELOCATION RECORDS
  OFFSET   TYPE              VALUE 
diff --git a/ld/testsuite/ld-arm/tls-mixed.r b/ld/testsuite/ld-arm/tls-mixed.r

index 79ccdebc8fee7fc6574db6e5949e40c918bae197..02f9b02e95cc9490db44ee5fb6e53da05b4b51b1 100644 (file)
--- a/ld/testsuite/ld-arm/tls-mixed.r
+++ b/ld/testsuite/ld-arm/tls-mixed.r
@@ -1,5 +1,5 @@
  
-.*:     file format elf32-.*arm
+.*:     file format elf32-.*arm.*
  
  DYNAMIC RELOCATION RECORDS
  OFFSET   TYPE              VALUE 
diff --git a/ld/testsuite/ld-arm/vfp11-fix-none.d b/ld/testsuite/ld-arm/vfp11-fix-none.d

index 64a67ae207daef16410404ef3f8544351428f7fd..e1be0e08809b69c30c687885e608cb76344b1082 100644 (file)
--- a/ld/testsuite/ld-arm/vfp11-fix-none.d
+++ b/ld/testsuite/ld-arm/vfp11-fix-none.d
@@ -1,5 +1,5 @@
  
-.*: .*file format elf32-(big|little)arm
+.*: .*file format elf32-(big|little)arm.*
  
  Disassembly of section \.text:
  
diff --git a/ld/testsuite/ld-arm/vfp11-fix-scalar.d b/ld/testsuite/ld-arm/vfp11-fix-scalar.d

index 509513711dfcc2cf2409af62b22a9a2c8b945350..a817af861df9971e3a9c02dc0d2260a7c6b2b327 100644 (file)
--- a/ld/testsuite/ld-arm/vfp11-fix-scalar.d
+++ b/ld/testsuite/ld-arm/vfp11-fix-scalar.d
@@ -1,5 +1,5 @@
  
-.*: .*file format elf32-(big|little)arm
+.*: .*file format elf32-(big|little)arm.*
  
  Disassembly of section \.text:
  
diff --git a/ld/testsuite/ld-arm/vfp11-fix-vector.d b/ld/testsuite/ld-arm/vfp11-fix-vector.d

index 15c080ac8a0132d4b650c35e435a706f0bae9ae4..b19645e4172fd8cb75fecab7a6ef0afcd3660073 100644 (file)
--- a/ld/testsuite/ld-arm/vfp11-fix-vector.d
+++ b/ld/testsuite/ld-arm/vfp11-fix-vector.d
@@ -1,5 +1,5 @@
  
-.*: .*file format elf32-(big|little)arm
+.*: .*file format elf32-(big|little)arm.*
  
  Disassembly of section \.text:
author	Nick Clifton <nickc@redhat.com>
	Thu, 12 Apr 2012 13:01:15 +0000 (13:01 +0000)
committer	Nick Clifton <nickc@redhat.com>
	Thu, 12 Apr 2012 13:01:15 +0000 (13:01 +0000)
bfd/ChangeLog		patch \| blob \| history
bfd/config.bfd		patch \| blob \| history
bfd/configure		patch \| blob \| history
bfd/configure.in		patch \| blob \| history
bfd/elf32-arm.c		patch \| blob \| history
bfd/targets.c		patch \| blob \| history
gas/ChangeLog		patch \| blob \| history
gas/config/tc-arm.c		patch \| blob \| history
gas/config/te-nacl.h		patch \| blob \| history
gas/configure.tgt		patch \| blob \| history
gas/testsuite/ChangeLog		patch \| blob \| history
gas/testsuite/gas/arm/any-idiv.d		patch \| blob \| history
gas/testsuite/gas/arm/arch4t-eabi.d		patch \| blob \| history
gas/testsuite/gas/arm/arch4t.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-any-armv4t.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-any-thumbv6.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-cpu-directive.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-default.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-all.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv1.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv2a.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv2s.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv3.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv3m.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv4.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv4t.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv4txm.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv4xm.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv5.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv5t.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv5te.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv5tej.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv5texp.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv5txm.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6-m+os.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6-m.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6j.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6k+sec.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6k.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6kt2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6s-m.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6t2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6z.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6zk.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6zkt2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv6zt2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-a+idiv.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-a+mp.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-a+sec+virt.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-a+sec.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-a+virt.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-a.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-m.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-r+mp.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7-r.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7a.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7em.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7m.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-armv7r.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-iwmmxt.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-iwmmxt2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-march-xscale.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mcpu.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-arm1020e.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-arm1020t.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-arm1136jf-s.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-arm1136jfs.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-arm7500fe.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-fpa.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-fpa10.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-fpa11.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-fpe.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-fpe2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-fpe3.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-maverick.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-neon-fp16.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-neon.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-softfpa.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-softvfp+vfp.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-softvfp.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfp.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfp10-r0.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfp10.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfp3.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfp9.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfpv2.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfpv3-d16.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfpv3.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfpv4-d16.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfpv4.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-mfpu-vfpxd.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-names.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-order.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-override-cpu-directive.d		patch \| blob \| history
gas/testsuite/gas/arm/attr-override-mcpu.d		patch \| blob \| history
gas/testsuite/gas/arm/got_prel.d		patch \| blob \| history
gas/testsuite/gas/arm/mapdir.d		patch \| blob \| history
gas/testsuite/gas/arm/mapmisc.d		patch \| blob \| history
gas/testsuite/gas/arm/mapsecs.d		patch \| blob \| history
gas/testsuite/gas/arm/mapshort-eabi.d		patch \| blob \| history
gas/testsuite/gas/arm/mapshort-elf.d		patch \| blob \| history
gas/testsuite/gas/arm/mov-highregs-any.d		patch \| blob \| history
gas/testsuite/gas/arm/mov-lowregs-any.d		patch \| blob \| history
gas/testsuite/gas/arm/pr12198-1.d		patch \| blob \| history
gas/testsuite/gas/arm/pr12198-2.d		patch \| blob \| history
gas/testsuite/gas/arm/thumb-eabi.d		patch \| blob \| history
gas/testsuite/gas/arm/thumb.d		patch \| blob \| history
gas/testsuite/gas/arm/thumbrel.d		patch \| blob \| history
gas/testsuite/gas/elf/elf.exp		patch \| blob \| history
ld/ChangeLog		patch \| blob \| history
ld/Makefile.am		patch \| blob \| history
ld/Makefile.in		patch \| blob \| history
ld/configure.tgt		patch \| blob \| history
ld/emulparams/armelf_nacl.sh	[new file with mode: 0644]	patch \| blob
ld/emulparams/armelfb_nacl.sh	[new file with mode: 0644]	patch \| blob
ld/testsuite/ChangeLog		patch \| blob \| history
ld/testsuite/ld-arm/arm-app-abs32.d		patch \| blob \| history
ld/testsuite/ld-arm/arm-app-abs32.r		patch \| blob \| history
ld/testsuite/ld-arm/arm-app.r		patch \| blob \| history
ld/testsuite/ld-arm/arm-elf.exp		patch \| blob \| history
ld/testsuite/ld-arm/arm-lib.d		patch \| blob \| history
ld/testsuite/ld-arm/arm-lib.r		patch \| blob \| history
ld/testsuite/ld-arm/arm-static-app.d		patch \| blob \| history
ld/testsuite/ld-arm/arm-static-app.r		patch \| blob \| history
ld/testsuite/ld-arm/armv4-bx.d		patch \| blob \| history
ld/testsuite/ld-arm/data-only-map.d		patch \| blob \| history
ld/testsuite/ld-arm/farcall-group.d		patch \| blob \| history
ld/testsuite/ld-arm/farcall-mix.d		patch \| blob \| history
ld/testsuite/ld-arm/farcall-mix2.d		patch \| blob \| history
ld/testsuite/ld-arm/fix-arm1176-off.d		patch \| blob \| history
ld/testsuite/ld-arm/fix-arm1176-on.d		patch \| blob \| history
ld/testsuite/ld-arm/group-relocs.d		patch \| blob \| history
ld/testsuite/ld-arm/jump19.d		patch \| blob \| history
ld/testsuite/ld-arm/reloc-boundaries.d		patch \| blob \| history
ld/testsuite/ld-arm/thumb1-bl.d		patch \| blob \| history
ld/testsuite/ld-arm/thumb2-b-interwork.d		patch \| blob \| history
ld/testsuite/ld-arm/thumb2-bl-undefweak.d		patch \| blob \| history
ld/testsuite/ld-arm/thumb2-bl-undefweak1.d		patch \| blob \| history
ld/testsuite/ld-arm/thumb2-bl.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-app.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-app.r		patch \| blob \| history
ld/testsuite/ld-arm/tls-gdesc-got.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-gdierelax.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-gdierelax2.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-gdlerelax.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-lib.d		patch \| blob \| history
ld/testsuite/ld-arm/tls-lib.r		patch \| blob \| history
ld/testsuite/ld-arm/tls-mixed.r		patch \| blob \| history
ld/testsuite/ld-arm/vfp11-fix-none.d		patch \| blob \| history
ld/testsuite/ld-arm/vfp11-fix-scalar.d		patch \| blob \| history
ld/testsuite/ld-arm/vfp11-fix-vector.d		patch \| blob \| history