From f7bc3442cffde3ee50e750f47b8f61977fc8bb87 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: May 28 2015 12:33:18 +0000
Subject: Fix compile time warnings building with gcc 5.1.

Resolves: BZ #1224187

---

diff --git a/binutils-2.24-i386-gcc-warnings.patch b/binutils-2.24-i386-gcc-warnings.patch
new file mode 100644
index 0000000..c8820b5
--- /dev/null
+++ b/binutils-2.24-i386-gcc-warnings.patch
@@ -0,0 +1,35 @@
+--- ../binutils-2.24.orig/gas/config/tc-i386.c	2015-05-28 10:28:39.739979405 +0100
++++ gas/config/tc-i386.c	2015-05-28 10:33:00.076466134 +0100
+@@ -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)
diff --git a/binutils.spec b/binutils.spec
index 7515930..e66c1bd 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -17,7 +17,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.24
-Release: 31%{?dist}
+Release: 32%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -74,6 +74,7 @@ Patch31: binutils-2.24-corrupt-binaries.patch
 Patch32: binutils-2.24-strings-default-all.patch
 Patch33: binutils-2.24-plugin-sym-add.patch
 Patch34: binutils-2.24-corrupt-ar.patch
+Patch35: binutils-2.24-i386-gcc-warnings.patch
 
 Provides: bundled(libiberty)
 
@@ -213,6 +214,7 @@ using libelf instead of BFD.
 %patch31 -p0 -b .corrupt-binaries~
 %patch32 -p0 -b .strings-all~
 %patch33 -p0 -b .plugin-syms~
+%patch35 -p0 -b .i386-gas-warn~
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -524,6 +526,10 @@ exit 0
 %endif # %{isnative}
 
 %changelog
+* Thu May 28 2015 Nick Clifton <nickc@redhat.com> - 2.24-32
+- Fix compile time warnings building with gcc 5.1.
+- Resolves: BZ #1224187
+
 * Mon Apr 27 2015 Nick Clifton <nickc@redhat.com> - 2.24-31
 - Require the coreutils so that touch is available.
 - Resolves: BZ #1215242