From 8fdd679ed7667d1f0f9dea538ae3b5095e6dccba Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Feb 2020 14:52:36 +0100 Subject: [PATCH 01/11] Also disable hwasan_symbolize on armel s390x powerpc ppc64 --- debian/changelog | 6 ++++++ debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 75812ce3..f5453dc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-10 (1:10.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium + + * Also disable hwasan_symbolize on armel s390x powerpc ppc64 + + -- Sylvestre Ledru Sun, 16 Feb 2020 14:50:53 +0100 + llvm-toolchain-10 (1:10.0.0~+rc2-1~exp1) experimental; urgency=medium * Second RC release diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 823e3733..7bc5355e 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -33,7 +33,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper -[!armhf !ppc64el !hurd-any] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize +[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ From 2ae1342584190058edb90feaab8b8c457394af22 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Feb 2020 15:02:35 +0100 Subject: [PATCH 02/11] Upload to unstable to get ci.debian.net testing --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f5453dc9..9900a9a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -llvm-toolchain-10 (1:10.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-10 (1:10.0.0~+rc2-1) unstabe; urgency=medium + * Upload to unstable to get ci.debian.net testing * Also disable hwasan_symbolize on armel s390x powerpc ppc64 -- Sylvestre Ledru Sun, 16 Feb 2020 14:50:53 +0100 From 47798c41250e9b21ed2585174260a0ce3765ecbd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Feb 2020 17:18:57 +0100 Subject: [PATCH 03/11] add a missing removal --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 599695bb..4ecacc86 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -11,7 +11,7 @@ DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" -echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*'" +echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*'" echo "sudo dpkg -i $LIST" L="" for f in $LIST; do From fe5501b176cf01d4f868a084a2de58c1ad309269 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Feb 2020 17:21:15 +0100 Subject: [PATCH 04/11] also install clang-tidy --- debian/qualify-clang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 4ecacc86..dd4f0725 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -9,7 +9,7 @@ VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") DETAILED_VERSION=$(dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1\2\3,p") DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) -LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb" +LIST="libomp5-${VERSION}_${DETAILED_VERSION}_amd64.deb libomp-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb python3-lldb-${VERSION}_${DETAILED_VERSION}_amd64.deb libllvm${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-common-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}_${DETAILED_VERSION}_amd64.deb liblldb-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-runtime_${DETAILED_VERSION}_amd64.deb lld-${VERSION}_${DETAILED_VERSION}_amd64.deb libfuzzer-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++abi-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libc++1-${VERSION}_${DETAILED_VERSION}_amd64.deb libc++abi1-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}_${DETAILED_VERSION}_amd64.deb llvm-${VERSION}-tools_${DETAILED_VERSION}_amd64.deb clang-tools-${VERSION}_${DETAILED_VERSION}_amd64.deb clangd-${VERSION}_${DETAILED_VERSION}_amd64.deb clang-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang1-${VERSION}-dbgsym_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*'" echo "sudo dpkg -i $LIST" From 32f3c4d27c1e5aa5a87cdaf08015a51c5f03605a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Feb 2020 17:22:29 +0100 Subject: [PATCH 05/11] fix typo in the version --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9900a9a8..2f7804ce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-10 (1:10.0.0~+rc2-1) unstabe; urgency=medium +llvm-toolchain-10 (1:10.0.0~+rc2-1) unstable; urgency=medium * Upload to unstable to get ci.debian.net testing * Also disable hwasan_symbolize on armel s390x powerpc ppc64 From 6a26661f3a050329dee41ee973b5bfa87918d665 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 16 Feb 2020 17:36:10 +0100 Subject: [PATCH 06/11] Pass -DCOMPILER_RT_USE_LIBCXX=NO to the build system to bring fuzzer library back https://bugs.llvm.org/show_bug.cgi?id=41956 --- debian/changelog | 8 ++++++++ debian/rules | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2f7804ce..b4afe206 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium + + * Pass -DCOMPILER_RT_USE_LIBCXX=NO to the build system + to bring fuzzer library back + https://bugs.llvm.org/show_bug.cgi?id=41956 + + -- Sylvestre Ledru Sun, 16 Feb 2020 17:35:25 +0100 + llvm-toolchain-10 (1:10.0.0~+rc2-1) unstable; urgency=medium * Upload to unstable to get ci.debian.net testing diff --git a/debian/rules b/debian/rules index 2069f305..1b52510c 100755 --- a/debian/rules +++ b/debian/rules @@ -363,9 +363,10 @@ override_dh_auto_configure: preconfigure -DLLVM_ENABLE_FFI=ON \ $(CMAKE_EXTRA) \ -DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \ - -DCLANG_LINK_CLANG_DYLIB=ON \ + -DCLANG_LINK_CLANG_DYLIB=ON \ -DENABLE_LINKER_BUILD_ID=ON \ -DPOLLY_BUNDLED_JSONCPP=OFF \ + -DCOMPILER_RT_USE_LIBCXX=NO \ $(Z3_FLAG) \ -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="AVR" \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ From 1fc5668e6ecd55a8470f5c68d17674293969048c Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Wed, 19 Feb 2020 21:56:36 +0100 Subject: [PATCH 07/11] Also disable hwasan_symbolize on mipsel mips64el riscv64 --- debian/changelog | 4 ++++ debian/clang-tools-X.Y.install.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b4afe206..f7ec82b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,13 @@ 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 https://bugs.llvm.org/show_bug.cgi?id=41956 + [ Aurelien Jarno ] + * Also disable hwasan_symbolize on mipsel mips64el riscv64 + -- Sylvestre Ledru Sun, 16 Feb 2020 17:35:25 +0100 llvm-toolchain-10 (1:10.0.0~+rc2-1) unstable; urgency=medium diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 7bc5355e..9fb8aaba 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -33,7 +33,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper -[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize +[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ From cbed89cedbc29eff4b1c194e5f27ba18f5a1cba4 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Feb 2020 14:57:03 +0100 Subject: [PATCH 08/11] Convert cgi to html method --- debian/patches/no-cgi.patch | 44 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 debian/patches/no-cgi.patch diff --git a/debian/patches/no-cgi.patch b/debian/patches/no-cgi.patch new file mode 100644 index 00000000..bf782e02 --- /dev/null +++ b/debian/patches/no-cgi.patch @@ -0,0 +1,44 @@ +Description: cgi method is deprecated, use html instead +Author: Gianfranco Costamagna +Last-Update: 2020-02-25 + +--- llvm-toolchain-10-10.0.0~+rc2.orig/llvm/tools/opt-viewer/opt-viewer.py ++++ llvm-toolchain-10-10.0.0~+rc2/llvm/tools/opt-viewer/opt-viewer.py +@@ -3,7 +3,7 @@ + from __future__ import print_function + + import argparse +-import cgi ++import html + import codecs + import errno + import functools +@@ -200,7 +200,7 @@ class IndexRenderer: + self.max_hottest_remarks_on_index = max_hottest_remarks_on_index + + def render_entry(self, r, odd): +- escaped_name = cgi.escape(r.DemangledFunctionName) ++ escaped_name = html.escape(r.DemangledFunctionName) + print(u''' + + {r.DebugLocString} +--- llvm-toolchain-10-10.0.0~+rc2.orig/llvm/tools/opt-viewer/optrecord.py ++++ llvm-toolchain-10-10.0.0~+rc2/llvm/tools/opt-viewer/optrecord.py +@@ -10,7 +10,7 @@ except ImportError: + print("For faster parsing, you may want to install libYAML for PyYAML") + from yaml import Loader + +-import cgi ++import html + from collections import defaultdict + import fnmatch + import functools +@@ -158,7 +158,7 @@ class Remark(yaml.YAMLObject): + (key, value) = list(mapping.items())[0] + + if key == 'Caller' or key == 'Callee' or key == 'DirectCallee': +- value = cgi.escape(self.demangle(value)) ++ value = html.escape(self.demangle(value)) + + if dl and key != 'Caller': + dl_dict = dict(list(dl)) diff --git a/debian/patches/series b/debian/patches/series index 1fd7b7a5..8aa59fc8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -138,3 +138,4 @@ no-z3.patch python3-shebang.patch print-lldb-path.patch +no-cgi.patch From 17d148c90409a2e0787a286bcec2fcf57f504fa0 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Feb 2020 14:57:25 +0100 Subject: [PATCH 09/11] Update changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index f7ec82b9..8a112a55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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 Tue, 25 Feb 2020 14:57:08 +0100 + llvm-toolchain-10 (1:10.0.0~+rc2-2) unstable; urgency=medium [ Sylvestre Ledru ] From 04d9ffab1627de0ed9b10c34577158dbb5fb8d3e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Feb 2020 15:15:42 +0100 Subject: [PATCH 10/11] Don't install stuff where not built (e.g. libarcher on armhf or hwasan on sparc64) --- debian/clang-tools-X.Y.install.in | 2 +- debian/libomp-X.Y-dev.install.in | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 9fb8aaba..b15f6577 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -33,7 +33,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/pp-trace usr/lib/llvm-@LLVM_VERSION@/bin/clang-move usr/lib/llvm-@LLVM_VERSION@/bin/clang-offload-wrapper -[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize +[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-build-py-@LLVM_VERSION@ usr/share/clang/ diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in index ccb04568..9255b828 100644 --- a/debian/libomp-X.Y-dev.install.in +++ b/debian/libomp-X.Y-dev.install.in @@ -1,6 +1,8 @@ +#!/usr/bin/dh-exec + /usr/lib/llvm-@LLVM_VERSION@/include/openmp/omp*.h /usr/lib/llvm-@LLVM_VERSION@/lib/libgomp.so /usr/lib/llvm-@LLVM_VERSION@/lib/libiomp5.so /usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so -/usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a -/usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so +[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a +[!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so From 828fbdd9b3e4571a3c67b94d01d46d9989abc5e1 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 25 Feb 2020 20:04:11 +0100 Subject: [PATCH 11/11] Add forgotten chmod +x to the libomp-X-Y-dev.install file, to let dh-exec do its job --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 1b52510c..8e224ad9 100755 --- a/debian/rules +++ b/debian/rules @@ -296,7 +296,7 @@ preconfigure: done # Make install file executable for dh-exec - chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install + chmod +x debian/llvm-$(LLVM_VERSION)-dev.install debian/clang-tools-$(LLVM_VERSION).install debian/libomp-$(LLVM_VERSION)-dev.install # DH doesn't support the [power ...] in install on Ubuntu trusty # fails with cp: cannot stat 'debian/tmp/[!powerpc': No such file or directory