5.0.2 Release

This reverts commit 6901b58773.

.gitignore

@@ -6,3 +6,10 @@
 /compiler-rt-3.9.1.src.tar.xz
 /compiler-rt-4.0.0.src.tar.xz
 /compiler-rt-4.0.1.src.tar.xz
+/Fuzzer.tar.xz
+/Fuzzer-5.0.0.tar.xz
+/compiler-rt-5.0.0.src.tar.xz
+/Fuzzer-5.0.1.tar.xz
+/compiler-rt-5.0.1.src.tar.xz
+/compiler-rt-5.0.2.src.tar.xz
+/Fuzzer-5.0.2.tar.xz

0001-Build-fixes-for-newer-glibc.patch

@@ -1,63 +0,0 @@
-From 8fbed3e5332537dea784f3b59b4bc6e678bfdae9 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <tstellar@redhat.com>
-Date: Fri, 23 Jun 2017 13:52:53 +0000
-Subject: [PATCH] Build fixes for newer glibc
-
----
- lib/esan/esan_sideline_linux.cpp                             | 4 ++--
- lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 4 ++--
- lib/tsan/rtl/tsan_platform_linux.cc                          | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/lib/esan/esan_sideline_linux.cpp b/lib/esan/esan_sideline_linux.cpp
-index d04f5909d..095f2c29b 100644
---- a/lib/esan/esan_sideline_linux.cpp
-+++ b/lib/esan/esan_sideline_linux.cpp
-@@ -70,11 +70,11 @@ int SidelineThread::runSideline(void *Arg) {
- 
-   // Set up a signal handler on an alternate stack for safety.
-   InternalScopedBuffer<char> StackMap(SigAltStackSize);
--  struct sigaltstack SigAltStack;
-+  stack_t SigAltStack;
-   SigAltStack.ss_sp = StackMap.data();
-   SigAltStack.ss_size = SigAltStackSize;
-   SigAltStack.ss_flags = 0;
--  internal_sigaltstack(&SigAltStack, nullptr);
-+  internal_sigaltstack((struct sigaltstack *)&SigAltStack, nullptr);
- 
-   // We inherit the signal mask from the app thread.  In case
-   // we weren't created at init time, we ensure the mask is empty.
-diff --git a/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-index 03f73ae88..8ac0fe5a1 100644
---- a/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-+++ b/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
-@@ -287,11 +287,11 @@ static int TracerThread(void* argument) {
- 
-   // Alternate stack for signal handling.
-   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
--  struct sigaltstack handler_stack;
-+  stack_t handler_stack;
-   internal_memset(&handler_stack, 0, sizeof(handler_stack));
-   handler_stack.ss_sp = handler_stack_memory.data();
-   handler_stack.ss_size = kHandlerStackSize;
--  internal_sigaltstack(&handler_stack, nullptr);
-+  internal_sigaltstack((struct sigaltstack *)&handler_stack, nullptr);
- 
-   // Install our handler for synchronous signals. Other signals should be
-   // blocked by the mask we inherited from the parent thread.
-diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc
-index d05c0e701..b01648b39 100644
---- a/lib/tsan/rtl/tsan_platform_linux.cc
-+++ b/lib/tsan/rtl/tsan_platform_linux.cc
-@@ -289,7 +289,7 @@ void InitializePlatform() {
- int ExtractResolvFDs(void *state, int *fds, int nfd) {
- #if SANITIZER_LINUX && !SANITIZER_ANDROID
-   int cnt = 0;
--  __res_state *statp = (__res_state*)state;
-+  struct __res_state *statp = (struct __res_state*)state;
-   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
-     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
-       fds[cnt++] = statp->_u._ext.nssocks[i];
--- 
-2.13.1
-

compiler-rt.spec

@@ -4,14 +4,21 @@
 %endif
 
 Name:		compiler-rt
-Version:	4.0.1
-Release:	4%{?dist}
+Version:	5.0.2
+Release:	1%{?dist}
 Summary:	LLVM "compiler-rt" runtime libraries
 
 License:	NCSA or MIT
 URL:		http://llvm.org
 Source0:	http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz
-Patch0:	0001-Build-fixes-for-newer-glibc.patch
+# Extract libFuzzer sources from the llvm tarball.  We are packaging it as part
+# of compiler-rt, because upstream moved the code into the compiler-rt project
+# for LLVM 6.0.0.
+# wget http://llvm.org/releases/5.0.1/llvm-5.0.1.src.tar.xz
+# tar -xJf llvm-5.0.1.src.tar.xz
+# cd llvm-5.0.1.src/lib/
+# tar -cJf Fuzzer-5.0.1.tar.xz Fuzzer/
+Source1: Fuzzer-5.0.2.tar.xz
 
 BuildRequires:	cmake
 BuildRequires:	python
@@ -25,6 +32,8 @@ code generation, sanitizer runtimes and profiling library for code
 instrumentation, and Blocks C language extension.
 
 %prep
+%setup -T -q -b 1 -n Fuzzer
+
 %autosetup -n %{name}-%{version}.src -p1
 
 %build
@@ -43,18 +52,28 @@ cd _build
 
 make %{?_smp_mflags}
 
+# Build Fuzzer with gcc
+export CXX=g++
+pushd ../../Fuzzer
+./build.sh
+popd
+
 %install
 cd _build
 make install DESTDIR=%{buildroot}
 
+mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib
+
+pushd ../../Fuzzer
+install -m0644 libFuzzer.a %{buildroot}%{_libdir}/clang/%{version}/lib
+popd
+
 # move sanitizer lists to better place
-mkdir -p %{buildroot}%{_libdir}/clang/%{version}
 for file in asan_blacklist.txt msan_blacklist.txt dfsan_blacklist.txt cfi_blacklist.txt dfsan_abilist.txt; do
 	mv -v %{buildroot}%{_prefix}/${file} %{buildroot}%{_libdir}/clang/%{version}/ || :
 done
 
 # move sanitizer libs to better place
-mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib
 mv -v %{buildroot}%{_prefix}/lib/linux/libclang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib/linux/
 pushd %{buildroot}%{_libdir}/clang/%{version}/lib
@@ -71,6 +90,21 @@ cd _build
 %{_libdir}/clang/%{version}
 
 %changelog
+* Tue May 8 2018 Tom Stellard <tstellar@redhat.com> - 5.0.2-1
+- 5.0.2 Release
+
+* Wed Jan 17 2018 Tom Stellard <tstellar@redhat.com> - 5.0.1-2
+- Build libFuzzer with gcc
+
+* Wed Dec 20 2017 Tom Stellard <tstellar@redhat.com> - 5.0.1-1
+- 5.0.1 Release
+
+* Fri Oct 13 2017 Tom Stellard <tstellar@redhat.com> - 5.0.0-1
+- 5.0.0 Release
+
+* Tue Sep 12 2017 Tom Stellard <tstellar@redhat.com> - 4.0.1-5
+- Package libFuzzer
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (compiler-rt-4.0.0.src.tar.xz) = ed52436a2399ca82c1af46a523e89e88c23367f74cd110f0267af49a72aa4912ae8f48c6093e6b01c9ea68c48354a12201d26baf721d254fb017ddb98af2e3dd
-SHA512 (compiler-rt-4.0.1.src.tar.xz) = cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649
+SHA512 (compiler-rt-5.0.2.src.tar.xz) = 605a6d064877a860d6c9097e0220896dfceafed0a2392ad495c97aa347b97899d89f7e21932e29d3274f396615837414a3e730a915fe4f53eaa858ce3642a666
+SHA512 (Fuzzer-5.0.2.tar.xz) = ed333fdec89e16610d12c6485cbb5254c6ec221f7cf1b3b002c0b223c356bfe8d5463592a76d7e33f88ee6262563fc9c804744ca2ff77bd430ed835f9cbd133c