bfd/

	* elf32-arm.c (elf32_arm_nacl_plt0_entry): Use bic rather than bfc
	instruction for data sandboxing.

gold/
	* arm.cc (Output_data_plt_arm_nacl::first_plt_entry): Use bic rather
	than bfc instruction for data sandboxing.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 2f39d1ca70c2094b9b60328327cb5adc1d96fb5f..c1d01b70259d9e541656b052f6ef1a9040836464 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14  Roland McGrath  <mcgrathr@google.com>
+
+       * elf32-arm.c (elf32_arm_nacl_plt0_entry): Use bic rather than bfc
+       instruction for data sandboxing.
+
 2012-11-14  Tristan Gingold  <gingold@adacore.com>
 
        * mach-o.c (bfd_mach_o_read_main)

diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
index fefc7db0c1e7e6c90c3788a9550df4e9b2e33c74..081265c5298630d97fe3a129c3b7b83d1662772f 100644 (file)
--- a/bfd/elf32-arm.c
+++ b/bfd/elf32-arm.c
@@ -2209,21 +2209,21 @@ static const bfd_vma elf32_arm_nacl_plt0_entry [] =
   0xe08cc00f,          /* add  ip, ip, pc                      */
   0xe52dc008,          /* str  ip, [sp, #-8]!                  */
   /* Second bundle: */
-  0xe7dfcf1f,  /* bfc  ip, #30, #2                     */
-  0xe59cc000,  /* ldr  ip, [ip]                        */
+  0xe3ccc103,          /* bic  ip, ip, #0xc0000000             */
+  0xe59cc000,          /* ldr  ip, [ip]                        */
   0xe3ccc13f,          /* bic  ip, ip, #0xc000000f             */
-  0xe12fff1c,  /* bx   ip                              */
+  0xe12fff1c,          /* bx   ip                              */
   /* Third bundle: */
-  0xe320f000,  /* nop                                  */
-  0xe320f000,  /* nop                                  */
-  0xe320f000,  /* nop                                  */
+  0xe320f000,          /* nop                                  */
+  0xe320f000,          /* nop                                  */
+  0xe320f000,          /* nop                                  */
   /* .Lplt_tail: */
   0xe50dc004,          /* str  ip, [sp, #-4]                   */
   /* Fourth bundle: */
-  0xe7dfcf1f,          /* bfc  ip, #30, #2                     */
-  0xe59cc000,  /* ldr  ip, [ip]                        */
+  0xe3ccc103,          /* bic  ip, ip, #0xc0000000             */
+  0xe59cc000,          /* ldr  ip, [ip]                        */
   0xe3ccc13f,          /* bic  ip, ip, #0xc000000f             */
-  0xe12fff1c,  /* bx   ip                              */
+  0xe12fff1c,          /* bx   ip                              */
 };
 #define ARM_NACL_PLT_TAIL_OFFSET       (11 * 4)
 

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 76cb658a104c68cf946748f4abc90e53f71c84be..d5cdd32f6353f3bbb87823cec0e046019e2a616c 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14  Roland McGrath  <mcgrathr@google.com>
+
+       * arm.cc (Output_data_plt_arm_nacl::first_plt_entry): Use bic rather
+       than bfc instruction for data sandboxing.
+
 2012-11-08  Alan Modra  <amodra@gmail.com>
 
        * po/POTFILES.in: Regenerate.

diff --git a/gold/arm.cc b/gold/arm.cc
index 19943295aaf2cfa26c61f3ade4dea835f8ca1d13..a98004b8284450f709b5bede666e4c262f222476 100644 (file)
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -12218,7 +12218,7 @@ const uint32_t Output_data_plt_arm_nacl<big_endian>::first_plt_entry[16] =
   0xe08cc00f,                           // add ip, ip, pc
   0xe52dc008,                           // str ip, [sp, #-8]!
   // Second bundle:
-  0xe7dfcf1f,                           // bfc ip, #30, #2
+  0xe3ccc103,                           // bic ip, ip, #0xc0000000
   0xe59cc000,                           // ldr ip, [ip]
   0xe3ccc13f,                           // bic ip, ip, #0xc000000f
   0xe12fff1c,                           // bx  ip
@@ -12229,7 +12229,7 @@ const uint32_t Output_data_plt_arm_nacl<big_endian>::first_plt_entry[16] =
   // .Lplt_tail:
   0xe50dc004,                           // str ip, [sp, #-4]
   // Fourth bundle:
-  0xe7dfcf1f,                           // bfc ip, #30, #2
+  0xe3ccc103,                           // bic ip, ip, #0xc0000000
   0xe59cc000,                           // ldr ip, [ip]
   0xe3ccc13f,                           // bic ip, ip, #0xc000000f
   0xe12fff1c,                           // bx  ip