diff --git a/binutils-bfd_h.patch b/binutils-bfd_h.patch
new file mode 100644
index 0000000..de13c26
--- /dev/null
+++ b/binutils-bfd_h.patch
@@ -0,0 +1,16 @@
+Remove the #error to avoid issues with legacy not dealing with this
+
+--- bfd/bfd-in.h.orig	2012-11-30 13:44:35.715871571 +0100
++++ bfd/bfd-in.h	2012-11-30 13:44:43.428871298 +0100
+@@ -25,11 +25,6 @@
+ #ifndef __BFD_H_SEEN__
+ #define __BFD_H_SEEN__
+ 
+-/* PR 14072: Ensure that config.h is included first.  */
+-#if !defined PACKAGE && !defined PACKAGE_VERSION
+-#error config.h must be included before this header
+-#endif
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/binutils.changes b/binutils.changes
index df61c64..7f2b073 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index 7673be7..2cffc24 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -94,6 +94,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -160,6 +161,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 50a10d5..48b2cb0 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-alpha-binutils.changes
+++ b/cross-alpha-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec
index 9e70368..1d36046 100644
--- a/cross-alpha-binutils.spec
+++ b/cross-alpha-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 7f7361e..024e05b 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index c112473..87b396c 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index d41dd34..4d41fa0 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index ed1774c..db7d7fa 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 6abff98..36fc81e 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index 4480a4e..c4ca4a3 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index e9ba992..72c8bc1 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 4dfee97..c7d3b06 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index be91b63..2774dbc 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index b1baa62..04a9537 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index c708e95..7a71363 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index db88a3d..36a91ec 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index d7eb3bf..a49d4ea 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 406e32e..fb2063a 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index df61c64..7f2b073 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com
+
+- Revert upstream change to error on bfd.h usage without first
+  including some config.h
+
 -------------------------------------------------------------------
 Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 7fbc16e..682eb28 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -97,6 +97,7 @@ Patch11:        use-hashtype-both-by-default.diff
 Patch14:        binutils-build-as-needed.diff
 Patch18:        gold-depend-on-opcodes.diff
 Patch21:        binutils-2.22-objalloc.patch
+Patch22:        binutils-bfd_h.patch
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch101:       aarch64-biarch.patch
@@ -163,6 +164,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch14
 %patch18
 %patch21
+%patch22
 %patch101 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h