Merge remote-tracking branch 'origin/10' into snapshot

debian/changelog

@@ -31,23 +31,23 @@ llvm-toolchain-snapshot (1:11~++20200123111717+04fd2041561-1~exp1) experimental;
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 23 Jan 2020 14:52:30 +0100
 
-llvm-toolchain-10 (1:10.0.0~+rc2-3) UNRELEASED; urgency=medium
-
-  * Patch to convert old python3 cgi method into the new html one 
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 25 Feb 2020 14:57:08 +0100
-
 llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium
 
   [ Sylvestre Ledru ]
-  * Pass -DCOMPILER_RT_USE_LIBCXX=NO to the build system
-    to bring fuzzer library back
+  * Bring back libfuzzer, for some reasons I don't remember
+    I disabled it:
     https://bugs.llvm.org/show_bug.cgi?id=41956
+  * Silent the polly tests in debian/qualify-clang.sh
+    clang (LLVM option parsing): Unknown command line argument
+    '-polly'.  Try: 'clang (LLVM option parsing) --help'
 
   [ Aurelien Jarno ]
   * Also disable hwasan_symbolize on mipsel mips64el riscv64
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 16 Feb 2020 17:35:25 +0100
+  [ Gianfranco Costamagna ]
+  * Patch to convert old python3 cgi method into the new html one
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 29 Feb 2020 14:04:22 +0100
 
 llvm-toolchain-10 (1:10.0.0~+rc2-1) unstable; urgency=medium
 

debian/patches/disable-fuzzer-compiler-rt.diff

@@ -1,31 +0,0 @@
-Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/lib/CMakeLists.txt
-+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/lib/CMakeLists.txt
-@@ -56,6 +56,6 @@ if(COMPILER_RT_BUILD_XRAY)
-   compiler_rt_build_runtime(xray)
- endif()
- 
--if(COMPILER_RT_BUILD_LIBFUZZER)
--  compiler_rt_build_runtime(fuzzer)
--endif()
-+#if(COMPILER_RT_BUILD_LIBFUZZER)
-+#  compiler_rt_build_runtime(fuzzer)
-+#endif()
-Index: llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt
-===================================================================
---- llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373.orig/compiler-rt/test/CMakeLists.txt
-+++ llvm-toolchain-snapshot_10~+20191215044521+fd7dca98373/compiler-rt/test/CMakeLists.txt
-@@ -54,9 +54,9 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
-     compiler_rt_test_runtime(sanitizer_common)
- 
-     # OpenBSD not supporting asan, cannot run the tests
--    if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
--      compiler_rt_test_runtime(fuzzer)
--    endif()
-+#    if(COMPILER_RT_BUILD_LIBFUZZER AND NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD" AND NOT ANDROID)
-+#      compiler_rt_test_runtime(fuzzer)
-+#    endif()
- 
-     foreach(sanitizer ${COMPILER_RT_SANITIZERS_TO_BUILD})
-       # cfi testing is gated on ubsan

debian/patches/series

@@ -135,7 +135,6 @@ workaround-bug-42994-use-linker.diff
 # bug 939472
 #try-to-unbreak-thinlto.diff
 D67877.patch
-disable-fuzzer-compiler-rt.diff
 no-z3.patch
 
 python3-shebang.patch

debian/qualify-clang.sh

@@ -458,7 +458,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) {
   return 0;
 }
 EOF
-clang-9 -fprofile-instr-generate -fcoverage-mapping fuzz_me.cc StandaloneFuzzTargetMain.c
+clang-$VERSION -fprofile-instr-generate -fcoverage-mapping fuzz_me.cc StandaloneFuzzTargetMain.c
 
 rm -rf CORPUS
 mkdir -p CORPUS
@@ -784,23 +784,23 @@ int main()
     return 0;
 }
 " > foo.c
-clang-$VERSION -O3 -mllvm -polly foo.c
+#clang-$VERSION -O3 -mllvm -polly -mllvm -polly-parallel -lgomp  foo.c
 # Comment because of https://bugs.llvm.org/show_bug.cgi?id=43164
-# clang-$VERSION -O3 -mllvm -polly -mllvm -lgomp -polly-parallel foo.c
-clang-$VERSION -O3 -mllvm -polly -mllvm -polly-vectorizer=stripmine foo.c
-clang-$VERSION -S -fsave-optimization-record -emit-llvm foo.c -o matmul.s
-opt-$VERSION -S -polly-canonicalize matmul.s > matmul.preopt.ll > /dev/null
-opt-$VERSION -basicaa -polly-ast -analyze -q matmul.preopt.ll -polly-process-unprofitable > /dev/null
-if test ! -f /usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py; then
-    echo "Install llvm-$VERSION-tools"
-    exit 42
-fi
-/usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py -source-dir .  matmul.opt.yaml -o ./output > /dev/null
+#clang-$VERSION -O3 -mllvm -polly -mllvm -lgomp -polly-parallel foo.c
+#clang-$VERSION -O3 -mllvm -polly -mllvm -polly-vectorizer=stripmine foo.c
+#clang-$VERSION -S -fsave-optimization-record -emit-llvm foo.c -o matmul.s
+#opt-$VERSION -S -polly-canonicalize matmul.s > matmul.preopt.ll > /dev/null
+#opt-$VERSION -basicaa -polly-ast -analyze -q matmul.preopt.ll -polly-process-unprofitable > /dev/null
+#if test ! -f /usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py; then
+#    echo "Install llvm-$VERSION-tools"
+#    exit 42
+#fi
+#/usr/lib/llvm-$VERSION/share/opt-viewer/opt-viewer.py -source-dir .  matmul.opt.yaml -o ./output > /dev/null
 
-if ! grep -q "not inlined into" output/foo.c.html 2>&1; then
-    echo "Could not find the output from polly"
-    exit -1
-fi
+#if ! grep -q "not inlined into" output/foo.c.html 2>&1; then
+#    echo "Could not find the output from polly"
+#    exit -1
+#fi
 
 echo "
 int foo(int x, int y) __attribute__((always_inline));