Fix AArch64 build with glibc 2.26

This commit is contained in:
Tom Stellard 2017-09-26 02:54:29 +00:00
parent 8d1a4ef2e5
commit 6901b58773
2 changed files with 30 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 7749e236bbeb46bd24da30023c51dd4733a85c64 Mon Sep 17 00:00:00 2001
From: Tom Stellard <tstellar@redhat.com>
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

View File

@ -5,7 +5,7 @@
Name: compiler-rt
Version: 4.0.1
Release: 5%{?dist}
Release: 6%{?dist}
Summary: LLVM "compiler-rt" runtime libraries
License: NCSA or MIT
@ -21,6 +21,7 @@ Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz
# tar -cJf Fuzzer.tar.xz Fuzzer/
Source1: Fuzzer.tar.xz
Patch0: 0001-Build-fixes-for-newer-glibc.patch
Patch1: 0001-Fix-AArch64-build-with-glibc-2.26.patch
BuildRequires: cmake
BuildRequires: python
@ -93,6 +94,9 @@ cd _build
%{_libdir}/clang/%{version}
%changelog
* Mon Sep 25 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-6
- Fix AArch64 build with glibc 2.26
* Tue Sep 12 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-5
- Package libFuzzer