diff options
3 files changed, 64 insertions, 4 deletions
diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/9/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/9/arm-linux-gnueabi-gcc.spec index 6855fd1..dc4eb78 100644 --- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/9/arm-linux-gnueabi-gcc.spec +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/9/arm-linux-gnueabi-gcc.spec @@ -30,7 +30,7 @@ Name: %{cross_triplet}-gcc%{pkg_suffix} Version: 9.2.0 -Release: 2%{?dist} +Release: 3%{?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=761a3a95ee26d54fbb8351c15cf5773d58fc9f70 +Patch0: gcc-9-arm-libsanitizer-bootstrap.patch + BuildRequires: gcc, gcc-c++, gcc-gnat BuildRequires: texinfo, gettext, flex, bison, zlib-devel, isl-devel BuildRequires: gmp-devel, mpfr-devel, libmpc-devel, elfutils-libelf-devel @@ -379,6 +382,9 @@ chmod +x %{__ar_no_strip} %changelog +* Mon Feb 10 2020 Ting-Wei Lan <lantw44@gmail.com> - 9.2.0-3 +- Fix build failure with GLIBC 2.31 + * Tue Sep 17 2019 Ting-Wei Lan <lantw44@gmail.com> - 9.2.0-2 - Rebuilt for Fedora 31 and 32 diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/files/gcc-9-arm-libsanitizer-bootstrap.patch b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/files/gcc-9-arm-libsanitizer-bootstrap.patch new file mode 100644 index 0000000..9676d3e --- /dev/null +++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/files/gcc-9-arm-libsanitizer-bootstrap.patch @@ -0,0 +1,51 @@ +From 761a3a95ee26d54fbb8351c15cf5773d58fc9f70 Mon Sep 17 00:00:00 2001 +From: Tamar Christina <tamar.christina@arm.com> +Date: Tue, 22 Oct 2019 14:25:38 +0000 +Subject: [PATCH] Arm: Fix arm libsanitizer bootstrap failure + +Glibc has recently introduced changed to the mode field in ipc_perm +in commit 2f959dfe849e0646e27403f2e4091536496ac0f0. For Arm this +means that the mode field no longer has the same size. + +This causes an assert failure against libsanitizer's internal copy +of ipc_perm. Since this change can't be easily detected I am adding +arm to the list of targets that are excluded from this check. libsanitizer +doesn't use this field (and others, it in fact uses only 1 field) so this check +can be ignored. + +Padding bits were used by glibc when the field was changed so sizeof and offsets +of the remaining fields should be the same. + +libsanitizer/ChangeLog: + + PR sanitizer/92154 + * sanitizer_common/sanitizer_platform_limits_posix.cpp (defined): + Cherry-pick compiler-rt revision r375220. + +From-SVN: r277291 +--- + libsanitizer/ChangeLog | 6 ++++++ + libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp | 6 +++++- + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 7f1132c..1e3c7fe 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -1126,8 +1126,12 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, uid); + CHECK_SIZE_AND_OFFSET(ipc_perm, gid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cuid); + CHECK_SIZE_AND_OFFSET(ipc_perm, cgid); +-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21) ++#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \ ++ !defined(__arm__) + /* On aarch64 glibc 2.20 and earlier provided incorrect mode field. */ ++/* On Arm glibc 2.31 and later provide a different mode field, this field is ++ never used by libsanitizer so we can simply ignore this assert for all glibc ++ versions. */ + CHECK_SIZE_AND_OFFSET(ipc_perm, mode); + #endif + +-- +2.9.3 + 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 ea1fa0d..8483932 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 @@ -55,8 +55,8 @@ %endif Name: %{cross_triplet}-glibc%{pkg_suffix} -Version: 2.30 -Release: 2%{?dist} +Version: 2.31 +Release: 1%{?dist} Summary: The GNU C Library (%{cross_triplet}) License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ @@ -178,7 +178,7 @@ chmod +x %{__ar_no_strip} %files %license COPYING COPYING.LIB LICENSES -%doc ChangeLog MAINTAINERS NEWS README +%doc MAINTAINERS NEWS README %{cross_sysroot}/usr/include/a.out.h %{cross_sysroot}/usr/include/aio.h %{cross_sysroot}/usr/include/aliases.h @@ -600,6 +600,9 @@ chmod +x %{__ar_no_strip} %changelog +* Sun Feb 09 2020 Ting-Wei Lan <lantw44@gmail.com> - 2.31-1 +- Update to 2.31 + * Tue Sep 17 2019 Ting-Wei Lan <lantw44@gmail.com> - 2.30-2 - Rebuilt for Fedora 31 and 32 |