From 05deefa5b47efba73c56f7fb69c68ac33c6aa87f Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Jan 04 2017 15:15:00 +0000
Subject: Import upstream xtensa bug fix causing cross-gcc FTBFS (BZ#1404857).


---

diff --git a/binutils-2.27-fix-xtensa-bug.patch b/binutils-2.27-fix-xtensa-bug.patch
new file mode 100644
index 0000000..4b85b6f
--- /dev/null
+++ b/binutils-2.27-fix-xtensa-bug.patch
@@ -0,0 +1,16 @@
+## Fix to xg_reverse_shift_count typo bug in tc-xtensa.c
+## Original upstream commit:
+##    https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=78fb7e37eb8bb08ae537d6c487996ff17c810332;hp=c5da193232ea0452f714dffee0d417d965590476
+diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
+index d062044..ca261ae 100644
+--- a/gas/config/tc-xtensa.c
++++ b/gas/config/tc-xtensa.c
+@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp)
+   cnt_arg = *cnt_argp;
+ 
+   /* replace the argument with "31-(argument)" */
+-  new_arg = concat ("31-(", cnt_argp, ")", (char *) NULL);
++  new_arg = concat ("31-(", cnt_arg, ")", (char *) NULL);
+ 
+   free (cnt_arg);
+   *cnt_argp = new_arg;
diff --git a/cross-binutils.spec b/cross-binutils.spec
index 024e8c2..05c24d6 100644
--- a/cross-binutils.spec
+++ b/cross-binutils.spec
@@ -57,7 +57,7 @@
 Summary: A GNU collection of cross-compilation binary utilities
 Name: %{cross}-binutils
 Version: 2.27
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+
 Group: Development/Tools
 URL: http://sources.redhat.com/binutils
@@ -106,6 +106,9 @@ Patch19: binutils-2.28-gold.patch
 Patch20: binutils-2.27-objdump-improvements.patch
 # Improve objdump's speed when mixing disassembly with source code
 Patch21: binutils-2.27-dwarf-parse-speedup.patch
+# Import upstream xtensa bug fix causing cross-gcc FTBFS
+# https://sourceware.org/ml/binutils/2016-09/msg00179.html
+Patch22: binutils-2.27-fix-xtensa-bug.patch
 
 %if %{build_sh64}
 Patch100: cross-binutils-2.25-fixup-for-sh64.patch
@@ -252,6 +255,7 @@ cd %{srcdir}
 %patch19 -p0
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %if %{build_sh64}
 %patch100 -p1 -b .sh64-fixup~
@@ -721,6 +725,9 @@ rm -rf %{buildroot}
 %do_files xtensa-linux-gnu	%{build_xtensa}
 
 %changelog
+* Wed Dec 14 2016 Merlin Mathesius <mmathesi@redhat.com> - 2.27-5
+- Import upstream xtensa bug fix causing cross-gcc FTBFS (BZ#1404857).
+
 * Fri Dec 9 2016 David Howells <dhowells@redhat.com> - 2.27-4
 - Sync with binutils-2.27-12.