From 116360f39ba7adb5860d36b9796578d0f38f4c2f Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 3 Nov 2015 16:21:13 -0600 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../binutils/binutils/0012-Add-XLP-instructions-support.patch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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. Upstream-Status: Pending Signed-off-by: Khem Raj + +Use 0x00000080 for INSN_XLP, the value 0x00000040 has already been assigned +to INSN_OCTEON3 + +Signed-off-by: Baoshan Pang +Signed-off-by: Mark Hatle --- bfd/aoutx.h | 1 + bfd/archures.c | 1 + @@ -251,7 +257,7 @@ index ef26167..ef53ec6 100644 +/* Netlogic Xlr instruction */ +#define INSN_XLR 0x00000020 +/* Netlogic XlP instruction */ -+#define INSN_XLP 0x00000040 ++#define INSN_XLP 0x00000080 /* DSP ASE */ #define ASE_DSP 0x00000001 -- cgit v1.2.3-54-g00ecf