diff options
3 files changed, 118 insertions, 123 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/11/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/11/arm-linux-gnueabi-gcc.spec index 9d64bee..924fb3b 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/11/arm-linux-gnueabi-gcc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/11/arm-linux-gnueabi-gcc.spec @@ -29,8 +29,8 @@ %bcond_without ada Name: %{cross_triplet}-gcc%{pkg_suffix} -Version: 11.2.0 -Release: 3%{?dist} +Version: 11.3.0 +Release: 1%{?dist} Summary: The GNU Compiler Collection (%{cross_triplet}) %global major_version %(echo %{version} | sed 's/\\..*$//') @@ -39,7 +39,7 @@ License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGP URL: https://gcc.gnu.org Source0: https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz -BuildRequires: gcc, gcc-c++, gcc-gnat +BuildRequires: gcc, gcc-c++ BuildRequires: texinfo, gettext, flex, bison, zlib-devel BuildRequires: gmp-devel, mpfr-devel, libmpc-devel, isl-devel BuildRequires: elfutils-libelf-devel, libzstd-devel @@ -50,12 +50,14 @@ Requires: %{cross_triplet}-binutils Provides: %{cross_triplet}-gcc-stage1 = %{version} %if "%{cross_stage}" == "pass2" +BuildRequires: %{cross_triplet}-gcc-stage1 BuildRequires: %{cross_triplet}-glibc-stage1 Requires: %{cross_triplet}-glibc-stage1 Provides: %{cross_triplet}-gcc-stage2 = %{version} %endif %if "%{cross_stage}" == "final" +BuildRequires: %{cross_triplet}-gcc-stage2 BuildRequires: %{cross_triplet}-glibc BuildRequires: gcc-gnat, libstdc++-static BuildRequires: chrpath @@ -108,7 +110,6 @@ export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc sed -e 's/-m[^ ]*//g' \\\ -e 's/-specs=[^ ]*//g' \\\ -e 's/-Werror=[^ ]*//g' \\\ - -e 's/-fstack-clash-protection *//g' \\\ -e 's/-fcf-protection *//g') # GCC doesn't build without dependency tracking # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930 @@ -145,17 +146,16 @@ export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc --enable-languages=c \ --disable-shared \ --disable-threads \ - --disable-libmudflap \ -%make_build all-gcc +%make_build all-gcc all-target-libgcc %endif %if "%{cross_stage}" == "pass2" --enable-languages=c \ --enable-shared \ - --disable-libgomp \ - --disable-libmudflap \ + --enable-threads=posix \ + --enable-libssp \ -%make_build all-gcc all-target-libgcc +%make_build all-gcc all-target-libgcc all-target-libssp %endif %if "%{cross_stage}" == "final" %if %{with ada} @@ -167,6 +167,7 @@ export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc --with-default-libstdcxx-abi=gcc4-compatible \ %endif --enable-shared \ + --enable-threads=posix \ --enable-libmulflap \ --enable-libgomp \ --enable-libssp \ @@ -175,7 +176,6 @@ export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc --enable-libsanitizer \ --enable-gold \ --enable-plugin \ - --enable-threads=posix \ %make_build %endif @@ -185,10 +185,12 @@ export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc cd %{_builddir}/gcc-%{version}-build %if "%{cross_stage}" == "pass1" -%{__make} install-gcc DESTDIR=%{buildroot} +%{__make} DESTDIR=%{buildroot} \ + install-gcc install-target-libgcc %endif %if "%{cross_stage}" == "pass2" -%{__make} install-gcc install-target-libgcc DESTDIR=%{buildroot} +%{__make} DESTDIR=%{buildroot} \ + install-gcc install-target-libgcc install-target-libssp mkdir -p %{buildroot}%{cross_sysroot}/%{lib_dir_name} mv %{buildroot}%{_prefix}/%{cross_triplet}/%{lib_dir_name}/* \ %{buildroot}%{cross_sysroot}/%{lib_dir_name} @@ -243,35 +245,42 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include-fixed/limits.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include-fixed/syslimits.h %dir %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stddef.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdarg.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdfix.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/varargs.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/float.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdbool.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/gcov.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/iso646.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdalign.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdarg.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdatomic.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdbool.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stddef.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdfix.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdint.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdint-gcc.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdalign.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdnoreturn.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/stdatomic.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/unwind.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/varargs.h %if "%{cross_arch}" == "arm" -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/unwind-arm-common.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/mmintrin.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_cmse.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_cde.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_cmse.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_mve.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_mve_types.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/mmintrin.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/unwind-arm-common.h %endif %if "%{cross_arch}" == "arm64" %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_sve.h %endif %if "%{cross_arch}" == "arm" || "%{cross_arch}" == "arm64" -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_neon.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_acle.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_fp16.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_bf16.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_fp16.h +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/arm_neon.h %endif +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/crtbegin*.o +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/crtend*.o +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/crtfastmath.o +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/libgcc.a +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/libgcov.a %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/plugin %dir %{_libexecdir}/gcc/%{cross_triplet} %dir %{_libexecdir}/gcc/%{cross_triplet}/%{major_version} @@ -283,16 +292,14 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %dir %{_libexecdir}/gcc/%{cross_triplet}/%{major_version}/plugin %{_libexecdir}/gcc/%{cross_triplet}/%{major_version}/plugin/gengtype %if "%{cross_stage}" != "pass1" -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/gcov.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/unwind.h -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/crtbegin*.o -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/crtend*.o -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/crtfastmath.o -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/libgcc.a +%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/ssp %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/libgcc_eh.a -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/libgcov.a %{cross_sysroot}/%{lib_dir_name}/libgcc_s.so %{cross_sysroot}/%{lib_dir_name}/libgcc_s.so.1 +%{cross_sysroot}/%{lib_dir_name}/libssp.a +%{cross_sysroot}/%{lib_dir_name}/libssp_nonshared.a +%{cross_sysroot}/%{lib_dir_name}/libssp.so +%{cross_sysroot}/%{lib_dir_name}/libssp.so.0* %endif %if "%{cross_stage}" == "final" %{_bindir}/%{cross_triplet}-c++ @@ -310,7 +317,6 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/acc_prof.h %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/d %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/objc -%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/ssp %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/sanitizer %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/finclude %{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/libcaf_single.a @@ -349,10 +355,6 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %{cross_sysroot}/%{lib_dir_name}/libobjc.a %{cross_sysroot}/%{lib_dir_name}/libobjc.so* %{cross_sysroot}/%{lib_dir_name}/libsanitizer.spec -%{cross_sysroot}/%{lib_dir_name}/libssp.a -%{cross_sysroot}/%{lib_dir_name}/libssp_nonshared.a -%{cross_sysroot}/%{lib_dir_name}/libssp.so -%{cross_sysroot}/%{lib_dir_name}/libssp.so.0* %{cross_sysroot}/%{lib_dir_name}/libstdc++fs.a %{cross_sysroot}/%{lib_dir_name}/libstdc++.a %{cross_sysroot}/%{lib_dir_name}/libstdc++.so @@ -393,6 +395,12 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %changelog +* Tue Apr 26 2022 Ting-Wei Lan <lantw44@gmail.com> - 11.3.0-1 +- Update to new stable release 11.3.0 +- Build libgcc in the first bootstrap stage +- Build libssp in the second bootstrap stage +- Restore -fstack-clash-protection flag + * Sun Mar 20 2022 Ting-Wei Lan <lantw44@gmail.com> - 11.2.0-3 - Remove -specs from _annotation_ldflags because it is now used directly diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec index 54cd390..f154c47 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-glibc/arm-linux-gnueabi-glibc.spec @@ -6,12 +6,13 @@ %global _find_debuginfo_opts --build-id-seed "%{name}-%{version}-%{release}" %endif -%if 0%{?bootstrap:1} -%global headers_only 1 -%global pkg_suffix -headers -%global debug_package %{nil} +%if 0%{!?cross_stage:1} +%global cross_stage final +%endif + +%if "%{cross_stage}" != "final" +%global pkg_suffix -%{cross_stage} %else -%global headers_only 0 %global pkg_suffix %{nil} %endif @@ -48,23 +49,25 @@ Name: %{cross_triplet}-glibc%{pkg_suffix} Version: 2.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The GNU C Library (%{cross_triplet}) License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ URL: https://www.gnu.org/software/libc Source0: https://ftp.gnu.org/gnu/glibc/glibc-%{version}.tar.xz -BuildRequires: bison, make, python3 +BuildRequires: bison, make, perl, python3 BuildRequires: %{cross_triplet}-filesystem -BuildRequires: %{cross_triplet}-gcc-stage1 BuildRequires: %{cross_triplet}-kernel-headers +BuildRequires: %{cross_triplet}-gcc-stage1 Requires: %{cross_triplet}-filesystem Requires: %{cross_triplet}-kernel-headers -Provides: %{cross_triplet}-glibc-stage1 +Provides: %{cross_triplet}-glibc-stage1 = %{version} -%if !%{headers_only} -BuildRequires: %{cross_triplet}-gcc-stage2, perl +%if "%{cross_stage}" == "final" +BuildRequires: %{cross_triplet}-gcc-stage2 +BuildRequires: %{cross_triplet}-glibc-stage1 +Provides: %{cross_triplet}-glibc-stage2 = %{version} %endif %global __provides_exclude_from ^%{cross_sysroot} @@ -102,8 +105,6 @@ export RANLIB=%{_bindir}/%{cross_triplet}-ranlib -e 's/-specs=[^ ]*//g' \\\ -e 's/-Werror=[^ ]*//g' \\\ -e 's/-Wp,[^ ]*//g' \\\ - -e 's/-fasynchronous-unwind-tables *//g' \\\ - -e 's/-fstack-clash-protection *//g' \\\ -e 's/-fcf-protection *//g' \\\ -e 's/-flto=auto *//g') # Use /usr directly because it is the path in cross_sysroot @@ -124,35 +125,16 @@ export RANLIB=%{_bindir}/%{cross_triplet}-ranlib --with-__thread \ --without-cvs \ --without-gd \ -%if %{headers_only} - libc_cv_forced_unwind=yes \ - libc_cv_c_cleanup=yes \ -%endif -%if %{headers_only} -%make_build csu/subdir_lib -%else %make_build -%endif %install cd %{_builddir}/glibc-%{version}-build -%if %{headers_only} -%{__make} install-headers install_root=%{buildroot}%{cross_sysroot} \ - install-bootstrap-headers=yes -touch %{buildroot}%{cross_sysroot}/usr/include/gnu/stubs.h -mkdir -p %{buildroot}%{cross_sysroot}/usr/%{lib_dir_name} -cp csu/crt1.o csu/crti.o csu/crtn.o \ - %{buildroot}%{cross_sysroot}/usr/%{lib_dir_name} -%{cross_triplet}-gcc -nostdlib -nostartfiles -shared -x c /dev/null \ - -o %{buildroot}%{cross_sysroot}/usr/%{lib_dir_name}/libc.so -%else %{__make} install install_root=%{buildroot}%{cross_sysroot} rm -rf %{buildroot}%{cross_sysroot}/usr/share/man rm -rf %{buildroot}%{cross_sysroot}/usr/share/info rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale -%endif # Don't strip anything - /usr/bin/strip does not work on other architectures %undefine __strip @@ -162,6 +144,51 @@ rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale %files %license COPYING COPYING.LIB LICENSES %doc MAINTAINERS NEWS README +%{cross_sysroot}/etc/rpc +%if "%{cross_arch}" == "arm64" +%{cross_sysroot}/lib/ld-linux%{loader_suffix}.so.%{loader_version} +%else +%{cross_sysroot}/%{lib_dir_name}/ld-linux%{loader_suffix}.so.%{loader_version} +%endif +%{cross_sysroot}/%{lib_dir_name}/libBrokenLocale.so.1 +%{cross_sysroot}/%{lib_dir_name}/libanl.so.1 +%{cross_sysroot}/%{lib_dir_name}/libc.so.6 +%{cross_sysroot}/%{lib_dir_name}/libc_malloc_debug.so.0 +%{cross_sysroot}/%{lib_dir_name}/libcrypt.so.1 +%{cross_sysroot}/%{lib_dir_name}/libdl.so.2 +%{cross_sysroot}/%{lib_dir_name}/libm.so.6 +%{cross_sysroot}/%{lib_dir_name}/libmemusage.so +%{cross_sysroot}/%{lib_dir_name}/libnsl.so.1 +%{cross_sysroot}/%{lib_dir_name}/libnss_compat.so.2 +%{cross_sysroot}/%{lib_dir_name}/libnss_db.so.2 +%{cross_sysroot}/%{lib_dir_name}/libnss_dns.so.2 +%{cross_sysroot}/%{lib_dir_name}/libnss_files.so.2 +%{cross_sysroot}/%{lib_dir_name}/libnss_hesiod.so.2 +%{cross_sysroot}/%{lib_dir_name}/libpcprofile.so +%{cross_sysroot}/%{lib_dir_name}/libpthread.so.0 +%{cross_sysroot}/%{lib_dir_name}/libresolv.so.2 +%{cross_sysroot}/%{lib_dir_name}/librt.so.1 +%{cross_sysroot}/%{lib_dir_name}/libthread_db.so.1 +%{cross_sysroot}/%{lib_dir_name}/libutil.so.1 +%{cross_sysroot}/sbin/ldconfig +%{cross_sysroot}/sbin/sln +%{cross_sysroot}/usr/bin/gencat +%{cross_sysroot}/usr/bin/getconf +%{cross_sysroot}/usr/bin/getent +%{cross_sysroot}/usr/bin/iconv +%{cross_sysroot}/usr/bin/ld.so +%{cross_sysroot}/usr/bin/ldd +%{cross_sysroot}/usr/bin/locale +%{cross_sysroot}/usr/bin/localedef +%{cross_sysroot}/usr/bin/makedb +%{cross_sysroot}/usr/bin/mtrace +%{cross_sysroot}/usr/bin/pcprofiledump +%{cross_sysroot}/usr/bin/pldd +%{cross_sysroot}/usr/bin/sotruss +%{cross_sysroot}/usr/bin/sprof +%{cross_sysroot}/usr/bin/tzselect +%{cross_sysroot}/usr/bin/xtrace +%{cross_sysroot}/usr/bin/zdump %{cross_sysroot}/usr/include/a.out.h %{cross_sysroot}/usr/include/aio.h %{cross_sysroot}/usr/include/aliases.h @@ -210,7 +237,9 @@ rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale %{cross_sysroot}/usr/include/gnu-versions.h %dir %{cross_sysroot}/usr/include/gnu %{cross_sysroot}/usr/include/gnu/lib-names.h +%{cross_sysroot}/usr/include/gnu/lib-names%{gnu_hdr_suffix}.h %{cross_sysroot}/usr/include/gnu/libc-version.h +%{cross_sysroot}/usr/include/gnu/stubs%{gnu_hdr_suffix}.h %{cross_sysroot}/usr/include/gnu/stubs.h %{cross_sysroot}/usr/include/grp.h %{cross_sysroot}/usr/include/gshadow.h @@ -424,54 +453,6 @@ rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale %{cross_sysroot}/usr/%{lib_dir_name}/crti.o %{cross_sysroot}/usr/%{lib_dir_name}/crtn.o %{cross_sysroot}/usr/%{lib_dir_name}/libc.so -%if !%{headers_only} -%{cross_sysroot}/etc/rpc -%if "%{cross_arch}" == "arm64" -%{cross_sysroot}/lib/ld-linux%{loader_suffix}.so.%{loader_version} -%else -%{cross_sysroot}/%{lib_dir_name}/ld-linux%{loader_suffix}.so.%{loader_version} -%endif -%{cross_sysroot}/%{lib_dir_name}/libBrokenLocale.so.1 -%{cross_sysroot}/%{lib_dir_name}/libanl.so.1 -%{cross_sysroot}/%{lib_dir_name}/libc.so.6 -%{cross_sysroot}/%{lib_dir_name}/libc_malloc_debug.so.0 -%{cross_sysroot}/%{lib_dir_name}/libcrypt.so.1 -%{cross_sysroot}/%{lib_dir_name}/libdl.so.2 -%{cross_sysroot}/%{lib_dir_name}/libm.so.6 -%{cross_sysroot}/%{lib_dir_name}/libmemusage.so -%{cross_sysroot}/%{lib_dir_name}/libnsl.so.1 -%{cross_sysroot}/%{lib_dir_name}/libnss_compat.so.2 -%{cross_sysroot}/%{lib_dir_name}/libnss_db.so.2 -%{cross_sysroot}/%{lib_dir_name}/libnss_dns.so.2 -%{cross_sysroot}/%{lib_dir_name}/libnss_files.so.2 -%{cross_sysroot}/%{lib_dir_name}/libnss_hesiod.so.2 -%{cross_sysroot}/%{lib_dir_name}/libpcprofile.so -%{cross_sysroot}/%{lib_dir_name}/libpthread.so.0 -%{cross_sysroot}/%{lib_dir_name}/libresolv.so.2 -%{cross_sysroot}/%{lib_dir_name}/librt.so.1 -%{cross_sysroot}/%{lib_dir_name}/libthread_db.so.1 -%{cross_sysroot}/%{lib_dir_name}/libutil.so.1 -%{cross_sysroot}/sbin/ldconfig -%{cross_sysroot}/sbin/sln -%{cross_sysroot}/usr/bin/gencat -%{cross_sysroot}/usr/bin/getconf -%{cross_sysroot}/usr/bin/getent -%{cross_sysroot}/usr/bin/iconv -%{cross_sysroot}/usr/bin/ld.so -%{cross_sysroot}/usr/bin/ldd -%{cross_sysroot}/usr/bin/locale -%{cross_sysroot}/usr/bin/localedef -%{cross_sysroot}/usr/bin/makedb -%{cross_sysroot}/usr/bin/mtrace -%{cross_sysroot}/usr/bin/pcprofiledump -%{cross_sysroot}/usr/bin/pldd -%{cross_sysroot}/usr/bin/sotruss -%{cross_sysroot}/usr/bin/sprof -%{cross_sysroot}/usr/bin/tzselect -%{cross_sysroot}/usr/bin/xtrace -%{cross_sysroot}/usr/bin/zdump -%{cross_sysroot}/usr/include/gnu/lib-names%{gnu_hdr_suffix}.h -%{cross_sysroot}/usr/include/gnu/stubs%{gnu_hdr_suffix}.h %{cross_sysroot}/usr/%{lib_dir_name}/?crt1.o %if "%{cross_arch}" == "arm64" %{cross_sysroot}/usr/%{lib_dir_name}/??crt1.o @@ -523,10 +504,14 @@ rm -rf %{buildroot}%{cross_sysroot}/usr/share/locale %{cross_sysroot}/usr/share/i18n/charmaps %{cross_sysroot}/usr/share/i18n/locales %{cross_sysroot}/var/db/Makefile -%endif %changelog +* Tue Apr 26 2022 Ting-Wei Lan <lantw44@gmail.com> - 2.35-2 +- Remove the headers-only bulid because we no longer need it to bootstrap GCC +- Replace bootstrap macro with cross_stage macro copied from our GCC package +- Restore -fasynchronous-unwind-tables and -fstack-clash-protection flags + * Sun Mar 20 2022 Ting-Wei Lan <lantw44@gmail.com> - 2.35-1 - Update to 2.35 - Remove -specs from _annotation_ldflags because it is now used directly diff --git a/arm-linux-gnueabi-toolchain/create-arch.sh b/arm-linux-gnueabi-toolchain/create-arch.sh index fc55155..c8228b9 100755 --- a/arm-linux-gnueabi-toolchain/create-arch.sh +++ b/arm-linux-gnueabi-toolchain/create-arch.sh @@ -69,12 +69,14 @@ create_boot_spec () { cat -- "${arg_src_spec}"; } > "${var_dst_spec}" } -base_pkg_name="${new_triplet}-glibc" -new_pkg_name="${new_triplet}-glibc-headers" -create_boot_spec \ - "${new_pkg_name}" \ - "${new_dir}/${base_pkg_name}/${base_pkg_name}.spec" \ - '%global bootstrap 1' +for stage in pass1; do + base_pkg_name="${new_triplet}-glibc" + new_pkg_name="${new_triplet}-glibc-${stage}" + create_boot_spec \ + "${new_pkg_name}" \ + "${new_dir}/${base_pkg_name}/${base_pkg_name}.spec" \ + "%global cross_stage ${stage}" +done for stage in pass1 pass2; do base_pkg_name="${new_triplet}-gcc" |