From 267e73a4ae219c1ee1ba69beb8b31821f3efe42d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Oct 2021 22:32:08 +0200 Subject: [PATCH 1/6] new upstream release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1312b8e4..39e8915b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-13 (1:13.0.0-1) unstable; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Fri, 01 Oct 2021 09:08:08 +0200 + llvm-toolchain-13 (1:13.0.0~+rc4-1) unstable; urgency=medium * New testing release From 14a06d109e0d7db9d9b96deac10224f4537586e3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Oct 2021 22:44:13 +0200 Subject: [PATCH 2/6] Fix the libclang detect in cmake (Closes: #994827) --- debian/changelog | 7 +++++++ debian/qualify-clang.sh | 11 +++++++++++ debian/rules | 3 +++ 3 files changed, 21 insertions(+) diff --git a/debian/changelog b/debian/changelog index 39e8915b..765c994f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-13 (1:13.0.0-2) unstable; urgency=medium + + * Fix the libclang detection in cmake + (Closes: #994827) + + -- Sylvestre Ledru Sun, 03 Oct 2021 22:38:18 +0200 + llvm-toolchain-13 (1:13.0.0-1) unstable; urgency=medium * New upstream release diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 1f845cd1..c62f3702 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1418,6 +1418,17 @@ mkdir cmaketest/foo/ rm -rf cmaketest +# Test case for bug #994827 +rm -rf cmaketest && mkdir cmaketest +cat > cmaketest/CMakeLists.txt < /dev/null) +rm -rf cmaketest CLANG=clang-$VERSION diff --git a/debian/rules b/debian/rules index 805f41ad..fdcf2070 100755 --- a/debian/rules +++ b/debian/rules @@ -761,6 +761,9 @@ endif # Disable CMake's package validation checks for binaries that may not be installed sed -i 's|.*_IMPORT_CHECK_FILES_FOR_.*/bin/.*)|#&|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake +# Adjust to the existing symlink. See #994827 + sed -i "s|libclang-$(LLVM_VERSION).so.$(LLVM_VERSION).*\"|libclang-$(LLVM_VERSION).so.1\"|" $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-relwithdebinfo.cmake + # Managed in python*-lldb-X.Y.links.in rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so From a6274d93aa43775d3d32a8926a0ff90d316c8202 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Oct 2021 09:01:41 +0200 Subject: [PATCH 3/6] test: adjust the type when using libclang --- 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 c62f3702..e03b6218 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1283,7 +1283,7 @@ int main() { CodeGenOptions* cgOpts; TargetOptions* tOpts; LangOptions* lOpts; - llvm::DataLayout* tDesc; + llvm::StringRef* tDesc; llvm::Module* m; BackendAction* action; std::unique_ptr AsmOutStream; From 257263a1146f29318918427ed8ff656166fbdcff Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Oct 2021 09:05:52 +0200 Subject: [PATCH 4/6] -lPollyPPCG doesn't exist --- 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 e03b6218..1c8d2ee5 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1291,7 +1291,7 @@ int main() { 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-$VERSION/lib/libLLVM-$VERSION.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 +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-$VERSION/lib/libLLVM-$VERSION.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 -lPollyISL if test ! -f /usr/bin/lldb-$VERSION; then echo "Install lldb-$VERSION"; From b2438aba010bcce164d84605a74f6add464099df Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Oct 2021 09:06:05 +0200 Subject: [PATCH 5/6] improve the version set --- 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 1c8d2ee5..99b312ae 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1424,7 +1424,7 @@ cat > cmaketest/CMakeLists.txt < /dev/null) From 8380a9458122c9054012401f95dc498aa2014cdf Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 4 Oct 2021 09:20:07 +0200 Subject: [PATCH 6/6] Adjust the testsuite after various changes (rpass, libclang, polly lib, etc) --- debian/changelog | 2 ++ debian/qualify-clang.sh | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 765c994f..7709a6ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ llvm-toolchain-13 (1:13.0.0-2) unstable; urgency=medium * Fix the libclang detection in cmake (Closes: #994827) + * Adjust the testsuite after various changes + (rpass, libclang, polly lib, etc) -- Sylvestre Ledru Sun, 03 Oct 2021 22:38:18 +0200 diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 99b312ae..5db5b871 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -1250,9 +1250,18 @@ fi echo " int foo(int x, int y) __attribute__((always_inline)); int foo(int x, int y) { return x + y; } -int bar(int j) { return foo(j, j - 2); }" > foo.cc +int bar(int j) { return foo(j, j - 2); } +int sum = 0; + +int main(int argc, const char *argv[]) { + for (int i = 0; i < 30; i++) + bar(argc); + return sum; +} + +" > foo.cc clang-$VERSION -O2 -Rpass=inline foo.cc -c &> foo.log -if ! grep -q "cost=always" foo.log; then +if ! grep -q -E "(inlined into main with|cost=always)" foo.log; then echo "-Rpass fails" cat foo.log exit 1