From 69ca4ed0338ba4398973cda6130cb0fd521b3ede Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 13 Feb 2018 18:44:51 +0000 Subject: [PATCH] Fix build on AArch64 --- 0001-Fix-AArch64-build-with-glibc-2.26.patch | 25 -------------------- compiler-rt.spec | 6 +++-- 2 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 0001-Fix-AArch64-build-with-glibc-2.26.patch diff --git a/0001-Fix-AArch64-build-with-glibc-2.26.patch b/0001-Fix-AArch64-build-with-glibc-2.26.patch deleted file mode 100644 index eab29f3..0000000 --- a/0001-Fix-AArch64-build-with-glibc-2.26.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7749e236bbeb46bd24da30023c51dd4733a85c64 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Mon, 25 Sep 2017 13:54:59 -0700 -Subject: [PATCH] Fix AArch64 build with glibc 2.26 - ---- - lib/sanitizer_common/sanitizer_linux.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc -index 7328a5c..83b2f7e 100644 ---- a/lib/sanitizer_common/sanitizer_linux.cc -+++ b/lib/sanitizer_common/sanitizer_linux.cc -@@ -1265,7 +1265,7 @@ struct __sanitizer_esr_context { - - static bool Aarch64GetESR(ucontext_t *ucontext, u64 *esr) { - static const u32 kEsrMagic = 0x45535201; -- u8 *aux = ucontext->uc_mcontext.__reserved; -+ u8 *aux = ucontext->uc_mcontext.__glibc_reserved1; - while (true) { - _aarch64_ctx *ctx = (_aarch64_ctx *)aux; - if (ctx->size == 0) break; --- -1.8.3.1 - diff --git a/compiler-rt.spec b/compiler-rt.spec index 10220bf..bec9c22 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -7,13 +7,12 @@ Name: compiler-rt Version: 6.0.0 -Release: 0.2.rc%{rc_ver}%{?dist} +Release: 0.3.rc%{rc_ver}%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT URL: http://llvm.org Source0: http://llvm.org/releases/%{version}/%{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src.tar.xz -Patch1: 0001-Fix-AArch64-build-with-glibc-2.26.patch BuildRequires: cmake BuildRequires: python @@ -76,6 +75,9 @@ cd _build %{_libdir}/clang/%{version} %changelog +* Tue Feb 13 2018 Tom Stellard - 6.0.0-0.3.rc1 +- Fix build on AArch64 + * Wed Feb 07 2018 Fedora Release Engineering - 6.0.0-0.2.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild