fix build on SLE/Leap

Rev devel:gcc/5 Md5 e7b6c367b57dbb28a692523f632b49c4 2022-01-14 13:17:05 rguenther None

cross-aarch64-gcc12-bootstrap.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-aarch64-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-amdgcn-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-arm-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-arm-none-gcc12-bootstrap.spec

@@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-arm-none-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-avr-gcc12-bootstrap.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-avr-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-epiphany-gcc12-bootstrap.spec

@@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-epiphany-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-hppa-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-m68k-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-mips-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-nvptx-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-ppc64-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-ppc64le-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-riscv64-elf-gcc12-bootstrap.spec

@@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-riscv64-elf-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-riscv64-gcc12-bootstrap.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-riscv64-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-rx-gcc12-bootstrap.spec

@@ -437,6 +437,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-rx-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-s390x-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-sparc-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-sparc64-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

cross-x86_64-gcc12.spec

@@ -436,6 +436,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

gcc.spec.in

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:818e9a2f8e738759d016697f4764b98d411d071a80ed0e9c9482621c46fed57c
+oid sha256:9ec555211158c3e2689ae470e5467832e69713eb4163f6b8d9888d8ebc6329e8
-size 86085
+size 86228

gcc12-testresults.spec

@@ -260,6 +260,7 @@ BuildRequires:  gcc-ada
 %if %{build_d}
 %if %{suse_version} < 1550
 BuildRequires:  gcc11-d
+BuildRequires:  libstdc++6-devel-gcc11
 %else
 BuildRequires:  gcc-d
 %endif
@@ -626,6 +627,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}

gcc12.spec

@@ -242,6 +242,7 @@ BuildRequires:  gcc-ada
 %if %{build_d}
 %if %{suse_version} < 1550
 BuildRequires:  gcc11-d
+BuildRequires:  libstdc++6-devel-gcc11
 %else
 BuildRequires:  gcc-d
 %endif
@@ -2046,6 +2047,11 @@ ln -sf /usr/%{_lib} host-tools/%{_lib}
 export PATH="`pwd`/host-tools/bin:$PATH"
 %endif
 
+%if %{build_d} && %{suse_version} < 1550
+# We are using gcc11-d to bootstrap d
+export GDC=gdc-11
+%endif
+
 # libsanitizer needs <crypt.h> and since the glibc/libxcrypt split
 # we don't have that yet in a pure cross environment
 %if 0%{?gcc_target_arch:1}