Update to 12.0.1

(cherry picked from commit 282fb72eb8691c60052ca173d5c3c487ffe82a28)

0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch

@@ -0,0 +1,43 @@
+From 8247295860b69fd379e282c3e6315df9f700e4d8 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <sguelton@redhat.com>
+Date: Thu, 25 Feb 2021 14:12:57 +0100
+Subject: [PATCH][compiler-rt] Workaround libstdc++ limitation wrt. thread copy
+
+---
+ compiler-rt/lib/fuzzer/FuzzerDefs.h     | 6 ++++++
+ compiler-rt/lib/fuzzer/FuzzerDriver.cpp | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/compiler-rt/lib/fuzzer/FuzzerDefs.h b/compiler-rt/lib/fuzzer/FuzzerDefs.h
+index 1a2752a..abfbb8d 100644
+--- a/compiler-rt/lib/fuzzer/FuzzerDefs.h
++++ b/compiler-rt/lib/fuzzer/FuzzerDefs.h
+@@ -50,6 +50,12 @@ template<typename T>
+ 
+       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 --git a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
+index 447cafc..2fce139 100644
+--- a/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
++++ b/compiler-rt/lib/fuzzer/FuzzerDriver.cpp
+@@ -294,7 +294,7 @@ static int RunInMultipleProcesses(const Vector<std::string> &Args,
+   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;
+-- 
+1.8.3.1
+

0001-PATCH-std-thread-copy.patch

@@ -1,28 +0,0 @@
-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;

0002-hwasan_symbolize-should-run-in-python2-and-python3.patch

@@ -1,127 +0,0 @@
-From 9cfd1d498364487b7d1ba990188bffbd9a73d942 Mon Sep 17 00:00:00 2001
-From: si-gui <245140120@qq.com>
-Date: Fri, 25 Sep 2020 17:06:30 +0800
-Subject: [PATCH] hwasan_symbolize should run in python2 and python3, and
- python3 is default now
-
-Signed-off-by: si-gui <245140120@qq.com>
----
- lib/hwasan/scripts/hwasan_symbolize | 45 +++++++++++++++--------------
- 1 file changed, 23 insertions(+), 22 deletions(-)
-
-diff --git a/lib/hwasan/scripts/hwasan_symbolize b/lib/hwasan/scripts/hwasan_symbolize
-index f77e36f..a488110 100755
---- a/lib/hwasan/scripts/hwasan_symbolize
-+++ b/lib/hwasan/scripts/hwasan_symbolize
-@@ -10,6 +10,7 @@
- # HWAddressSanitizer offline symbolization script.
- #
- #===------------------------------------------------------------------------===#
-+from __future__ import print_function
- import glob
- import os
- import re
-@@ -41,14 +42,14 @@ class Symbolizer:
-     pass
- 
-   def __write(self, s):
--    print >>self.__pipe.stdin, s
-+    print(s,file=self.__pipe.stdin)
-     if self.__log:
--      print >>sys.stderr, ("#>>  |%s|" % (s,))
-+      print(("#>>  |%s|" % (s,)),file=sys.stderr)
- 
-   def __read(self):
-     s = self.__pipe.stdout.readline().rstrip()
-     if self.__log:
--      print >>sys.stderr, ("# << |%s|" % (s,))
-+      print(("# << |%s|" % (s,)),file=sys.stderr)
-     if s == '':
-       raise Symbolizer.__EOF
-     return s
-@@ -73,7 +74,7 @@ class Symbolizer:
-       full_path = os.path.join(p, os.path.basename(name))
-       if os.path.exists(full_path):
-         return full_path
--    print >>sys.stderr, "Could not find symbols for", name
-+    print("Could not find symbols for",name,file=sys.stderr)
-     return None
- 
-   def iter_locals(self, binary, addr):
-@@ -125,16 +126,16 @@ def symbolize_line(line, symbolizer_path):
-     frames = list(symbolizer.iter_call_stack(binary, addr))
- 
-     if len(frames) > 0:
--      print "%s#%s%s%s in %s" % (match.group(1).encode('utf-8'), match.group(2).encode('utf-8'),
--                                 match.group(3).encode('utf-8'), frames[0][0], frames[0][1])
-+      print("%s#%s%s%s in %s" % (match.group(1).encode('utf-8'), match.group(2).encode('utf-8'),
-+                                 match.group(3).encode('utf-8'), frames[0][0], frames[0][1]))
-       for i in range(1, len(frames)):
-         space1 = ' ' * match.end(1)
-         space2 = ' ' * (match.start(4) - match.end(1) - 2)
--        print "%s->%s%s in %s" % (space1, space2, frames[i][0], frames[i][1])
-+        print("%s->%s%s in %s" % (space1, space2, frames[i][0], frames[i][1]))
-     else:
--      print line.rstrip().encode('utf-8')
-+      print(line.rstrip().encode('utf-8'))
-   else:
--    print line.rstrip().encode('utf-8')
-+    print(line.rstrip().encode('utf-8'))
- 
- def save_access_address(line):
-   global last_access_address, last_access_tag
-@@ -174,10 +175,10 @@ def process_stack_history(line, symbolizer, ignore_tags=False):
-       tag_offset = local[5]
-       if not ignore_tags and (tag_offset is None or base_tag ^ tag_offset != last_access_tag):
-         continue
--      print ''
--      print 'Potentially referenced stack object:'
--      print '  %d bytes inside variable "%s" in stack frame of function "%s"' % (obj_offset, local[2], local[0])
--      print '  at %s' % (local[1],)
-+      print('')
-+      print('Potentially referenced stack object:')
-+      print('  %d bytes inside variable "%s" in stack frame of function "%s"' % (obj_offset, local[2], local[0]))
-+      print('  at %s' % (local[1],))
-     return True
-   return False
- 
-@@ -200,7 +201,7 @@ if not binary_prefixes:
- 
- for p in binary_prefixes:
-   if not os.path.isdir(p):
--    print >>sys.stderr, "Symbols path does not exist or is not a directory:", p
-+    print("Symbols path does not exist or is not a directory:",p,file=sys.stderr)
-     sys.exit(1)
- 
- # Source location.
-@@ -257,19 +258,19 @@ if not symbolizer_path:
-       symbolizer_path = candidates[0]
-       break
- 
--if not os.path.exists(symbolizer_path):
--  print >>sys.stderr, "Symbolizer path does not exist:", symbolizer_path
-+if not os.path.exists(str(symbolizer_path)):
-+  print("Symbolizer path does not exist:",symbolizer_path,file=sys.stderr)
-   sys.exit(1)
- 
- if args.v:
--  print "Looking for symbols in:"
-+  print("Looking for symbols in:")
-   for s in binary_prefixes:
--    print "  %s" % (s,)
--  print "Stripping source path prefixes:"
-+    print("  %s" % (s,))
-+  print("Stripping source path prefixes:")
-   for s in paths_to_cut:
--    print "  %s" % (s,)
--  print "Using llvm-symbolizer binary in:\n  %s" % (symbolizer_path,)
--  print
-+    print("  %s" % (s,))
-+  print("Using llvm-symbolizer binary in:\n  %s" % (symbolizer_path,))
-+  print()
- 
- symbolizer = Symbolizer(symbolizer_path, binary_prefixes, paths_to_cut)
- symbolizer.enable_logging(args.d)
--- 
-2.23.0
-

close-no-stack-protector.patch

@@ -1,12 +0,0 @@
-diff -ruNa compiler-rt-7.0.0.src.old/CMakeLists.txt compiler-rt-7.0.0.src/CMakeLists.txt
---- compiler-rt-7.0.0.src.old/CMakeLists.txt	2020-03-20 18:23:28.512249162 +0800
-+++ compiler-rt-7.0.0.src/CMakeLists.txt	2020-03-20 17:37:26.462851376 +0800
-@@ -205,7 +205,7 @@
-   append_list_if(COMPILER_RT_HAS_FOMIT_FRAME_POINTER_FLAG -fomit-frame-pointer SANITIZER_COMMON_CFLAGS)
- endif()
- append_list_if(COMPILER_RT_HAS_FUNWIND_TABLES_FLAG -funwind-tables SANITIZER_COMMON_CFLAGS)
--append_list_if(COMPILER_RT_HAS_FNO_STACK_PROTECTOR_FLAG -fno-stack-protector SANITIZER_COMMON_CFLAGS)
-+#append_list_if(COMPILER_RT_HAS_FNO_STACK_PROTECTOR_FLAG -fno-stack-protector SANITIZER_COMMON_CFLAGS)
- append_list_if(COMPILER_RT_HAS_FNO_SANITIZE_SAFE_STACK_FLAG -fno-sanitize=safe-stack SANITIZER_COMMON_CFLAGS)
- append_list_if(COMPILER_RT_HAS_FVISIBILITY_HIDDEN_FLAG -fvisibility=hidden SANITIZER_COMMON_CFLAGS)
- if(NOT COMPILER_RT_HAS_FVISIBILITY_HIDDEN_FLAG)

compiler-rt.spec

@@ -3,23 +3,28 @@
 %global optflags %(echo %{optflags} -Dasm=__asm__)
 
 Name:		compiler-rt
-Version:	10.0.1
-Release:	3
+Version:	12.0.1
+Release:	1
 Summary:	LLVM "compiler-rt" runtime libraries
+
 License:	NCSA or MIT
 URL:		http://llvm.org
 Source0:	https://github.com/llvm/llvm-project/releases/download/llvmorg-%{version}/%{crt_srcdir}.tar.xz
-Patch0000:	0001-PATCH-std-thread-copy.patch
-Patch0001:      0002-hwasan_symbolize-should-run-in-python2-and-python3.patch
+Source2:	tstellar-gpg-key.asc
+Patch0:		0001-PATCH-compiler-rt-Workaround-libstdc-limitation-wrt..patch
 
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
+BuildRequires:	ninja-build
 BuildRequires:	python3
 # We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
 BuildRequires:	llvm-devel = %{version}
-BuildRequires:	llvm-static = %{version}
+# For gpg source verification
+BuildRequires:	gnupg2
+
+Requires: clang-resource-filesystem%{?isa} = %{version}
 
 %description
 The compiler-rt project is a part of the LLVM project. It provides
@@ -28,7 +33,8 @@ code generation, sanitizer runtimes and profiling library for code
 instrumentation, and Blocks C language extension.
 
 %prep
-%autosetup -n %{crt_srcdir} -p1
+%autosetup -n %{crt_srcdir} -p2
+pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
 
 %build
 mkdir -p _build
@@ -65,7 +71,8 @@ do
 	ln -s ../$i linux/$i
 done
 popd
-
+# multilib support: also create symlink from lib to lib64, fixes rhbz#1678240
+# the symlinks will be dangling if the 32 bits version is not installed, but that should be fine
 %ifarch %{ix86}
 %post
 if test "`uname -m`" = x86_64
@@ -93,16 +100,22 @@ fi
 %endif
 
 %check
-#make check-all -C _build
+
+#%%cmake_build --target check-compiler-rt
 
 %files
+%license LICENSE.TXT
 %{_includedir}/*
-%{_libdir}/clang/%{version}
+%{_libdir}/clang/%{version}/lib/*
+%{_libdir}/clang/%{version}/share/*
 %ifarch x86_64 aarch64
 %{_bindir}/hwasan_symbolize
 %endif
 
 %changelog
+* Mon Dec 27 2021 Chen Chen <chen_aka_jan@163.com> - 12.0.1-1
+- Update to 12.0.1
+
 * Fri Sep 25 2020 Guoshuai Sun <sunguoshuai@huawei.com> - 10.0.1-3
 - hwasan_symbolize should run in python2 and python3, and python3 is default now