- Add bootstrap conditional to allow --without=bootstrap to be

specified to speed up local builds for testing.

OBS-URL: https://build.opensuse.org/package/show/devel:gcc/gcc13?expand=0&rev=19
This commit is contained in:
Richard Biener 2023-01-23 15:24:29 +00:00 committed by Git OBS Bridge
parent 0b8efaa38b
commit 47544fef54
33 changed files with 149 additions and 3 deletions

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -687,10 +687,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -687,10 +687,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -687,10 +687,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -687,10 +687,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -687,10 +687,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -686,10 +686,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif

View File

@ -28,6 +28,8 @@
%define usrmerged 1
%endif
%bcond_without bootstrap
# Ada currently fails to build on a few platforms, enable it only
# on those that work
%if %{suse_version} >= 1310
@ -102,7 +104,7 @@
%define use_lto_bootstrap 0
%ifarch x86_64 ppc64le s390x aarch64
%if %{suse_version} > 1500
%define use_lto_bootstrap 1
%define use_lto_bootstrap %{with bootstrap}
%endif
%endif
@ -1561,10 +1563,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif
@ -1585,9 +1591,11 @@ amdgcn-amdhsa,\
STAGE1_FLAGS="-g -O2"
%if 0%{?do_profiling} && !0%{?building_testsuite:1}
%ifarch x86_64 %ix86 ppc64le s390x aarch64
%if %{with bootstrap}
%define use_pgo_bootstrap 1
%endif
%endif
%endif
%{?use_pgo_bootstrap:setarch `arch` -R} make %{?make_output_sync} %{?use_pgo_bootstrap:profiledbootstrap} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
make info
%if 0%{?run_tests:1}

View File

@ -48,6 +48,8 @@
%define usrmerged 1
%endif
%bcond_without bootstrap
# Ada currently fails to build on a few platforms, enable it only
# on those that work
%if %{suse_version} >= 1310
@ -122,7 +124,7 @@
%define use_lto_bootstrap 0
%ifarch x86_64 ppc64le s390x aarch64
%if %{suse_version} > 1500
%define use_lto_bootstrap 1
%define use_lto_bootstrap %{with bootstrap}
%endif
%endif
@ -881,10 +883,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif
@ -902,9 +908,11 @@ amdgcn-amdhsa,\
STAGE1_FLAGS="-g -O2"
%if 0%{?do_profiling} && !0%{?building_testsuite:1}
%ifarch x86_64 %ix86 ppc64le s390x aarch64
%if %{with bootstrap}
%define use_pgo_bootstrap 1
%endif
%endif
%endif
%{?use_pgo_bootstrap:setarch `arch` -R} make %{?make_output_sync} %{?use_pgo_bootstrap:profiledbootstrap} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
make info
%if 0%{?run_tests:1}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jan 23 15:19:53 UTC 2023 - Richard Biener <rguenther@suse.com>
- Add bootstrap conditional to allow --without=bootstrap to be
specified to speed up local builds for testing.
-------------------------------------------------------------------
Mon Jan 23 08:45:24 UTC 2023 - Richard Biener <rguenther@suse.com>

View File

@ -27,6 +27,8 @@
%define usrmerged 1
%endif
%bcond_without bootstrap
# Ada currently fails to build on a few platforms, enable it only
# on those that work
%if %{suse_version} >= 1310
@ -101,7 +103,7 @@
%define use_lto_bootstrap 0
%ifarch x86_64 ppc64le s390x aarch64
%if %{suse_version} > 1500
%define use_lto_bootstrap 1
%define use_lto_bootstrap %{with bootstrap}
%endif
%endif
@ -2382,10 +2384,14 @@ amdgcn-amdhsa,\
%if "%{TARGET_ARCH}" == "riscv64"
--disable-multilib \
%endif
%if %{with bootstrap}
%if %{use_lto_bootstrap} && !0%{?building_testsuite:1}
--with-build-config=bootstrap-lto-lean \
--enable-link-mutex \
%endif
%else
--disable-bootstrap \
%endif
%ifarch riscv64
--enable-link-mutex \
%endif
@ -2403,9 +2409,11 @@ amdgcn-amdhsa,\
STAGE1_FLAGS="-g -O2"
%if 0%{?do_profiling} && !0%{?building_testsuite:1}
%ifarch x86_64 %ix86 ppc64le s390x aarch64
%if %{with bootstrap}
%define use_pgo_bootstrap 1
%endif
%endif
%endif
%{?use_pgo_bootstrap:setarch `arch` -R} make %{?make_output_sync} %{?use_pgo_bootstrap:profiledbootstrap} STAGE1_CFLAGS="$STAGE1_FLAGS" BOOT_CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
make info
%if 0%{?run_tests:1}