diff --git a/cross-aarch64-gcc12-bootstrap.spec b/cross-aarch64-gcc12-bootstrap.spec
index c8668f3..1d5bb54 100644
--- a/cross-aarch64-gcc12-bootstrap.spec
+++ b/cross-aarch64-gcc12-bootstrap.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-aarch64-gcc12.spec b/cross-aarch64-gcc12.spec
index 6e0787b..eaa8d35 100644
--- a/cross-aarch64-gcc12.spec
+++ b/cross-aarch64-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-amdgcn-gcc12.spec b/cross-amdgcn-gcc12.spec
index cd5a739..5c2466a 100644
--- a/cross-amdgcn-gcc12.spec
+++ b/cross-amdgcn-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-arm-gcc12.spec b/cross-arm-gcc12.spec
index aec0a6e..2e2dd54 100644
--- a/cross-arm-gcc12.spec
+++ b/cross-arm-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-arm-none-gcc12-bootstrap.spec b/cross-arm-none-gcc12-bootstrap.spec
index c44dd49..fb9fb24 100644
--- a/cross-arm-none-gcc12-bootstrap.spec
+++ b/cross-arm-none-gcc12-bootstrap.spec
@@ -646,8 +646,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-arm-none-gcc12.spec b/cross-arm-none-gcc12.spec
index fd867f4..4b73a02 100644
--- a/cross-arm-none-gcc12.spec
+++ b/cross-arm-none-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-avr-gcc12-bootstrap.spec b/cross-avr-gcc12-bootstrap.spec
index 5abad2b..017b6ea 100644
--- a/cross-avr-gcc12-bootstrap.spec
+++ b/cross-avr-gcc12-bootstrap.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-avr-gcc12.spec b/cross-avr-gcc12.spec
index b195289..868b1a5 100644
--- a/cross-avr-gcc12.spec
+++ b/cross-avr-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-epiphany-gcc12-bootstrap.spec b/cross-epiphany-gcc12-bootstrap.spec
index af6ac37..8f37e96 100644
--- a/cross-epiphany-gcc12-bootstrap.spec
+++ b/cross-epiphany-gcc12-bootstrap.spec
@@ -646,8 +646,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-epiphany-gcc12.spec b/cross-epiphany-gcc12.spec
index f3a09e7..4daec21 100644
--- a/cross-epiphany-gcc12.spec
+++ b/cross-epiphany-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-hppa-gcc12-bootstrap.spec b/cross-hppa-gcc12-bootstrap.spec
index 31d336d..8d868fa 100644
--- a/cross-hppa-gcc12-bootstrap.spec
+++ b/cross-hppa-gcc12-bootstrap.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-hppa-gcc12.spec b/cross-hppa-gcc12.spec
index 1b4d933..41b7bc8 100644
--- a/cross-hppa-gcc12.spec
+++ b/cross-hppa-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-m68k-gcc12.spec b/cross-m68k-gcc12.spec
index 241a906..6d7ed76 100644
--- a/cross-m68k-gcc12.spec
+++ b/cross-m68k-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-mips-gcc12.spec b/cross-mips-gcc12.spec
index 4adce99..2f8cea1 100644
--- a/cross-mips-gcc12.spec
+++ b/cross-mips-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-nvptx-gcc12.spec b/cross-nvptx-gcc12.spec
index 81cde74..d774fa7 100644
--- a/cross-nvptx-gcc12.spec
+++ b/cross-nvptx-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-ppc64-gcc12.spec b/cross-ppc64-gcc12.spec
index 6d0727f..41ab325 100644
--- a/cross-ppc64-gcc12.spec
+++ b/cross-ppc64-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-ppc64le-gcc12.spec b/cross-ppc64le-gcc12.spec
index c3362c5..ee5efc9 100644
--- a/cross-ppc64le-gcc12.spec
+++ b/cross-ppc64le-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-riscv64-elf-gcc12-bootstrap.spec b/cross-riscv64-elf-gcc12-bootstrap.spec
index adb8b32..ba3b0c1 100644
--- a/cross-riscv64-elf-gcc12-bootstrap.spec
+++ b/cross-riscv64-elf-gcc12-bootstrap.spec
@@ -646,8 +646,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-riscv64-elf-gcc12.spec b/cross-riscv64-elf-gcc12.spec
index 2f1f782..f166c80 100644
--- a/cross-riscv64-elf-gcc12.spec
+++ b/cross-riscv64-elf-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-riscv64-gcc12-bootstrap.spec b/cross-riscv64-gcc12-bootstrap.spec
index 0a579b2..757fe1e 100644
--- a/cross-riscv64-gcc12-bootstrap.spec
+++ b/cross-riscv64-gcc12-bootstrap.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-riscv64-gcc12.spec b/cross-riscv64-gcc12.spec
index 0c40354..869ee64 100644
--- a/cross-riscv64-gcc12.spec
+++ b/cross-riscv64-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-rx-gcc12-bootstrap.spec b/cross-rx-gcc12-bootstrap.spec
index 6a23d13..3dcd7af 100644
--- a/cross-rx-gcc12-bootstrap.spec
+++ b/cross-rx-gcc12-bootstrap.spec
@@ -646,8 +646,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-rx-gcc12.spec b/cross-rx-gcc12.spec
index 1efd478..dbae285 100644
--- a/cross-rx-gcc12.spec
+++ b/cross-rx-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-s390x-gcc12.spec b/cross-s390x-gcc12.spec
index 46fe10a..9ce65c9 100644
--- a/cross-s390x-gcc12.spec
+++ b/cross-s390x-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-sparc-gcc12.spec b/cross-sparc-gcc12.spec
index fa48dc7..8f14efb 100644
--- a/cross-sparc-gcc12.spec
+++ b/cross-sparc-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-sparc64-gcc12.spec b/cross-sparc64-gcc12.spec
index 1d98a9b..ed41dfc 100644
--- a/cross-sparc64-gcc12.spec
+++ b/cross-sparc64-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/cross-x86_64-gcc12.spec b/cross-x86_64-gcc12.spec
index 3166651..c4eca5d 100644
--- a/cross-x86_64-gcc12.spec
+++ b/cross-x86_64-gcc12.spec
@@ -645,8 +645,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/gcc.spec.in b/gcc.spec.in
index b57c938..946ffdd 100644
--- a/gcc.spec.in
+++ b/gcc.spec.in
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:009c7ae09da8aef952b281ed4241b9d9c74f24eb0a9e25596f75799e9f3b3646
+oid sha256:8e8bc91c875b9f5d30e70948227e6aa3b20b92e6b9849ef8c7ce690832816f89
 size 87855
diff --git a/gcc12-testresults.spec b/gcc12-testresults.spec
index 1109853..a86163a 100644
--- a/gcc12-testresults.spec
+++ b/gcc12-testresults.spec
@@ -837,8 +837,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"
diff --git a/gcc12.spec b/gcc12.spec
index b11591f..891b31c 100644
--- a/gcc12.spec
+++ b/gcc12.spec
@@ -2333,8 +2333,8 @@ amdgcn-amdhsa,\
 	--with-long-double-format=ieee \
 %else
 	--with-long-double-format=ibm \
-	--disable-multilib \
 %endif
+	--disable-multilib \
 %endif
 %endif
 %if "%{TARGET_ARCH}" == "sparc64"