diff --git a/gcc.changes b/gcc.changes
index 1f189c0..65db2ca 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 18 09:08:26 UTC 2020 - Richard Biener <rguenther@suse.com>
+
+- Sync separate_bi{32,64} macros with the GCC side, honoring
+  %disable_32bit.  [bsc#1170466]
+
 -------------------------------------------------------------------
 Tue Mar 31 08:46:16 UTC 2020 - Richard Biener <rguenther@suse.com>
 
diff --git a/gcc.spec b/gcc.spec
index 7a23382..cf9c302 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -19,12 +19,14 @@
 Name:           gcc
 %define separate_bi32 0
 %define separate_bi64 0
-%ifarch ppc
+%if 0%{!?disable_32bit:1}
+%ifarch ppc sparcv9
 %define separate_bi64 1
 %endif
-%ifarch x86_64 s390x ppc64
+%ifarch x86_64 s390x ppc64 sparc64
 %define separate_bi32 1
 %endif
+%endif
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 # Note that AdaCore only supports %ix86, x86_64 and ia64