summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0005-bfd.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/binutils/binutils-2.23.1/backport/0005-bfd.patch')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.1/backport/0005-bfd.patch103
1 files changed, 0 insertions, 103 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0005-bfd.patch b/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0005-bfd.patch
deleted file mode 100644
index 4f970044e3..0000000000
--- a/meta/recipes-devtools/binutils/binutils-2.23.1/backport/0005-bfd.patch
+++ /dev/null
@@ -1,103 +0,0 @@
1From e4b6d90dbcbf56c959eca8dcdf846fbe21c822e3 Mon Sep 17 00:00:00 2001
2From: Roland McGrath <roland@gnu.org>
3Date: Thu, 15 Nov 2012 00:33:27 +0000
4Subject: [PATCH 05/27] bfd/ * elf32-arm.c (elf32_arm_nacl_plt0_entry): Use
5 bic rather than bfc instruction for data
6 sandboxing.
7
8gold/
9 * arm.cc (Output_data_plt_arm_nacl::first_plt_entry): Use bic rather
10 than bfc instruction for data sandboxing.
11---
12 bfd/ChangeLog | 5 +++++
13 bfd/elf32-arm.c | 18 +++++++++---------
14 gold/ChangeLog | 5 +++++
15 gold/arm.cc | 4 ++--
16 4 files changed, 21 insertions(+), 11 deletions(-)
17
18diff --git a/bfd/ChangeLog b/bfd/ChangeLog
19index 7aa83bf..981e05a 100644
20--- a/bfd/ChangeLog
21+++ b/bfd/ChangeLog
22@@ -1,3 +1,8 @@
23+2012-11-14 Roland McGrath <mcgrathr@google.com>
24+
25+ * elf32-arm.c (elf32_arm_nacl_plt0_entry): Use bic rather than bfc
26+ instruction for data sandboxing.
27+
28 2012-11-13 Tristan Gingold <gingold@adacore.com>
29
30 * Makefile.am (RELEASE): Unset.
31diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c
32index a287fbb..3c541ca 100644
33--- a/bfd/elf32-arm.c
34+++ b/bfd/elf32-arm.c
35@@ -2209,21 +2209,21 @@ static const bfd_vma elf32_arm_nacl_plt0_entry [] =
36 0xe08cc00f, /* add ip, ip, pc */
37 0xe52dc008, /* str ip, [sp, #-8]! */
38 /* Second bundle: */
39- 0xe7dfcf1f, /* bfc ip, #30, #2 */
40- 0xe59cc000, /* ldr ip, [ip] */
41+ 0xe3ccc103, /* bic ip, ip, #0xc0000000 */
42+ 0xe59cc000, /* ldr ip, [ip] */
43 0xe3ccc13f, /* bic ip, ip, #0xc000000f */
44- 0xe12fff1c, /* bx ip */
45+ 0xe12fff1c, /* bx ip */
46 /* Third bundle: */
47- 0xe320f000, /* nop */
48- 0xe320f000, /* nop */
49- 0xe320f000, /* nop */
50+ 0xe320f000, /* nop */
51+ 0xe320f000, /* nop */
52+ 0xe320f000, /* nop */
53 /* .Lplt_tail: */
54 0xe50dc004, /* str ip, [sp, #-4] */
55 /* Fourth bundle: */
56- 0xe7dfcf1f, /* bfc ip, #30, #2 */
57- 0xe59cc000, /* ldr ip, [ip] */
58+ 0xe3ccc103, /* bic ip, ip, #0xc0000000 */
59+ 0xe59cc000, /* ldr ip, [ip] */
60 0xe3ccc13f, /* bic ip, ip, #0xc000000f */
61- 0xe12fff1c, /* bx ip */
62+ 0xe12fff1c, /* bx ip */
63 };
64 #define ARM_NACL_PLT_TAIL_OFFSET (11 * 4)
65
66diff --git a/gold/ChangeLog b/gold/ChangeLog
67index 0d3074a..9a1a9d3 100644
68--- a/gold/ChangeLog
69+++ b/gold/ChangeLog
70@@ -1,3 +1,8 @@
71+2012-11-14 Roland McGrath <mcgrathr@google.com>
72+
73+ * arm.cc (Output_data_plt_arm_nacl::first_plt_entry): Use bic rather
74+ than bfc instruction for data sandboxing.
75+
76 2012-11-07 Roland McGrath <mcgrathr@google.com>
77
78 * i386.cc (Target_i386::relocate_for_relocatable): Remove extraneous
79diff --git a/gold/arm.cc b/gold/arm.cc
80index d434c9d..238cf32 100644
81--- a/gold/arm.cc
82+++ b/gold/arm.cc
83@@ -12196,7 +12196,7 @@ const uint32_t Output_data_plt_arm_nacl<big_endian>::first_plt_entry[16] =
84 0xe08cc00f, // add ip, ip, pc
85 0xe52dc008, // str ip, [sp, #-8]!
86 // Second bundle:
87- 0xe7dfcf1f, // bfc ip, #30, #2
88+ 0xe3ccc103, // bic ip, ip, #0xc0000000
89 0xe59cc000, // ldr ip, [ip]
90 0xe3ccc13f, // bic ip, ip, #0xc000000f
91 0xe12fff1c, // bx ip
92@@ -12207,7 +12207,7 @@ const uint32_t Output_data_plt_arm_nacl<big_endian>::first_plt_entry[16] =
93 // .Lplt_tail:
94 0xe50dc004, // str ip, [sp, #-4]
95 // Fourth bundle:
96- 0xe7dfcf1f, // bfc ip, #30, #2
97+ 0xe3ccc103, // bic ip, ip, #0xc0000000
98 0xe59cc000, // ldr ip, [ip]
99 0xe3ccc13f, // bic ip, ip, #0xc000000f
100 0xe12fff1c, // bx ip
101--
1021.7.9.5
103