diff -Nru llvm-toolchain-10-10.0.0/debian/changelog llvm-toolchain-10-10.0.0/debian/changelog --- llvm-toolchain-10-10.0.0/debian/changelog 2020-04-02 19:48:13.000000000 +0000 +++ llvm-toolchain-10-10.0.0/debian/changelog 2020-04-20 05:12:09.000000000 +0000 @@ -1,3 +1,16 @@ +llvm-toolchain-10 (1:10.0.0-4ubuntu1) focal; urgency=medium + + * Disable the test suite on riscv64. It takes too long. + + -- William Grant Mon, 20 Apr 2020 15:12:09 +1000 + +llvm-toolchain-10 (1:10.0.0-4) unstable; urgency=medium + + * Also ship polly libs in libclang-common-10-dev. + Fixes bug #44870 (upstream) + + -- Sylvestre Ledru Fri, 10 Apr 2020 10:27:41 +0200 + llvm-toolchain-10 (1:10.0.0-3) unstable; urgency=medium * ppc64el/autopkgtest: Just like with arm64, ignore two tests diff -Nru llvm-toolchain-10-10.0.0/debian/control llvm-toolchain-10-10.0.0/debian/control --- llvm-toolchain-10-10.0.0/debian/control 2020-03-31 21:25:00.000000000 +0000 +++ llvm-toolchain-10-10.0.0/debian/control 2020-04-20 05:12:09.000000000 +0000 @@ -2,7 +2,8 @@ Section: devel Priority: optional Rules-Requires-Root: no -Maintainer: LLVM Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: LLVM Packaging Team Uploaders: Sylvestre Ledru , Gianfranco Costamagna Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, libffi-dev, diff -Nru llvm-toolchain-10-10.0.0/debian/libclang-common-X.Y-dev.install.in llvm-toolchain-10-10.0.0/debian/libclang-common-X.Y-dev.install.in --- llvm-toolchain-10-10.0.0/debian/libclang-common-X.Y-dev.install.in 2020-01-20 21:09:49.000000000 +0000 +++ llvm-toolchain-10-10.0.0/debian/libclang-common-X.Y-dev.install.in 2020-04-10 08:27:41.000000000 +0000 @@ -4,4 +4,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt - +usr/lib/llvm-@LLVM_VERSION@/lib/libPolly*.a diff -Nru llvm-toolchain-10-10.0.0/debian/qualify-clang.sh llvm-toolchain-10-10.0.0/debian/qualify-clang.sh --- llvm-toolchain-10-10.0.0/debian/qualify-clang.sh 2020-04-02 19:48:13.000000000 +0000 +++ llvm-toolchain-10-10.0.0/debian/qualify-clang.sh 2020-04-10 08:27:41.000000000 +0000 @@ -1011,23 +1011,23 @@ return 0; } " > foo.c -#clang-$VERSION -O3 -mllvm -polly -mllvm -polly-parallel -lgomp 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 - -#if ! grep -q "not inlined into" output/foo.c.html 2>&1; then -# echo "Could not find the output from polly" -# exit -1 -#fi +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 echo " int foo(int x, int y) __attribute__((always_inline)); @@ -1053,6 +1053,29 @@ llvm-profdata-$VERSION merge -output=foo.profdata foo-*.profraw clang++-$VERSION -O2 -fprofile-instr-use=foo.profdata foo.cc -o foo +# https://bugs.llvm.org/show_bug.cgi?id=44870 +cat < foo.cpp +#include + +using namespace clang; + +int main() { + DiagnosticsEngine* diags; + HeaderSearchOptions* hsOpts; + CodeGenOptions* cgOpts; + TargetOptions* tOpts; + LangOptions* lOpts; + llvm::DataLayout* tDesc; + llvm::Module* m; + BackendAction* action; + std::unique_ptr AsmOutStream; + + EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, std::move(AsmOutStream)); +} +EOF +clang++-$VERSION foo.cpp -o test -lclangBasic -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangCodeGen -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangFrontend -lclangDriver -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -ldl /usr/lib/llvm-10/lib/libLLVM-10.so -lclangCodeGen -lclangDriver -lclangFrontend -lclangFrontendTool -lclangRewriteFrontend -lclangARCMigrate -lclangStaticAnalyzerFrontend -lclangStaticAnalyzerCheckers -lclangStaticAnalyzerCore -lclangCrossTU -lclangIndex -lclangParse -lclangSerialization -lclangSema -lclangAnalysis -lclangEdit -lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangASTMatchers -lclangAST -lclangLex -ldl -I /usr/lib/llvm-$VERSION/include/ -L/usr/lib/llvm-$VERSION/lib/ -lPolly -lPollyPPCG -lPollyISL + + if test ! -f /usr/bin/lldb-$VERSION; then echo "Install lldb-$VERSION"; exit -1; diff -Nru llvm-toolchain-10-10.0.0/debian/rules llvm-toolchain-10-10.0.0/debian/rules --- llvm-toolchain-10-10.0.0/debian/rules 2020-03-31 21:46:59.000000000 +0000 +++ llvm-toolchain-10-10.0.0/debian/rules 2020-04-20 05:12:09.000000000 +0000 @@ -181,6 +181,9 @@ ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) RUN_TEST=no endif +ifeq (riscv64,$(DEB_HOST_ARCH)) + RUN_TEST=no +endif ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS))) # enable the build using scan-build @@ -604,8 +607,6 @@ mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang -# Don't think it is used - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a # Probably useless rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/six.py rm -rf $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/build/utils/lit/lit/__pycache__/ \