summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2013-05-27 16:49:50 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-29 22:07:55 +0100
commit40187e50dac1384ab0c5afa882a38f59ab07e762 (patch)
tree1f6da655b980e1af036dec475028e11991913821 /meta
parent7ba36158523ea96a6d506b91f5215f05123ba86c (diff)
downloadpoky-40187e50dac1384ab0c5afa882a38f59ab07e762.tar.gz
binutils: add two AArch64 related backports to 2.23.2
Update required to pass "movi" related build errors when gcc-4.8 is used. libgcrypt, slang, mysql5 were failing like this: | {standard input}: Assembler messages: | {standard input}:316: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v3.8b,-106' | {standard input}:348: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v3.8b,-8' | {standard input}:352: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v3.8b,-27' (From OE-Core rev: 2489151dbfc8bc002d89ab199d457ab3794c54a8) Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.2.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch117
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch144
3 files changed, 263 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2.inc b/meta/recipes-devtools/binutils/binutils-2.23.2.inc
index 07bc7e0f7f..abec597507 100644
--- a/meta/recipes-devtools/binutils/binutils-2.23.2.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.23.2.inc
@@ -39,6 +39,8 @@ BACKPORT = "\
39 file://backport/binutils-replace-strncat-with-strcat.patch \ 39 file://backport/binutils-replace-strncat-with-strcat.patch \
40 file://backport/0001-config-tc-ppc.c-md_assemble-Do-not-generate-APUinfo-.patch \ 40 file://backport/0001-config-tc-ppc.c-md_assemble-Do-not-generate-APUinfo-.patch \
41 file://backport/binutils-fix-skip-whitespace-pr14887.patch \ 41 file://backport/binutils-fix-skip-whitespace-pr14887.patch \
42 file://backport/aarch64-crn.patch \
43 file://backport/aarch64-movi.patch \
42" 44"
43SRC_URI[md5sum] = "4f8fa651e35ef262edc01d60fb45702e" 45SRC_URI[md5sum] = "4f8fa651e35ef262edc01d60fb45702e"
44SRC_URI[sha256sum] = "fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097" 46SRC_URI[sha256sum] = "fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097"
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch
new file mode 100644
index 0000000000..3f0338c10a
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-crn.patch
@@ -0,0 +1,117 @@
1From: Yufeng Zhang <yufeng.zhang@arm.com>
2Date: Mon, 13 May 2013 22:50:00 +0000 (+0000)
3Subject: gas/
4X-Git-Url: http://sourceware.org/git/?p=binutils.git;a=commitdiff_plain;h=1796bf893c4729d5c523502318d72cae78495d6c
5
6Upstream-status: backport
7
8gas/
9
10 Backport from mainline:
11
12 2013-02-27 Yufeng Zhang <yufeng.zhang@arm.com>
13 * config/tc-aarch64.c (parse_sys_reg): Allow the full range of CRn
14 for system registers.
15
16gas/testsuite/
17
18 Backport from mainline:
19
20 2013-02-27 Yufeng Zhang <yufeng.zhang@arm.com>
21 * gas/aarch64/illegal.l: Delete the error message for
22 msr S3_1_C13_C15_1,x7.
23 * gas/aarch64/sysreg.s: Add new tests.
24 * gas/aarch64/sysreg.d: Update.
25---
26
27diff --git a/gas/ChangeLog b/gas/ChangeLog
28index 821acc9..3d09792 100644
29--- a/gas/ChangeLog
30+++ b/gas/ChangeLog
31@@ -1,3 +1,11 @@
32+2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
33+
34+ Backport from mainline:
35+
36+ 2013-02-27 Yufeng Zhang <yufeng.zhang@arm.com>
37+ * config/tc-aarch64.c (parse_sys_reg): Allow the full range of CRn
38+ for system registers.
39+
40 2013-03-05 Yufeng Zhang <yufeng.zhang@arm.com>
41
42 * config/tc-aarch64.c (aarch64_imm_float_p): Rename 'e' to 'pattern';
43diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c
44index 162c865..db28c71 100644
45--- a/gas/config/tc-aarch64.c
46+++ b/gas/config/tc-aarch64.c
47@@ -3243,10 +3243,14 @@ parse_sys_reg (char **str, struct hash_control *sys_regs, int imple_defined_p)
48 unsigned int op0, op1, cn, cm, op2;
49 if (sscanf (buf, "s%u_%u_c%u_c%u_%u", &op0, &op1, &cn, &cm, &op2) != 5)
50 return PARSE_FAIL;
51- /* Register access is encoded as follows:
52+ /* The architecture specifies the encoding space for implementation
53+ defined registers as:
54 op0 op1 CRn CRm op2
55- 11 xxx 1x11 xxxx xxx. */
56- if (op0 != 3 || op1 > 7 || (cn | 0x4) != 0xf || cm > 15 || op2 > 7)
57+ 11 xxx 1x11 xxxx xxx
58+ For convenience GAS accepts a wider encoding space, as follows:
59+ op0 op1 CRn CRm op2
60+ 11 xxx xxxx xxxx xxx */
61+ if (op0 != 3 || op1 > 7 || cn > 15 || cm > 15 || op2 > 7)
62 return PARSE_FAIL;
63 value = (op0 << 14) | (op1 << 11) | (cn << 7) | (cm << 3) | op2;
64 }
65diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
66index d1ebc3b..8ee06c8 100644
67--- a/gas/testsuite/ChangeLog
68+++ b/gas/testsuite/ChangeLog
69@@ -1,3 +1,13 @@
70+2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
71+
72+ Backport from mainline:
73+
74+ 2013-02-27 Yufeng Zhang <yufeng.zhang@arm.com>
75+ * gas/aarch64/illegal.l: Delete the error message for
76+ msr S3_1_C13_C15_1,x7.
77+ * gas/aarch64/sysreg.s: Add new tests.
78+ * gas/aarch64/sysreg.d: Update.
79+
80 2013-03-08 Christian Groessler <chris@groessler.org>
81
82 Backport from mainline:
83diff --git a/gas/testsuite/gas/aarch64/illegal.l b/gas/testsuite/gas/aarch64/illegal.l
84index e17a1de..f7e4074 100644
85--- a/gas/testsuite/gas/aarch64/illegal.l
86+++ b/gas/testsuite/gas/aarch64/illegal.l
87@@ -520,7 +520,6 @@
88 [^:]*:496: Error: .*`str x1,page_table_count'
89 [^:]*:498: Error: .*`prfm PLDL3KEEP,\[x9,x15,sxtx#2\]'
90 [^:]*:500: Error: .*`mrs x5,S1_0_C13_C8_0'
91-[^:]*:501: Error: .*`msr S3_1_C13_C15_1,x7'
92 [^:]*:502: Error: .*`msr S3_1_C11_C15_-1,x7'
93 [^:]*:503: Error: .*`msr S3_1_11_15_1,x7'
94 [^:]*:506: Error: .*`movi w1,#15'
95diff --git a/gas/testsuite/gas/aarch64/sysreg.d b/gas/testsuite/gas/aarch64/sysreg.d
96index b83b270..c7cf00e 100644
97--- a/gas/testsuite/gas/aarch64/sysreg.d
98+++ b/gas/testsuite/gas/aarch64/sysreg.d
99@@ -23,3 +23,6 @@ Disassembly of section \.text:
100 3c: d5380260 mrs x0, id_isar3_el1
101 40: d5380280 mrs x0, id_isar4_el1
102 44: d53802a0 mrs x0, id_isar5_el1
103+ 48: d538cc00 mrs x0, s3_0_c12_c12_0
104+ 4c: d5384600 mrs x0, s3_0_c4_c6_0
105+ 50: d5184600 msr s3_0_c4_c6_0, x0
106diff --git a/gas/testsuite/gas/aarch64/sysreg.s b/gas/testsuite/gas/aarch64/sysreg.s
107index e6f770e..3287594 100644
108--- a/gas/testsuite/gas/aarch64/sysreg.s
109+++ b/gas/testsuite/gas/aarch64/sysreg.s
110@@ -22,3 +22,7 @@
111 mrs x0, id_isar3_el1
112 mrs x0, id_isar4_el1
113 mrs x0, id_isar5_el1
114+
115+ mrs x0, s3_0_c12_c12_0
116+ mrs x0, s3_0_c4_c6_0
117+ msr s3_0_c4_c6_0, x0
diff --git a/meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch
new file mode 100644
index 0000000000..5c7076d255
--- /dev/null
+++ b/meta/recipes-devtools/binutils/binutils-2.23.2/backport/aarch64-movi.patch
@@ -0,0 +1,144 @@
1From: Yufeng Zhang <yufeng.zhang@arm.com>
2Date: Mon, 13 May 2013 23:09:51 +0000 (+0000)
3Subject: gas/testsuite/
4X-Git-Url: http://sourceware.org/git/?p=binutils.git;a=commitdiff_plain;h=f426901e1be0f58fe4e9386cada50ca57d0a4f36
5
6Upstream-status: backport
7
8gas/testsuite/
9
10 Backport from mainline:
11
12 2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
13 * gas/aarch64/diagnostic.s: Update.
14 * gas/aarch64/diagnostic.l: Ditto.
15 * gas/aarch64/movi.s: Add new tests.
16 * gas/aarch64/movi.d: Update.
17
18opcodes/
19
20 Backport from mainline:
21
22 2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
23 * aarch64-asm.c (aarch64_ins_advsimd_imm_modified): Remove assertion.
24 * aarch64-opc.c (operand_general_constraint_met_p): Relax the range
25 check from [0, 255] to [-128, 255].
26---
27
28diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
29index 8ee06c8..475c93a 100644
30--- a/gas/testsuite/ChangeLog
31+++ b/gas/testsuite/ChangeLog
32@@ -1,3 +1,13 @@
33+2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
34+
35+ Backport from mainline:
36+
37+ 2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
38+ * gas/aarch64/diagnostic.s: Update.
39+ * gas/aarch64/diagnostic.l: Ditto.
40+ * gas/aarch64/movi.s: Add new tests.
41+ * gas/aarch64/movi.d: Update.
42+
43 2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
44
45 Backport from mainline:
46diff --git a/gas/testsuite/gas/aarch64/diagnostic.l b/gas/testsuite/gas/aarch64/diagnostic.l
47index f37f11c..d7a1347 100644
48--- a/gas/testsuite/gas/aarch64/diagnostic.l
49+++ b/gas/testsuite/gas/aarch64/diagnostic.l
50@@ -38,8 +38,8 @@
51 [^:]*:40: Error: invalid shift amount at operand 3 -- `shll v1.4s,v2.4h,#32'
52 [^:]*:41: Error: immediate value out of range 0 to 31 at operand 3 -- `shl v1.2s,v2.2s,32'
53 [^:]*:42: Error: immediate value out of range 1 to 8 at operand 3 -- `sqshrn2 v2.16b,v3.8h,#17'
54-[^:]*:43: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v1.4h,256'
55-[^:]*:44: Error: immediate value out of range 0 to 255 at operand 2 -- `movi v1.4h,-1'
56+[^:]*:43: Error: immediate value out of range -128 to 255 at operand 2 -- `movi v1.4h,256'
57+[^:]*:44: Error: immediate value out of range -128 to 255 at operand 2 -- `movi v1.4h,-129'
58 [^:]*:45: Error: invalid shift operator at operand 2 -- `movi v1.4h,255,msl#8'
59 [^:]*:46: Error: invalid value for immediate at operand 2 -- `movi d0,256'
60 [^:]*:47: Error: immediate value should be a multiple of 8 at operand 2 -- `movi v1.4h,255,lsl#7'
61diff --git a/gas/testsuite/gas/aarch64/diagnostic.s b/gas/testsuite/gas/aarch64/diagnostic.s
62index 99ebf8f..e5443ab 100644
63--- a/gas/testsuite/gas/aarch64/diagnostic.s
64+++ b/gas/testsuite/gas/aarch64/diagnostic.s
65@@ -41,7 +41,7 @@
66 shl v1.2s, v2.2s, 32
67 sqshrn2 v2.16b, v3.8h, #17
68 movi v1.4h, 256
69- movi v1.4h, -1
70+ movi v1.4h, -129
71 movi v1.4h, 255, msl #8
72 movi d0, 256
73 movi v1.4h, 255, lsl #7
74diff --git a/gas/testsuite/gas/aarch64/movi.d b/gas/testsuite/gas/aarch64/movi.d
75index 2c73cc4..c225b21 100644
76--- a/gas/testsuite/gas/aarch64/movi.d
77+++ b/gas/testsuite/gas/aarch64/movi.d
78@@ -8201,3 +8201,6 @@ Disassembly of section \.text:
79 8004: 6f07e7e0 movi v0.2d, #0xffffffffffffffff
80 8008: 6f07e7e0 movi v0.2d, #0xffffffffffffffff
81 800c: 2f07e7ff movi d31, #0xffffffffffffffff
82+ 8010: 0f04e403 movi v3.8b, #0x80
83+ 8014: 0f04e423 movi v3.8b, #0x81
84+ 8018: 0f07e7e3 movi v3.8b, #0xff
85diff --git a/gas/testsuite/gas/aarch64/movi.s b/gas/testsuite/gas/aarch64/movi.s
86index 99ca34a..76f2d47 100644
87--- a/gas/testsuite/gas/aarch64/movi.s
88+++ b/gas/testsuite/gas/aarch64/movi.s
89@@ -102,3 +102,8 @@
90 movi v0.2d, bignum
91 movi d31, 18446744073709551615
92 .set bignum, 0xffffffffffffffff
93+
94+ // Allow -128 to 255 in #<imm8>
95+ movi v3.8b, -128
96+ movi v3.8b, -127
97+ movi v3.8b, -1
98diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
99index 96dfaeb..4adbc86 100644
100--- a/opcodes/ChangeLog
101+++ b/opcodes/ChangeLog
102@@ -1,3 +1,12 @@
103+2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
104+
105+ Backport from mainline:
106+
107+ 2013-05-13 Yufeng Zhang <yufeng.zhang@arm.com>
108+ * aarch64-asm.c (aarch64_ins_advsimd_imm_modified): Remove assertion.
109+ * aarch64-opc.c (operand_general_constraint_met_p): Relax the range
110+ check from [0, 255] to [-128, 255].
111+
112 2013-03-25 Tristan Gingold <gingold@adacore.com>
113 Backport of: 2013-03-08 Yann Sionneau <yann.sionneau@gmail.com>
114
115diff --git a/opcodes/aarch64-asm.c b/opcodes/aarch64-asm.c
116index 16cdaa9..ba463d9 100644
117--- a/opcodes/aarch64-asm.c
118+++ b/opcodes/aarch64-asm.c
119@@ -369,7 +369,6 @@ aarch64_ins_advsimd_imm_modified (const aarch64_operand *self ATTRIBUTE_UNUSED,
120 imm = aarch64_shrink_expanded_imm8 (imm);
121 assert ((int)imm >= 0);
122 }
123- assert (imm <= 255);
124 insert_fields (code, imm, 0, 2, FLD_defgh, FLD_abc);
125
126 if (kind == AARCH64_MOD_NONE)
127diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c
128index 73a760a..32f34c6 100644
129--- a/opcodes/aarch64-opc.c
130+++ b/opcodes/aarch64-opc.c
131@@ -1724,10 +1724,10 @@ operand_general_constraint_met_p (const aarch64_opnd_info *opnds, int idx,
132 assert (idx == 1);
133 if (aarch64_get_qualifier_esize (opnds[0].qualifier) != 8)
134 {
135- /* uimm8 */
136- if (!value_in_range_p (opnd->imm.value, 0, 255))
137+ /* uimm8 or simm8 */
138+ if (!value_in_range_p (opnd->imm.value, -128, 255))
139 {
140- set_imm_out_of_range_error (mismatch_detail, idx, 0, 255);
141+ set_imm_out_of_range_error (mismatch_detail, idx, -128, 255);
142 return 0;
143 }
144 }