mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 06:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

binutils: fix native builds when host has gcc5

Browse Source 
Cherry pick upstream commit to fix -Werror=logical-not-parentheses error
when building with native gcc5.

(From OE-Core rev: b3bd0dba3139a3e79bfcebe137248c7bdcadf04d)

(From OE-Core rev: c8bc2d7913e11278990d1fe82066e26f7fc1c11b)

Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
George McCollister
2015-06-16 13:12:34 -05:00
committed by Richard Purdie
parent cfc5952b11
commit a93005e6d0
2 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/recipes-devtools/binutils/binutils-2.24.inc
View File

@@ -40,6 +40,7 @@ SRC_URI = "\
file://binutils_CVE-2014-8503.patch \
file://binutils_CVE-2014-8504.patch \
file://binutils_CVE-2014-8737.patch \
file://Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch \
"
SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b"

76
meta/recipes-devtools/binutils/binutils/Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch Normal file
View File

@@ -0,0 +1,76 @@
From 360ddc990a941bc506576f45a3858d38f508410b Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Fri, 12 Sep 2014 09:46:30 +0930
Subject: [PATCH] Fix tc-i386.c -Werror=logical-not-parentheses error
* config/tc-i386.c (match_template): Remove redundant "!!" testing
single-bit bitfields.
(build_modrm_byte): Don't compare single-bit bitfields to "1".
Upstream commit:
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=ac4eb736520174305bf6e691827f7473b858cff1
Manually resolved gas/ChangeLog conflict by placing the change at the
top of the file.
gas/config/tc-i386.c patched with offset
Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
gas/ChangeLog | 6 ++++++
gas/config/tc-i386.c | 12 ++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7fafa26..c6e60c9 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-12 Alan Modra <amodra@gmail.com>
+
+ * config/tc-i386.c (match_template): Remove redundant "!!" testing
+ single-bit bitfields.
+ (build_modrm_byte): Don't compare single-bit bitfields to "1".
+
2013-11-18 H.J. Lu <hongjiu.lu@intel.com>
* config/tc-i386.c (lex_got): Add a dummy "int bnd_prefix"
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 3c423da..4464091 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4672,9 +4672,9 @@ match_template (void)
&& !operand_types[0].bitfield.regymm
&& !operand_types[0].bitfield.regzmm)
|| (!operand_types[t->operands > 1].bitfield.regmmx
- && !!operand_types[t->operands > 1].bitfield.regxmm
- && !!operand_types[t->operands > 1].bitfield.regymm
- && !!operand_types[t->operands > 1].bitfield.regzmm))
+ && operand_types[t->operands > 1].bitfield.regxmm
+ && operand_types[t->operands > 1].bitfield.regymm
+ && operand_types[t->operands > 1].bitfield.regzmm))
&& (t->base_opcode != 0x0fc7
|| t->extension_opcode != 1 /* cmpxchg8b */))
continue;
@@ -4689,7 +4689,7 @@ match_template (void)
&& ((!operand_types[0].bitfield.regmmx
&& !operand_types[0].bitfield.regxmm)
|| (!operand_types[t->operands > 1].bitfield.regmmx
- && !!operand_types[t->operands > 1].bitfield.regxmm)))
+ && operand_types[t->operands > 1].bitfield.regxmm)))
continue;
/* Do not verify operands when there are none. */
@@ -6139,8 +6139,8 @@ build_modrm_byte (void)
op = i.tm.operand_types[vvvv];
op.bitfield.regmem = 0;
if ((dest + 1) >= i.operands
- || (op.bitfield.reg32 != 1
- && !op.bitfield.reg64 != 1
+ || (!op.bitfield.reg32
+ && op.bitfield.reg64
&& !operand_type_equal (&op, &regxmm)
&& !operand_type_equal (&op, &regymm)
&& !operand_type_equal (&op, &regzmm)
--
2.4.3