diff --git a/cross-aarch64-gcc13-bootstrap.spec b/cross-aarch64-gcc13-bootstrap.spec index bba35af..70da9d9 100644 --- a/cross-aarch64-gcc13-bootstrap.spec +++ b/cross-aarch64-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-aarch64-gcc13.spec b/cross-aarch64-gcc13.spec index 57981df..4a590b3 100644 --- a/cross-aarch64-gcc13.spec +++ b/cross-aarch64-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-amdgcn-gcc13.spec b/cross-amdgcn-gcc13.spec index 76d6e1f..4405751 100644 --- a/cross-amdgcn-gcc13.spec +++ b/cross-amdgcn-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-arm-gcc13.spec b/cross-arm-gcc13.spec index 0b0756d..df29f87 100644 --- a/cross-arm-gcc13.spec +++ b/cross-arm-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-arm-none-gcc13-bootstrap.spec b/cross-arm-none-gcc13-bootstrap.spec index 8c05a7a..d03b963 100644 --- a/cross-arm-none-gcc13-bootstrap.spec +++ b/cross-arm-none-gcc13-bootstrap.spec @@ -746,6 +746,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-arm-none-gcc13.spec b/cross-arm-none-gcc13.spec index 2962f8e..289a587 100644 --- a/cross-arm-none-gcc13.spec +++ b/cross-arm-none-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-avr-gcc13-bootstrap.spec b/cross-avr-gcc13-bootstrap.spec index c81fce3..68c8591 100644 --- a/cross-avr-gcc13-bootstrap.spec +++ b/cross-avr-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-avr-gcc13.spec b/cross-avr-gcc13.spec index a6a4a1b..1b104d5 100644 --- a/cross-avr-gcc13.spec +++ b/cross-avr-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-bpf-gcc13.spec b/cross-bpf-gcc13.spec index 18d443b..59e749e 100644 --- a/cross-bpf-gcc13.spec +++ b/cross-bpf-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-epiphany-gcc13-bootstrap.spec b/cross-epiphany-gcc13-bootstrap.spec index 41f8595..c187df8 100644 --- a/cross-epiphany-gcc13-bootstrap.spec +++ b/cross-epiphany-gcc13-bootstrap.spec @@ -746,6 +746,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-epiphany-gcc13.spec b/cross-epiphany-gcc13.spec index 16aa9ca..9141058 100644 --- a/cross-epiphany-gcc13.spec +++ b/cross-epiphany-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-hppa-gcc13-bootstrap.spec b/cross-hppa-gcc13-bootstrap.spec index a569330..4754ce2 100644 --- a/cross-hppa-gcc13-bootstrap.spec +++ b/cross-hppa-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-hppa-gcc13.spec b/cross-hppa-gcc13.spec index 7ec2552..fef80c9 100644 --- a/cross-hppa-gcc13.spec +++ b/cross-hppa-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-m68k-gcc13.spec b/cross-m68k-gcc13.spec index cf13568..5cf1b6d 100644 --- a/cross-m68k-gcc13.spec +++ b/cross-m68k-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-mips-gcc13.spec b/cross-mips-gcc13.spec index c74f3db..98c865e 100644 --- a/cross-mips-gcc13.spec +++ b/cross-mips-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-nvptx-gcc13.spec b/cross-nvptx-gcc13.spec index e49a436..99894e1 100644 --- a/cross-nvptx-gcc13.spec +++ b/cross-nvptx-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-ppc64-gcc13.spec b/cross-ppc64-gcc13.spec index 786697c..f6a6f10 100644 --- a/cross-ppc64-gcc13.spec +++ b/cross-ppc64-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-ppc64le-gcc13-bootstrap.spec b/cross-ppc64le-gcc13-bootstrap.spec index a9d65cd..3223c31 100644 --- a/cross-ppc64le-gcc13-bootstrap.spec +++ b/cross-ppc64le-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-ppc64le-gcc13.spec b/cross-ppc64le-gcc13.spec index d7f2e64..c907e94 100644 --- a/cross-ppc64le-gcc13.spec +++ b/cross-ppc64le-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-pru-gcc13-bootstrap.spec b/cross-pru-gcc13-bootstrap.spec index b779e79..0891bc4 100644 --- a/cross-pru-gcc13-bootstrap.spec +++ b/cross-pru-gcc13-bootstrap.spec @@ -746,6 +746,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-pru-gcc13.spec b/cross-pru-gcc13.spec index e2a331b..fbca31f 100644 --- a/cross-pru-gcc13.spec +++ b/cross-pru-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-riscv64-elf-gcc13-bootstrap.spec b/cross-riscv64-elf-gcc13-bootstrap.spec index b3e1174..8024bca 100644 --- a/cross-riscv64-elf-gcc13-bootstrap.spec +++ b/cross-riscv64-elf-gcc13-bootstrap.spec @@ -746,6 +746,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-riscv64-elf-gcc13.spec b/cross-riscv64-elf-gcc13.spec index a8fe782..4e21cf4 100644 --- a/cross-riscv64-elf-gcc13.spec +++ b/cross-riscv64-elf-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-riscv64-gcc13-bootstrap.spec b/cross-riscv64-gcc13-bootstrap.spec index 54f21ac..52b78c6 100644 --- a/cross-riscv64-gcc13-bootstrap.spec +++ b/cross-riscv64-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-riscv64-gcc13.spec b/cross-riscv64-gcc13.spec index 1e0a0eb..0879c01 100644 --- a/cross-riscv64-gcc13.spec +++ b/cross-riscv64-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-rx-gcc13-bootstrap.spec b/cross-rx-gcc13-bootstrap.spec index 7c8fcf2..cb79fa6 100644 --- a/cross-rx-gcc13-bootstrap.spec +++ b/cross-rx-gcc13-bootstrap.spec @@ -746,6 +746,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-rx-gcc13.spec b/cross-rx-gcc13.spec index 81fa215..6bc9c38 100644 --- a/cross-rx-gcc13.spec +++ b/cross-rx-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-s390x-gcc13-bootstrap.spec b/cross-s390x-gcc13-bootstrap.spec index 78bc233..28290bc 100644 --- a/cross-s390x-gcc13-bootstrap.spec +++ b/cross-s390x-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-s390x-gcc13.spec b/cross-s390x-gcc13.spec index 71ae0dd..0dea949 100644 --- a/cross-s390x-gcc13.spec +++ b/cross-s390x-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-sparc-gcc13.spec b/cross-sparc-gcc13.spec index c5cb8d5..0f0378f 100644 --- a/cross-sparc-gcc13.spec +++ b/cross-sparc-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-sparc64-gcc13.spec b/cross-sparc64-gcc13.spec index a49983b..b5c8a9b 100644 --- a/cross-sparc64-gcc13.spec +++ b/cross-sparc64-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-x86_64-gcc13-bootstrap.spec b/cross-x86_64-gcc13-bootstrap.spec index 13065e3..dd0cd82 100644 --- a/cross-x86_64-gcc13-bootstrap.spec +++ b/cross-x86_64-gcc13-bootstrap.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/cross-x86_64-gcc13.spec b/cross-x86_64-gcc13.spec index 6da8de6..005a954 100644 --- a/cross-x86_64-gcc13.spec +++ b/cross-x86_64-gcc13.spec @@ -745,6 +745,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/gcc.spec.in b/gcc.spec.in index f3d7175..16b6be4 100644 --- a/gcc.spec.in +++ b/gcc.spec.in @@ -1756,6 +1756,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/gcc13-testresults.spec b/gcc13-testresults.spec index f22a155..9361b58 100644 --- a/gcc13-testresults.spec +++ b/gcc13-testresults.spec @@ -947,6 +947,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \ diff --git a/gcc13.spec b/gcc13.spec index 418fcbc..fa477db 100644 --- a/gcc13.spec +++ b/gcc13.spec @@ -2764,6 +2764,9 @@ amdgcn-amdhsa,\ %endif --with-long-double-128 \ --enable-decimal-float \ +%if %{?cross_arch:1} + --disable-multilib \ +%endif %endif %if "%{TARGET_ARCH}" == "m68k" --disable-multilib \