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

This commit is contained in:
Sylvestre Ledru 2021-10-13 22:36:36 +02:00
commit f6bb7a18ec
6 changed files with 188 additions and 7 deletions

26
debian/changelog vendored
View File

@ -148,6 +148,26 @@ llvm-toolchain-snapshot (1:14~++20210715093511+afc760ef3527-1~exp2) unstable; ur
-- Sylvestre Ledru <sylvestre@debian.org> Fri, 06 Aug 2021 08:40:58 +0200
llvm-toolchain-13 (1:13.0.0-4) unstable; urgency=medium
* Instead of using llvm-* to install binaries in llvm-X.Y
list all the binaries one by one.
It will prevent "llvm-omp-device-info" to be installed in
llvm-X.Y which caused an explicit dependency on libomp
which caused llvm-X.Y to be NOT coinstallable anymore
* Move llvm-omp-device-info-X.Y from llvm-X to libompX-dev
Fixes upstream #52162
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 13 Oct 2021 13:29:51 +0200
llvm-toolchain-13 (1:13.0.0-3) unstable; urgency=medium
* libc++-13-dev should depends on libunwind-13-dev
(Closes: #995810)
* Disable a tsan and two lldb tests on i386
-- Sylvestre Ledru <sylvestre@debian.org> Wed, 06 Oct 2021 12:52:10 +0200
llvm-toolchain-13 (1:13.0.0-2) unstable; urgency=medium
* Fix the libclang detection in cmake
@ -742,7 +762,7 @@ llvm-toolchain-11 (1:11.1.0-3) unstable; urgency=medium
llvm-toolchain-11 (1:11.1.0-2) unstable; urgency=medium
* Ajust the cmake test to unbreak autopkgtest
* Adjust the cmake test to unbreak autopkgtest
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 26 Sep 2021 22:02:43 +0200
@ -1133,7 +1153,7 @@ llvm-toolchain-snapshot (1:11~++20200411120955+c65e6079fc9-1~exp1) experimental;
* Bring back libc++-experimental
* remove no-cgi.patch - applied upstream
* Also install liblldMachO2.a in liblld
* Reoder the cmake arg
* Reorder the cmake arg
* Update the copyright file with recent changes (Closes: #956287)
Thanks to Michael Lustfield for the detective work
@ -1145,7 +1165,7 @@ llvm-toolchain-snapshot (1:11~++20200409051253+d08105482e1-1~exp1) experimental;
* Bring back libc++-experimental
* remove no-cgi.patch - applied upstream
* Also install liblldMachO2.a in liblld
* Reoder the cmake arg
* Reorder the cmake arg
* Update the copyright file with recent changes (Closes: #956287)
Thanks to Michael Lustfield for the detective work

5
debian/control vendored
View File

@ -555,10 +555,10 @@ Section: libdevel
Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64
Depends: libomp5-14 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Suggests: libomp-14-doc
Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44)
Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44), llvm-14 (<< TODO)
Provides: libomp-x.y-dev
Conflicts: libomp-x.y-dev
Replaces: libomp-x.y-dev
Replaces: libomp-x.y-dev, llvm-14 (<< TODO)
Description: LLVM OpenMP runtime - dev package
The runtime is the part of the OpenMP implementation that your code is
linked against, and that manages the multiple threads in an OpenMP program
@ -621,6 +621,7 @@ Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libc++1-14 (= ${binary:Version}), ${misc:Depends}
libunwind-14-dev
Breaks: libc++-dev (<< 44)
Provides: libc++-x.y-dev
Conflicts: libc++-x.y-dev

View File

@ -11,3 +11,6 @@
[amd64 ppc64el arm64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc
usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info
usr/bin/llvm-omp-device-info-@LLVM_VERSION@

View File

@ -1,4 +1,72 @@
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-*
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-PerfectShuffle
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ar
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-as
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bcanalyzer
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-c-test
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cat
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cfi-verify
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-config
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cov
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cvtres
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cxxdump
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cxxfilt
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-cxxmap
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-diff
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dis
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dwarfdump
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dwp
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-exegesis
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-extract
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-gsymutil
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ifs
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-jitlink
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-jitlink-executor
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-libtool-darwin
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-link
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lipo
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lto
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lto2
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-mc
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-mca
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ml
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-modextract
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-mt
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-nm
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-objcopy
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-objdump
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-opt-report
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-pdbutil
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-profdata
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-profgen
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-rc
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readobj
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-reduce
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-rtdyld
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-sim
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-size
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-split
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-stress
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-strings
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-symbolizer
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-tapi-diff
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-tblgen
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-undname
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-xray
usr/lib/llvm-@LLVM_VERSION@/bin/obj2yaml
usr/lib/llvm-@LLVM_VERSION@/bin/opt
usr/lib/llvm-@LLVM_VERSION@/bin/sanstats
usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder
usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-addr2line
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bitcode-strip
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-dlltool
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-install-name-tool
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-lib
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-otool
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-ranlib
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-readelf
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-strip
usr/lib/llvm-@LLVM_VERSION@/bin/llvm-windres
usr/lib/llvm-@LLVM_VERSION@/bin/opt*
usr/lib/llvm-@LLVM_VERSION@/bin/bugpoint*
usr/lib/llvm-@LLVM_VERSION@/bin/llc*
@ -7,7 +75,71 @@ usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj
usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder
usr/lib/llvm-@LLVM_VERSION@/bin/sanstats
usr/lib/llvm-@LLVM_VERSION@/bin/dsymutil
usr/bin/llvm-*
usr/bin/llvm-PerfectShuffle-@LLVM_VERSION@
usr/bin/llvm-addr2line-@LLVM_VERSION@
usr/bin/llvm-ar-@LLVM_VERSION@
usr/bin/llvm-as-@LLVM_VERSION@
usr/bin/llvm-bcanalyzer-@LLVM_VERSION@
usr/bin/llvm-bitcode-strip-@LLVM_VERSION@
usr/bin/llvm-c-test-@LLVM_VERSION@
usr/bin/llvm-cat-@LLVM_VERSION@
usr/bin/llvm-cfi-verify-@LLVM_VERSION@
usr/bin/llvm-config-@LLVM_VERSION@
usr/bin/llvm-cov-@LLVM_VERSION@
usr/bin/llvm-cvtres-@LLVM_VERSION@
usr/bin/llvm-cxxdump-@LLVM_VERSION@
usr/bin/llvm-cxxfilt-@LLVM_VERSION@
usr/bin/llvm-cxxmap-@LLVM_VERSION@
usr/bin/llvm-diff-@LLVM_VERSION@
usr/bin/llvm-dis-@LLVM_VERSION@
usr/bin/llvm-dlltool-@LLVM_VERSION@
usr/bin/llvm-dwarfdump-@LLVM_VERSION@
usr/bin/llvm-dwp-@LLVM_VERSION@
usr/bin/llvm-exegesis-@LLVM_VERSION@
usr/bin/llvm-extract-@LLVM_VERSION@
usr/bin/llvm-gsymutil-@LLVM_VERSION@
usr/bin/llvm-ifs-@LLVM_VERSION@
usr/bin/llvm-install-name-tool-@LLVM_VERSION@
usr/bin/llvm-jitlink-@LLVM_VERSION@
usr/bin/llvm-jitlink-executor-@LLVM_VERSION@
usr/bin/llvm-lib-@LLVM_VERSION@
usr/bin/llvm-libtool-darwin-@LLVM_VERSION@
usr/bin/llvm-link-@LLVM_VERSION@
usr/bin/llvm-lipo-@LLVM_VERSION@
usr/bin/llvm-lto-@LLVM_VERSION@
usr/bin/llvm-lto2-@LLVM_VERSION@
usr/bin/llvm-mc-@LLVM_VERSION@
usr/bin/llvm-mca-@LLVM_VERSION@
usr/bin/llvm-ml-@LLVM_VERSION@
usr/bin/llvm-modextract-@LLVM_VERSION@
usr/bin/llvm-mt-@LLVM_VERSION@
usr/bin/llvm-nm-@LLVM_VERSION@
usr/bin/llvm-objcopy-@LLVM_VERSION@
usr/bin/llvm-objdump-@LLVM_VERSION@
usr/bin/llvm-opt-report-@LLVM_VERSION@
usr/bin/llvm-otool-@LLVM_VERSION@
usr/bin/llvm-pdbutil-@LLVM_VERSION@
usr/bin/llvm-profdata-@LLVM_VERSION@
usr/bin/llvm-profgen-@LLVM_VERSION@
usr/bin/llvm-ranlib-@LLVM_VERSION@
usr/bin/llvm-rc-@LLVM_VERSION@
usr/bin/llvm-readelf-@LLVM_VERSION@
usr/bin/llvm-readobj-@LLVM_VERSION@
usr/bin/llvm-reduce-@LLVM_VERSION@
usr/bin/llvm-rtdyld-@LLVM_VERSION@
usr/bin/llvm-sim-@LLVM_VERSION@
usr/bin/llvm-size-@LLVM_VERSION@
usr/bin/llvm-split-@LLVM_VERSION@
usr/bin/llvm-stress-@LLVM_VERSION@
usr/bin/llvm-strings-@LLVM_VERSION@
usr/bin/llvm-strip-@LLVM_VERSION@
usr/bin/llvm-symbolizer-@LLVM_VERSION@
usr/bin/llvm-tapi-diff-@LLVM_VERSION@
usr/bin/llvm-tblgen-@LLVM_VERSION@
usr/bin/llvm-undname-@LLVM_VERSION@
usr/bin/llvm-windres-@LLVM_VERSION@
usr/bin/llvm-xray-@LLVM_VERSION@
usr/bin/opt*
usr/bin/bugpoint*
usr/bin/llc*

View File

@ -144,3 +144,4 @@ scan-build-py-fix-default-bin.diff
libclc-llvm-spirv.diff
omp-riscv64.patch
bring-back-triple-linux.diff
test-disable-lldb-i386.diff

View File

@ -0,0 +1,24 @@
Index: llvm-toolchain-13-13.0.0~+rc3/integration-test-suite/tests/basic_lldb.c
===================================================================
--- llvm-toolchain-13-13.0.0~+rc3.orig/integration-test-suite/tests/basic_lldb.c
+++ llvm-toolchain-13-13.0.0~+rc3/integration-test-suite/tests/basic_lldb.c
@@ -1,6 +1,7 @@
// RUN: %clang -g -o %t %s
// RUN: %lldb -s %S/basic_lldb.in %t | grep "main at basic_lldb.c:"
// REQUIRES: lldb, clang
+ // XFAIL: i686, i386
int main() {
int a=0;
Index: llvm-toolchain-13-13.0.0~+rc3/integration-test-suite/tests/basic_lldb2.cpp
===================================================================
--- llvm-toolchain-13-13.0.0~+rc3.orig/integration-test-suite/tests/basic_lldb2.cpp
+++ llvm-toolchain-13-13.0.0~+rc3/integration-test-suite/tests/basic_lldb2.cpp
@@ -1,6 +1,7 @@
// RUN: %clangxx -g -o %t %s
// RUN: %lldb -s %S/basic_lldb2.in %t | grep "stop reason = step over"
// REQUIRES: lldb, clangxx
+ // XFAIL: i686, i386
#include <vector>
int main (void)