diff --git a/binutils.changes b/binutils.changes
index 7fca57d..985f3ca 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/binutils.spec b/binutils.spec
index 3cce87f..7e7b409 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -238,6 +238,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-aarch64-binutils.changes
+++ b/cross-aarch64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec
index fcb11e6..29d1135 100644
--- a/cross-aarch64-binutils.spec
+++ b/cross-aarch64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-arm-binutils.changes
+++ b/cross-arm-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec
index ee642e2..115658c 100644
--- a/cross-arm-binutils.spec
+++ b/cross-arm-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-avr-binutils.changes
+++ b/cross-avr-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec
index dce2064..fe38757 100644
--- a/cross-avr-binutils.spec
+++ b/cross-avr-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-epiphany-binutils.changes b/cross-epiphany-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-epiphany-binutils.changes
+++ b/cross-epiphany-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-epiphany-binutils.spec b/cross-epiphany-binutils.spec
index a817e3f..cfac7ed 100644
--- a/cross-epiphany-binutils.spec
+++ b/cross-epiphany-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-hppa-binutils.changes
+++ b/cross-hppa-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec
index 2a7182a..ef709e5 100644
--- a/cross-hppa-binutils.spec
+++ b/cross-hppa-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-hppa64-binutils.changes
+++ b/cross-hppa64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec
index 34c438d..8c127a8 100644
--- a/cross-hppa64-binutils.spec
+++ b/cross-hppa64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-i386-binutils.changes
+++ b/cross-i386-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec
index 7c1bbc1..4b37854 100644
--- a/cross-i386-binutils.spec
+++ b/cross-i386-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-ia64-binutils.changes
+++ b/cross-ia64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec
index c8b05e9..aa38e54 100644
--- a/cross-ia64-binutils.spec
+++ b/cross-ia64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-m68k-binutils.changes b/cross-m68k-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-m68k-binutils.changes
+++ b/cross-m68k-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-m68k-binutils.spec b/cross-m68k-binutils.spec
index 64fdfd1..b76bebb 100644
--- a/cross-m68k-binutils.spec
+++ b/cross-m68k-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-mips-binutils.changes
+++ b/cross-mips-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec
index abc0bed..74a296a 100644
--- a/cross-mips-binutils.spec
+++ b/cross-mips-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-ppc-binutils.changes
+++ b/cross-ppc-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec
index afb3db0..5f0a5e6 100644
--- a/cross-ppc-binutils.spec
+++ b/cross-ppc-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-ppc64-binutils.changes
+++ b/cross-ppc64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec
index b4304a1..dc697b8 100644
--- a/cross-ppc64-binutils.spec
+++ b/cross-ppc64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-ppc64le-binutils.changes b/cross-ppc64le-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-ppc64le-binutils.changes
+++ b/cross-ppc64le-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-ppc64le-binutils.spec b/cross-ppc64le-binutils.spec
index 537c2ab..55c8fb2 100644
--- a/cross-ppc64le-binutils.spec
+++ b/cross-ppc64le-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-riscv64-binutils.changes b/cross-riscv64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-riscv64-binutils.changes
+++ b/cross-riscv64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-riscv64-binutils.spec b/cross-riscv64-binutils.spec
index 460cc0f..0e8cb67 100644
--- a/cross-riscv64-binutils.spec
+++ b/cross-riscv64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-rx-binutils.changes b/cross-rx-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-rx-binutils.changes
+++ b/cross-rx-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-rx-binutils.spec b/cross-rx-binutils.spec
index bb646e3..e0d76bc 100644
--- a/cross-rx-binutils.spec
+++ b/cross-rx-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-s390-binutils.changes
+++ b/cross-s390-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec
index 4ae8e33..da74cdb 100644
--- a/cross-s390-binutils.spec
+++ b/cross-s390-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-s390x-binutils.changes
+++ b/cross-s390x-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec
index 579a8cb..46caf82 100644
--- a/cross-s390x-binutils.spec
+++ b/cross-s390x-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-sparc-binutils.changes
+++ b/cross-sparc-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec
index 223ddcc..c23a631 100644
--- a/cross-sparc-binutils.spec
+++ b/cross-sparc-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-sparc64-binutils.changes
+++ b/cross-sparc64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec
index 9f436e3..2993159 100644
--- a/cross-sparc64-binutils.spec
+++ b/cross-sparc64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-spu-binutils.changes
+++ b/cross-spu-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec
index 3c20a8d..b60207d 100644
--- a/cross-spu-binutils.spec
+++ b/cross-spu-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"
diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes
index 7fca57d..985f3ca 100644
--- a/cross-x86_64-binutils.changes
+++ b/cross-x86_64-binutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 31 11:45:27 UTC 2018 - rguenther@suse.com
+
+- Disable -z separate-code everywhere but in Tumbleweed.
+
 -------------------------------------------------------------------
 Mon Jul 16 07:55:51 UTC 2018 - rguenther@suse.com
 
diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec
index 65a9e10..e74d6ad 100644
--- a/cross-x86_64-binutils.spec
+++ b/cross-x86_64-binutils.spec
@@ -241,6 +241,9 @@ cd build-dir
 %endif
 %if %{suse_version} > 1320
 	--enable-compressed-debug-sections=gas \
+%endif
+%if %{suse_version} < 1550
+	--disable-separate-code \
 %endif
 	--enable-new-dtags \
 %if "%{TARGET}" != "mips"