summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2015-11-03 16:21:13 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:26 +0000
commit116360f39ba7adb5860d36b9796578d0f38f4c2f (patch)
tree6d159d3e01c552214bad0d1266628b63d4a7193e
parentfd4f4d299e404ec01595e9df37c192435cbff595 (diff)
downloadpoky-116360f39ba7adb5860d36b9796578d0f38f4c2f.tar.gz
binutils: Fix XLP / Octeon 3 instruction clash
Use the value 0x00000080 for INSN_XLP, as the value 0x00000040 has already been assigned to INSN_OCTEON3 by the binutils project. Without this change, invalid instructions can be generated for both INSN_XLP and INSN_OCTEON3. (From OE-Core rev: 3a3269e7f4c7d13ad0c5705cb59c138b697151d7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch b/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
index c56ff915b4..ecc37ccc01 100644
--- a/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
+++ b/meta/recipes-devtools/binutils/binutils/0012-Add-XLP-instructions-support.patch
@@ -31,6 +31,12 @@ Netlogic. Also, update vendor name to NLM wherever applicable.
31Upstream-Status: Pending 31Upstream-Status: Pending
32 32
33Signed-off-by: Khem Raj <raj.khem@gmail.com> 33Signed-off-by: Khem Raj <raj.khem@gmail.com>
34
35Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been assigned
36to INSN_OCTEON3
37
38Signed-off-by: Baoshan Pang <baoshan.pang@windriver.com>
39Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
34--- 40---
35 bfd/aoutx.h | 1 + 41 bfd/aoutx.h | 1 +
36 bfd/archures.c | 1 + 42 bfd/archures.c | 1 +
@@ -251,7 +257,7 @@ index ef26167..ef53ec6 100644
251+/* Netlogic Xlr instruction */ 257+/* Netlogic Xlr instruction */
252+#define INSN_XLR 0x00000020 258+#define INSN_XLR 0x00000020
253+/* Netlogic XlP instruction */ 259+/* Netlogic XlP instruction */
254+#define INSN_XLP 0x00000040 260+#define INSN_XLP 0x00000080
255 261
256 /* DSP ASE */ 262 /* DSP ASE */
257 #define ASE_DSP 0x00000001 263 #define ASE_DSP 0x00000001