!8 update to 10.0.1

Merge pull request !8 from sigui/master

0001-PATCH-std-thread-copy.patch

@@ -0,0 +1,28 @@
+diff -ru compiler-rt-8.0.0rc1.src.orig/lib/fuzzer/FuzzerDefs.h compiler-rt-8.0.0rc1.src/lib/fuzzer/FuzzerDefs.h
+--- compiler-rt-8.0.0rc1.src.orig/lib/fuzzer/FuzzerDefs.h	2019-01-09 21:46:09.000000000 +0000
++++ compiler-rt-8.0.0rc1.src/lib/fuzzer/FuzzerDefs.h	2019-02-12 14:03:32.971147814 +0000
+@@ -176,6 +176,12 @@
+ 
+       template<class Other>
+       struct rebind { typedef fuzzer_allocator<Other> other;  };
++
++      template< class U, class... Args >
++      void construct( U* p, Args&&... args ) {
++        std::allocator<T>::construct(p, std::forward<Args>(args)...);
++      }
++
+   };
+ 
+ template<typename T>
+diff -ru compiler-rt-8.0.0rc1.src.orig/lib/fuzzer/FuzzerDriver.cpp compiler-rt-8.0.0rc1.src/lib/fuzzer/FuzzerDriver.cpp
+--- compiler-rt-8.0.0rc1.src.orig/lib/fuzzer/FuzzerDriver.cpp	2019-01-15 22:12:51.000000000 +0000
++++ compiler-rt-8.0.0rc1.src/lib/fuzzer/FuzzerDriver.cpp	2019-02-12 13:05:15.965113872 +0000
+@@ -252,7 +252,7 @@
+   std::thread Pulse(PulseThread);
+   Pulse.detach();
+   for (unsigned i = 0; i < NumWorkers; i++)
+-    V.push_back(std::thread(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors));
++    V.emplace_back(WorkerThread, std::ref(Cmd), &Counter, NumJobs, &HasErrors);
+   for (auto &T : V)
+     T.join();
+   return HasErrors ? 1 : 0;

compiler-rt.spec

@@ -1,38 +1,49 @@
 %global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
+%global optflags %(echo %{optflags} -D_DEFAULT_SOURCE)
+%global optflags %(echo %{optflags} -Dasm=__asm__)
 
-Name:           compiler-rt
+Name:		compiler-rt
-Version:        7.0.0
+Version:	10.0.1
-Release:        2
+Release:	1
-Summary:        LLVM "compiler-rt" runtime libraries
+Summary:	LLVM "compiler-rt" runtime libraries
-License:        NCSA or MIT
+License:	NCSA or MIT
-URL:            http://llvm.org
+URL:		http://llvm.org
-Source0:        http://llvm.org/releases/%{version}/%{crt_srcdir}.tar.xz
+Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{crt_srcdir}.tar.xz
-BuildRequires:  gcc gcc-c++ cmake python3 python3-devel
+Patch0000:	0001-PATCH-std-thread-copy.patch
-BuildRequires:  llvm-devel = %{version} llvm-static = %{version}
+
+BuildRequires:	gcc
+BuildRequires:	gcc-c++
+BuildRequires:	cmake
+BuildRequires:	python3
+# We need python3-devel for pathfix.py.
+BuildRequires:	python3-devel
+BuildRequires:	llvm-devel = %{version}
+BuildRequires:	llvm-static = %{version}
 
 %description
-The compiler-rt project provides highly tuned implementations of the
+The compiler-rt project is a part of the LLVM project. It provides
-low-level code generator support routines like "__fixunsdfdi" and other
+implementation of the low-level target-specific hooks required by
-calls generated when a target doesn't have a short sequence of native
+code generation, sanitizer runtimes and profiling library for code
-instructions to implement a core IR operation.
+instrumentation, and Blocks C language extension.
 
 %prep
 %autosetup -n %{crt_srcdir} -p1
-pathfix.py -i %{__python3} -pn .
+
+pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
 
 %build
 mkdir -p _build
 cd _build
 %cmake .. \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
+	-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
-    \
+	\
 %if 0%{?__isa_bits} == 64
-    -DLLVM_LIBDIR_SUFFIX=64 \
+	-DLLVM_LIBDIR_SUFFIX=64 \
 %else
-    -DLLVM_LIBDIR_SUFFIX= \
+	-DLLVM_LIBDIR_SUFFIX= \
 %endif
-    -DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF
+	-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on?
 
 %make_build
 
@@ -40,33 +51,61 @@ cd _build
 cd _build
 %make_install
 
+# move blacklist/abilist files to where clang expect them
+mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
+mv -v %{buildroot}%{_datadir}/*list.txt  %{buildroot}%{_libdir}/clang/%{version}/share/
+
+# move sanitizer libs to better place
+%global libclang_rt_installdir lib/linux
 mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib
-
+mv -v %{buildroot}%{_prefix}/%{libclang_rt_installdir}/*clang_rt* %{buildroot}%{_libdir}/clang/%{version}/lib
-%ifarch aarch64
-%global aarch64_blacklists hwasan_blacklist.txt
-%endif
-
-for file in %{aarch64_blacklists} asan_blacklist.txt msan_blacklist.txt dfsan_blacklist.txt \
-    cfi_blacklist.txt dfsan_abilist.txt hwasan_blacklist.txt; do
-    mv -v %{buildroot}%{_datadir}/${file} %{buildroot}%{_libdir}/clang/%{version}/ || :
-done
-
-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
-for i in *.a *.syms *.so; do
+for i in *.a *.so
-    ln -s ../$i linux/$i
+do
+	ln -s ../$i linux/$i
 done
+popd
+
+%ifarch %{ix86}
+%post
+if test "`uname -m`" = x86_64
+then
+	cd %{_libdir}/clang/%{version}/lib
+	mkdir -p ../../../../lib64/clang/%{version}/lib
+	for i in *.a *.so
+	do
+		ln -s ../../../../%{_lib}/clang/%{version}/lib/$i ../../../../lib64/clang/%{version}/lib/$i
+	done
+fi
+
+%preun
+
+if test "`uname -m`" = x86_64
+then
+	cd %{_libdir}/clang/%{version}/lib
+	for i in *.a *.so
+	do
+		rm ../../../../lib64/clang/%{version}/lib/$i
+	done
+	rmdir -p ../../../../lib64/clang/%{version}/lib 2>/dev/null 1>/dev/null || :
+fi
+
+%endif
 
 %check
-cd _build
+#make check-all -C _build
 
 %files
-%defattr(-,root,root)
-%license LICENSE.TXT
 %{_includedir}/*
 %{_libdir}/clang/%{version}
+%ifarch x86_64 aarch64
+%{_bindir}/hwasan_symbolize
+%endif
 
 %changelog
+* Thu Jul 30 2020 Guoshuai Sun <sunguoshuai@huawei.com> - 10.0.1-1
+- Update to 10.0.1
+
 * Thu Dec 5 2019 openEuler Buildteam <buildteam@openeuler.org> - 7.0.0-2
 - Package init