diff --git a/binutils-bso21333.diff b/binutils-bso21333.diff
new file mode 100644
index 0000000..4ae6f03
--- /dev/null
+++ b/binutils-bso21333.diff
@@ -0,0 +1,18 @@
+diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
+index 35cee61..40c9f6f 100644
+--- a/gas/config/tc-s390.c
++++ b/gas/config/tc-s390.c
+@@ -2133,9 +2133,11 @@ md_pcrel_from_section (fixS *fixp, segT sec ATTRIBUTE_UNUSED)
+ int
+ tc_s390_fix_adjustable (fixS *fixP)
+ {
+-  /* Don't adjust references to merge sections.  */
+-  if ((S_GET_SEGMENT (fixP->fx_addsy)->flags & SEC_MERGE) != 0)
++  /* Don't adjust pc-relative references to merge sections.  */
++  if (fixP->fx_pcrel
++      && (S_GET_SEGMENT (fixP->fx_addsy)->flags & SEC_MERGE) != 0)
+     return 0;
++
+   /* adjust_reloc_syms doesn't know about the GOT.  */
+   if (   fixP->fx_r_type == BFD_RELOC_16_GOTOFF
+       || fixP->fx_r_type == BFD_RELOC_32_GOTOFF
diff --git a/binutils.changes b/binutils.changes
index e618bd8..7f24d40 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/binutils.spec b/binutils.spec
index 56f4082..c2b37e0 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -100,6 +100,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -177,6 +178,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index 7e65c62..d45e6ed 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index 8b9932e..fa78fde 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index 19533aa..ad965af 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index 7147eb0..04260bd 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 2237681..f66c18f 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index e46864e..0e6a159 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 92928ce..1347fc1 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index b6af7e3..1844847 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 7a8fb07..f69d359 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index 1de6293..ca35569 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index 50910cc..2ca8d3b 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index b4410d8..81291e2 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 623152b..af1969d 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index d287546..12bde59 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index f767792..6fdb79e 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 498f3ce..ca59dce 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 0b35bb7..103769e 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 00d04ab..bd9f926 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index bc0aa27..fadcc14 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index e618bd8..7f24d40 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -4,6 +4,7 @@ Fri Mar 31 10:30:08 UTC 2017 - rguenther@suse.com
 - Update binutils-2.28-branch.diff.
 - Make compressed debug section handling explicit, disable for
   old products and enable for gas on all architectures otherwise.
+- Add binutils-bso21333.diff.  [boo#1029995]
 
 -------------------------------------------------------------------
 Thu Mar 30 11:16:18 UTC 2017 - rguenther@suse.com
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 3374213..a454948 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -103,6 +103,7 @@ Patch34:        aarch64-common-pagesize.patch
 # Backport 758d96d834ba725461a
 Patch36:        binutils-bso21193.diff
 Patch37:        fix-security-bugs.diff
+Patch38:        binutils-bso21333.diff
 Patch90:        cross-avr-nesc-as.patch
 Patch92:        cross-avr-omit_section_dynsym.patch
 Patch93:        cross-avr-size.patch
@@ -180,6 +181,7 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa
 %patch34 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %if "%{TARGET}" == "avr"
 cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h
 %patch90