From 103cb1357c55b508e283d329083119d2429029ca Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Oct 2021 12:52:18 +0200 Subject: [PATCH 1/9] libc++-13-dev should depends on libunwind-13-dev (Closes: #995810) --- debian/changelog | 7 +++++++ debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7709a6ea..1c0c4c4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-13 (1:13.0.0-3) unstable; urgency=medium + + * libc++-13-dev should depends on libunwind-13-dev + (Closes: #995810) + + -- Sylvestre Ledru 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 diff --git a/debian/control b/debian/control index a6cafd15..67308e48 100644 --- a/debian/control +++ b/debian/control @@ -624,7 +624,8 @@ Package: libc++-13-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-13 (= ${binary:Version}), ${misc:Depends} +Depends: libc++1-13 (= ${binary:Version}), ${misc:Depends}, + libunwind-13-dev Breaks: libc++-dev (<< 44) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev From df3fdc5cf5673ee66aaa205442e57b5be0de035a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 11 Oct 2021 14:36:58 +0200 Subject: [PATCH 2/9] Disable a tsan test on i386 --- debian/changelog | 1 + debian/patches/series | 1 + debian/patches/test-disable-tsan-i386.diff | 13 +++++++++++++ 3 files changed, 15 insertions(+) create mode 100644 debian/patches/test-disable-tsan-i386.diff diff --git a/debian/changelog b/debian/changelog index 1c0c4c4f..e8e258de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ 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 test on i386 -- Sylvestre Ledru Wed, 06 Oct 2021 12:52:10 +0200 diff --git a/debian/patches/series b/debian/patches/series index 5e14cb80..0ac5d8f6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -144,3 +144,4 @@ scan-build-py-fix-default-bin.diff libclc-llvm-spirv.diff omp-riscv64.patch +test-disable-tsan-i386.diff diff --git a/debian/patches/test-disable-tsan-i386.diff b/debian/patches/test-disable-tsan-i386.diff new file mode 100644 index 00000000..6bba47c6 --- /dev/null +++ b/debian/patches/test-disable-tsan-i386.diff @@ -0,0 +1,13 @@ +Index: llvm-toolchain-13_13.0.0~+rc1/integration-test-suite/tests/test_tsan.c +=================================================================== +--- llvm-toolchain-13_13.0.0~+rc1.orig/integration-test-suite/tests/test_tsan.c ++++ llvm-toolchain-13_13.0.0~+rc1/integration-test-suite/tests/test_tsan.c +@@ -5,7 +5,7 @@ + // RUN: %llvm-nm %t | grep __tsan + // RUN: env TSAN_OPTIONS="log_path=stdout:exitcode=0" %t 2>&1 > %t.out + // RUN: grep -q "data race" %t.out +-// XFAIL: arm ++// XFAIL: arm, i686, i386 + + #include + #include From 21595aecfbc1b1af3f3a9efa69880bf180e7a1cb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 11 Oct 2021 14:39:27 +0200 Subject: [PATCH 3/9] Disable a tsan and two lldb tests on i386 --- debian/changelog | 2 +- debian/patches/series | 1 + debian/patches/test-disable-lldb-i386.diff | 24 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 debian/patches/test-disable-lldb-i386.diff diff --git a/debian/changelog b/debian/changelog index e8e258de..69f21044 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ 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 test on i386 + * Disable a tsan and two lldb tests on i386 -- Sylvestre Ledru Wed, 06 Oct 2021 12:52:10 +0200 diff --git a/debian/patches/series b/debian/patches/series index 0ac5d8f6..8fd3562d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -145,3 +145,4 @@ scan-build-py-fix-default-bin.diff libclc-llvm-spirv.diff omp-riscv64.patch test-disable-tsan-i386.diff +test-disable-lldb-i386.diff diff --git a/debian/patches/test-disable-lldb-i386.diff b/debian/patches/test-disable-lldb-i386.diff new file mode 100644 index 00000000..731b687d --- /dev/null +++ b/debian/patches/test-disable-lldb-i386.diff @@ -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 + int main (void) From 700729ed40cb89eced871d88e2987d7b6e47acf5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 13:26:46 +0200 Subject: [PATCH 4/9] fix typos --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69f21044..9d315ce5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -604,7 +604,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 Sun, 26 Sep 2021 22:02:43 +0200 @@ -995,7 +995,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 @@ -1007,7 +1007,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 From 60b3c83d93f7ac4a1c3af5f003ad3fcaf8307d8f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 13:29:27 +0200 Subject: [PATCH 5/9] 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 --- debian/changelog | 10 +++ debian/llvm-X.Y.install.in | 138 ++++++++++++++++++++++++++++++++++++- 2 files changed, 146 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9d315ce5..e6bd603f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +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 + + -- + llvm-toolchain-13 (1:13.0.0-3) unstable; urgency=medium * libc++-13-dev should depends on libunwind-13-dev diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index dc67100a..163dfa1d 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -1,4 +1,73 @@ -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-omp-device-info +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 +76,72 @@ 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-omp-device-info-@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* From 8c12d273c23e8ad6e5d60dcff2ee6c0cce51ad2b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 13:29:42 +0200 Subject: [PATCH 6/9] Move llvm-omp-device-info-X.Y from llvm-X to libompX-dev --- debian/changelog | 1 + debian/control | 4 ++-- debian/libomp-X.Y-dev.install.in | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e6bd603f..51d1d41c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-13 (1:13.0.0-4) unstable; urgency=medium 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 -- diff --git a/debian/control b/debian/control index 67308e48..82215517 100644 --- a/debian/control +++ b/debian/control @@ -559,10 +559,10 @@ Section: libdevel Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 Depends: libomp5-13 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-13-doc -Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) +Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44), llvm-13 (<< 1:13.0.0-4) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev -Replaces: libomp-x.y-dev +Replaces: libomp-x.y-dev, llvm-13 (<< 1:13.0.0-4) 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 diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in index c5127159..2f777aba 100644 --- a/debian/libomp-X.Y-dev.install.in +++ b/debian/libomp-X.Y-dev.install.in @@ -11,3 +11,6 @@ [amd64 ppc64el arm64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-amdgcn-*.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@ From 7ef68849e229c3dbd8b058eab7d9a63e09333061 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 15:47:41 +0200 Subject: [PATCH 7/9] remove it from llvm-X --- debian/changelog | 2 +- debian/llvm-X.Y.install.in | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51d1d41c..a8cffa21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,7 @@ llvm-toolchain-13 (1:13.0.0-4) unstable; urgency=medium which caused llvm-X.Y to be NOT coinstallable anymore * Move llvm-omp-device-info-X.Y from llvm-X to libompX-dev - -- + -- Sylvestre Ledru Wed, 13 Oct 2021 13:29:51 +0200 llvm-toolchain-13 (1:13.0.0-3) unstable; urgency=medium diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 163dfa1d..b0d252b7 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -34,7 +34,6 @@ 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-omp-device-info 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 @@ -118,7 +117,6 @@ 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-omp-device-info-@LLVM_VERSION@ usr/bin/llvm-opt-report-@LLVM_VERSION@ usr/bin/llvm-otool-@LLVM_VERSION@ usr/bin/llvm-pdbutil-@LLVM_VERSION@ From 9a20fa3df4a17378103e23917ea69160111175c7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 16:33:11 +0200 Subject: [PATCH 8/9] add upstream bug number --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index a8cffa21..6c8325aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ llvm-toolchain-13 (1:13.0.0-4) unstable; urgency=medium 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 Wed, 13 Oct 2021 13:29:51 +0200 From 4c2bb3ab8a4e9ce4c46d12ee298c0ec5a9608a95 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 13 Oct 2021 18:18:43 +0200 Subject: [PATCH 9/9] remove patch (merged upstream) --- debian/patches/series | 1 - debian/patches/test-disable-tsan-i386.diff | 13 ------------- 2 files changed, 14 deletions(-) delete mode 100644 debian/patches/test-disable-tsan-i386.diff diff --git a/debian/patches/series b/debian/patches/series index 8fd3562d..96823ec0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -144,5 +144,4 @@ scan-build-py-fix-default-bin.diff libclc-llvm-spirv.diff omp-riscv64.patch -test-disable-tsan-i386.diff test-disable-lldb-i386.diff diff --git a/debian/patches/test-disable-tsan-i386.diff b/debian/patches/test-disable-tsan-i386.diff deleted file mode 100644 index 6bba47c6..00000000 --- a/debian/patches/test-disable-tsan-i386.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-13_13.0.0~+rc1/integration-test-suite/tests/test_tsan.c -=================================================================== ---- llvm-toolchain-13_13.0.0~+rc1.orig/integration-test-suite/tests/test_tsan.c -+++ llvm-toolchain-13_13.0.0~+rc1/integration-test-suite/tests/test_tsan.c -@@ -5,7 +5,7 @@ - // RUN: %llvm-nm %t | grep __tsan - // RUN: env TSAN_OPTIONS="log_path=stdout:exitcode=0" %t 2>&1 > %t.out - // RUN: grep -q "data race" %t.out --// XFAIL: arm -+// XFAIL: arm, i686, i386 - - #include - #include