diff options
4 files changed, 141 insertions, 3 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/10/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/10/arm-linux-gnueabi-gcc.spec index 4130bb6..ad2b124 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/10/arm-linux-gnueabi-gcc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/10/arm-linux-gnueabi-gcc.spec @@ -30,7 +30,7 @@ Name: %{cross_triplet}-gcc%{pkg_suffix} Version: 10.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The GNU Compiler Collection (%{cross_triplet}) %global major_version %(echo %{version} | sed 's/\\..*$//') @@ -39,6 +39,9 @@ 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 +# https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=patch;h=2bf34b9f4e446bf9be7f04458058dd5319fb396e +Patch0: gcc-11-libsanitizer-cyclades.patch + BuildRequires: gcc, gcc-c++, gcc-gnat BuildRequires: texinfo, gettext, flex, bison, zlib-devel BuildRequires: gmp-devel, mpfr-devel, libmpc-devel, isl-devel @@ -384,6 +387,9 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %changelog +* Fri Jul 02 2021 Ting-Wei Lan <lantw44@gmail.com> - 10.3.0-2 +- Fix build failure with Linux 5.13 + * Fri Apr 09 2021 Ting-Wei Lan <lantw44@gmail.com> - 10.3.0-1 - Update to new stable release 10.3.0 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 00d2f08..41b466b 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 @@ -30,7 +30,7 @@ Name: %{cross_triplet}-gcc%{pkg_suffix} Version: 11.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The GNU Compiler Collection (%{cross_triplet}) %global major_version %(echo %{version} | sed 's/\\..*$//') @@ -39,6 +39,9 @@ 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 +# https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;a=patch;h=2bf34b9f4e446bf9be7f04458058dd5319fb396e +Patch0: gcc-11-libsanitizer-cyclades.patch + BuildRequires: gcc, gcc-c++, gcc-gnat BuildRequires: texinfo, gettext, flex, bison, zlib-devel BuildRequires: gmp-devel, mpfr-devel, libmpc-devel, isl-devel @@ -387,6 +390,9 @@ rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet} %changelog +* Fri Jul 02 2021 Ting-Wei Lan <lantw44@gmail.com> - 11.1.0-2 +- Fix build failure with Linux 5.13 + * Wed Apr 28 2021 Ting-Wei Lan <lantw44@gmail.com> - 11.1.0-1 - Update to new stable release 11.1.0 diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/files/gcc-11-libsanitizer-cyclades.patch b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/files/gcc-11-libsanitizer-cyclades.patch new file mode 100644 index 0000000..2aa903f --- /dev/null +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/files/gcc-11-libsanitizer-cyclades.patch @@ -0,0 +1,123 @@ +From 2bf34b9f4e446bf9be7f04458058dd5319fb396e Mon Sep 17 00:00:00 2001 +From: Tamar Christina <tamar.christina@arm.com> +Date: Fri, 21 May 2021 10:30:59 +0100 +Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer + +The Linux kernel has removed the interface to cyclades from +the latest kernel headers[1] due to them being orphaned for the +past 13 years. + +libsanitizer uses this header when compiling against glibc, but +glibcs itself doesn't seem to have any references to cyclades. + +Further more it seems that the driver is broken in the kernel and +the firmware doesn't seem to be available anymore. + +As such since this is breaking the build of libsanitizer (and so the +GCC bootstrap[2]) I propose to remove this. + +[1] https://lkml.org/lkml/2021/3/2/153 +[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379 + +libsanitizer/ChangeLog: + + PR sanitizer/100379 + * sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick + llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135. + * sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise. + * sanitizer_common/sanitizer_platform_limits_posix.h: Likewise. + +(cherry picked from commit 745dae5923aba02982563481d75a21595df22ff8) +--- + .../sanitizer_common_interceptors_ioctl.inc | 9 --------- + .../sanitizer_platform_limits_posix.cpp | 11 ----------- + .../sanitizer_platform_limits_posix.h | 10 ---------- + 3 files changed, 30 deletions(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 490a04b2181..42e43a04441 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -366,15 +366,6 @@ static void ioctl_table_fill() { + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE +- _(CYGETDEFTHRESH, WRITE, sizeof(int)); +- _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +- _(CYGETMON, WRITE, struct_cyclades_monitor_sz); +- _(CYGETTHRESH, WRITE, sizeof(int)); +- _(CYGETTIMEOUT, WRITE, sizeof(int)); +- _(CYSETDEFTHRESH, NONE, 0); +- _(CYSETDEFTIMEOUT, NONE, 0); +- _(CYSETTHRESH, NONE, 0); +- _(CYSETTIMEOUT, NONE, 0); + _(EQL_EMANCIPATE, WRITE, struct_ifreq_sz); + _(EQL_ENSLAVE, WRITE, struct_ifreq_sz); + _(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz); +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 1427cec48c4..025e575b5bc 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -131,7 +131,6 @@ typedef struct user_fpregs elf_fpregset_t; + # include <sys/procfs.h> + #endif + #include <sys/user.h> +-#include <linux/cyclades.h> + #include <linux/if_eql.h> + #include <linux/if_plip.h> + #include <linux/lp.h> +@@ -449,7 +448,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); +- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) + unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry); + #else +@@ -815,15 +813,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; +- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; +- unsigned IOCTL_CYGETMON = CYGETMON; +- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH; +- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT; +- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH; +- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT; +- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH; +- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT; + unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE; + unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE; + unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG; +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +index 0812039b038..83861105a50 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h +@@ -981,7 +981,6 @@ extern unsigned struct_vt_mode_sz; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + extern unsigned struct_ax25_parms_struct_sz; +-extern unsigned struct_cyclades_monitor_sz; + extern unsigned struct_input_keymap_entry_sz; + extern unsigned struct_ipx_config_data_sz; + extern unsigned struct_kbdiacrs_sz; +@@ -1326,15 +1325,6 @@ extern unsigned IOCTL_VT_WAITACTIVE; + #endif // SANITIZER_LINUX + + #if SANITIZER_LINUX && !SANITIZER_ANDROID +-extern unsigned IOCTL_CYGETDEFTHRESH; +-extern unsigned IOCTL_CYGETDEFTIMEOUT; +-extern unsigned IOCTL_CYGETMON; +-extern unsigned IOCTL_CYGETTHRESH; +-extern unsigned IOCTL_CYGETTIMEOUT; +-extern unsigned IOCTL_CYSETDEFTHRESH; +-extern unsigned IOCTL_CYSETDEFTIMEOUT; +-extern unsigned IOCTL_CYSETTHRESH; +-extern unsigned IOCTL_CYSETTIMEOUT; + extern unsigned IOCTL_EQL_EMANCIPATE; + extern unsigned IOCTL_EQL_ENSLAVE; + extern unsigned IOCTL_EQL_GETMASTRCFG; +-- +2.27.0 + diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec index fd51e3c..d7c3681 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-kernel-headers/arm-linux-gnueabi-kernel-headers.spec @@ -3,7 +3,7 @@ %global cross_sysroot %{_prefix}/%{cross_triplet}/sys-root Name: %{cross_triplet}-kernel-headers -Version: 5.12.0 +Version: 5.13.0 Release: 1%{?dist} Summary: Header files for the Linux kernel (%{cross_triplet}) @@ -132,6 +132,9 @@ find %{buildroot}%{cross_sysroot} -name ..install.cmd -delete %changelog +* Tue Jun 29 2021 Ting-Wei Lan <lantw44@gmail.com> - 5.13.0-1 +- Update to 5.13 + * Mon Apr 26 2021 Ting-Wei Lan <lantw44@gmail.com> - 5.12.0-1 - Update to 5.12 |