diff --git a/debian/README b/debian/README index aa6d4d2f..b9b0d31b 100644 --- a/debian/README +++ b/debian/README @@ -9,13 +9,13 @@ The current snapshot release is maintained in the "snapshot" branch. The easiest way to get all branches is probably to have one clone per version: -for f in 14 15 snapshot; do +for f in 14 15 16 17 snapshot; do git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f done debian/control is generated from debian/control.in by running: -ebian/rules preconfigure +debian/rules preconfigure Steps for manually building a snapshot release diff --git a/debian/bolt-X.Y.install.in b/debian/bolt-X.Y.install.in index 26610f3b..1119f0fc 100644 --- a/debian/bolt-X.Y.install.in +++ b/debian/bolt-X.Y.install.in @@ -3,10 +3,9 @@ usr/bin/llvm-bolt-heatmap-@LLVM_VERSION@ usr/bin/llvm-boltdiff-@LLVM_VERSION@ usr/bin/merge-fdata-@LLVM_VERSION@ usr/bin/perf2bolt-@LLVM_VERSION@ -usr/bin/llvm-bat-dump-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bolt usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bolt-heatmap usr/lib/llvm-@LLVM_VERSION@/bin/llvm-boltdiff usr/lib/llvm-@LLVM_VERSION@/bin/merge-fdata usr/lib/llvm-@LLVM_VERSION@/bin/perf2bolt -usr/lib/llvm-@LLVM_VERSION@/bin/llvm-bat-dump + diff --git a/debian/changelog b/debian/changelog index 3abb4297..c9cdde6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,486 @@ -llvm-toolchain-16 (1:16.0.6-15~bpo12+pve1) bookworm; urgency=medium +llvm-toolchain-17 (1:17.0.6-12) unstable; urgency=medium - * Rebuild for Debian Bookworm / Proxmox + * Add oracular as supported release - -- Proxmox Support Team Thu, 14 Sep 2023 10:54:03 +0200 + -- Gianfranco Costamagna Sat, 04 May 2024 07:30:47 +0200 + +llvm-toolchain-17 (1:17.0.6-11) unstable; urgency=medium + + * Disable --as-needed on armel + * Pass LLVM_EXPERIMENTAL_TARGETS_TO_BUILD to stage 1 to (try to) build M68k + (Closes: #1067646) + + -- Sylvestre Ledru Sun, 28 Apr 2024 18:00:09 +0200 + +llvm-toolchain-17 (1:17.0.6-10) unstable; urgency=medium + + [ Matthias Klose ] + * Fix libomp symbols file for t64. + + [ Sylvestre Ledru ] + * Allow build on machines without too many CPU + Thanks to Santiago Vila for the patch + (Closes: #1067714) + * Disable Loongson SIMD Extension (LSX) and Loongson + Advanced SIMD Extension (LASX) on 17 (Closes: #1068169) + + -- Sylvestre Ledru Wed, 24 Apr 2024 12:22:47 +0200 + +llvm-toolchain-17 (1:17.0.6-9) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Bump version to -9, the -8 is already used in Ubuntu + + [ Matthias Klose ] + * Make libclang-common-17-dev architecture dependent. + * Fix sanitizer build on 32bit time_t64 architectures. + * Enable compiler-rt runtime again for 32bit time_t64 architectures. + * Add a stage1 profile to disable curl, grpc and spirv. + * Build with --as-needed. + + -- Matthias Klose Fri, 08 Mar 2024 14:52:29 +0100 + +llvm-toolchain-17 (1:17.0.6-7) unstable; urgency=medium + + * Fix mxgot export on mips64el + + -- Gianfranco Costamagna Mon, 04 Mar 2024 16:09:18 +0100 + +llvm-toolchain-17 (1:17.0.6-6) unstable; urgency=medium + + [ chenli ] + * Enable flang on loong64 + + [ Sylvestre Ledru ] + * try to enable sccache on 'my' s390x machines + + [ Steve Langasek ] + * Rename libraries for 64-bit time_t transition. + + [ Gianfranco Costamagna ] + * Fix 32bit builds + * Export mxgot on mips64el + + -- Sylvestre Ledru Wed, 24 Jan 2024 13:29:35 +0100 + +llvm-toolchain-17 (1:17.0.6-5) unstable; urgency=medium + + [ Faidon Liambotis ] + * Revert "Enable COMPILER_RT_BUILD_BUILTINS for armel" + * Fix i386 FTBFS resulting from COMPILER_RT_DEFAULT_TARGET_ONLY + (Closes: #1060440) + + -- Sylvestre Ledru Thu, 11 Jan 2024 14:15:09 +0100 + +llvm-toolchain-17 (1:17.0.6-4) unstable; urgency=medium + + * debian/qualify-clang.sh: remove the compiler-rt test of i386 + use libclang-rt-17-dev:i386 instead + + [ Matthias Klose ] + * libclang1-17: Remove the full version symlinks. + + [ Faidon Liambotis ] + * Enable COMPILER_RT_DEFAULT_TARGET_ONLY for all archs + * Enable COMPILER_RT_BUILD_BUILTINS for armel + * Drop two unreferenced debian/patches + * Mark documentation packages as Multi-Arch: foreign + * Convert libclang-common-*-dev to Arch: all/M-A: foreign + + -- Sylvestre Ledru Tue, 09 Jan 2024 13:03:56 +0100 + +llvm-toolchain-17 (1:17.0.6-3) unstable; urgency=medium + + * Cherry pick the wasm fix from 16 + (Closes: #1057838) + + -- Sylvestre Ledru Fri, 15 Dec 2023 18:51:57 +0100 + +llvm-toolchain-17 (1:17.0.6-2) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Add new cmake-clang-test to spot issues such as + Debian bug #1057151 + * Fix cmake file (Closes: #1057151) + * Drop sed command, useless now + + [ Matthias Klose ] + * Also use the free swap to determine the number of parallel processes. + * libclang1-17: Hard-code the last full versions for the symlinks. + * Also use the free swap to determine the number of parallel processes. + * Set the cpu defaults for the ARM32 architectures: + - armel: arm926ej-s. Closes: #1056115. + - armhf: cortex-a8. + Thanks to Arnd Bergmann and Ard Biesheuvel for the fixes. + * Apply the proposed fix for D158491, build failure on mips64el, still + unreviewed upstream. Addresses: #1056116. + + [ Sylvestre Ledru ] + * Move the symlink /usr/lib/*/libc++experimental.a from libc++abi-17-dev + to libc++-17-dev + * Remove some old break/replaces from 16 + * Fix the EmitBackendOutput test in debian/qualify-clang.sh + * Also add back /usr/lib/llvm-17/lib/libclang-17.so.1 + + -- Gianfranco Costamagna Fri, 08 Dec 2023 09:49:04 +0100 + +llvm-toolchain-17 (1:17.0.6-1) unstable; urgency=medium + + [ Matthias Klose ] + * Further limit the number of parallel processes + * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not + yet built on these architectures). + * Fix stripping build flags on Ubuntu/ppc64el. + * libclang1-17: Only encode the major version in the soname. Closes: #1056126. + * libclang1-17: Provide a symlink for the last soname with the full version. + * Restore the patch for D148945, searching /usr/lib/llvm-17/lib by default. + Closes: #1056580. + + [ Sylvestre Ledru ] + * New upstream release + * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a + to fix https://github.com/llvm/llvm-project/issues/72753 + * try to relax the wasi-libc dep declaration for apt.llvm.org + * add a check that, if we are going to build wasm, wasi-libc is installed + on the system + + [ John Paul Adrian Glaubitz ] + * Don't install *clang_rt* on sparc and sparc64 + + -- Sylvestre Ledru Tue, 28 Nov 2023 11:43:43 +0100 + +llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Don't run chrpath for libclang on sparc and sparc64 + + [ Matthias Klose ] + * Build-depend on llvm-spirv-17. + + [ Sylvestre Ledru ] + * New upstream release + + -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 + +llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium + + [ Matthias Klose ] + * Limit the number of parallel processes based on the available memory + and the packages to be built (flang has some memory hogs). + + [ Sylvestre Ledru ] + * New supstream release + * Upload to unstable + + -- Sylvestre Ledru Tue, 31 Oct 2023 11:39:22 +0100 + +llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium + + [ Matthias Klose ] + * Consolidate the build flags for the wasm builds. + * Disable the clc and wasm builds when not building binary indep packages. + * Limit the parallel links to 2 on riscv64. + * d/rules: Be less noisy when building without grpc. + * Build-depend on libncurses-dev instead of libncurses5-dev. + * Use a stamps subdirectory for all build stamps. + * Factor-out the calls to dh_listpackages. + * d/rules/preconfigure: Print info about build environment. + + [ Sylvestre Ledru ] + * New upstream release + + -- Sylvestre Ledru Tue, 17 Oct 2023 08:44:01 +0200 + +llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Tue, 03 Oct 2023 09:18:45 +0200 + +llvm-toolchain-17 (1:17.0.1-1~exp2) experimental; urgency=medium + + * Also remove omp from cmake file (Closes: #1052533) + + -- Gianfranco Costamagna Thu, 28 Sep 2023 11:24:39 +0200 + +llvm-toolchain-17 (1:17.0.1-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Tue, 19 Sep 2023 10:43:02 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp6) experimental; urgency=medium + + * Enable again python3-lldb on bionic (apt.llvm.org) + + -- Sylvestre Ledru Mon, 18 Sep 2023 11:22:37 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp5) experimental; urgency=medium + + * debian/patches/D158066.patch: + - cherry-pick change from 1:16.0.6-11 + * Make sure at least spirv 17 is used, FTBFS with older version + + -- Gianfranco Costamagna Tue, 12 Sep 2023 08:51:38 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp4) experimental; urgency=medium + + [ Gianfranco Costamagna ] + * Don't depend on spirv, the version 16 is too old to work + + [ Sylvestre Ledru ] + * Also ignore "-mbranch-protection=standard" (used on arm64) + + -- Sylvestre Ledru Fri, 08 Sep 2023 13:49:38 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp3) experimental; urgency=medium + + * Update control file + * Fixup build failures from 16 branch + + -- Gianfranco Costamagna Thu, 07 Sep 2023 23:04:28 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium + + * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 + * Explicitly depend on libcurl4-openssl-dev + Thanks to Samuel Henrique for the fix + + -- Sylvestre Ledru Wed, 06 Sep 2023 22:44:15 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable wasm support on powerpc and powerpcspe + * Remove powerpc from BINUTILS_GOLD_ARCHS again + + [ Sylvestre Ledru ] + * new upstream release + * Disable python3-lldb on mips64el to unbreak the build + + -- Sylvestre Ledru Tue, 05 Sep 2023 14:30:50 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Tue, 22 Aug 2023 19:22:57 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium + + * debian/tests/control: update gcc to 10 => 13 + + -- Sylvestre Ledru Sat, 19 Aug 2023 10:07:19 +0200 + +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium + + * New snapshot release: + * Fix the libclang-rt-17-dev: ships + /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in + libclang-rt-17-dev-wasm* (closes: #1041388) + * Also install llvm-debuginfod in llvm-X.Y + * Fix for real the libclang-rt-17-dev issue + + -- Sylvestre Ledru Tue, 15 Aug 2023 19:25:12 +0000 + +llvm-toolchain-snapshot (1:17~++20230723074821+3ebe606592fb-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Sun, 23 Jul 2023 19:48:42 +0200 + +llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium + + * Install usr/lib/llvm-17/lib/clang/17/include/llvm_libc_wrappers/*.h + in libclang-common-X.Y-dev + * fix the libclang & libomp5 symbol files + * Add new symbol to libclang1: + clang_CXXMethod_isExplicit + clang_createIndexWithOptions + clang_getBinaryOperatorKindSpelling + clang_getCursorBinaryOperatorKind + clang_getCursorUnaryOperatorKind + clang_getUnaryOperatorKindSpelling + + [ Samuel Thibault ] + * Fix hurd build by fixing Linux-specific lines. + + -- Sylvestre Ledru Sun, 09 Jul 2023 15:15:34 +0200 + +llvm-toolchain-snapshot (1:17~++20230701095046+dc6c8b8d1e35-1~exp1) experimental; urgency=medium + + * llvm-debuginfod not installed anymore + https://github.com/llvm/llvm-project/commit/8ac330bde40e9e0a0b2d0708ba6c7888fb1ce225 + * New snapshot release + * Yet a new element (omp) to disable in cmake detection. Upstream #62622 + * remove some mlir example (libMyExtensionCh*.a) + * Try to pass MAKE_C_COMPILER_LAUNCHER and CMAKE_CXX_COMPILER_LAUNCHER + in CLANG_BOOTSTRAP_PASSTHROUGH for sccache in stage2 + * Disable python3-lldb-17 for buster (it has been this way for a while) + * Try to workaround issue 63613 + + -- Sylvestre Ledru Tue, 04 Jul 2023 13:16:48 +0200 + +llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental; urgency=medium + + * Snapshot is now 17 + * ship libHLFIRTransforms & libHLFIRDialect in libflang + * Also install liborc_rt-x86_64.a in libclang-rt + * Adjust some path since upstream changed the path from + /usr/lib/llvm-16/lib/clang/16.0.0/ to + /usr/lib/llvm-16/lib/clang/16/ + * Workaround some missing files on buster + * Replace LLVM_CONFIG by LLVM_CMAKE_DIR + * Bring back -DBUILTINS_CMAKE_ARGS & -DRUNTIMES_CMAKE_ARGS options + https://github.com/llvm/llvm-project/issues/59097 + * unbreak a symlink to fix to libclang + * Add a symlink /usr/lib/x86_64-linux-gnu/{libclang-16.so.16.0.0 => libclang-16.so.1} + Expected by program like the firefox build system + * ship amdgpu-arch & nvptx-arch in clang-tools + * ship llvm-omp-kernel-replay in libomp-X.Y-dev + * Disable flang on s390x. Seems that it is breaking + * compiler-rt: Only build liborc on amd64, i386 & arm64 + * Don't build omptarget on i386 + + -- Sylvestre Ledru Sat, 28 Jan 2023 18:07:40 +0100 + +llvm-toolchain-16 (1:16.0.6-26) unstable; urgency=medium + + * Disable --as-needed on armel + + -- Sylvestre Ledru Sat, 27 Apr 2024 01:12:00 +0200 + +llvm-toolchain-16 (1:16.0.6-25) unstable; urgency=medium + + * Fix libomp symbols file for t64. + + -- Matthias Klose Sun, 14 Apr 2024 11:55:50 +0200 + +llvm-toolchain-16 (1:16.0.6-24) unstable; urgency=medium + + [ Matthias Klose ] + * Add a stage1 profile to disable curl, grpc and spirv. + * Build with --as-needed. + * ASan: move allocator base to avoid conflict with high-entropy ASLR + for x86-64 Linux. Patch taken from LLVM 17. + + -- Matthias Klose Sat, 16 Mar 2024 22:12:22 +0100 + +llvm-toolchain-16 (1:16.0.6-23) unstable; urgency=medium + + [ Matthias Klose ] + * Fix sanitizer build on 32bit time_t64 architectures. + + -- Gianfranco Costamagna Mon, 11 Mar 2024 22:48:48 +0100 + +llvm-toolchain-16 (1:16.0.6-22) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Disable tests on mips64el + + [ Matthias Klose ] + * Fix sanitizer build on 32bit time_t64 architectures. + + -- Gianfranco Costamagna Wed, 06 Mar 2024 08:38:53 +0100 + +llvm-toolchain-16 (1:16.0.6-21) unstable; urgency=medium + + [ Steve Langasek ] + * Rename libraries for 64-bit time_t transition. + + [ Gianfranco Costamagna ] + * Fix 32bit builds + + -- Gianfranco Costamagna Sun, 03 Mar 2024 12:02:57 +0100 + +llvm-toolchain-16 (1:16.0.6-20) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Don't install *clang_rt* on sparc and sparc64 + + [ Matthias Klose ] + * Remove unused import of imp module in scan-view, removed in Python 3.12. + + -- John Paul Adrian Glaubitz Sat, 24 Feb 2024 08:54:59 +0100 + +llvm-toolchain-16 (1:16.0.6-19) unstable; urgency=medium + + * Revert my ugly fix for 1052002. + + [ Faidon Liambotis ] + * Improve the fix for the bug 1052002. + + -- Sylvestre Ledru Thu, 23 Nov 2023 16:27:52 +0100 + +llvm-toolchain-16 (1:16.0.6-18) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Upload to sid + + [ Sylvestre Ledru ] + * Change the logic to disable SPIRV. Disable it on most of the versions because + it needs llvm-spirv-16. + Enabled on trixie/sid, Ubuntu Mantic + FAILED: spirv-mesa3d-.spv /build/source/libclc/build/spirv-mesa3d-.spv + cd /build/source/libclc/build && /usr/bin/llvm-spirv-15 + --spirv-max-version=1.1 -o spirv-mesa3d-.spv builtins.link.spirv-mesa3d-.bc + Unknown attribute kind (86) (Producer: 'LLVM16.0.6' Reader: 'LLVM 15.0.6') + * For Ubuntu bionic, improve the deactivation of lldb python + + [ Steve Langasek ] + * Add noble as supported Ubuntu release + + [ John Paul Adrian Glaubitz ] + * Don't run chrpath for libclang on sparc and sparc64 + + [ Sylvestre Ledru ] + + -- Sylvestre Ledru Sat, 11 Nov 2023 09:57:35 +0100 + +llvm-toolchain-16 (1:16.0.6-17exp1) experimental; urgency=medium + + * Fixup the move from all to any + * Update debian/README documentation + + -- Gianfranco Costamagna Tue, 24 Oct 2023 12:38:21 +0200 + +llvm-toolchain-16 (1:16.0.6-17) unstable; urgency=medium + + * Try to fix the wasm path detection (Closes: #1052002) + + -- Sylvestre Ledru Thu, 19 Oct 2023 22:37:29 +0200 + +llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * Make libclang-common-16-dev arch:any (Closes: #1041455) + It was arch:all because all the code isn't arch dependant + However, it causes issues for cross build. + So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) + instead of source + + [ Sylvestre Ledru ] + * Bring back old version of spirv - necessary for apt.llvm.org + + [ Alexandre Detiste ] + * Remove python-six as dep + + [ Li Chen ] + * Add support for loongarch64 (Closes: #1053658) + * Cherry-pick upstream patch D142688 to fix the build failure on loong64 + (Closes: #1053655) + + [ Matthias Klose ] + * Disable the clc and wasm builds when not building binary indep packages. + * Limit the parallel links to 2 on riscv64. + * d/rules: Be less noisy when building without grpc. + + -- Sylvestre Ledru Sun, 08 Oct 2023 09:11:38 +0200 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium * Second attempt to refresh D158066.patch (Closes: #1049362) + (SIMD compatibility headers on ppc64el) -- Gianfranco Costamagna Mon, 11 Sep 2023 15:40:42 +0200 diff --git a/debian/clang-tools-X.Y.install.in b/debian/clang-tools-X.Y.install.in index 6a0d0c4c..d69cd402 100644 --- a/debian/clang-tools-X.Y.install.in +++ b/debian/clang-tools-X.Y.install.in @@ -61,7 +61,8 @@ usr/lib/llvm-@LLVM_VERSION@/libexec/analyze-cc usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++ usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc -[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize +# See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / HWASAN_SUPPORTED_ARCH +[amd64 arm64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@/bin/hwasan_symbolize clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ diff --git a/debian/control b/debian/control index bd8fbba0..5eb8f50c 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-16 +Source: llvm-toolchain-17 Section: devel Priority: optional Rules-Requires-Root: no @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, - libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), + libedit-dev, libncurses-dev, swig, python3-sphinx (>= 1.3.6), binutils-dev, libxml2-dev, libjsoncpp-dev, pkg-config, @@ -23,33 +23,36 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], - spirv-tools [ linux-any ] | hello [ !i386], - wasi-libc | hello [ !any-i386], - libcurl4-openssl-dev | libcurl-dev, - libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] +# llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello, + spirv-tools [linux-any] | hello [!i386], + wasi-libc | hello, + libcurl4-openssl-dev | libcurl-dev , + libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , # "| hello" is for older buster/bionic distros without spirv support Build-Conflicts: oprofile Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ -Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 16 -Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/16 +Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 17 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17 # ------------- clang ------------- -Package: clang-16 +Package: clang-17 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang-common-16-dev (= ${source:Version}), - llvm-16-linker-tools (= ${binary:Version}), - libclang1-16 (= ${binary:Version}), libc6-dev, binutils + ${dep:devlibs-objc}, + libllvm17t64 (= ${binary:Version}), + libclang-common-17-dev (= ${binary:Version}), + llvm-17-linker-tools (= ${binary:Version}), + libclang1-17t64 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler -Recommends: llvm-16-dev, python3 -# libomp-16-dev -Suggests: clang-16-doc, wasi-libc +Recommends: llvm-17-dev, python3 +# libomp-17-dev +Suggests: clang-17-doc, wasi-libc Description: C, C++ and Objective-C compiler Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -58,9 +61,9 @@ Description: C, C++ and Objective-C compiler Clang implements all of the ISO C++ 1998, 11, 14 and 17 standards and also provides most of the support of C++20. -Package: clang-tools-16 +Package: clang-tools-17 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-16 (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-17 (= ${binary:Version}), python3 Description: clang-based tools for C/C++ developments Clang project is a C, C++, Objective C and Objective C++ front-end @@ -72,10 +75,10 @@ Description: clang-based tools for C/C++ developments . This package contains some clang-based tools like scan-build, clang-cl, etc. -Package: clang-format-16 +Package: clang-format-17 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm16 (= ${binary:Version}) + libllvm17t64 (= ${binary:Version}) Description: Tool to format C/C++/Obj-C code Clang-format is both a library and a stand-alone tool with the goal of automatically reformatting C++ sources files according to configurable @@ -88,21 +91,23 @@ Description: Tool to format C/C++/Obj-C code . This package also provides vim and emacs plugins. -Package: clang-tidy-16 +Package: clang-tidy-17 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm16 (= ${binary:Version}), libclang-common-16-dev, - clang-tools-16, python3-yaml + libllvm17t64 (= ${binary:Version}), + libclang-common-17-dev (= ${binary:Version}), + clang-tools-17, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming errors, like style violations, interface misuse, or bugs that can be deduced via static analysis. clang-tidy is modular and provides a convenient interface for writing new checks. -Package: clangd-16 +Package: clangd-17 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libclang-common-16-dev (= ${source:Version}) + libllvm17t64 (= ${binary:Version}), + libclang-common-17-dev (= ${binary:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -113,8 +118,9 @@ Description: Language server that provides IDE-like features to editors clangd is a language server that implements the Language Server Protocol; it can work with many editors through a plugin. -Package: clang-16-doc +Package: clang-17-doc Architecture: all +Multi-Arch: foreign Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax Description: C, C++ and Objective-C compiler - Documentation @@ -127,7 +133,10 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-16 +Package: libclang1-17t64 +Provides: ${t64:Provides} +Replaces: libclang1-17 +Breaks: libclang1-17 (<< ${source:Version}) Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -148,12 +157,12 @@ Description: C interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang-16-dev +Package: libclang-17-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-16 (= ${binary:Version}), - libclang-common-16-dev (= ${source:Version}) + ${dep:devlibs-objc}, libclang1-17t64 (= ${binary:Version}), + libclang-common-17-dev (= ${binary:Version}) Description: Clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -163,14 +172,14 @@ Description: Clang library - Development package provides most of the support of C++20. . This package contains the Clang headers to develop extensions over - libclang1-16. + libclang1-17. -Package: libclang-common-16-dev -Architecture: all +Package: libclang-common-17-dev +Architecture: any +Multi-Arch: same Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version}), - libllvm16 (<< ${source:Version}.1~) -Recommends: libclang-rt-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) +Depends: ${shlibs:Depends}, ${misc:Depends}, +Recommends: libclang-rt-17-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -183,12 +192,10 @@ Description: Clang library - Common development package # ------------- compiler-rt ------------- -Package: libclang-rt-16-dev +Package: libclang-rt-17-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Compiler-rt - development package This package provides various libraries: @@ -201,36 +208,28 @@ Description: Compiler-rt - development package DataFlowSanitizer, etc * profile - Library which is used to collect coverage information. -Package: libclang-rt-16-dev-wasm32 +Package: libclang-rt-17-dev-wasm32 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm32 builtins Provides the compiler-rt builtins for WebAssembly 32 bits -Package: libclang-rt-16-dev-wasm64 +Package: libclang-rt-17-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-16-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits # ------------- polly ------------- -Package: libpolly-16-dev +Package: libpolly-17-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-16-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: High-level loop and data-locality optimizer Uses an abstract mathematical representation based on integer polyhedra @@ -238,10 +237,13 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- -Package: libclang-cpp16 +Package: libclang-cpp17t64 +Provides: ${t64:Provides} +Replaces: libclang-cpp17 +Breaks: libclang-cpp17 (<< ${source:Version}) Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end @@ -259,12 +261,12 @@ Description: C++ interface to the Clang library locations with elements within the AST, and other facilities that support Clang-based development tools. -Package: libclang-cpp16-dev +Package: libclang-cpp17-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp16 (= ${binary:Version}) -# Move of libclang-cpp.so into libclang-cpp16.dev + libclang-cpp17t64 (= ${binary:Version}) +# Move of libclang-cpp.so into libclang-cpp17.dev Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -285,10 +287,10 @@ Description: C++ interface to the Clang library linker at build time. -Package: libfuzzer-16-dev +Package: libfuzzer-17-dev Architecture: linux-any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, clang-16 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clang-17 (= ${binary:Version}) Description: Library for coverage-guided fuzz testing LibFuzzer is a library for in-process, coverage-guided, evolutionary fuzzing of other libraries. @@ -306,10 +308,10 @@ Description: Library for coverage-guided fuzz testing instrumentation. -Package: python3-clang-16 +Package: python3-clang-17 Section: python Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-16-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, python3, libclang-17-dev Replaces: python-clang-x.y, Conflicts: python-clang-x.y Provides: python-clang-x.y @@ -323,8 +325,9 @@ Description: Clang Python Bindings . This binding package provides access to the Clang compiler and libraries. -Package: clang-16-examples -Architecture: any +Package: clang-17-examples +Architecture: all +Multi-Arch: foreign Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} Description: Clang examples @@ -339,7 +342,10 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm16 +Package: libllvm17t64 +Provides: ${t64:Provides} +Replaces: libllvm17 +Breaks: libllvm17 (<< ${source:Version}) Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -352,7 +358,7 @@ Description: Modular compiler and toolchain technologies, runtime library . This package contains the LLVM runtime library. -Package: llvm-16-linker-tools +Package: llvm-17-linker-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Modular compiler and toolchain technologies - Plugins @@ -362,13 +368,13 @@ Description: Modular compiler and toolchain technologies - Plugins . This package contains the LLVMgold and LLVMPolly linker plugins. -Package: llvm-16 +Package: llvm-17 Architecture: any -Suggests: llvm-16-doc -Depends: llvm-16-runtime (= ${binary:Version}), - llvm-16-linker-tools (= ${binary:Version}), +Suggests: llvm-17-doc +Depends: llvm-17-runtime (= ${binary:Version}), + llvm-17-linker-tools (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: llvm-16-dev +Recommends: llvm-17-dev Description: Modular compiler and toolchain technologies LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -392,7 +398,7 @@ Description: Modular compiler and toolchain technologies a young scheme front-end, and Java support is in development. LLVM can generate code for X96, SparcV10, PowerPC or many other architectures. -Package: llvm-16-runtime +Package: llvm-17-runtime Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: binfmt-support | systemd @@ -412,11 +418,11 @@ Description: Modular compiler and toolchain technologies, IR interpreter This package provides the minimal required to execute programs in LLVM format. -Package: llvm-16-dev +Package: llvm-17-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, - llvm-16 (= ${binary:Version}), libllvm16 (= ${binary:Version}), libncurses-dev, - llvm-16-tools (= ${binary:Version}), libclang-cpp16 (= ${binary:Version}), + llvm-17 (= ${binary:Version}), libllvm17t64 (= ${binary:Version}), libncurses-dev, + llvm-17-tools (= ${binary:Version}), libclang-cpp17t64 (= ${binary:Version}), libz3-dev, libxml2-dev Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -434,7 +440,7 @@ Description: Modular compiler and toolchain technologies, libraries and headers This package provides the libraries and headers to develop applications using llvm. -Package: llvm-16-tools +Package: llvm-17-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-pygments, python3-yaml, @@ -454,11 +460,11 @@ Description: Modular compiler and toolchain technologies, tools . This package provides tools for testing. -Package: libllvm-16-ocaml-dev +Package: libllvm-17-ocaml-dev Section: ocaml Architecture: amd64 arm64 armhf ppc64el s390x riscv64 -Suggests: llvm-16-doc -Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-16-dev (= ${binary:Version}) +Suggests: llvm-17-doc +Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-17-dev (= ${binary:Version}) Replaces: libllvm-x.y-ocaml-dev Conflicts: libllvm-x.y-ocaml-dev Provides: ${ocaml:Provides}, libllvm-x.y-ocaml-dev @@ -477,9 +483,10 @@ Description: Modular compiler and toolchain technologies, OCaml bindings . This package provides the OCaml bindings to develop applications using llvm. -Package: llvm-16-doc +Package: llvm-17-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, libjs-jquery, libjs-underscore Description: Modular compiler and toolchain technologies, documentation LLVM is a collection of libraries and tools that make it easy to build @@ -496,10 +503,10 @@ Description: Modular compiler and toolchain technologies, documentation . This package contains all documentation (extensive). -Package: llvm-16-examples +Package: llvm-17-examples Section: doc Architecture: all -Depends: ${misc:Depends}, llvm-16-dev (>= ${source:Version}), llvm-16-dev (<< ${source:Version}+c~) +Depends: ${misc:Depends}, llvm-17-dev (>= ${source:Version}), llvm-17-dev (<< ${source:Version}+c~) Description: Modular compiler and toolchain technologies, examples LLVM is a collection of libraries and tools that make it easy to build compilers, optimizers, just-in-time code generators, and many other @@ -519,20 +526,20 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- -Package: lld-16 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 +Package: lld-17 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker LLD is a new, high-performance linker. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM Project. -Package: liblld-16 -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 +Package: liblld-17 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -542,12 +549,12 @@ Description: LLVM-based linker, library . This package contains the LLD runtime library. -Package: liblld-16-dev +Package: liblld-17-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lld-16 (= ${binary:Version}), - liblld-16 (= ${binary:Version}), libzstd-dev, zlib1g-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, lld-17 (= ${binary:Version}), + liblld-17 (= ${binary:Version}), libzstd-dev, zlib1g-dev Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker, header files LLD is a new, high-performance linker. It is built as a set of reusable @@ -559,21 +566,24 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- -Package: lldb-16 -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Package: lldb-17 +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}), - python3-lldb-16 +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}), + python3-lldb-17 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger LLDB is a next generation, high-performance debugger. It is built as a set of reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: liblldb-16 -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Package: liblldb-17t64 +Provides: ${t64:Provides} +Replaces: liblldb-17 +Breaks: liblldb-17 (<< ${source:Version}) +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: Next generation, high-performance debugger, library @@ -583,11 +593,11 @@ Description: Next generation, high-performance debugger, library . This package contains the LLDB runtime library. -Package: python3-lldb-16 +Package: python3-lldb-17 Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-16 (= ${binary:Version}), python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-17t64 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y @@ -599,11 +609,11 @@ Description: Next generation, high-performance debugger, python3 lib . This binding package provides access to lldb. -Package: liblldb-16-dev +Package: liblldb-17-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-16 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-17 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger, header files LLDB is a next generation, high-performance debugger. It is built as a set of @@ -617,11 +627,11 @@ Description: Next generation, high-performance debugger, header files # 44 because it was the first version in which openmp & libc++ have been # managed in llvm-defaults -Package: libomp-16-dev +Package: libomp-17-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 -Depends: libomp5-16 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: libomp-16-doc +Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 +Depends: libomp5-17t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Suggests: libomp-17-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev Conflicts: libomp-x.y-dev @@ -631,22 +641,23 @@ Description: LLVM OpenMP runtime - dev package linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp5-16 +Package: libomp5-17t64 Multi-Arch: same -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libomp5 (<< 44) -Provides: libomp-x.y +Breaks: libomp5-17 (<< ${source:Version}), libomp5 (<< 44) +Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y -Replaces: libomp-x.y +Replaces: libomp5-17, libomp-x.y Description: LLVM OpenMP runtime 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 while it is executing. -Package: libomp-16-doc +Package: libomp-17-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery Replaces: libiomp-x.y-doc Breaks: libiomp-x.y-doc @@ -659,17 +670,17 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-16 +Package: libc++1-17t64 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: clang -Breaks: libc++1 (<< 44) -Provides: libc++-x.y +Breaks: libc++1-17 (<< ${source:Version}), libc++1 (<< 44) +Provides: ${t64:Provides}, libc++-x.y Conflicts: libc++-x.y -Replaces: libc++-x.y +Replaces: libc++1-17, libc++-x.y Description: LLVM C++ Standard library libc++ is another implementation of the C++ standard library. . @@ -683,16 +694,17 @@ Description: LLVM C++ Standard library as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-16-dev +Package: libc++-17-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-16 (= ${binary:Version}), ${misc:Depends}, - libunwind-16-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44) +Depends: libc++1-17t64 (= ${binary:Version}), ${misc:Depends}, + libc++abi-17-dev (= ${binary:Version}), + libunwind-17-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] +Breaks: libc++-dev (<< 44), libc++abi-17-dev (<< 1:17.0.6~++20231206041259) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev +Replaces: libc++-x.y-dev, libc++abi-17-dev (<< 1:17.0.6~++20231206041259) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . @@ -706,11 +718,11 @@ Description: LLVM C++ Standard library (development files) as exception objects, rtti and memory allocation. * Extensive unit tests. -Package: libc++-16-dev-wasm32 +Package: libc++-17-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign -Depends: wasi-libc, libc++abi-16-dev-wasm32, ${misc:Depends} +Depends: wasi-libc, libc++abi-17-dev-wasm32, ${misc:Depends} Provides: libc++-x.y-dev-wasm32 Conflicts: libc++-x.y-dev-wasm32 Replaces: libc++-x.y-dev-wasm32 @@ -731,16 +743,16 @@ Description: LLVM C++ Standard library (WASI) # ------------- libcxxabi ------------- -Package: libc++abi1-16 +Package: libc++abi1-17t64 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libc++abi1 (<< 44) -Provides: libc++abi-x.y +Breaks: libc++abi1-17 (<< ${source:Version}), libc++abi1 (<< 44) +Provides: ${t64:Provides}, libc++abi-x.y Conflicts: libc++abi-x.y -Replaces: libc++abi-x.y +Replaces: libc++abi1-17, libc++abi-x.y Description: LLVM low level support for a standard C++ library libc++abi is another implementation of low level support for a standard C++ library. @@ -750,11 +762,11 @@ Description: LLVM low level support for a standard C++ library * Correctness as defined by the C++ standards. * Provide a portable sublayer to ease the porting of libc++ -Package: libc++abi-16-dev +Package: libc++abi-17-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-16 (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-17t64 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev @@ -768,7 +780,7 @@ Description: LLVM low level support for a standard C++ library (development file * Correctness as defined by the C++ standards. * Provide a portable sublayer to ease the porting of libc++ -Package: libc++abi-16-dev-wasm32 +Package: libc++abi-17-dev-wasm32 Section: libdevel Architecture: all Multi-Arch: foreign @@ -789,14 +801,14 @@ Description: LLVM low level support for a standard C++ library (WASI) # ------------- libclc ------------- -Package: libclc-16 +Package: libclc-17 Section: libs Architecture: all Multi-Arch: foreign Depends: ${misc:Depends}, - libclc-16-dev (= ${binary:Version}), - libclang-common-16-dev, + libclc-17-dev (= ${binary:Version}), + libclang-common-17-dev, Breaks: libclc-amdgcn, libclc-ptx, libclc-r600 Provides: libclc-x.y Conflicts: libclc-x.y @@ -808,7 +820,7 @@ Description: OpenCL C language implementation - platform support This package contains support for the amdgcn (AMD GPU), PTX and r600 platforms. -Package: libclc-16-dev +Package: libclc-17-dev Section: libdevel Architecture: all Multi-Arch: foreign @@ -826,15 +838,16 @@ Description: OpenCL C language implementation - development files # ------------- libunwind ------------- -Package: libunwind-16 +Package: libunwind-17t64 +Breaks: libunwind-17 (<< ${source:Version}) Section: libs -Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libunwind-x.y +Provides: ${t64:Provides}, libunwind-x.y Conflicts: libunwind-x.y -Replaces: libunwind-x.y +Replaces: libunwind-17, libunwind-x.y Description: production-quality unwinder libunwind is a production-quality unwinder, with platform support for DWARF unwind info, SjLj, and ARM EHABI. @@ -843,13 +856,13 @@ Description: production-quality unwinder or to operate on another process (aka remote), but only the local path has been implemented. Remote unwinding remains as future work. -Package: libunwind-16-dev +Package: libunwind-17-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, - libunwind-16 (= ${binary:Version}) + libunwind-17t64 (= ${binary:Version}) Provides: libunwind-dev, libunwind-x.y-dev Conflicts: libunwind-dev, libunwind-x.y-dev Replaces: libunwind-dev, libunwind-x.y-dev @@ -863,7 +876,7 @@ Description: production-quality unwinder # ------------- mlir ------------- -Package: mlir-16-tools +Package: mlir-17-tools Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multi-Level Intermediate Representation tools @@ -874,15 +887,16 @@ Description: Multi-Level Intermediate Representation tools . This package provides tools. -Package: libmlir-16 +Package: libmlir-17t64 +Breaks: libmlir-17 (<< ${source:Version}) Section: libs Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libmlir-x.y +Provides: ${t64:Provides}, libmlir-x.y Conflicts: libmlir-x.y -Replaces: libmlir-x.y +Replaces: libmlir-17, libmlir-x.y Description: Multi-Level Intermediate Representation library Novel approach to building reusable and extensible compiler infrastructure. MLIR aims to address software fragmentation, improve compilation for @@ -890,13 +904,13 @@ Description: Multi-Level Intermediate Representation library specific compilers, and aid in connecting existing compilers together. -Package: libmlir-16-dev +Package: libmlir-17-dev Section: libdevel Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libmlir-16 (= ${binary:Version}) + libmlir-17t64 (= ${binary:Version}) Breaks: libmlir-dev Provides: libmlir-x.y-dev Conflicts: libmlir-x.y-dev @@ -910,16 +924,16 @@ Description: Multi-Level Intermediate Representation library # ------------- bolt ------------- -Package: bolt-16 +Package: bolt-17 Architecture: amd64 # Disable on arm64 because libbolt_rt_hugify.a isn't generated -Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-16-dev (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, libbolt-17-dev (= ${binary:Version}), Pre-Depends: ${misc:Pre-Depends} Description: Post-link optimizer It achieves the improvements by optimizing application's code layout based on execution profile gathered by sampling profiler. -Package: libbolt-16-dev +Package: libbolt-17-dev Section: libdevel Architecture: amd64 #arm64 @@ -930,11 +944,11 @@ Description: Post-link optimizer # ------------- flang ------------- -Package: flang-16 +Package: flang-17 # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 -Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-16-dev (= ${binary:Version}), +Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-17-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler Ground-up implementation of a Fortran front end written in @@ -943,8 +957,8 @@ Description: Fortran compiler While it is capable of generating executables for a number of examples, some functionalities are still missing. -Package: libflang-16-dev -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 +Package: libflang-17-dev +Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Description: Flang library - Development package diff --git a/debian/control.in b/debian/control.in index 6df959fa..d918940a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libelf-dev, libffi-dev, lsb-release, patchutils, diffstat, xz-utils, python3-dev, - libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), + libedit-dev, libncurses-dev, swig, python3-sphinx (>= 1.3.6), binutils-dev, libxml2-dev, libjsoncpp-dev, pkg-config, @@ -23,14 +23,15 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello [!i386], - spirv-tools [ linux-any ] | hello [ !i386], - wasi-libc | hello [ !any-i386], - libcurl4-openssl-dev | libcurl-dev, - libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], - protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] +# llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello, + spirv-tools [linux-any] | hello [!i386], + wasi-libc | hello, + libcurl4-openssl-dev | libcurl-dev , + libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , + protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x] , # "| hello" is for older buster/bionic distros without spirv support Build-Conflicts: oprofile Standards-Version: 4.6.2 @@ -43,9 +44,11 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_ Package: clang-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}), + ${dep:devlibs-objc}, + libllvm@LLVM_VERSION@t64 (= ${binary:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}), - libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils + libclang1-@LLVM_VERSION@t64 (= ${binary:Version}), libc6-dev, binutils Provides: c-compiler, objc-compiler, c++-compiler Recommends: llvm-@LLVM_VERSION@-dev, python3 # libomp-@LLVM_VERSION@-dev @@ -75,7 +78,7 @@ Description: clang-based tools for C/C++ developments Package: clang-format-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm@LLVM_VERSION@ (= ${binary:Version}) + libllvm@LLVM_VERSION@t64 (= ${binary:Version}) Description: Tool to format C/C++/Obj-C code Clang-format is both a library and a stand-alone tool with the goal of automatically reformatting C++ sources files according to configurable @@ -91,7 +94,8 @@ Description: Tool to format C/C++/Obj-C code Package: clang-tidy-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, python3, - libllvm@LLVM_VERSION@ (= ${binary:Version}), libclang-common-@LLVM_VERSION@-dev, + libllvm@LLVM_VERSION@t64 (= ${binary:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), clang-tools-@LLVM_VERSION@, python3-yaml Description: clang-based C++ linter tool Provide an extensible framework for diagnosing and fixing typical programming @@ -102,7 +106,8 @@ Description: clang-based C++ linter tool Package: clangd-@LLVM_VERSION@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}) + libllvm@LLVM_VERSION@t64 (= ${binary:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}), Description: Language server that provides IDE-like features to editors clangd understands your C++ code and adds smart features to your editor: - code completion @@ -115,6 +120,7 @@ Description: Language server that provides IDE-like features to editors Package: clang-@LLVM_VERSION@-doc Architecture: all +Multi-Arch: foreign Section: doc Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-mathjax Description: C, C++ and Objective-C compiler - Documentation @@ -127,7 +133,10 @@ Description: C, C++ and Objective-C compiler - Documentation . This package contains the documentation. -Package: libclang1-@LLVM_VERSION@ +Package: libclang1-@LLVM_VERSION@t64 +Provides: ${t64:Provides} +Replaces: libclang1-@LLVM_VERSION@ +Breaks: libclang1-@LLVM_VERSION@ (<< ${source:Version}) Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} @@ -152,8 +161,8 @@ Package: libclang-@LLVM_VERSION@-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@ (= ${binary:Version}), - libclang-common-@LLVM_VERSION@-dev (= ${source:Version}) + ${dep:devlibs-objc}, libclang1-@LLVM_VERSION@t64 (= ${binary:Version}), + libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}) Description: Clang library - Development package Clang project is a C, C++, Objective C and Objective C++ front-end based on the LLVM compiler. Its goal is to offer a replacement to the @@ -166,10 +175,10 @@ Description: Clang library - Development package libclang1-@LLVM_VERSION@. Package: libclang-common-@LLVM_VERSION@-dev -Architecture: all +Architecture: any +Multi-Arch: same Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}), - libllvm@LLVM_VERSION@ (<< ${source:Version}.1~) +Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: libclang-rt-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end @@ -187,8 +196,6 @@ Package: libclang-rt-@LLVM_VERSION@-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Compiler-rt - development package This package provides various libraries: @@ -205,10 +212,7 @@ Package: libclang-rt-@LLVM_VERSION@-dev-wasm32 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm32 builtins Provides the compiler-rt builtins for WebAssembly 32 bits @@ -216,10 +220,7 @@ Package: libclang-rt-@LLVM_VERSION@-dev-wasm64 Architecture: all Multi-Arch: foreign Section: libdevel -Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: libclang-common-@LLVM_VERSION@-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Compiler-rt - wasm64 builtins Provides the compiler-rt builtins for WebAssembly 64 bits @@ -229,8 +230,6 @@ Package: libpolly-@LLVM_VERSION@-dev Architecture: any Multi-Arch: same Section: libdevel -Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) -Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:16~++20230115053056+df5fc4504b86-1~exp1) Depends: ${shlibs:Depends}, ${misc:Depends} Description: High-level loop and data-locality optimizer Uses an abstract mathematical representation based on integer polyhedra @@ -238,10 +237,13 @@ Description: High-level loop and data-locality optimizer # ------------- clang libraries ------------- -Package: libclang-cpp@LLVM_VERSION@ +Package: libclang-cpp@LLVM_VERSION@t64 +Provides: ${t64:Provides} +Replaces: libclang-cpp@LLVM_VERSION@ +Breaks: libclang-cpp@LLVM_VERSION@ (<< ${source:Version}) Section: libs Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end @@ -263,7 +265,7 @@ Package: libclang-cpp@LLVM_VERSION@-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, - libclang-cpp@LLVM_VERSION@ (= ${binary:Version}) + libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version}) # Move of libclang-cpp.so into libclang-cpp@LLVM_VERSION@.dev Description: C++ interface to the Clang library Clang project is a C, C++, Objective C and Objective C++ front-end @@ -324,7 +326,8 @@ Description: Clang Python Bindings This binding package provides access to the Clang compiler and libraries. Package: clang-@LLVM_VERSION@-examples -Architecture: any +Architecture: all +Multi-Arch: foreign Section: doc Depends: ${shlibs:Depends}, ${misc:Depends} Description: Clang examples @@ -339,7 +342,10 @@ Description: Clang examples # ------------- LLVM ------------- -Package: libllvm@LLVM_VERSION@ +Package: libllvm@LLVM_VERSION@t64 +Provides: ${t64:Provides} +Replaces: libllvm@LLVM_VERSION@ +Breaks: libllvm@LLVM_VERSION@ (<< ${source:Version}) Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -415,8 +421,8 @@ Description: Modular compiler and toolchain technologies, IR interpreter Package: llvm-@LLVM_VERSION@-dev Architecture: any Depends: ${shlibs:Depends}, libffi-dev, ${misc:Depends}, - llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@ (= ${binary:Version}), libncurses-dev, - llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@ (= ${binary:Version}), + llvm-@LLVM_VERSION@ (= ${binary:Version}), libllvm@LLVM_VERSION@t64 (= ${binary:Version}), libncurses-dev, + llvm-@LLVM_VERSION@-tools (= ${binary:Version}), libclang-cpp@LLVM_VERSION@t64 (= ${binary:Version}), libz3-dev, libxml2-dev Description: Modular compiler and toolchain technologies, libraries and headers LLVM is a collection of libraries and tools that make it easy to build @@ -480,6 +486,7 @@ Description: Modular compiler and toolchain technologies, OCaml bindings Package: llvm-@LLVM_VERSION@-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends}, libjs-jquery, libjs-underscore Description: Modular compiler and toolchain technologies, documentation LLVM is a collection of libraries and tools that make it easy to build @@ -520,9 +527,9 @@ Description: Modular compiler and toolchain technologies, examples # ------------- lld ------------- Package: lld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Description: LLVM-based linker LLD is a new, high-performance linker. It is built as a set of reusable @@ -530,9 +537,9 @@ Description: LLVM-based linker Project. Package: liblld-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: LLVM-based linker, library @@ -544,7 +551,7 @@ Description: LLVM-based linker, library Package: liblld-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 +Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64 loong64 # ia64 hurd powerpc have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lld-@LLVM_VERSION@ (= ${binary:Version}), liblld-@LLVM_VERSION@ (= ${binary:Version}), libzstd-dev, zlib1g-dev @@ -560,9 +567,9 @@ Description: LLVM-based linker, header files # ------------- lldb ------------- Package: lldb-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}), python3-lldb-@LLVM_VERSION@ Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger @@ -570,10 +577,13 @@ Description: Next generation, high-performance debugger reusable components which highly leverage existing libraries in the larger LLVM Project, such as the Clang expression parser and LLVM disassembler. -Package: liblldb-@LLVM_VERSION@ -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Package: liblldb-@LLVM_VERSION@t64 +Provides: ${t64:Provides} +Replaces: liblldb-@LLVM_VERSION@ +Breaks: liblldb-@LLVM_VERSION@ (<< ${source:Version}) +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@t64 (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} Section: libs Description: Next generation, high-performance debugger, library @@ -585,9 +595,9 @@ Description: Next generation, high-performance debugger, library Package: python3-lldb-@LLVM_VERSION@ Section: python -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version}), python3-six +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@t64 (= ${binary:Version}) Conflicts: python3-lldb-x.y Replaces: python3-lldb-x.y Provides: python3-lldb-x.y @@ -601,7 +611,7 @@ Description: Next generation, high-performance debugger, python3 lib Package: liblldb-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 +Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version}) Pre-Depends: ${misc:Pre-Depends} @@ -619,8 +629,8 @@ Description: Next generation, high-performance debugger, header files Package: libomp-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 -Depends: libomp5-@LLVM_VERSION@ (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 +Depends: libomp5-@LLVM_VERSION@t64 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-@LLVM_VERSION@-doc Breaks: libiomp-dev (<< 3.7-1), libomp-dev (<< 44) Provides: libomp-x.y-dev @@ -631,14 +641,14 @@ Description: LLVM OpenMP runtime - dev package linked against, and that manages the multiple threads in an OpenMP program while it is executing. -Package: libomp5-@LLVM_VERSION@ +Package: libomp5-@LLVM_VERSION@t64 Multi-Arch: same -Architecture: amd64 arm64 armhf i386 mips64el ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64el ppc64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libomp5 (<< 44) -Provides: libomp-x.y +Breaks: libomp5-@LLVM_VERSION@ (<< ${source:Version}), libomp5 (<< 44) +Provides: ${t64:Provides}, libomp-x.y Conflicts: libomp-x.y -Replaces: libomp-x.y +Replaces: libomp5-@LLVM_VERSION@, libomp-x.y Description: LLVM OpenMP runtime 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 @@ -647,6 +657,7 @@ Description: LLVM OpenMP runtime Package: libomp-@LLVM_VERSION@-doc Section: doc Architecture: all +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libjs-jquery Replaces: libiomp-x.y-doc Breaks: libiomp-x.y-doc @@ -659,17 +670,17 @@ Description: LLVM OpenMP runtime - Documentation # ------------- libcxx ------------- -Package: libc++1-@LLVM_VERSION@ +Package: libc++1-@LLVM_VERSION@t64 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: clang -Breaks: libc++1 (<< 44) -Provides: libc++-x.y +Breaks: libc++1-@LLVM_VERSION@ (<< ${source:Version}), libc++1 (<< 44) +Provides: ${t64:Provides}, libc++-x.y Conflicts: libc++-x.y -Replaces: libc++-x.y +Replaces: libc++1-@LLVM_VERSION@, libc++-x.y Description: LLVM C++ Standard library libc++ is another implementation of the C++ standard library. . @@ -687,12 +698,13 @@ Package: libc++-@LLVM_VERSION@-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends}, - libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 ppc64el ppc64 riscv64] -Breaks: libc++-dev (<< 44) +Depends: libc++1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends}, + libc++abi-@LLVM_VERSION@-dev (= ${binary:Version}), + libunwind-@LLVM_VERSION@-dev [amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64] +Breaks: libc++-dev (<< 44), libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2) Provides: libc++-x.y-dev Conflicts: libc++-x.y-dev -Replaces: libc++-x.y-dev +Replaces: libc++-x.y-dev, libc++abi-@LLVM_VERSION@-dev (<< 1:17.0.6-2) Description: LLVM C++ Standard library (development files) libc++ is another implementation of the C++ standard library . @@ -731,16 +743,16 @@ Description: LLVM C++ Standard library (WASI) # ------------- libcxxabi ------------- -Package: libc++abi1-@LLVM_VERSION@ +Package: libc++abi1-@LLVM_VERSION@t64 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: libc++abi1 (<< 44) -Provides: libc++abi-x.y +Breaks: libc++abi1-@LLVM_VERSION@ (<< ${source:Version}), libc++abi1 (<< 44) +Provides: ${t64:Provides}, libc++abi-x.y Conflicts: libc++abi-x.y -Replaces: libc++abi-x.y +Replaces: libc++abi1-@LLVM_VERSION@, libc++abi-x.y Description: LLVM low level support for a standard C++ library libc++abi is another implementation of low level support for a standard C++ library. @@ -754,7 +766,7 @@ Package: libc++abi-@LLVM_VERSION@-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libc++abi1-@LLVM_VERSION@ (= ${binary:Version}), ${misc:Depends} +Depends: libc++abi1-@LLVM_VERSION@t64 (= ${binary:Version}), ${misc:Depends} Breaks: libc++abi-dev (<= 44) Provides: libc++abi-x.y-dev Conflicts: libc++abi-x.y-dev @@ -826,15 +838,16 @@ Description: OpenCL C language implementation - development files # ------------- libunwind ------------- -Package: libunwind-@LLVM_VERSION@ +Package: libunwind-@LLVM_VERSION@t64 +Breaks: libunwind-@LLVM_VERSION@ (<< ${source:Version}) Section: libs -Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libunwind-x.y +Provides: ${t64:Provides}, libunwind-x.y Conflicts: libunwind-x.y -Replaces: libunwind-x.y +Replaces: libunwind-@LLVM_VERSION@, libunwind-x.y Description: production-quality unwinder libunwind is a production-quality unwinder, with platform support for DWARF unwind info, SjLj, and ARM EHABI. @@ -845,11 +858,11 @@ Description: production-quality unwinder Package: libunwind-@LLVM_VERSION@-dev Section: libdevel -Architecture: amd64 arm64 armhf i386 ppc64el ppc64 riscv64 +Architecture: amd64 arm64 armhf i386 loong64 ppc64el ppc64 riscv64 Multi-Arch: same Depends: ${misc:Depends}, - libunwind-@LLVM_VERSION@ (= ${binary:Version}) + libunwind-@LLVM_VERSION@t64 (= ${binary:Version}) Provides: libunwind-dev, libunwind-x.y-dev Conflicts: libunwind-dev, libunwind-x.y-dev Replaces: libunwind-dev, libunwind-x.y-dev @@ -874,15 +887,16 @@ Description: Multi-Level Intermediate Representation tools . This package provides tools. -Package: libmlir-@LLVM_VERSION@ +Package: libmlir-@LLVM_VERSION@t64 +Breaks: libmlir-@LLVM_VERSION@ (<< ${source:Version}) Section: libs Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Provides: libmlir-x.y +Provides: ${t64:Provides}, libmlir-x.y Conflicts: libmlir-x.y -Replaces: libmlir-x.y +Replaces: libmlir-@LLVM_VERSION@, libmlir-x.y Description: Multi-Level Intermediate Representation library Novel approach to building reusable and extensible compiler infrastructure. MLIR aims to address software fragmentation, improve compilation for @@ -896,7 +910,7 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, - libmlir-@LLVM_VERSION@ (= ${binary:Version}) + libmlir-@LLVM_VERSION@t64 (= ${binary:Version}) Breaks: libmlir-dev Provides: libmlir-x.y-dev Conflicts: libmlir-x.y-dev @@ -933,7 +947,7 @@ Description: Post-link optimizer Package: flang-@LLVM_VERSION@ # no 32bit support # https://github.com/llvm/llvm-project/issues/59845 -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 +Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, libflang-@LLVM_VERSION@-dev (= ${binary:Version}), Provides: fortran-compiler, gfortran-mod-15 Description: Fortran compiler @@ -944,7 +958,7 @@ Description: Fortran compiler of examples, some functionalities are still missing. Package: libflang-@LLVM_VERSION@-dev -Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 +Architecture: amd64 arm64 mips64el ppc64el kfreebsd-amd64 ppc64 sparc64 riscv64 loong64 Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs}, Description: Flang library - Development package diff --git a/debian/libc++-X.Y-dev.links.in b/debian/libc++-X.Y-dev.links.in index 854e14b7..3e55af80 100644 --- a/debian/libc++-X.Y-dev.links.in +++ b/debian/libc++-X.Y-dev.links.in @@ -1,3 +1,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++.so usr/lib/llvm-@LLVM_VERSION@/lib/libc++.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++.a usr/lib/llvm-@LLVM_VERSION@/include/c++/v1 /usr/include/c++/v1 +usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++experimental.a diff --git a/debian/libc++1-X.Y.lintian-overrides.in b/debian/libc++1-X.Y.lintian-overrides.in deleted file mode 100644 index 8e1532d4..00000000 --- a/debian/libc++1-X.Y.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -libc++1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0* diff --git a/debian/libc++1-X.Y.install.in b/debian/libc++1-X.Yt64.install.in similarity index 100% rename from debian/libc++1-X.Y.install.in rename to debian/libc++1-X.Yt64.install.in diff --git a/debian/libc++1-X.Y.links.in b/debian/libc++1-X.Yt64.links.in similarity index 100% rename from debian/libc++1-X.Y.links.in rename to debian/libc++1-X.Yt64.links.in diff --git a/debian/libc++1-X.Yt64.lintian-overrides.in b/debian/libc++1-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..25a325fa --- /dev/null +++ b/debian/libc++1-X.Yt64.lintian-overrides.in @@ -0,0 +1,2 @@ +libc++1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++.so.1.0* +libc++1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++1-@LLVM_VERSION@ diff --git a/debian/libc++abi1-X.Y.lintian-overrides.in b/debian/libc++abi1-X.Y.lintian-overrides.in deleted file mode 100644 index 0637b505..00000000 --- a/debian/libc++abi1-X.Y.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -libc++abi1-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0* diff --git a/debian/libc++abi1-X.Y.install.in b/debian/libc++abi1-X.Yt64.install.in similarity index 100% rename from debian/libc++abi1-X.Y.install.in rename to debian/libc++abi1-X.Yt64.install.in diff --git a/debian/libc++abi1-X.Y.links.in b/debian/libc++abi1-X.Yt64.links.in similarity index 100% rename from debian/libc++abi1-X.Y.links.in rename to debian/libc++abi1-X.Yt64.links.in diff --git a/debian/libc++abi1-X.Yt64.lintian-overrides.in b/debian/libc++abi1-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..c3100c96 --- /dev/null +++ b/debian/libc++abi1-X.Yt64.lintian-overrides.in @@ -0,0 +1,2 @@ +libc++abi1-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so.1.0* +libc++abi1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libc++abi1-@LLVM_VERSION@ diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index a82e6089..7cd10c4d 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,3 +1,3 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 89fbf8a3..89cfed01 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,5 +1,3 @@ - - usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/*.h usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/module.modulemap usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/xray/ @@ -7,3 +5,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/profile/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/ppc_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/openmp_wrappers/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/cuda_wrappers/ +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/llvm_libc_wrappers/*.h diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Yt64.install.in similarity index 100% rename from debian/libclang-cppX.Y.install.in rename to debian/libclang-cppX.Yt64.install.in diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Yt64.links.in similarity index 100% rename from debian/libclang-cppX.Y.links.in rename to debian/libclang-cppX.Yt64.links.in diff --git a/debian/libclang-cppX.Yt64.lintian-overrides.in b/debian/libclang-cppX.Yt64.lintian-overrides.in new file mode 100644 index 00000000..5d4a86a8 --- /dev/null +++ b/debian/libclang-cppX.Yt64.lintian-overrides.in @@ -0,0 +1 @@ +libclang-cpp@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-cpp@LLVM_VERSION@ diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index 6864ec82..be3689b8 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -2,9 +2,9 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/ -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* +[!sparc !sparc64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*clang_rt* usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h # See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH -[amd64 arm64 armhf armel i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* +[amd64 arm64 armhf armel] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* diff --git a/debian/libclang1-X.Y.links.in b/debian/libclang1-X.Y.links.in deleted file mode 100644 index dc4b7a44..00000000 --- a/debian/libclang1-X.Y.links.in +++ /dev/null @@ -1,4 +0,0 @@ -# as upstream -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 diff --git a/debian/libclang1-X.Y.lintian-overrides.in b/debian/libclang1-X.Y.lintian-overrides.in deleted file mode 100644 index 86038455..00000000 --- a/debian/libclang1-X.Y.lintian-overrides.in +++ /dev/null @@ -1,5 +0,0 @@ -# I know and I am not planning to change that yet. -libclang1-@LLVM_VERSION@: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1 -# Provided as transition -libclang1-@LLVM_VERSION@: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so -libclang1-@LLVM_VERSION@: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Yt64.install.in similarity index 100% rename from debian/libclang1-X.Y.install.in rename to debian/libclang1-X.Yt64.install.in diff --git a/debian/libclang1-X.Yt64.links.in b/debian/libclang1-X.Yt64.links.in new file mode 100644 index 00000000..5c1051d0 --- /dev/null +++ b/debian/libclang1-X.Yt64.links.in @@ -0,0 +1,5 @@ +# as upstream +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.1 +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/libclang1-X.Yt64.lintian-overrides.in b/debian/libclang1-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..c0e016cc --- /dev/null +++ b/debian/libclang1-X.Yt64.lintian-overrides.in @@ -0,0 +1,6 @@ +# I know and I am not planning to change that yet. +libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang-@LLVM_VERSION@-1 +# Provided as transition +libclang1-@LLVM_VERSION@t64: dev-pkg-without-shlib-symlink usr/lib/*/libclang-@LLVM_VERSION@.so.1 usr/lib/*/libclang.so +libclang1-@LLVM_VERSION@t64: ldconfig-symlink-missing-for-shlib usr/lib/*/libclang-LLVM_VERSION@.so usr/lib/*/libclang-LLVM_VERSION@.so.1 libclang-LLVM_VERSION@.so +libclang1-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libclang1-@LLVM_VERSION@ diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Yt64.symbols.in similarity index 98% rename from debian/libclang1-X.Y.symbols.in rename to debian/libclang1-X.Yt64.symbols.in index 9d6e9d20..35c74c56 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Yt64.symbols.in @@ -1,6 +1,7 @@ -libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# +libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@t64 #MINVER# (optional)LLVM_13@LLVM_13 1:15.0.7-3 (optional)LLVM_16@LLVM_16 1:16.0.2-1 + (optional)LLVM_17@LLVM_17 1:17.0.1-1 clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~ clang_BlockCommandComment_getCommandName@LLVM_13 1:5.0~svn298832-1~ clang_BlockCommandComment_getNumArgs@LLVM_13 1:5.0~svn298832-1~ @@ -26,6 +27,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# clang_CXXMethod_isCopyAssignmentOperator@LLVM_16 1:16.0.2-1~ clang_CXXMethod_isDefaulted@LLVM_13 1:5.0~svn298832-1~ clang_CXXMethod_isDeleted@LLVM_16 1:16.0.2-1~ + clang_CXXMethod_isExplicit@LLVM_17 1:17 clang_CXXMethod_isMoveAssignmentOperator@LLVM_16 1:16.0.2-1~ clang_CXXMethod_isPureVirtual@LLVM_13 1:5.0~svn298832-1~ clang_CXXMethod_isStatic@LLVM_13 1:5.0~svn298832-1~ @@ -191,6 +193,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# clang_createAPISet@LLVM_16 1:16.0.2-1~ clang_createCXCursorSet@LLVM_13 1:5.0~svn298832-1~ clang_createIndex@LLVM_13 1:5.0~svn298832-1~ + clang_createIndexWithOptions@LLVM_17 1:17 clang_createTranslationUnit2@LLVM_13 1:5.0~svn298832-1~ clang_createTranslationUnit@LLVM_13 1:5.0~svn298832-1~ clang_createTranslationUnitFromSourceFile@LLVM_13 1:5.0~svn298832-1~ @@ -230,6 +233,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# clang_getArgType@LLVM_13 1:5.0~svn298832-1~ clang_getArrayElementType@LLVM_13 1:5.0~svn298832-1~ clang_getArraySize@LLVM_13 1:5.0~svn298832-1~ + clang_getBinaryOperatorKindSpelling@LLVM_17 1:17 clang_getBuildSessionTimestamp@LLVM_13 1:5.0~svn298832-1~ clang_getCString@LLVM_13 1:5.0~svn298832-1~ clang_getCXTUResourceUsage@LLVM_13 1:5.0~svn298832-1~ @@ -251,6 +255,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# clang_getCompletionPriority@LLVM_13 1:5.0~svn298832-1~ clang_getCursor@LLVM_13 1:5.0~svn298832-1~ clang_getCursorAvailability@LLVM_13 1:5.0~svn298832-1~ + clang_getCursorBinaryOperatorKind@LLVM_17 1:17 clang_getCursorCompletionString@LLVM_13 1:5.0~svn298832-1~ clang_getCursorDefinition@LLVM_13 1:5.0~svn298832-1~ clang_getCursorDisplayName@LLVM_13 1:5.0~svn298832-1~ @@ -273,6 +278,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# clang_getCursorTLSKind@LLVM_13 1:6.0~svn320926-1~ clang_getCursorType@LLVM_13 1:5.0~svn298832-1~ clang_getCursorUSR@LLVM_13 1:5.0~svn298832-1~ + clang_getCursorUnaryOperatorKind@LLVM_17 1:17 clang_getCursorVisibility@LLVM_13 1:5.0~svn298832-1~ clang_getDeclObjCTypeEncoding@LLVM_13 1:5.0~svn298832-1~ clang_getDefinitionSpellingAndExtent@LLVM_13 1:5.0~svn298832-1~ @@ -351,6 +357,7 @@ libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# clang_getTypeSpelling@LLVM_13 1:5.0~svn298832-1~ clang_getTypedefDeclUnderlyingType@LLVM_13 1:5.0~svn298832-1~ clang_getTypedefName@LLVM_13 1:5.0~+rc1~ + clang_getUnaryOperatorKindSpelling@LLVM_17 1:17 clang_getUnqualifiedType@LLVM_16 1:16.0.2-1~ clang_hashCursor@LLVM_13 1:5.0~svn298832-1~ clang_indexLoc_getCXSourceLocation@LLVM_13 1:5.0~svn298832-1~ diff --git a/debian/liblldb-X.Y.lintian-overrides.in b/debian/liblldb-X.Y.lintian-overrides.in deleted file mode 100644 index 180aec35..00000000 --- a/debian/liblldb-X.Y.lintian-overrides.in +++ /dev/null @@ -1,5 +0,0 @@ -# That is normal. The lib is not (yet?) shipped as a new package -liblldb-@LLVM_VERSION@: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@-1 -# For now, override this warning. We might create a -dev at some point -liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so -liblldb-@LLVM_VERSION@: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@.so.1 usr/lib/*/liblldb-@LLVM_VERSION@.so diff --git a/debian/liblldb-X.Y.install.in b/debian/liblldb-X.Yt64.install.in similarity index 100% rename from debian/liblldb-X.Y.install.in rename to debian/liblldb-X.Yt64.install.in diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Yt64.links.in similarity index 100% rename from debian/liblldb-X.Y.links.in rename to debian/liblldb-X.Yt64.links.in diff --git a/debian/liblldb-X.Yt64.lintian-overrides.in b/debian/liblldb-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..02752489 --- /dev/null +++ b/debian/liblldb-X.Yt64.lintian-overrides.in @@ -0,0 +1,6 @@ +# That is normal. The lib is not (yet?) shipped as a new package +liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@t64-1 +# For now, override this warning. We might create a -dev at some point +liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb.so.1 usr/lib/*/liblldb.so +liblldb-@LLVM_VERSION@t64: non-dev-pkg-with-shlib-symlink usr/lib/*/liblldb-@LLVM_VERSION@t64.so.1 usr/lib/*/liblldb-@LLVM_VERSION@t64.so +liblldb-@LLVM_VERSION@t64: package-name-doesnt-match-sonames liblldb-@LLVM_VERSION@ diff --git a/debian/libllvmX.Y.lintian-overrides.in b/debian/libllvmX.Y.lintian-overrides.in deleted file mode 100644 index 49f7ef24..00000000 --- a/debian/libllvmX.Y.lintian-overrides.in +++ /dev/null @@ -1,2 +0,0 @@ -# That is normal. Upstream does not match the debian convention -libllvm@LLVM_VERSION@: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1 diff --git a/debian/libllvmX.Y.install.in b/debian/libllvmX.Yt64.install.in similarity index 100% rename from debian/libllvmX.Y.install.in rename to debian/libllvmX.Yt64.install.in diff --git a/debian/libllvmX.Y.links.in b/debian/libllvmX.Yt64.links.in similarity index 100% rename from debian/libllvmX.Y.links.in rename to debian/libllvmX.Yt64.links.in diff --git a/debian/libllvmX.Yt64.lintian-overrides.in b/debian/libllvmX.Yt64.lintian-overrides.in new file mode 100644 index 00000000..40fd72df --- /dev/null +++ b/debian/libllvmX.Yt64.lintian-overrides.in @@ -0,0 +1,3 @@ +# That is normal. Upstream does not match the debian convention +libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libLLVM-@LLVM_VERSION@-1 +libllvm@LLVM_VERSION@t64: package-name-doesnt-match-sonames libllvm@LLVM_VERSION@ diff --git a/debian/libmlir-X.Y.lintian-overrides.in b/debian/libmlir-X.Y.lintian-overrides.in deleted file mode 100644 index f2f020ba..00000000 --- a/debian/libmlir-X.Y.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -libmlir-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/* diff --git a/debian/libmlir-X.Y.install.in b/debian/libmlir-X.Yt64.install.in similarity index 100% rename from debian/libmlir-X.Y.install.in rename to debian/libmlir-X.Yt64.install.in diff --git a/debian/libmlir-X.Yt64.lintian-overrides.in b/debian/libmlir-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..50568c40 --- /dev/null +++ b/debian/libmlir-X.Yt64.lintian-overrides.in @@ -0,0 +1,2 @@ +libmlir-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/* +libmlir-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libmlir-@LLVM_VERSION@ diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in index 081d2c52..ff72a7d7 100644 --- a/debian/libomp-X.Y-dev.install.in +++ b/debian/libomp-X.Y-dev.install.in @@ -7,16 +7,16 @@ [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher_static.a [!armhf !mips64el] /usr/lib/llvm-@LLVM_VERSION@/lib/libarcher.so -[amd64 ppc64el arm64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a +[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget.devicertl.a -[amd64 ppc64el arm64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc +[amd64 ppc64el arm64 loong64 mips64el ppc64 riscv64] /usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget-*.bc usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake -[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info -[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay +[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-device-info +[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/bin/llvm-omp-kernel-replay -[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@ -[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@ +[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@ +[amd64 arm64 loong64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@ [!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/ diff --git a/debian/libomp5-X.Y.install.in b/debian/libomp5-X.Y.install.in deleted file mode 100644 index eea9615b..00000000 --- a/debian/libomp5-X.Y.install.in +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/dh-exec - -usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5 -[amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@ diff --git a/debian/libomp5-X.Y.lintian-overrides.in b/debian/libomp5-X.Y.lintian-overrides.in deleted file mode 100644 index 335e58e9..00000000 --- a/debian/libomp5-X.Y.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -libomp5-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5* diff --git a/debian/libomp5-X.Yt64.install.in b/debian/libomp5-X.Yt64.install.in new file mode 100644 index 00000000..8204faac --- /dev/null +++ b/debian/libomp5-X.Yt64.install.in @@ -0,0 +1,4 @@ +#!/usr/bin/dh-exec + +usr/lib/llvm-@LLVM_VERSION@/lib/libomp*.so.5 +[amd64 arm64 mips64el ppc64el ppc64 riscv64 loong64] usr/lib/llvm-@LLVM_VERSION@/lib/libomptarget*.so.@LLVM_VERSION@ diff --git a/debian/libomp5-X.Y.links.in b/debian/libomp5-X.Yt64.links.in similarity index 100% rename from debian/libomp5-X.Y.links.in rename to debian/libomp5-X.Yt64.links.in diff --git a/debian/libomp5-X.Yt64.lintian-overrides.in b/debian/libomp5-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..0bbf0689 --- /dev/null +++ b/debian/libomp5-X.Yt64.lintian-overrides.in @@ -0,0 +1,2 @@ +libomp5-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libomp.so.5* +libomp5-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libomp5-@LLVM_VERSION@ diff --git a/debian/libomp5-X.Y.symbols.in b/debian/libomp5-X.Yt64.symbols.in similarity index 76% rename from debian/libomp5-X.Y.symbols.in rename to debian/libomp5-X.Yt64.symbols.in index a9b00734..1ae47f0d 100644 --- a/debian/libomp5-X.Y.symbols.in +++ b/debian/libomp5-X.Yt64.symbols.in @@ -1,4 +1,4 @@ -libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# +libomp.so.5 libomp5-@LLVM_VERSION@t64 #MINVER# GOMP_1.0@GOMP_1.0 0.20131209 GOMP_2.0@GOMP_2.0 0.20131209 GOMP_3.0@GOMP_3.0 0.20131209 @@ -270,8 +270,6 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# OMP_4.5@OMP_4.5 7 OMP_5.0@OMP_5.0 13 VERSION@VERSION 0.20130412 - _You_must_link_with_Intel_OpenMP_library@VERSION 0.20130412 - _You_must_link_with_exactly_one_OpenMP_library@VERSION 0.20130412 ___kmp_allocate@VERSION 0.20130412 ___kmp_free@VERSION 0.20130412 __kmp_acquire_drdpa_lock@VERSION 0.20130715 @@ -282,52 +280,52 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmp_acquire_queuing_lock@VERSION 0.20130715 __kmp_acquire_tas_lock@VERSION 0.20130715 __kmp_acquire_ticket_lock@VERSION 0.20130715 - __kmp_debugging@VERSION 1:16.0.2-1~ + __kmp_debugging@VERSION 17 __kmp_fork_call@VERSION 0.20130715 __kmp_get_reduce_method@VERSION 0.20130412 __kmp_invoke_microtask@VERSION 0.20130715 __kmp_itt_fini_ittlib@VERSION 0.20130715 __kmp_itt_init_ittlib@VERSION 0.20130715 - __kmp_omp_debug_struct_info@VERSION 1:16.0.2-1~ - __kmp_reap_monitor@VERSION 1:16.0.2-1~ + __kmp_omp_debug_struct_info@VERSION 17 + __kmp_reap_monitor@VERSION 17 __kmp_reap_worker@VERSION 0.20130715 __kmp_release_64@VERSION 0.20140926 - __kmp_reset_stats@VERSION 1:16.0.2-1~ + __kmp_reset_stats@VERSION 17 __kmp_thread_pool@VERSION 0.20130412 __kmp_wait_4@VERSION 9 __kmp_wait_64@VERSION 0.20140926 __kmpc_aligned_alloc@VERSION 14 __kmpc_alloc@VERSION 8 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_10@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_10@VERSION 0.20130412 __kmpc_atomic_16@VERSION 0.20130412 __kmpc_atomic_1@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_20@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_20@VERSION 0.20130412 __kmpc_atomic_2@VERSION 0.20130412 __kmpc_atomic_32@VERSION 0.20130412 __kmpc_atomic_4@VERSION 0.20130412 __kmpc_atomic_8@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_1_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_1_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_2_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_2_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_4_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_4_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_8_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_bool_8_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_add@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_1_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_1_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_2_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_2_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_4_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_4_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_8_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_bool_8_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_add_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_div_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_mul@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_mul_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_rd@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx10_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx10_wr@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_cmplx16_add@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_cmplx16_add_cpt@VERSION 0.20130412 @@ -350,8 +348,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_cmplx4_div@VERSION 0.20130412 __kmpc_atomic_cmplx4_div_cmplx8@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_div_rev@VERSION 0.20130412 __kmpc_atomic_cmplx4_mul@VERSION 0.20130412 __kmpc_atomic_cmplx4_mul_cmplx8@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_mul_cpt@VERSION 0.20130412 @@ -359,30 +357,30 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_cmplx4_sub@VERSION 0.20130412 __kmpc_atomic_cmplx4_sub_cmplx8@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_sub_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx4_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx4_wr@VERSION 0.20130412 __kmpc_atomic_cmplx8_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_add_cpt@VERSION 0.20130412 __kmpc_atomic_cmplx8_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_div_rev@VERSION 0.20130412 __kmpc_atomic_cmplx8_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_mul_cpt@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_rd@VERSION 0.20130412 __kmpc_atomic_cmplx8_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_sub_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_cmplx8_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_cmplx8_wr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_end@VERSION 0.20130412 (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed1_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_add_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed1_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_andl@VERSION 0.20130412 @@ -390,11 +388,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_fixed1_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed1_div_float8@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed1_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_eqv_cpt@VERSION 0.20130412 @@ -404,9 +402,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed1_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed1_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed1_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed1_orb@VERSION 0.20130412 @@ -416,48 +414,48 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_rd@VERSION 0.20130412 __kmpc_atomic_fixed1_shl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shl_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shl_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shl_rev@VERSION 0.20130412 __kmpc_atomic_fixed1_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed1_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_wr@VERSION 0.20130412 __kmpc_atomic_fixed1_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_add_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed1u_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed1u_add_fp@VERSION 4.0 __kmpc_atomic_fixed1u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed1u_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_div_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_mul_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed1u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed1u_shr_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed1u_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed1u_sub_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed1u_sub_rev_fp@VERSION 5.0 __kmpc_atomic_fixed2_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_add_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed2_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_andl@VERSION 0.20130412 @@ -465,11 +463,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_fixed2_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed2_div_float8@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed2_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_eqv_cpt@VERSION 0.20130412 @@ -479,9 +477,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed2_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed2_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed2_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed2_orb@VERSION 0.20130412 @@ -491,48 +489,48 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_rd@VERSION 0.20130412 __kmpc_atomic_fixed2_shl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shl_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shl_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shl_rev@VERSION 0.20130412 __kmpc_atomic_fixed2_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed2_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_wr@VERSION 0.20130412 __kmpc_atomic_fixed2_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_add_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed2u_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed2u_add_fp@VERSION 4.0 __kmpc_atomic_fixed2u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed2u_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_div_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_mul_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed2u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed2u_shr_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed2u_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed2u_sub_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed2u_sub_rev_fp@VERSION 5.0 __kmpc_atomic_fixed4_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_add_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed4_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_andl@VERSION 0.20130412 @@ -540,11 +538,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_fixed4_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed4_div_float8@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed4_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_eqv_cpt@VERSION 0.20130412 @@ -554,9 +552,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed4_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed4_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed4_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed4_orb@VERSION 0.20130412 @@ -566,48 +564,48 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_rd@VERSION 0.20130412 __kmpc_atomic_fixed4_shl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shl_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shl_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shl_rev@VERSION 0.20130412 __kmpc_atomic_fixed4_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed4_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_wr@VERSION 0.20130412 __kmpc_atomic_fixed4_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_add_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed4u_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed4u_add_fp@VERSION 4.0 (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed4u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed4u_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_div_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_mul_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed4u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed4u_shr_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed4u_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed4u_sub_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed4u_sub_rev_fp@VERSION 5.0 (arch=!ppc64 !ppc64el)__kmpc_atomic_fixed8_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_add_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_add_fp@VERSION 0.20130412 __kmpc_atomic_fixed8_andb@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_andb_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_andl@VERSION 0.20130412 @@ -615,11 +613,11 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_atomic_fixed8_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_fixed8_div_float8@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_div_rev_fp@VERSION 4.0 __kmpc_atomic_fixed8_eqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_eqv_cpt@VERSION 0.20130412 @@ -629,9 +627,9 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_min_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_fixed8_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_fixed8_mul_fp@VERSION 0.20130412 __kmpc_atomic_fixed8_neqv@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_neqv_cpt@VERSION 0.20130412 __kmpc_atomic_fixed8_orb@VERSION 0.20130412 @@ -641,107 +639,107 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_rd@VERSION 0.20130412 __kmpc_atomic_fixed8_shl@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shl_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shl_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shl_rev@VERSION 0.20130412 __kmpc_atomic_fixed8_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_shr_rev@VERSION 0.20130412 __kmpc_atomic_fixed8_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_wr@VERSION 0.20130412 __kmpc_atomic_fixed8_xor@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8_xor_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_add_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_fixed8u_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)__kmpc_atomic_fixed8u_add_fp@VERSION 4.0 __kmpc_atomic_fixed8u_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_fixed8u_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_div_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_mul_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_mul_fp@VERSION 4.0 __kmpc_atomic_fixed8u_shr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_fixed8u_shr_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_fixed8u_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)__kmpc_atomic_fixed8u_sub_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !arm64)__kmpc_atomic_fixed8u_sub_rev_fp@VERSION 5.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_add_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_add_cpt_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_add_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_div_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_max@VERSION 14 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_max_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_min@VERSION 14 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_min_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float10_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float10_mul_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_rd@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float10_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float10_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float10_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float10_wr@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_add@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_div@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_div_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_div_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_div_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_max@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_max_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_min@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_min_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_mul@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_rd@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float16_sub@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_sub_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_sub_cpt_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_sub_rev@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_swp@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float16_wr@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_add@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_add_cpt@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_div@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_cpt@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_cpt_rev@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_div_rev@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_max@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_max_cpt@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_min@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_min_cpt@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_mul@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_mul_cpt@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_rd@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float16_sub@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_cpt@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_cpt_rev@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_sub_rev@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_swp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float16_wr@VERSION 0.20130412 __kmpc_atomic_float4_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_add_cpt_fp@VERSION 4.0 (arch=!ppc64 !ppc64el)__kmpc_atomic_float4_add_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_add_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_add_fp@VERSION 0.20130412 __kmpc_atomic_float4_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_float4_div_float8@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_div_rev_fp@VERSION 4.0 __kmpc_atomic_float4_max@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_max_cpt@VERSION 0.20130412 @@ -749,32 +747,32 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_min_cpt@VERSION 0.20130412 __kmpc_atomic_float4_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float4_mul_cpt_fp@VERSION 4.0 __kmpc_atomic_float4_mul_float8@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float4_mul_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_rd@VERSION 0.20130412 __kmpc_atomic_float4_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_cpt_rev_fp@VERSION 4.0 __kmpc_atomic_float4_sub_float8@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float4_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float4_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float4_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float4_wr@VERSION 0.20130412 __kmpc_atomic_float8_add@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_add_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_add_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_add_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_add_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_add_fp@VERSION 0.20130412 __kmpc_atomic_float8_div@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_div_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_div_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_div_rev_fp@VERSION 4.0 __kmpc_atomic_float8_max@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_max_cpt@VERSION 0.20130412 @@ -782,40 +780,41 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_min_cpt@VERSION 0.20130412 __kmpc_atomic_float8_mul@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_mul_cpt@VERSION 0.20130412 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_mul_cpt_fp@VERSION 4.0 -#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_mul_fp@VERSION 0.20130412 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)__kmpc_atomic_float8_mul_cpt_fp@VERSION 4.0 +#MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf !loong64)__kmpc_atomic_float8_mul_fp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_rd@VERSION 0.20130412 __kmpc_atomic_float8_sub@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_cpt_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_cpt_rev_fp@VERSION 4.0 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !armel !armhf)__kmpc_atomic_float8_sub_fp@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_sub_rev@VERSION 0.20130412 #MISSING: 7# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)__kmpc_atomic_float8_sub_rev_fp@VERSION 4.0 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_swp@VERSION 0.20130412 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_float8_swp@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_float8_wr@VERSION 0.20130412 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_start@VERSION 0.20130412 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_1_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_1_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_2_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_2_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_4_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_4_cas_cpt@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_8_cas@VERSION 14 - (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64)__kmpc_atomic_val_8_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_1_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_1_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_2_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_2_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_4_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_4_cas_cpt@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_8_cas@VERSION 14 + (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !riscv64 !loong64)__kmpc_atomic_val_8_cas_cpt@VERSION 14 __kmpc_barrier@VERSION 0.20130412 __kmpc_barrier_master@VERSION 0.20130412 __kmpc_barrier_master_nowait@VERSION 0.20130412 __kmpc_begin@VERSION 0.20130412 __kmpc_bound_num_threads@VERSION 0.20130412 __kmpc_bound_thread_num@VERSION 0.20130412 + __kmpc_calc_original_ivs_rectang@VERSION 17 __kmpc_calloc@VERSION 12 __kmpc_cancel@VERSION 0.20131209 __kmpc_cancel_barrier@VERSION 0.20131209 __kmpc_cancellationpoint@VERSION 0.20131209 __kmpc_copyprivate@VERSION 0.20130412 - __kmpc_copyprivate_light@VERSION 1:16.0.2-1~ + __kmpc_copyprivate_light@VERSION 17 __kmpc_critical@VERSION 0.20130412 __kmpc_critical_with_hint@VERSION 3.8.0 __kmpc_destroy_allocator@VERSION 9 @@ -854,19 +853,20 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_end_reduce@VERSION 0.20130412 __kmpc_end_reduce_nowait@VERSION 0.20130412 __kmpc_end_scope@VERSION 14 - __kmpc_end_sections@VERSION 1:16.0.2-1~ + __kmpc_end_sections@VERSION 17 __kmpc_end_serialized_parallel@VERSION 0.20130412 __kmpc_end_single@VERSION 0.20130412 __kmpc_end_taskgroup@VERSION 0.20130412 __kmpc_error@VERSION 13 __kmpc_flush@VERSION 0.20130412 + __kmpc_for_collapsed_init@VERSION 17 __kmpc_for_static_fini@VERSION 0.20130412 __kmpc_for_static_init_4@VERSION 0.20130412 __kmpc_for_static_init_4u@VERSION 0.20130412 __kmpc_for_static_init_8@VERSION 0.20130412 __kmpc_for_static_init_8u@VERSION 0.20130412 __kmpc_fork_call@VERSION 0.20130412 - __kmpc_fork_call_if@VERSION 1:16.0.2-1~ + __kmpc_fork_call_if@VERSION 17 __kmpc_fork_teams@VERSION 0.20130715 __kmpc_free@VERSION 8 __kmpc_get_default_allocator@VERSION 8 @@ -884,10 +884,10 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_invoke_task_func@VERSION 0.20130412 __kmpc_masked@VERSION 13 __kmpc_master@VERSION 0.20130412 - __kmpc_next_section@VERSION 1:16.0.2-1~ + __kmpc_next_section@VERSION 17 __kmpc_ok_to_fork@VERSION 0.20130412 - __kmpc_omp_get_target_async_handle_ptr@VERSION 1:16.0.2-1~ - __kmpc_omp_has_task_team@VERSION 1:16.0.2-1~ + __kmpc_omp_get_target_async_handle_ptr@VERSION 17 + __kmpc_omp_has_task_team@VERSION 17 __kmpc_omp_reg_task_with_affinity@VERSION 8 __kmpc_omp_target_task_alloc@VERSION 9 __kmpc_omp_task@VERSION 0.20130412 @@ -897,12 +897,13 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_omp_task_parts@VERSION 0.20130412 __kmpc_omp_task_with_deps@VERSION 0.20130912 __kmpc_omp_taskwait@VERSION 0.20130412 - __kmpc_omp_taskwait_deps_51@VERSION 1:16.0.2-1~ + __kmpc_omp_taskwait_deps_51@VERSION 17 __kmpc_omp_taskyield@VERSION 0.20130412 __kmpc_omp_wait_deps@VERSION 0.20130912 __kmpc_ordered@VERSION 0.20130412 __kmpc_pause_resource@VERSION 9 __kmpc_pop_num_threads@VERSION 0.20130412 + __kmpc_process_loop_nest_rectang@VERSION 17 __kmpc_proxy_task_completed@VERSION 0.20150401 __kmpc_proxy_task_completed_ooo@VERSION 0.20150401 __kmpc_push_num_teams@VERSION 0.20130715 @@ -913,7 +914,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# __kmpc_reduce@VERSION 0.20130412 __kmpc_reduce_nowait@VERSION 0.20130412 __kmpc_scope@VERSION 14 - __kmpc_sections_init@VERSION 1:16.0.2-1~ + __kmpc_sections_init@VERSION 17 __kmpc_serialized_parallel@VERSION 0.20130412 __kmpc_set_default_allocator@VERSION 8 __kmpc_set_lock@VERSION 0.20130412 @@ -1027,7 +1028,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# kmpc_set_stacksize@VERSION 0.20130412 kmpc_set_stacksize_s@VERSION 0.20130412 kmpc_unset_affinity_mask_proc@VERSION 0.20130412 -#MISSING: 14# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)libomp_start_tool@VERSION 14 +#MISSING: 14# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf !loong64)libomp_start_tool@VERSION 14 omp_aligned_alloc@VERSION 14 omp_aligned_calloc@VERSION 14 omp_alloc@VERSION 8 @@ -1098,18 +1099,18 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# omp_get_initial_device@VERSION 8 omp_get_initial_device_@OMP_4.5 13 omp_get_initial_device_@VERSION 8 - omp_get_interop_int@VERSION 1:16.0.2-1~ - omp_get_interop_int_@VERSION 1:16.0.2-1~ - omp_get_interop_name@VERSION 1:16.0.2-1~ - omp_get_interop_name_@VERSION 1:16.0.2-1~ - omp_get_interop_ptr@VERSION 1:16.0.2-1~ - omp_get_interop_ptr_@VERSION 1:16.0.2-1~ - omp_get_interop_rc_desc@VERSION 1:16.0.2-1~ - omp_get_interop_rc_desc_@VERSION 1:16.0.2-1~ - omp_get_interop_str@VERSION 1:16.0.2-1~ - omp_get_interop_str_@VERSION 1:16.0.2-1~ - omp_get_interop_type_desc@VERSION 1:16.0.2-1~ - omp_get_interop_type_desc_@VERSION 1:16.0.2-1~ + omp_get_interop_int@VERSION 17 + omp_get_interop_int_@VERSION 17 + omp_get_interop_name@VERSION 17 + omp_get_interop_name_@VERSION 17 + omp_get_interop_ptr@VERSION 17 + omp_get_interop_ptr_@VERSION 17 + omp_get_interop_rc_desc@VERSION 17 + omp_get_interop_rc_desc_@VERSION 17 + omp_get_interop_str@VERSION 17 + omp_get_interop_str_@VERSION 17 + omp_get_interop_type_desc@VERSION 17 + omp_get_interop_type_desc_@VERSION 17 omp_get_level@OMP_3.0 0.20131209 omp_get_level@VERSION 0.20130412 omp_get_level_@OMP_3.0 0.20131209 @@ -1136,8 +1137,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# omp_get_num_devices@VERSION 8 omp_get_num_devices_@OMP_4.0 8 omp_get_num_devices_@VERSION 8 - omp_get_num_interop_properties@VERSION 1:16.0.2-1~ - omp_get_num_interop_properties_@VERSION 1:16.0.2-1~ + omp_get_num_interop_properties@VERSION 17 + omp_get_num_interop_properties_@VERSION 17 omp_get_num_places@OMP_4.5 7 omp_get_num_places@VERSION 3.9.0 omp_get_num_places_@OMP_4.5 7 @@ -1212,8 +1213,8 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# omp_get_wtime_@VERSION 0.20130412 omp_high_bw_mem_alloc@VERSION 8 omp_high_bw_mem_space@VERSION 9 - omp_in_explicit_task@VERSION 1:16.0.2-1~ - omp_in_explicit_task_@VERSION 1:16.0.2-1~ + omp_in_explicit_task@VERSION 17 + omp_in_explicit_task_@VERSION 17 omp_in_final@OMP_3.1 0.20131209 omp_in_final@VERSION 0.20130412 omp_in_final_@OMP_3.1 0.20131209 @@ -1305,7 +1306,7 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# omp_set_schedule_@VERSION 0.20130412 omp_set_teams_thread_limit@VERSION 13 omp_set_teams_thread_limit_@VERSION 13 -#MISSING: 8# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf)omp_state_info@VERSION 6.0 +#MISSING: 8# (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !arm64 !armel !armhf !loong64)omp_state_info@VERSION 6.0 omp_test_lock@OMP_1.0 0.20131209 omp_test_lock@OMP_3.0 0.20131209 omp_test_lock@VERSION 0.20130412 @@ -1342,242 +1343,184 @@ libomp.so.5 libomp5-@LLVM_VERSION@ #MINVER# ompc_set_nested@VERSION 0.20130412 ompc_set_num_threads@VERSION 0.20130412 ompc_set_schedule@VERSION 0.20130412 - ompt_libomp_connect@VERSION 1:16.0.2-1~ + ompt_libomp_connect@VERSION 17 (arch=!mips !mipsel !ppc64 !ppc64el !mips64 !mips64el !armel !armhf)ompt_start_tool@VERSION 6.0 -libomptarget.rtl.amdgpu.nextgen.so.16 libomp5-16 #MINVER# [amd64 arm64] - VERS1.0@VERS1.0 1:16.0.2-1~ - __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_lock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_unlock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_destroy_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_async_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_requires@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_data_exchangable@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_launch_kernel@VERS1.0 1:16.0.2-1~ - __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~ - __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_query_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_record_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_set_info_flag@VERS1.0 1:16.0.2-1~ - __tgt_rtl_supports_empty_images@VERS1.0 1:16.0.2-1~ - __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~ - __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~ -libomptarget.rtl.amdgpu.so.16 libomp5-16 #MINVER# [amd64 arm64] - VERS1.0@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_lock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_unlock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_requires@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_launch_kernel@VERS1.0 1:16.0.2-1~ - __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~ - __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~ -libomptarget.rtl.cuda.nextgen.so.16 libomp5-16 #MINVER# - VERS1.0@VERS1.0 1:16.0.2-1~ - __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_lock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_unlock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_destroy_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_async_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_requires@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_data_exchangable@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_launch_kernel@VERS1.0 1:16.0.2-1~ - __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~ - __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_query_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_record_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_set_info_flag@VERS1.0 1:16.0.2-1~ - __tgt_rtl_supports_empty_images@VERS1.0 1:16.0.2-1~ - __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~ - __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~ -libomptarget.rtl.cuda.so.16 libomp5-16 #MINVER# [amd64 arm64] - VERS1.0@VERS1.0 1:16.0.2-1~ - __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_destroy_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_async_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_requires@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_data_exchangable@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_launch_kernel@VERS1.0 1:16.0.2-1~ - __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~ - __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_query_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_record_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_release_async_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_run_target_region@VERS1.0 1:16.0.2-1~ - __tgt_rtl_run_target_region_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_run_target_team_region@VERS1.0 1:16.0.2-1~ - __tgt_rtl_run_target_team_region_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_set_info_flag@VERS1.0 1:16.0.2-1~ - __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~ - __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~ -libomptarget.rtl.x86_64.nextgen.so.16 libomp5-16 #MINVER# [amd64 arm64] - VERS1.0@VERS1.0 1:16.0.2-1~ - __tgt_rtl_create_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_exchange_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_lock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_unlock@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_deinit_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_destroy_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_async_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_plugin@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_requires@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_data_exchangable@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_launch_kernel@VERS1.0 1:16.0.2-1~ - __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~ - __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~ - __tgt_rtl_query_async@VERS1.0 1:16.0.2-1~ - __tgt_rtl_record_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_set_info_flag@VERS1.0 1:16.0.2-1~ - __tgt_rtl_supports_empty_images@VERS1.0 1:16.0.2-1~ - __tgt_rtl_sync_event@VERS1.0 1:16.0.2-1~ - __tgt_rtl_synchronize@VERS1.0 1:16.0.2-1~ - __tgt_rtl_wait_event@VERS1.0 1:16.0.2-1~ -libomptarget.rtl.x86_64.so.16 libomp5-16 #MINVER# [amd64 arm64] - VERS1.0@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_alloc@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_delete@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_retrieve@VERS1.0 1:16.0.2-1~ - __tgt_rtl_data_submit@VERS1.0 1:16.0.2-1~ - __tgt_rtl_init_device@VERS1.0 1:16.0.2-1~ - __tgt_rtl_is_valid_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_launch_kernel@VERS1.0 1:16.0.2-1~ - __tgt_rtl_load_binary@VERS1.0 1:16.0.2-1~ - __tgt_rtl_number_of_devices@VERS1.0 1:16.0.2-1~ - __tgt_rtl_print_device_info@VERS1.0 1:16.0.2-1~ -libomptarget.so.16 libomp5-16 #MINVER# [amd64 arm64] - VERS1.0@VERS1.0 1:16.0.2-1~ - __kmpc_push_target_tripcount@VERS1.0 1:16.0.2-1~ - __kmpc_push_target_tripcount_mapper@VERS1.0 1:16.0.2-1~ - __tgt_init_all_rtls@VERS1.0 1:16.0.2-1~ - __tgt_interop_destroy@VERS1.0 1:16.0.2-1~ - __tgt_interop_init@VERS1.0 1:16.0.2-1~ - __tgt_interop_use@VERS1.0 1:16.0.2-1~ - __tgt_mapper_num_components@VERS1.0 1:16.0.2-1~ - __tgt_print_device_info@VERS1.0 1:16.0.2-1~ - __tgt_push_mapper_component@VERS1.0 1:16.0.2-1~ - __tgt_register_lib@VERS1.0 1:16.0.2-1~ - __tgt_register_requires@VERS1.0 1:16.0.2-1~ - __tgt_set_info_flag@VERS1.0 1:16.0.2-1~ - __tgt_target@VERS1.0 1:16.0.2-1~ - __tgt_target_data_begin@VERS1.0 1:16.0.2-1~ - __tgt_target_data_begin_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_data_begin_nowait@VERS1.0 1:16.0.2-1~ - __tgt_target_data_begin_nowait_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_data_end@VERS1.0 1:16.0.2-1~ - __tgt_target_data_end_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_data_end_nowait@VERS1.0 1:16.0.2-1~ - __tgt_target_data_end_nowait_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_data_update@VERS1.0 1:16.0.2-1~ - __tgt_target_data_update_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_data_update_nowait@VERS1.0 1:16.0.2-1~ - __tgt_target_data_update_nowait_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_kernel@VERS1.0 1:16.0.2-1~ - __tgt_target_kernel_nowait@VERS1.0 1:16.0.2-1~ - __tgt_target_kernel_replay@VERS1.0 1:16.0.2-1~ - __tgt_target_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_nowait@VERS1.0 1:16.0.2-1~ - __tgt_target_nowait_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_nowait_query@VERS1.0 1:16.0.2-1~ - __tgt_target_teams@VERS1.0 1:16.0.2-1~ - __tgt_target_teams_mapper@VERS1.0 1:16.0.2-1~ - __tgt_target_teams_nowait@VERS1.0 1:16.0.2-1~ - __tgt_target_teams_nowait_mapper@VERS1.0 1:16.0.2-1~ - __tgt_unregister_lib@VERS1.0 1:16.0.2-1~ - llvm_omp_target_alloc_device@VERS1.0 1:16.0.2-1~ - llvm_omp_target_alloc_host@VERS1.0 1:16.0.2-1~ - llvm_omp_target_alloc_shared@VERS1.0 1:16.0.2-1~ - llvm_omp_target_dynamic_shared_alloc@VERS1.0 1:16.0.2-1~ - llvm_omp_target_free_device@VERS1.0 1:16.0.2-1~ - llvm_omp_target_free_host@VERS1.0 1:16.0.2-1~ - llvm_omp_target_free_shared@VERS1.0 1:16.0.2-1~ - llvm_omp_target_lock_mem@VERS1.0 1:16.0.2-1~ - llvm_omp_target_unlock_mem@VERS1.0 1:16.0.2-1~ - omp_get_device_num@VERS1.0 1:16.0.2-1~ - omp_get_initial_device@VERS1.0 1:16.0.2-1~ - omp_get_interop_int@VERS1.0 1:16.0.2-1~ - omp_get_interop_name@VERS1.0 1:16.0.2-1~ - omp_get_interop_ptr@VERS1.0 1:16.0.2-1~ - omp_get_interop_str@VERS1.0 1:16.0.2-1~ - omp_get_interop_type_desc@VERS1.0 1:16.0.2-1~ - omp_get_mapped_ptr@VERS1.0 1:16.0.2-1~ - omp_get_num_devices@VERS1.0 1:16.0.2-1~ - omp_target_alloc@VERS1.0 1:16.0.2-1~ - omp_target_associate_ptr@VERS1.0 1:16.0.2-1~ - omp_target_disassociate_ptr@VERS1.0 1:16.0.2-1~ - omp_target_free@VERS1.0 1:16.0.2-1~ - omp_target_is_present@VERS1.0 1:16.0.2-1~ - omp_target_memcpy@VERS1.0 1:16.0.2-1~ - omp_target_memcpy_rect@VERS1.0 1:16.0.2-1~ +libomptarget.rtl.amdgpu.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER# + VERS1.0@VERS1.0 17 + __tgt_rtl_create_event@VERS1.0 17 + __tgt_rtl_data_alloc@VERS1.0 17 + __tgt_rtl_data_delete@VERS1.0 17 + __tgt_rtl_data_exchange@VERS1.0 17 + __tgt_rtl_data_exchange_async@VERS1.0 17 + __tgt_rtl_data_lock@VERS1.0 17 + __tgt_rtl_data_notify_mapped@VERS1.0 17 + __tgt_rtl_data_notify_unmapped@VERS1.0 17 + __tgt_rtl_data_retrieve@VERS1.0 17 + __tgt_rtl_data_retrieve_async@VERS1.0 17 + __tgt_rtl_data_submit@VERS1.0 17 + __tgt_rtl_data_submit_async@VERS1.0 17 + __tgt_rtl_data_unlock@VERS1.0 17 + __tgt_rtl_deinit_device@VERS1.0 17 + __tgt_rtl_deinit_plugin@VERS1.0 17 + __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_init_async_info@VERS1.0 17 + __tgt_rtl_init_device@VERS1.0 17 + __tgt_rtl_init_device_info@VERS1.0 17 + __tgt_rtl_init_plugin@VERS1.0 17 + __tgt_rtl_init_requires@VERS1.0 17 + __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_valid_binary@VERS1.0 17 + __tgt_rtl_is_valid_binary_info@VERS1.0 17 + __tgt_rtl_launch_kernel@VERS1.0 17 + __tgt_rtl_load_binary@VERS1.0 17 + __tgt_rtl_number_of_devices@VERS1.0 17 + __tgt_rtl_print_device_info@VERS1.0 17 + __tgt_rtl_query_async@VERS1.0 17 + __tgt_rtl_record_event@VERS1.0 17 + __tgt_rtl_set_info_flag@VERS1.0 17 + __tgt_rtl_supports_empty_images@VERS1.0 17 + __tgt_rtl_sync_event@VERS1.0 17 + __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_wait_event@VERS1.0 17 +libomptarget.rtl.cuda.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER# + VERS1.0@VERS1.0 17 + __tgt_rtl_create_event@VERS1.0 17 + __tgt_rtl_data_alloc@VERS1.0 17 + __tgt_rtl_data_delete@VERS1.0 17 + __tgt_rtl_data_exchange@VERS1.0 17 + __tgt_rtl_data_exchange_async@VERS1.0 17 + __tgt_rtl_data_lock@VERS1.0 17 + __tgt_rtl_data_notify_mapped@VERS1.0 17 + __tgt_rtl_data_notify_unmapped@VERS1.0 17 + __tgt_rtl_data_retrieve@VERS1.0 17 + __tgt_rtl_data_retrieve_async@VERS1.0 17 + __tgt_rtl_data_submit@VERS1.0 17 + __tgt_rtl_data_submit_async@VERS1.0 17 + __tgt_rtl_data_unlock@VERS1.0 17 + __tgt_rtl_deinit_device@VERS1.0 17 + __tgt_rtl_deinit_plugin@VERS1.0 17 + __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_init_async_info@VERS1.0 17 + __tgt_rtl_init_device@VERS1.0 17 + __tgt_rtl_init_device_info@VERS1.0 17 + __tgt_rtl_init_plugin@VERS1.0 17 + __tgt_rtl_init_requires@VERS1.0 17 + __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_valid_binary@VERS1.0 17 + __tgt_rtl_is_valid_binary_info@VERS1.0 17 + __tgt_rtl_launch_kernel@VERS1.0 17 + __tgt_rtl_load_binary@VERS1.0 17 + __tgt_rtl_number_of_devices@VERS1.0 17 + __tgt_rtl_print_device_info@VERS1.0 17 + __tgt_rtl_query_async@VERS1.0 17 + __tgt_rtl_record_event@VERS1.0 17 + __tgt_rtl_set_info_flag@VERS1.0 17 + __tgt_rtl_supports_empty_images@VERS1.0 17 + __tgt_rtl_sync_event@VERS1.0 17 + __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_wait_event@VERS1.0 17 +libomptarget.rtl.x86_64.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER# + VERS1.0@VERS1.0 17 + __tgt_rtl_create_event@VERS1.0 1:17.0.1-1 + __tgt_rtl_data_alloc@VERS1.0 17 + __tgt_rtl_data_delete@VERS1.0 17 + __tgt_rtl_data_exchange@VERS1.0 17 + __tgt_rtl_data_exchange_async@VERS1.0 17 + __tgt_rtl_data_lock@VERS1.0 17 + __tgt_rtl_data_notify_mapped@VERS1.0 17 + __tgt_rtl_data_notify_unmapped@VERS1.0 17 + __tgt_rtl_data_retrieve@VERS1.0 17 + __tgt_rtl_data_retrieve_async@VERS1.0 17 + __tgt_rtl_data_submit@VERS1.0 17 + __tgt_rtl_data_submit_async@VERS1.0 17 + __tgt_rtl_data_unlock@VERS1.0 17 + __tgt_rtl_deinit_device@VERS1.0 17 + __tgt_rtl_deinit_plugin@VERS1.0 17 + __tgt_rtl_destroy_event@VERS1.0 17 + __tgt_rtl_init_async_info@VERS1.0 17 + __tgt_rtl_init_device@VERS1.0 17 + __tgt_rtl_init_device_info@VERS1.0 17 + __tgt_rtl_init_plugin@VERS1.0 17 + __tgt_rtl_init_requires@VERS1.0 17 + __tgt_rtl_is_data_exchangable@VERS1.0 17 + __tgt_rtl_is_valid_binary@VERS1.0 17 + __tgt_rtl_is_valid_binary_info@VERS1.0 17 + __tgt_rtl_launch_kernel@VERS1.0 17 + __tgt_rtl_load_binary@VERS1.0 17 + __tgt_rtl_number_of_devices@VERS1.0 17 + __tgt_rtl_print_device_info@VERS1.0 17 + __tgt_rtl_query_async@VERS1.0 17 + __tgt_rtl_record_event@VERS1.0 17 + __tgt_rtl_set_info_flag@VERS1.0 17 + __tgt_rtl_supports_empty_images@VERS1.0 17 + __tgt_rtl_sync_event@VERS1.0 17 + __tgt_rtl_synchronize@VERS1.0 17 + __tgt_rtl_wait_event@VERS1.0 17 +libomptarget.so.@LLVM_VERSION@ libomp5-@LLVM_VERSION@t64 #MINVER# + VERS1.0@VERS1.0 17 + __kmpc_push_target_tripcount@VERS1.0 17 + __kmpc_push_target_tripcount_mapper@VERS1.0 17 + __tgt_init_all_rtls@VERS1.0 17 + __tgt_interop_destroy@VERS1.0 17 + __tgt_interop_init@VERS1.0 17 + __tgt_interop_use@VERS1.0 17 + __tgt_mapper_num_components@VERS1.0 17 + __tgt_print_device_info@VERS1.0 17 + __tgt_push_mapper_component@VERS1.0 17 + __tgt_register_lib@VERS1.0 17 + __tgt_register_requires@VERS1.0 17 + __tgt_set_info_flag@VERS1.0 17 + __tgt_target@VERS1.0 17 + __tgt_target_data_begin@VERS1.0 17 + __tgt_target_data_begin_mapper@VERS1.0 17 + __tgt_target_data_begin_nowait@VERS1.0 17 + __tgt_target_data_begin_nowait_mapper@VERS1.0 17 + __tgt_target_data_end@VERS1.0 17 + __tgt_target_data_end_mapper@VERS1.0 17 + __tgt_target_data_end_nowait@VERS1.0 17 + __tgt_target_data_end_nowait_mapper@VERS1.0 17 + __tgt_target_data_update@VERS1.0 17 + __tgt_target_data_update_mapper@VERS1.0 17 + __tgt_target_data_update_nowait@VERS1.0 17 + __tgt_target_data_update_nowait_mapper@VERS1.0 17 + __tgt_target_kernel@VERS1.0 17 + __tgt_target_kernel_nowait@VERS1.0 17 + __tgt_target_kernel_replay@VERS1.0 17 + __tgt_target_mapper@VERS1.0 17 + __tgt_target_nowait@VERS1.0 17 + __tgt_target_nowait_mapper@VERS1.0 17 + __tgt_target_nowait_query@VERS1.0 17 + __tgt_target_teams@VERS1.0 17 + __tgt_target_teams_mapper@VERS1.0 17 + __tgt_target_teams_nowait@VERS1.0 17 + __tgt_target_teams_nowait_mapper@VERS1.0 17 + __tgt_unregister_lib@VERS1.0 17 + llvm_omp_target_alloc_device@VERS1.0 17 + llvm_omp_target_alloc_host@VERS1.0 17 + llvm_omp_target_alloc_shared@VERS1.0 17 + llvm_omp_target_dynamic_shared_alloc@VERS1.0 17 + llvm_omp_target_free_device@VERS1.0 17 + llvm_omp_target_free_host@VERS1.0 17 + llvm_omp_target_free_shared@VERS1.0 17 + llvm_omp_target_lock_mem@VERS1.0 17 + llvm_omp_target_unlock_mem@VERS1.0 17 + omp_get_device_num@VERS1.0 17 + omp_get_initial_device@VERS1.0 17 + omp_get_interop_int@VERS1.0 17 + omp_get_interop_name@VERS1.0 17 + omp_get_interop_ptr@VERS1.0 17 + omp_get_interop_str@VERS1.0 17 + omp_get_interop_type_desc@VERS1.0 17 + omp_get_mapped_ptr@VERS1.0 17 + omp_get_num_devices@VERS1.0 17 + omp_target_alloc@VERS1.0 17 + omp_target_associate_ptr@VERS1.0 17 + omp_target_disassociate_ptr@VERS1.0 17 + omp_target_free@VERS1.0 17 + omp_target_is_present@VERS1.0 17 + omp_target_memcpy@VERS1.0 17 + omp_target_memcpy_async@VERS1.0 17 + omp_target_memcpy_rect@VERS1.0 17 + omp_target_memcpy_rect_async@VERS1.0 17 + ompt_libomptarget_connect@VERS1.0 17 + diff --git a/debian/libunwind-X.Y.lintian-overrides.in b/debian/libunwind-X.Y.lintian-overrides.in deleted file mode 100644 index 6cb74223..00000000 --- a/debian/libunwind-X.Y.lintian-overrides.in +++ /dev/null @@ -1 +0,0 @@ -libunwind-@LLVM_VERSION@: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0* diff --git a/debian/libunwind-X.Y.install.in b/debian/libunwind-X.Yt64.install.in similarity index 100% rename from debian/libunwind-X.Y.install.in rename to debian/libunwind-X.Yt64.install.in diff --git a/debian/libunwind-X.Y.links.in b/debian/libunwind-X.Yt64.links.in similarity index 100% rename from debian/libunwind-X.Y.links.in rename to debian/libunwind-X.Yt64.links.in diff --git a/debian/libunwind-X.Yt64.lintian-overrides.in b/debian/libunwind-X.Yt64.lintian-overrides.in new file mode 100644 index 00000000..3683dc8c --- /dev/null +++ b/debian/libunwind-X.Yt64.lintian-overrides.in @@ -0,0 +1,2 @@ +libunwind-@LLVM_VERSION@t64: arch-dependent-file-not-in-arch-specific-directory *usr/lib/llvm-@LLVM_VERSION@/lib/libunwind.so.1.0* +libunwind-@LLVM_VERSION@t64: package-name-doesnt-match-sonames libunwind-@LLVM_VERSION@ diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index a84b0423..aaafde92 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,6 +1 @@ llvm/docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index edcdeaea..98cc13e3 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -77,8 +77,8 @@ 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/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod-find +usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfod usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remark-size-diff usr/lib/llvm-@LLVM_VERSION@/bin/llvm-remarkutil usr/lib/llvm-@LLVM_VERSION@/bin/llvm-debuginfo-analyzer @@ -158,7 +158,7 @@ usr/bin/yaml2obj-* usr/bin/verify-uselistorder-* usr/bin/sanstats-* usr/bin/dsymutil-* -usr/bin/llvm-debuginfod-@LLVM_VERSION@ usr/bin/llvm-debuginfod-find-* +usr/bin/llvm-debuginfod-@LLVM_VERSION@ usr/bin/llvm-remark-size-diff-* -usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@ \ No newline at end of file +usr/bin/llvm-debuginfo-analyzer-@LLVM_VERSION@ diff --git a/debian/patches/0044-soname.diff b/debian/patches/0044-soname.diff index 27efc32f..ea0313c7 100644 --- a/debian/patches/0044-soname.diff +++ b/debian/patches/0044-soname.diff @@ -3,11 +3,11 @@ tools/llvm-shlib/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libclang/CMakeLists.txt +Index: llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/clang/tools/libclang/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/tools/libclang/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libclang/CMakeLists.txt -@@ -117,7 +117,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE +--- llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8.orig/clang/tools/libclang/CMakeLists.txt ++++ llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/clang/tools/libclang/CMakeLists.txt +@@ -134,7 +134,7 @@ if (UNIX AND ${CMAKE_SYSTEM_NAME} MATCHE remove_definitions("-D_XOPEN_SOURCE=700") endif() @@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/tools/libc OUTPUT_NAME ${output_name} ${SOURCES} -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/tools/llvm-shlib/CMakeLists.txt +Index: llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/llvm/tools/llvm-shlib/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/tools/llvm-shlib/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/tools/llvm-shlib/CMakeLists.txt +--- llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8.orig/llvm/tools/llvm-shlib/CMakeLists.txt ++++ llvm-toolchain-17_17.0.6~++20231127102111+f6c231c15ec8/llvm/tools/llvm-shlib/CMakeLists.txt @@ -32,6 +32,8 @@ if(LLVM_BUILD_LLVM_DYLIB) endif() add_llvm_library(LLVM SHARED DISABLE_LLVM_LINK_LLVM_DYLIB SONAME ${INSTALL_WITH_TOOLCHAIN} ${SOURCES}) @@ -27,5 +27,5 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/tools/llvm- + set_property(TARGET LLVM PROPERTY VERSION "1") # Append .1 to SONAME + list(REMOVE_DUPLICATES LIB_NAMES) - if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU) - OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") + if((MINGW) OR (HAIKU) + OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") diff --git a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch index 624d7fb1..39c2ff05 100644 --- a/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch +++ b/debian/patches/0049-Use-Debian-provided-MathJax-everywhere.patch @@ -13,24 +13,24 @@ Subject: Use Debian-provided MathJax everywhere. polly/docs/doxygen.cfg.in | 2 +- 8 files changed, 14 insertions(+), 5 deletions(-) -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/conf.py -@@ -119,6 +119,9 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/conf.py +@@ -119,6 +119,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". - html_static_path = ['_static'] + html_static_path = ["_static"] +# Use Debian-provided MathJax +mathjax_path = '/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML' + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. - #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/doxygen.cfg.in + # html_last_updated_fmt = '%b %d, %Y' +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang-tools-extra/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extra/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/docs/doxygen.cfg.in @@ -1443,7 +1443,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -40,11 +40,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang-tools-extr # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analyzer/conf.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/analyzer/conf.py -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analyzer/conf.py -@@ -123,6 +123,9 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/analyzer/conf.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/analyzer/conf.py +@@ -120,6 +120,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -53,12 +53,12 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/analy + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. - #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py + # html_last_updated_fmt = '%b %d, %Y' +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf.py -@@ -137,6 +137,9 @@ html_theme = 'haiku' +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/conf.py +@@ -135,6 +135,9 @@ html_theme = "haiku" # so a file named "default.css" will overwrite the builtin "default.css". html_static_path = ['_static'] @@ -67,11 +67,11 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/conf. + # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. - #html_last_updated_fmt = '%b %d, %Y' -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxygen.cfg.in + # html_last_updated_fmt = '%b %d, %Y' +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/docs/doxygen.cfg.in @@ -1432,7 +1432,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -81,10 +81,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/doxyg # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. @@ -94,10 +94,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/docs/doxyge # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/docs/doxygen.cfg.in +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/polly/docs/doxygen.cfg.in -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/docs/doxygen.cfg.in +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/polly/docs/doxygen.cfg.in ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/polly/docs/doxygen.cfg.in @@ -1433,7 +1433,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index 0aa1f42e..4e95100f 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/clang/Basic/Builtins.def -@@ -626,8 +626,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz +--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/include/clang/Basic/Builtins.def +@@ -645,8 +645,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") @@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/cl BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -1149,8 +1149,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", +@@ -1179,8 +1179,8 @@ LIBBUILTIN(getcontext, "iK*", "fjT", LIBBUILTIN(_longjmp, "vJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "frT", SETJMP_H, ALL_GNU_LANGUAGES) // non-standard but very common @@ -33,11 +33,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/include/cl // id objc_msgSend(id, SEL, ...) LIBBUILTIN(objc_msgSend, "GGH.", "f", OBJC_MESSAGE_H, OBJC_LANG) // long double objc_msgSend_fpret(id self, SEL op, ...) -Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/Decl.cpp -@@ -4175,13 +4175,13 @@ unsigned FunctionDecl::getMemoryFunction +--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/AST/Decl.cpp +@@ -4274,13 +4274,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/AST/De case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/SemaChecking.cpp -@@ -1264,8 +1264,8 @@ void Sema::checkFortifiedBuiltinMemoryFu +--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/Sema/SemaChecking.cpp +@@ -1265,8 +1265,8 @@ void Sema::checkFortifiedBuiltinMemoryFu case Builtin::BI__builtin___memcpy_chk: case Builtin::BI__builtin___memmove_chk: case Builtin::BI__builtin___memset_chk: @@ -72,7 +72,7 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/S case Builtin::BI__builtin___strncat_chk: case Builtin::BI__builtin___strncpy_chk: case Builtin::BI__builtin___stpncpy_chk: -@@ -6087,10 +6087,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -6744,10 +6744,10 @@ bool Sema::CheckFunctionCall(FunctionDec switch (CMId) { case 0: return false; @@ -85,11 +85,11 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Sema/S case Builtin::BIstrncat: CheckStrncatArguments(TheCall, FnInfo); break; -Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -@@ -652,10 +652,10 @@ void GenericTaintChecker::initTaintRules +--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +@@ -717,10 +717,10 @@ void GenericTaintChecker::initTaintRules {{CDF_MaybeBuiltin, {BI.getName(Builtin::BIstrncat)}}, TR::Prop({{1, 2}}, {{0, ReturnValueIndex}})}, @@ -102,10 +102,10 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/lib/Static {{CDF_MaybeBuiltin, {{"snprintf"}}}, TR::Prop({{1}, 3}, {{0, ReturnValueIndex}})}, {{CDF_MaybeBuiltin, {{"sprintf"}}}, -Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/builtins.c @@ -197,12 +197,10 @@ void test18(void) { void *ptr; @@ -119,14 +119,14 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/ } void no_ms_builtins(void) { -@@ -217,6 +215,7 @@ void unavailable(void) { +@@ -216,6 +214,7 @@ void unavailable(void) { + __builtin_operator_delete(0); // expected-error {{'__builtin_operator_delete' is only available in C++}} } - // rdar://18259539 +/* + // rdar://18259539 size_t strlcpy(char * restrict dst, const char * restrict src, size_t size); size_t strlcat(char * restrict dst, const char * restrict src, size_t size); - @@ -238,6 +237,7 @@ void Test19(void) // expected-note {{change size argument to be the size of the destination}} \ // expected-warning {{'strlcat' will always overflow; destination buffer has size 20, but size argument is 40}} @@ -135,10 +135,10 @@ Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/ // rdar://11076881 char * Test20(char *p, const char *in, unsigned n) -Index: llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_16~++20230123091551+c3737a652230.orig/clang/test/Sema/warn-strlcpycat-size.c -+++ llvm-toolchain-snapshot_16~++20230123091551+c3737a652230/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde.orig/clang/test/Sema/warn-strlcpycat-size.c ++++ llvm-toolchain-snapshot_17~++20230718090722+aa9a10ac1dde/clang/test/Sema/warn-strlcpycat-size.c @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s - diff --git a/debian/patches/26-set-correct-float-abi.diff b/debian/patches/26-set-correct-float-abi.diff index f7ea5633..7321fd78 100644 --- a/debian/patches/26-set-correct-float-abi.diff +++ b/debian/patches/26-set-correct-float-abi.diff @@ -18,11 +18,11 @@ Forwarded: Reviewed-By: Last-Update: -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/ARM.cpp -@@ -373,7 +373,7 @@ arm::FloatABI arm::getDefaultFloatABI(co +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/ARM.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/ARM.cpp +@@ -384,7 +384,7 @@ arm::FloatABI arm::getDefaultFloatABI(co case llvm::Triple::MuslEABI: case llvm::Triple::EABI: // EABI is always AAPCS, and if it was not marked 'hard', it's softfp diff --git a/debian/patches/930008-arm.diff b/debian/patches/930008-arm.diff index 41bd01b1..2374afcd 100644 --- a/debian/patches/930008-arm.diff +++ b/debian/patches/930008-arm.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/lib/TargetParser/ARMTargetParser.cpp -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/lib/TargetParser/ARMTargetParser.cpp -@@ -589,7 +589,7 @@ StringRef ARM::getARMCPUForArch(const ll +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -590,7 +590,7 @@ StringRef ARM::getARMCPUForArch(const ll case llvm::Triple::EABIHF: case llvm::Triple::GNUEABIHF: case llvm::Triple::MuslEABIHF: diff --git a/debian/patches/D148945-revert.diff b/debian/patches/D148945-revert.diff new file mode 100644 index 00000000..73426bdb --- /dev/null +++ b/debian/patches/D148945-revert.diff @@ -0,0 +1,21 @@ +Restore that for now, we're not GenToo ... + +https://reviews.llvm.org/D148945 +https://reviews.llvm.org/D122444 + +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -333,6 +333,13 @@ Linux::Linux(const Driver &D, const llvm + + Generic_GCC::AddMultiarchPaths(D, SysRoot, OSLibDir, Paths); + ++ // The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs ++ // libc++.so in D.Dir+"/../lib/". Detect this path. ++ // TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported. ++ if (StringRef(D.Dir).startswith(SysRoot) && ++ D.getVFS().exists(D.Dir + "/../lib/libc++.so")) ++ addPathIfExists(D, D.Dir + "/../lib", Paths); ++ + addPathIfExists(D, concat(SysRoot, "/lib"), Paths); + addPathIfExists(D, concat(SysRoot, "/usr/lib"), Paths); + } diff --git a/debian/patches/D154931-revert-loong64.patch b/debian/patches/D154931-revert-loong64.patch new file mode 100644 index 00000000..91d7b35b --- /dev/null +++ b/debian/patches/D154931-revert-loong64.patch @@ -0,0 +1,468 @@ +From 7236a15338bafc4bb4c6e61d4b151e0b9cc85448 Mon Sep 17 00:00:00 2001 +From: chenli +Date: Mon, 18 Mar 2024 15:16:34 +0800 +Subject: [PATCH] Revert "[LoongArch] Support InlineAsm for LSX and LASX" + +This reverts commit d25c79dc70008b835312e5cc7ef48b199fda3165. + +D154931[1] needs to be reverted on LLVM17. As Loongson SIMD Extension(LSX) and +Loongson Advanced SIMD Extension(LASX) are not fully supported on LLVM17, +InlineAsm for LSX and LASX should not be supported as well. Otherwise it leads +to the following issue[2]: +''' +LLVM ERROR: Cannot select: 0x7ffea41a3650: ch = store<(store (s128) into %ir.mask +store52)> 0x7ffea41a35e0, 0x7ffea4196a30, FrameIndex:i64<6>, undef:i64 +''' + +LSX and LASX are fully supported on LLVM18 and are not supported on LLVM16, +thus only LLVM17 has the problem. + +[1] https://reviews.llvm.org/D154931 +[2] https://buildd.debian.org/status/fetch.php?pkg=qtdeclarative-opensource-src&arch=loong64&ver=5.15.10%2Bdfsg-2%2Bb1&stamp=1710571569&raw=0 + +Change-Id: I2bd74a71fe5f0bcadeb04ecf1d63d9f97765e8b5 +--- + clang/lib/Basic/Targets/LoongArch.cpp | 12 +--- + .../lasx/inline-asm-gcc-regs-error.c | 10 ---- + .../LoongArch/lasx/inline-asm-gcc-regs.c | 36 ------------ + .../lasx/inline-asm-operand-modifier.c | 15 ----- + .../LoongArch/lsx/inline-asm-gcc-regs-error.c | 10 ---- + .../LoongArch/lsx/inline-asm-gcc-regs.c | 36 ------------ + .../lsx/inline-asm-operand-modifier.c | 15 ----- + .../Target/LoongArch/LoongArchAsmPrinter.cpp | 14 ----- + .../LoongArch/LoongArchISelLowering.cpp | 17 +----- + .../lasx/inline-asm-operand-modifier.ll | 14 ----- + .../LoongArch/lasx/inline-asm-reg-names.ll | 58 ------------------- + .../lsx/inline-asm-operand-modifier.ll | 14 ----- + .../LoongArch/lsx/inline-asm-reg-names.ll | 58 ------------------- + 13 files changed, 2 insertions(+), 307 deletions(-) + delete mode 100644 clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c + delete mode 100644 clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c + delete mode 100644 clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c + delete mode 100644 clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c + delete mode 100644 clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c + delete mode 100644 clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c + delete mode 100644 llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll + delete mode 100644 llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll + delete mode 100644 llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll + delete mode 100644 llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll + +diff --git a/clang/lib/Basic/Targets/LoongArch.cpp b/clang/lib/Basic/Targets/LoongArch.cpp +index 4448a2ae10a1..96ef29620eb6 100644 +--- a/clang/lib/Basic/Targets/LoongArch.cpp ++++ b/clang/lib/Basic/Targets/LoongArch.cpp +@@ -33,17 +33,7 @@ ArrayRef LoongArchTargetInfo::getGCCRegNames() const { + "$f19", "$f20", "$f21", "$f22", "$f23", "$f24", "$f25", "$f26", "$f27", + "$f28", "$f29", "$f30", "$f31", + // Condition flag registers. +- "$fcc0", "$fcc1", "$fcc2", "$fcc3", "$fcc4", "$fcc5", "$fcc6", "$fcc7", +- // 128-bit vector registers. +- "$vr0", "$vr1", "$vr2", "$vr3", "$vr4", "$vr5", "$vr6", "$vr7", "$vr8", +- "$vr9", "$vr10", "$vr11", "$vr12", "$vr13", "$vr14", "$vr15", "$vr16", +- "$vr17", "$vr18", "$vr19", "$vr20", "$vr21", "$vr22", "$vr23", "$vr24", +- "$vr25", "$vr26", "$vr27", "$vr28", "$vr29", "$vr30", "$vr31", +- // 256-bit vector registers. +- "$xr0", "$xr1", "$xr2", "$xr3", "$xr4", "$xr5", "$xr6", "$xr7", "$xr8", +- "$xr9", "$xr10", "$xr11", "$xr12", "$xr13", "$xr14", "$xr15", "$xr16", +- "$xr17", "$xr18", "$xr19", "$xr20", "$xr21", "$xr22", "$xr23", "$xr24", +- "$xr25", "$xr26", "$xr27", "$xr28", "$xr29", "$xr30", "$xr31"}; ++ "$fcc0", "$fcc1", "$fcc2", "$fcc3", "$fcc4", "$fcc5", "$fcc6", "$fcc7"}; + return llvm::ArrayRef(GCCRegNames); + } + +diff --git a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c b/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c +deleted file mode 100644 +index 1fd602574b8e..000000000000 +--- a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs-error.c ++++ /dev/null +@@ -1,10 +0,0 @@ +-// RUN: not %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s 2>&1 -o - | FileCheck %s +- +-typedef signed char v32i8 __attribute__((vector_size(32), aligned(32))); +- +-void test() { +-// CHECK: :[[#@LINE+1]]:28: error: unknown register name 'xr0' in asm +- register v32i8 p0 asm ("xr0"); +-// CHECK: :[[#@LINE+1]]:29: error: unknown register name '$xr32' in asm +- register v32i8 p32 asm ("$xr32"); +-} +diff --git a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c b/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c +deleted file mode 100644 +index ed1a9660a06c..000000000000 +--- a/clang/test/CodeGen/LoongArch/lasx/inline-asm-gcc-regs.c ++++ /dev/null +@@ -1,36 +0,0 @@ +-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --filter "^define |tail call" +-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s +- +-typedef signed char v32i8 __attribute__((vector_size(32), aligned(32))); +- +-// CHECK-LABEL: @test_xr0( +-// CHECK: tail call void asm sideeffect "", "{$xr0}"(<32 x i8> undef) #[[ATTR1:[0-9]+]], !srcloc !2 +-// +-void test_xr0() { +- register v32i8 a asm ("$xr0"); +- asm ("" :: "f"(a)); +-} +- +-// CHECK-LABEL: @test_xr7( +-// CHECK: tail call void asm sideeffect "", "{$xr7}"(<32 x i8> undef) #[[ATTR1]], !srcloc !3 +-// +-void test_xr7() { +- register v32i8 a asm ("$xr7"); +- asm ("" :: "f"(a)); +-} +- +-// CHECK-LABEL: @test_xr15( +-// CHECK: tail call void asm sideeffect "", "{$xr15}"(<32 x i8> undef) #[[ATTR1]], !srcloc !4 +-// +-void test_xr15() { +- register v32i8 a asm ("$xr15"); +- asm ("" :: "f"(a)); +-} +- +-// CHECK-LABEL: @test_xr31( +-// CHECK: tail call void asm sideeffect "", "{$xr31}"(<32 x i8> undef) #[[ATTR1]], !srcloc !5 +-// +-void test_xr31() { +- register v32i8 a asm ("$xr31"); +- asm ("" :: "f"(a)); +-} +diff --git a/clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c b/clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c +deleted file mode 100644 +index a5cc8798fd66..000000000000 +--- a/clang/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.c ++++ /dev/null +@@ -1,15 +0,0 @@ +-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 2 +-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s +- +-typedef long long v4i64 __attribute__ ((vector_size(32), aligned(32))); +- +-// CHECK-LABEL: define dso_local void @test_u +-// CHECK-SAME: () local_unnamed_addr #[[ATTR0:[0-9]+]] { +-// CHECK-NEXT: entry: +-// CHECK-NEXT: [[TMP0:%.*]] = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "=f"() #[[ATTR1:[0-9]+]], !srcloc !2 +-// CHECK-NEXT: ret void +-// +-void test_u() { +- v4i64 v4i64_r; +- asm volatile ("xvldi %u0, 1" : "=f" (v4i64_r)); +-} +diff --git a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c b/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c +deleted file mode 100644 +index 54132307e93f..000000000000 +--- a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs-error.c ++++ /dev/null +@@ -1,10 +0,0 @@ +-// RUN: not %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s 2>&1 -o - | FileCheck %s +- +-typedef signed char v16i8 __attribute__((vector_size(16), aligned(16))); +- +-void test() { +-// CHECK: :[[#@LINE+1]]:28: error: unknown register name 'vr0' in asm +- register v16i8 p0 asm ("vr0"); +-// CHECK: :[[#@LINE+1]]:29: error: unknown register name '$vr32' in asm +- register v16i8 p32 asm ("$vr32"); +-} +diff --git a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c b/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c +deleted file mode 100644 +index b05b1c8c15fa..000000000000 +--- a/clang/test/CodeGen/LoongArch/lsx/inline-asm-gcc-regs.c ++++ /dev/null +@@ -1,36 +0,0 @@ +-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --filter "^define |tail call" +-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s +- +-typedef signed char v16i8 __attribute__((vector_size(16), aligned(16))); +- +-// CHECK-LABEL: @test_vr0( +-// CHECK: tail call void asm sideeffect "", "{$vr0}"(<16 x i8> undef) #[[ATTR1:[0-9]+]], !srcloc !2 +-// +-void test_vr0() { +- register v16i8 a asm ("$vr0"); +- asm ("" :: "f"(a)); +-} +- +-// CHECK-LABEL: @test_vr7( +-// CHECK: tail call void asm sideeffect "", "{$vr7}"(<16 x i8> undef) #[[ATTR1]], !srcloc !3 +-// +-void test_vr7() { +- register v16i8 a asm ("$vr7"); +- asm ("" :: "f"(a)); +-} +- +-// CHECK-LABEL: @test_vr15( +-// CHECK: tail call void asm sideeffect "", "{$vr15}"(<16 x i8> undef) #[[ATTR1]], !srcloc !4 +-// +-void test_vr15() { +- register v16i8 a asm ("$vr15"); +- asm ("" :: "f"(a)); +-} +- +-// CHECK-LABEL: @test_vr31( +-// CHECK: tail call void asm sideeffect "", "{$vr31}"(<16 x i8> undef) #[[ATTR1]], !srcloc !5 +-// +-void test_vr31() { +- register v16i8 a asm ("$vr31"); +- asm ("" :: "f"(a)); +-} +diff --git a/clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c b/clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c +deleted file mode 100644 +index 5e0fae984134..000000000000 +--- a/clang/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.c ++++ /dev/null +@@ -1,15 +0,0 @@ +-// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 2 +-// RUN: %clang_cc1 -triple loongarch64 -emit-llvm -O2 %s -o - | FileCheck %s +- +-typedef long long v2i64 __attribute__ ((vector_size(16), aligned(16))); +- +-// CHECK-LABEL: define dso_local void @test_w +-// CHECK-SAME: () local_unnamed_addr #[[ATTR0:[0-9]+]] { +-// CHECK-NEXT: entry: +-// CHECK-NEXT: [[TMP0:%.*]] = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "=f"() #[[ATTR1:[0-9]+]], !srcloc !2 +-// CHECK-NEXT: ret void +-// +-void test_w() { +- v2i64 v2i64_r; +- asm volatile ("vldi %w0, 1" : "=f" (v2i64_r)); +-} +diff --git a/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp b/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp +index 27979a830b10..5cf0673df69a 100644 +--- a/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp ++++ b/llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp +@@ -75,20 +75,6 @@ bool LoongArchAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo, + return false; + } + break; +- case 'w': // Print LSX registers. +- if (MO.getReg().id() >= LoongArch::VR0 && +- MO.getReg().id() <= LoongArch::VR31) +- break; +- // The modifier is 'w' but the operand is not an LSX register; Report an +- // unknown operand error. +- return true; +- case 'u': // Print LASX registers. +- if (MO.getReg().id() >= LoongArch::XR0 && +- MO.getReg().id() <= LoongArch::XR31) +- break; +- // The modifier is 'u' but the operand is not an LASX register; Report an +- // unknown operand error. +- return true; + // TODO: handle other extra codes if any. + } + } +diff --git a/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp b/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp +index db5961fc501a..488e1c7f3a76 100644 +--- a/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp ++++ b/llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp +@@ -53,14 +53,6 @@ LoongArchTargetLowering::LoongArchTargetLowering(const TargetMachine &TM, + addRegisterClass(MVT::f32, &LoongArch::FPR32RegClass); + if (Subtarget.hasBasicD()) + addRegisterClass(MVT::f64, &LoongArch::FPR64RegClass); +- if (Subtarget.hasExtLSX()) +- for (auto VT : {MVT::v4f32, MVT::v2f64, MVT::v16i8, MVT::v8i16, MVT::v4i32, +- MVT::v2i64}) +- addRegisterClass(VT, &LoongArch::LSX128RegClass); +- if (Subtarget.hasExtLASX()) +- for (auto VT : {MVT::v8f32, MVT::v4f64, MVT::v32i8, MVT::v16i16, MVT::v8i32, +- MVT::v4i64}) +- addRegisterClass(VT, &LoongArch::LASX256RegClass); + + setLoadExtAction({ISD::EXTLOAD, ISD::SEXTLOAD, ISD::ZEXTLOAD}, GRLenVT, + MVT::i1, Promote); +@@ -3056,12 +3048,6 @@ LoongArchTargetLowering::getRegForInlineAsmConstraint( + return std::make_pair(0U, &LoongArch::FPR32RegClass); + if (Subtarget.hasBasicD() && VT == MVT::f64) + return std::make_pair(0U, &LoongArch::FPR64RegClass); +- if (Subtarget.hasExtLSX() && +- TRI->isTypeLegalForClass(LoongArch::LSX128RegClass, VT)) +- return std::make_pair(0U, &LoongArch::LSX128RegClass); +- if (Subtarget.hasExtLASX() && +- TRI->isTypeLegalForClass(LoongArch::LASX256RegClass, VT)) +- return std::make_pair(0U, &LoongArch::LASX256RegClass); + break; + default: + break; +@@ -3079,8 +3065,7 @@ LoongArchTargetLowering::getRegForInlineAsmConstraint( + // decode the usage of register name aliases into their official names. And + // AFAIK, the not yet upstreamed `rustc` for LoongArch will always use + // official register names. +- if (Constraint.startswith("{$r") || Constraint.startswith("{$f") || +- Constraint.startswith("{$vr") || Constraint.startswith("{$xr")) { ++ if (Constraint.startswith("{$r") || Constraint.startswith("{$f")) { + bool IsFP = Constraint[2] == 'f'; + std::pair Temp = Constraint.split('$'); + std::pair R; +diff --git a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll b/llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll +deleted file mode 100644 +index 201e34c8b5ae..000000000000 +--- a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-operand-modifier.ll ++++ /dev/null +@@ -1,14 +0,0 @@ +-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2 +-; RUN: llc --mtriple=loongarch64 --mattr=+lasx < %s | FileCheck %s +- +-define void @test_u() nounwind { +-; CHECK-LABEL: test_u: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: xvldi $xr0, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "=f"() +- ret void +-} +diff --git a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll b/llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll +deleted file mode 100644 +index dd400ecfcf91..000000000000 +--- a/llvm/test/CodeGen/LoongArch/lasx/inline-asm-reg-names.ll ++++ /dev/null +@@ -1,58 +0,0 @@ +-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2 +-; RUN: llc --mtriple=loongarch64 --mattr=+lasx < %s | FileCheck %s +- +-define void @register_xr1() nounwind { +-; CHECK-LABEL: register_xr1: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: xvldi $xr1, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr1}"() +- ret void +-} +- +-define void @register_xr7() nounwind { +-; CHECK-LABEL: register_xr7: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: xvldi $xr7, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr7}"() +- ret void +-} +- +-define void @register_xr23() nounwind { +-; CHECK-LABEL: register_xr23: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: xvldi $xr23, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr23}"() +- ret void +-} +- +-;; The lower 64-bit of the vector register '$xr31' is overlapped with +-;; the floating-point register '$f31' ('$fs7'). And '$f31' ('$fs7') +-;; is a callee-saved register which is preserved across calls. +-;; That's why the fst.d and fld.d instructions are emitted. +-define void @register_xr31() nounwind { +-; CHECK-LABEL: register_xr31: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: addi.d $sp, $sp, -16 +-; CHECK-NEXT: fst.d $fs7, $sp, 8 # 8-byte Folded Spill +-; CHECK-NEXT: #APP +-; CHECK-NEXT: xvldi $xr31, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: fld.d $fs7, $sp, 8 # 8-byte Folded Reload +-; CHECK-NEXT: addi.d $sp, $sp, 16 +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <4 x i64> asm sideeffect "xvldi ${0:u}, 1", "={$xr31}"() +- ret void +-} +diff --git a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll b/llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll +deleted file mode 100644 +index c46e624ddaa8..000000000000 +--- a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-operand-modifier.ll ++++ /dev/null +@@ -1,14 +0,0 @@ +-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2 +-; RUN: llc --mtriple=loongarch64 --mattr=+lsx < %s | FileCheck %s +- +-define void @test_w() nounwind { +-; CHECK-LABEL: test_w: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: vldi $vr0, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "=f"() +- ret void +-} +diff --git a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll b/llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll +deleted file mode 100644 +index ceea3621be2f..000000000000 +--- a/llvm/test/CodeGen/LoongArch/lsx/inline-asm-reg-names.ll ++++ /dev/null +@@ -1,58 +0,0 @@ +-; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 2 +-; RUN: llc --mtriple=loongarch64 --mattr=+lsx < %s | FileCheck %s +- +-define void @register_vr1() nounwind { +-; CHECK-LABEL: register_vr1: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: vldi $vr1, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr1}"() +- ret void +-} +- +-define void @register_vr7() nounwind { +-; CHECK-LABEL: register_vr7: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: vldi $vr7, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr7}"() +- ret void +-} +- +-define void @register_vr23() nounwind { +-; CHECK-LABEL: register_vr23: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: #APP +-; CHECK-NEXT: vldi $vr23, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr23}"() +- ret void +-} +- +-;; The lower half of the vector register '$vr31' is overlapped with +-;; the floating-point register '$f31'. And '$f31' is a callee-saved +-;; register which is preserved across calls. That's why the +-;; fst.d and fld.d instructions are emitted. +-define void @register_vr31() nounwind { +-; CHECK-LABEL: register_vr31: +-; CHECK: # %bb.0: # %entry +-; CHECK-NEXT: addi.d $sp, $sp, -16 +-; CHECK-NEXT: fst.d $fs7, $sp, 8 # 8-byte Folded Spill +-; CHECK-NEXT: #APP +-; CHECK-NEXT: vldi $vr31, 1 +-; CHECK-NEXT: #NO_APP +-; CHECK-NEXT: fld.d $fs7, $sp, 8 # 8-byte Folded Reload +-; CHECK-NEXT: addi.d $sp, $sp, 16 +-; CHECK-NEXT: ret +-entry: +- %0 = tail call <2 x i64> asm sideeffect "vldi ${0:w}, 1", "={$vr31}"() +- ret void +-} +-- +2.20.1 + diff --git a/debian/patches/D158066-simd-ppc64el.patch b/debian/patches/D158066-simd-ppc64el.patch index 7f615de4..8db4a92f 100644 --- a/debian/patches/D158066-simd-ppc64el.patch +++ b/debian/patches/D158066-simd-ppc64el.patch @@ -2,25 +2,24 @@ Description: Fix SIMD compatibility headers on ppc64el Origin/Author: https://reviews.llvm.org/D158066 Bug-Debian: https://bugs.debian.org/1049362 -Index: llvm-toolchain-16-16.0.6/clang/include/clang/Basic/BuiltinsPPC.def -=================================================================== ---- llvm-toolchain-16-16.0.6.orig/clang/include/clang/Basic/BuiltinsPPC.def -+++ llvm-toolchain-16-16.0.6/clang/include/clang/Basic/BuiltinsPPC.def -@@ -132,8 +132,10 @@ - BUILTIN(__builtin_ppc_extract_sig, "ULLid", "") +diff --git a/clang/include/clang/Basic/BuiltinsPPC.def b/clang/include/clang/Basic/BuiltinsPPC.def +--- a/clang/include/clang/Basic/BuiltinsPPC.def ++++ b/clang/include/clang/Basic/BuiltinsPPC.def +@@ -151,8 +151,10 @@ + TARGET_BUILTIN(__builtin_ppc_extract_sig, "ULLid", "", "power9-vector") BUILTIN(__builtin_ppc_mtfsb0, "vUIi", "") BUILTIN(__builtin_ppc_mtfsb1, "vUIi", "") +BUILTIN(__builtin_ppc_mffs, "d", "") BUILTIN(__builtin_ppc_mtfsf, "vUIiUi", "") BUILTIN(__builtin_ppc_mtfsfi, "vUIiUIi", "") +BUILTIN(__builtin_ppc_set_fpscr_rn, "di", "") - BUILTIN(__builtin_ppc_insert_exp, "ddULLi", "") + TARGET_BUILTIN(__builtin_ppc_insert_exp, "ddULLi", "", "power9-vector") BUILTIN(__builtin_ppc_fmsub, "dddd", "") BUILTIN(__builtin_ppc_fmsubs, "ffff", "") diff --git a/clang/lib/Basic/Targets/PPC.cpp b/clang/lib/Basic/Targets/PPC.cpp --- a/clang/lib/Basic/Targets/PPC.cpp +++ b/clang/lib/Basic/Targets/PPC.cpp -@@ -260,6 +260,10 @@ +@@ -262,6 +262,10 @@ Builder.defineMacro("__builtin_minfe", "__builtin_ppc_minfe"); Builder.defineMacro("__builtin_minfl", "__builtin_ppc_minfl"); Builder.defineMacro("__builtin_minfs", "__builtin_ppc_minfs"); @@ -34,7 +33,7 @@ diff --git a/clang/lib/Basic/Targets/PPC.cpp b/clang/lib/Basic/Targets/PPC.cpp diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp -@@ -16742,6 +16742,11 @@ +@@ -17062,6 +17062,11 @@ Value *Op1 = EmitScalarExpr(E->getArg(1)); return Builder.CreateFDiv(Op0, Op1, "swdiv"); } diff --git a/debian/patches/HIP-search-path-fix.patch b/debian/patches/HIP-search-path-fix.patch deleted file mode 100644 index 79e82bed..00000000 --- a/debian/patches/HIP-search-path-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f8598357662dc8dd0f4400bcaeb48e8befe43ecc Mon Sep 17 00:00:00 2001 -From: Cordell Bloor -Date: Tue, 9 May 2023 09:46:48 -0400 -Subject: [PATCH] [HIP] Detect HIP for Ubuntu, Mint, Gentoo, etc. - -HIP may be installed into /usr or /usr/local on a variety of Linux -operating systems. It may become unwieldy to list them all. - -Reviewed by: Siu Chi Chan, Yaxun Liu - -Differential Revision: https://reviews.llvm.org/D149110 ---- - clang/lib/Driver/ToolChains/AMDGPU.cpp | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp -index acedcfabefe1c..1eb22ed8704c9 100644 ---- a/clang/lib/Driver/ToolChains/AMDGPU.cpp -+++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp -@@ -11,7 +11,6 @@ - #include "clang/Basic/TargetID.h" - #include "clang/Config/config.h" - #include "clang/Driver/Compilation.h" --#include "clang/Driver/Distro.h" - #include "clang/Driver/DriverDiagnostic.h" - #include "clang/Driver/InputInfo.h" - #include "clang/Driver/Options.h" -@@ -309,13 +308,10 @@ RocmInstallationDetector::getInstallationPathCandidates() { - ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm, - /*StrictChecking=*/true); - -- Distro Dist(D.getVFS(), llvm::Triple(llvm::sys::getProcessTriple())); -- if (Dist.IsDebian() || Dist.IsRedhat()) { -- ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local", -- /*StrictChecking=*/true); -- ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", -- /*StrictChecking=*/true); -- } -+ ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local", -+ /*StrictChecking=*/true); -+ ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", -+ /*StrictChecking=*/true); - - DoPrintROCmSearchDirs(); - return ROCmSearchDirs; diff --git a/debian/patches/amdgpu/bitcode-multiarch.patch b/debian/patches/amdgpu/bitcode-multiarch.patch deleted file mode 100644 index 88e2ef55..00000000 --- a/debian/patches/amdgpu/bitcode-multiarch.patch +++ /dev/null @@ -1,53 +0,0 @@ -From efa9394d72968e0c84c2c9283476c70807f60b80 Mon Sep 17 00:00:00 2001 -From: Cordell Bloor -Date: Wed, 8 Mar 2023 02:57:51 -0700 -Subject: [PATCH] Search for the bitcode libraries in a multiarch directory - -The Debian path for the rocm-device-libs is -/usr/lib/$(DEB_HOST_MULTIARCH)/amdgcn/bitcode - -Forwarded: not-needed ---- - clang/lib/Driver/ToolChains/AMDGPU.cpp | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -Index: llvm-toolchain-15-15.0.7/clang/lib/Driver/ToolChains/AMDGPU.cpp -=================================================================== ---- llvm-toolchain-15-15.0.7.orig/clang/lib/Driver/ToolChains/AMDGPU.cpp -+++ llvm-toolchain-15-15.0.7/clang/lib/Driver/ToolChains/AMDGPU.cpp -@@ -14,6 +14,7 @@ - #include "clang/Driver/DriverDiagnostic.h" - #include "clang/Driver/InputInfo.h" - #include "clang/Driver/Options.h" -+#include "llvm/ADT/Triple.h" - #include "llvm/Option/ArgList.h" - #include "llvm/Support/Error.h" - #include "llvm/Support/FileUtilities.h" -@@ -423,16 +424,21 @@ void RocmInstallationDetector::detectDev - // The possible structures are: - // - ${ROCM_ROOT}/amdgcn/bitcode/* - // - ${ROCM_ROOT}/lib/* -+ // - ${ROCM_ROOT}/lib//amdgcn/bitcode/* - // - ${ROCM_ROOT}/lib/bitcode/* -- // so try to detect these layouts. -- static constexpr std::array SubDirsList[] = { -- {"amdgcn", "bitcode"}, -- {"lib", ""}, -- {"lib", "bitcode"}, -+ // so try to detect these layouts. Note that bitcode is associated with the -+ // compiler that built it (not the target architecture). -+ llvm::Triple HostTriple(llvm::sys::getProcessTriple()); -+ std::string Multiarch = Twine(HostTriple.getArchName() + "-linux-gnu").str(); -+ static const std::array SubDirsList[] = { -+ {"amdgcn", "bitcode", "", ""}, -+ {"lib", "", "", ""}, -+ {"lib", Multiarch, "amdgcn", "bitcode"}, -+ {"lib", "bitcode", "", ""}, - }; - - // Make a path by appending sub-directories to InstallPath. -- auto MakePath = [&](const llvm::ArrayRef &SubDirs) { -+ auto MakePath = [&](const llvm::ArrayRef &SubDirs) { - auto Path = CandidatePath; - for (auto SubDir : SubDirs) - llvm::sys::path::append(Path, SubDir); diff --git a/debian/patches/amdgpu/nonlinux.patch b/debian/patches/amdgpu/nonlinux.patch deleted file mode 100644 index 0f66f517..00000000 --- a/debian/patches/amdgpu/nonlinux.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://reviews.llvm.org/D143017 - -[Libomptarget] Fix disabling amdgpu on non-Linux. - -Previously, on non-Linux, amdgpu would get enabled whatever the CPU -architecture. - -Index: llvm-toolchain-16_16.0.0~+rc4/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt -=================================================================== ---- llvm-toolchain-16_16.0.0~+rc4.orig/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~+rc4/openmp/libomptarget/plugins/amdgpu/CMakeLists.txt -@@ -22,7 +22,7 @@ endif() - # as of rocm-3.7, hsa is installed with cmake packages and kmt is found via hsa - find_package(hsa-runtime64 QUIET 1.2.0 HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm) - --if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux") -+if(NOT (CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64)|(ppc64le)|(aarch64)$" AND CMAKE_SYSTEM_NAME MATCHES "Linux")) - libomptarget_say("Not building AMDGPU plugin: only support AMDGPU in Linux x86_64, ppc64le, or aarch64 hosts") - return() - endif() diff --git a/debian/patches/arm32-defaults.diff b/debian/patches/arm32-defaults.diff new file mode 100644 index 00000000..4a392854 --- /dev/null +++ b/debian/patches/arm32-defaults.diff @@ -0,0 +1,14 @@ +--- a/llvm/lib/TargetParser/ARMTargetParser.cpp ++++ b/llvm/lib/TargetParser/ARMTargetParser.cpp +@@ -590,9 +590,9 @@ StringRef ARM::getARMCPUForArch(const ll + case llvm::Triple::EABIHF: + case llvm::Triple::GNUEABIHF: + case llvm::Triple::MuslEABIHF: +- return "cortex-a7"; ++ return "cortex-a8"; + default: +- return "arm7tdmi"; ++ return "arm926ej-s"; + } + } + diff --git a/debian/patches/bolt-disable-emit-relocs.patch b/debian/patches/bolt-disable-emit-relocs.patch index fba8a7f1..ca0e61c3 100644 --- a/debian/patches/bolt-disable-emit-relocs.patch +++ b/debian/patches/bolt-disable-emit-relocs.patch @@ -1,9 +1,9 @@ -Index: llvm-toolchain-snapshot_16~++20230104114047+37228b1baa48/bolt/tools/merge-fdata/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230601055733+ee6ec2c5f1a5/bolt/tools/merge-fdata/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20230104114047+37228b1baa48.orig/bolt/tools/merge-fdata/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20230104114047+37228b1baa48/bolt/tools/merge-fdata/CMakeLists.txt -@@ -18,6 +18,6 @@ install(PROGRAMS - ) +--- llvm-toolchain-snapshot_17~++20230601055733+ee6ec2c5f1a5.orig/bolt/tools/merge-fdata/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230601055733+ee6ec2c5f1a5/bolt/tools/merge-fdata/CMakeLists.txt +@@ -12,6 +12,6 @@ add_bolt_tool(merge-fdata + add_dependencies(bolt merge-fdata) # Emit relocations for BOLT meta test (bolt/test/runtime/meta-merge-fdata.test) -if (BOLT_INCLUDE_TESTS AND UNIX AND NOT APPLE) diff --git a/debian/patches/clang-analyzer-force-version.diff b/debian/patches/clang-analyzer-force-version.diff index 07b76900..f364728c 100644 --- a/debian/patches/clang-analyzer-force-version.diff +++ b/debian/patches/clang-analyzer-force-version.diff @@ -1,16 +1,16 @@ # Force the version of clang in the analyzer # This was causing the static analyzer to fail silently if the clang & clang++ are # not installed -Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/libexec/ccc-analyzer +Index: llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/libexec/ccc-analyzer =================================================================== ---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/tools/scan-build/libexec/ccc-analyzer -+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/libexec/ccc-analyzer +--- llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417.orig/clang/tools/scan-build/libexec/ccc-analyzer ++++ llvm-toolchain-snapshot_17~++20211117120952+5b4bfd8c2417/clang/tools/scan-build/libexec/ccc-analyzer @@ -93,7 +93,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } $Clang = $ENV{'CLANG_CXX'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-16'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++-17'; } $IsCXX = 1 } @@ -19,7 +19,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan $Clang = $ENV{'CLANG'}; - if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } -+ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-16'; } ++ if (!defined $Clang || ! -x $Clang) { $Clang = 'clang-17'; } $IsCXX = 0 } diff --git a/debian/patches/clang-baseline-fix-i386.patch b/debian/patches/clang-baseline-fix-i386.patch index 74961c10..592d2733 100644 --- a/debian/patches/clang-baseline-fix-i386.patch +++ b/debian/patches/clang-baseline-fix-i386.patch @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/X86.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Driver/ToolChains/Arch/X86.cpp -@@ -114,8 +114,8 @@ std::string x86::getX86TargetCPU(const D +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Driver/ToolChains/Arch/X86.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Driver/ToolChains/Arch/X86.cpp +@@ -111,8 +111,8 @@ std::string x86::getX86TargetCPU(const D case llvm::Triple::FreeBSD: return "i686"; default: diff --git a/debian/patches/clang-format-version.diff b/debian/patches/clang-format-version.diff index 4e34cee9..f2719282 100644 --- a/debian/patches/clang-format-version.diff +++ b/debian/patches/clang-format-version.diff @@ -4,42 +4,42 @@ clang/tools/clang-format/clang-format.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format-diff.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format-diff.py -+++ llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format-diff.py -@@ -63,7 +63,7 @@ def main(): - 'fallback in case clang-format is invoked with' - '-style=file, but can not find the .clang-format' - 'file to use.') -- parser.add_argument('-binary', default='clang-format', -+ parser.add_argument('-binary', default='clang-format-16', - help='location of binary to use for clang-format') - args = parser.parse_args() - -Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format-diff.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format-diff.py +@@ -92,7 +92,7 @@ def main(): + ) + parser.add_argument( + "-binary", +- default="clang-format", ++ default="clang-format-17", + help="location of binary to use for clang-format", + ) + args = parser.parse_args() +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.el =================================================================== ---- llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format.el -+++ llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.el +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format.el ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.el @@ -37,7 +37,7 @@ :group 'tools) (defcustom clang-format-executable - (or (executable-find "clang-format") -+ (or (executable-find "clang-format-16") ++ (or (executable-find "clang-format-17") "clang-format") "Location of the clang-format executable. -Index: llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487.orig/clang/tools/clang-format/clang-format.py -+++ llvm-toolchain-snapshot_16~++20220407011631+46f0e2ceb487/clang/tools/clang-format/clang-format.py -@@ -48,7 +48,7 @@ import vim +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/clang-format/clang-format.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/clang-format/clang-format.py +@@ -49,7 +49,7 @@ import vim # set g:clang_format_path to the path to clang-format if it is not on the path # Change this to the full path if clang-format is not on the path. --binary = 'clang-format' -+binary = 'clang-format-16' +-binary = "clang-format" ++binary = "clang-format-17" if vim.eval('exists("g:clang_format_path")') == "1": - binary = vim.eval('g:clang_format_path') + binary = vim.eval("g:clang_format_path") diff --git a/debian/patches/clang-tidy-run-bin.diff b/debian/patches/clang-tidy-run-bin.diff index 1c6ac5ad..ed7637a4 100644 --- a/debian/patches/clang-tidy-run-bin.diff +++ b/debian/patches/clang-tidy-run-bin.diff @@ -1,15 +1,19 @@ -Index: llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py =================================================================== ---- llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -+++ llvm-toolchain-snapshot_16~++20220525112612+8919447c71ab/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py -@@ -225,8 +225,10 @@ def main(): - action='store_true', help='allow alpha checkers from ' - 'clang-analyzer.') - parser.add_argument('-clang-tidy-binary', metavar='PATH', -+ default='clang-tidy-16', - help='path to clang-tidy binary') - parser.add_argument('-clang-apply-replacements-binary', metavar='PATH', -+ default='clang-apply-replacements-16', - help='path to clang-apply-replacements binary') - parser.add_argument('-checks', default=None, - help='checks filter, when not specified, use clang-tidy ' +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py +@@ -256,10 +256,13 @@ def main(): + help="allow alpha checkers from " "clang-analyzer.", + ) + parser.add_argument( +- "-clang-tidy-binary", metavar="PATH", help="path to clang-tidy binary" ++ "-clang-tidy-binary", metavar="PATH", ++ default='clang-tidy-17', ++ help="path to clang-tidy binary" + ) + parser.add_argument( + "-clang-apply-replacements-binary", ++ default='clang-apply-replacements-17', + metavar="PATH", + help="path to clang-apply-replacements binary", + ) diff --git a/debian/patches/clangd-atomic-cmake.patch b/debian/patches/clangd-atomic-cmake.patch index dd7488cd..51860c8e 100644 --- a/debian/patches/clangd-atomic-cmake.patch +++ b/debian/patches/clangd-atomic-cmake.patch @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9.orig/clang-tools-extra/clangd/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extra/clangd/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang-tools-extra/clangd/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang-tools-extra/clangd/CMakeLists.txt @@ -61,6 +61,11 @@ endif() include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/../clang-tidy") include_directories(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/../include-cleaner/include") @@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_16~++20230120073736+259fa70885e9/clang-tools-extr add_clang_library(clangDaemon AST.cpp ASTSignals.cpp -@@ -177,6 +182,7 @@ clang_target_link_libraries(clangDaemon +@@ -178,6 +183,7 @@ clang_target_link_libraries(clangDaemon target_link_libraries(clangDaemon PRIVATE ${LLVM_PTHREAD_LIB} diff --git a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff index e13a3bc8..4430c91c 100644 --- a/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff +++ b/debian/patches/compiler-rt/compilerrt-build-scudo-standalone-option.diff @@ -1,10 +1,10 @@ add option to disable compiler-rt scudo standalone allocator as it is not always supported by all arch profiles such as arm5vt of ARM32 arch -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/compiler-rt/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/compiler-rt/CMakeLists.txt -@@ -271,6 +271,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/CMakeLists.txt +@@ -303,6 +303,12 @@ option(COMPILER_RT_USE_BUILTINS_LIBRARY include(config-ix) diff --git a/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff b/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff index 7166eb5f..319053db 100644 --- a/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff +++ b/debian/patches/compiler-rt/compilerrt-builtins-arch-fix-armhf.diff @@ -1,10 +1,10 @@ fix builtins armhf default arch detection by adding the same armhf triple handling use for compiler-rt -Index: llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20221115104007+a853c42a6a5e/compiler-rt/lib/builtins/CMakeLists.txt -@@ -29,6 +29,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt +@@ -36,6 +36,11 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR load_llvm_config() endif() construct_compiler_rt_default_triple() diff --git a/debian/patches/debug-jit-path.diff b/debian/patches/debug-jit-path.diff index 65667490..7eedfb1a 100644 --- a/debian/patches/debug-jit-path.diff +++ b/debian/patches/debug-jit-path.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp -+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp -@@ -304,8 +304,8 @@ bool PerfJITEventListener::InitDebugging +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/lib/ExecutionEngine/PerfJITEvents/PerfJITEventListener.cpp +@@ -303,8 +303,8 @@ bool PerfJITEventListener::InitDebugging // search for location to dump data to if (const char *BaseDir = getenv("JITDUMPDIR")) Path.append(BaseDir); diff --git a/debian/patches/disable-path-test-failing.diff b/debian/patches/disable-path-test-failing.diff index 4c5ff440..62c6e0b8 100644 --- a/debian/patches/disable-path-test-failing.diff +++ b/debian/patches/disable-path-test-failing.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c.orig/llvm/unittests/Support/Path.cpp -+++ llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/Support/Path.cpp -@@ -677,7 +677,7 @@ protected: +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/unittests/Support/Path.cpp ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/unittests/Support/Path.cpp +@@ -679,7 +679,7 @@ protected: sys::path::append(NonExistantFile, "1B28B495C16344CB9822E588CD4C3EF0"); } @@ -11,7 +11,7 @@ Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/S }; TEST_F(FileSystemTest, Unique) { -@@ -761,7 +761,8 @@ TEST_F(FileSystemTest, RealPath) { +@@ -763,7 +763,8 @@ TEST_F(FileSystemTest, RealPath) { // This can fail if $HOME is not set and getpwuid fails. bool Result = llvm::sys::path::home_directory(HomeDir); @@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_14~++20211105102832+020ca1747d6c/llvm/unittests/S checkSeparators(HomeDir); ASSERT_NO_ERROR(fs::real_path(HomeDir, Expected)); checkSeparators(Expected); -@@ -770,6 +771,7 @@ TEST_F(FileSystemTest, RealPath) { +@@ -772,6 +773,7 @@ TEST_F(FileSystemTest, RealPath) { ASSERT_NO_ERROR(fs::real_path("~/", Actual, true)); EXPECT_EQ(Expected, Actual); } diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff index 10de84be..4f5d242a 100644 --- a/debian/patches/disable-sse2-old-x86.diff +++ b/debian/patches/disable-sse2-old-x86.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def +Index: llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c.orig/llvm/include/llvm/TargetParser/X86TargetParser.def -+++ llvm-toolchain-snapshot_16~++20221220013513+bb7940e25f6c/llvm/include/llvm/TargetParser/X86TargetParser.def -@@ -249,7 +249,7 @@ CPU_SPECIFIC("pentium_mmx", "pentium-mmx - CPU_SPECIFIC("pentium_ii", "pentium2", 'E', "+cmov,+mmx") - CPU_SPECIFIC("pentium_iii", "pentium3", 'H', "+cmov,+mmx,+sse") - CPU_SPECIFIC_ALIAS("pentium_iii_no_xmm_regs", "pentium3", "pentium_iii") --CPU_SPECIFIC("pentium_4", "pentium4", 'J', "+cmov,+mmx,+sse,+sse2") -+CPU_SPECIFIC("pentium_4", "pentium4", 'J', "+cmov,+mmx,+sse") - CPU_SPECIFIC("pentium_m", "pentium-m", 'K', "+cmov,+mmx,+sse,+sse2") - CPU_SPECIFIC("pentium_4_sse3", "prescott", 'L', "+cmov,+mmx,+sse,+sse2,+sse3") - CPU_SPECIFIC("core_2_duo_ssse3", "core2", 'M', "+cmov,+mmx,+sse,+sse2,+sse3,+ssse3") +--- llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17.orig/llvm/lib/TargetParser/X86TargetParser.cpp ++++ llvm-toolchain-snapshot_17~++20230705085103+4ef04876ef17/llvm/lib/TargetParser/X86TargetParser.cpp +@@ -132,7 +132,7 @@ constexpr FeatureBitset FeaturesPentium2 + constexpr FeatureBitset FeaturesPentium3 = FeaturesPentium2 | FeatureSSE; + + // Pentium 4 CPUs +-constexpr FeatureBitset FeaturesPentium4 = FeaturesPentium3 | FeatureSSE2; ++constexpr FeatureBitset FeaturesPentium4 = FeaturesPentium3; + constexpr FeatureBitset FeaturesPrescott = FeaturesPentium4 | FeatureSSE3; + constexpr FeatureBitset FeaturesNocona = + FeaturesPrescott | Feature64BIT | FeatureCMPXCHG16B; diff --git a/debian/patches/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff index 25d064a5..2931c2ca 100644 --- a/debian/patches/do-not-fail-on-unexpected-pass.diff +++ b/debian/patches/do-not-fail-on-unexpected-pass.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/Test.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/Test.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/utils/lit/lit/Test.py -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/Test.py -@@ -52,7 +52,7 @@ XFAIL = ResultCode('XFAIL', - UNRESOLVED = ResultCode('UNRESOLVED', 'Unresolved', True) - TIMEOUT = ResultCode('TIMEOUT', 'Timed Out', True) - FAIL = ResultCode('FAIL', 'Failed', True) --XPASS = ResultCode('XPASS', 'Unexpectedly Passed', True) +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/utils/lit/lit/Test.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/Test.py +@@ -52,7 +52,7 @@ XFAIL = ResultCode("XFAIL", "Expectedly + UNRESOLVED = ResultCode("UNRESOLVED", "Unresolved", True) + TIMEOUT = ResultCode("TIMEOUT", "Timed Out", True) + FAIL = ResultCode("FAIL", "Failed", True) +-XPASS = ResultCode("XPASS", "Unexpectedly Passed", True) +XPASS = ResultCode('XPASS', 'Unexpectedly Passed', False) diff --git a/debian/patches/fix-scan-view-path.diff b/debian/patches/fix-scan-view-path.diff index af85272e..ee310efe 100644 --- a/debian/patches/fix-scan-view-path.diff +++ b/debian/patches/fix-scan-view-path.diff @@ -1,12 +1,12 @@ -Index: llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_16~++20200326162000+4673699a470.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_16~++20200326162000+4673699a470/clang/tools/scan-view/bin/scan-view +--- llvm-toolchain-snapshot_17~++20200326172000+4673699a470.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_17~++20200326172000+4673699a470/clang/tools/scan-view/bin/scan-view @@ -28,6 +28,7 @@ kDefaultPort = 8181 kMaxPortsToTry = 100 ### -+BASE_DIR = '/usr/share/clang/scan-view-16' ++BASE_DIR = '/usr/share/clang/scan-view-17' def url_is_up(url): diff --git a/debian/patches/force-sse2-compiler-rt.diff b/debian/patches/force-sse2-compiler-rt.diff index 391540c8..53968f12 100644 --- a/debian/patches/force-sse2-compiler-rt.diff +++ b/debian/patches/force-sse2-compiler-rt.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-16_16.0.0~+rc4/compiler-rt/lib/builtins/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~+rc4.orig/compiler-rt/lib/builtins/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~+rc4/compiler-rt/lib/builtins/CMakeLists.txt -@@ -750,6 +750,12 @@ else () +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/compiler-rt/lib/builtins/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/compiler-rt/lib/builtins/CMakeLists.txt +@@ -765,6 +765,12 @@ else () append_list_if(COMPILER_RT_ENABLE_CET -fcf-protection=full BUILTIN_CFLAGS) endif() diff --git a/debian/patches/hurd/hurd-pathmax.diff b/debian/patches/hurd/hurd-pathmax.diff index 421aebd8..c8939dd8 100644 --- a/debian/patches/hurd/hurd-pathmax.diff +++ b/debian/patches/hurd/hurd-pathmax.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp +Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/lib/Basic/FileManager.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/FileManager.cpp +--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/clang/lib/Basic/FileManager.cpp ++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/clang/lib/Basic/FileManager.cpp @@ -610,6 +610,12 @@ FileManager::getNoncachedStatValue(Strin return std::error_code(); } @@ -15,10 +15,10 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/lib/Basic/ void FileManager::GetUniqueIDMapping( SmallVectorImpl &UIDToFiles) const { UIDToFiles.clear(); -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h +Index: llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/lldb/include/lldb/lldb-defines.h =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/lldb/include/lldb/lldb-defines.h -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lldb/lldb-defines.h +--- llvm-toolchain-snapshot_17~++20230309125305+68367141dd91.orig/lldb/include/lldb/lldb-defines.h ++++ llvm-toolchain-snapshot_17~++20230309125305+68367141dd91/lldb/include/lldb/lldb-defines.h @@ -15,6 +15,11 @@ #define INT32_MAX 2147483647 #endif @@ -31,19 +31,3 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/lldb/include/lld #if !defined(UINT32_MAX) #define UINT32_MAX 4294967295U #endif -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/lib/External/ppcg/cuda_common.c -=================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/polly/lib/External/ppcg/cuda_common.c -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/polly/lib/External/ppcg/cuda_common.c -@@ -15,6 +15,11 @@ - #include "cuda_common.h" - #include "ppcg.h" - -+// For GNU Hurd -+#if defined(__GNU__) && !defined(PATH_MAX) -+# define PATH_MAX 4096 -+#endif -+ - /* Open the host .cu file and the kernel .hu and .cu files for writing. - * Add the necessary includes. - */ diff --git a/debian/patches/issue-54242.diff b/debian/patches/issue-54242.diff index 3f4fa75a..e32cc735 100644 --- a/debian/patches/issue-54242.diff +++ b/debian/patches/issue-54242.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/mlir/lib/ExecutionEngine/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/mlir/lib/ExecutionEngine/CMakeLists.txt -@@ -56,7 +56,7 @@ endif(LLVM_USE_PERF) +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/mlir/lib/ExecutionEngine/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/mlir/lib/ExecutionEngine/CMakeLists.txt +@@ -57,7 +57,7 @@ endif(LLVM_USE_PERF) add_mlir_library(MLIRExecutionEngine ExecutionEngine.cpp diff --git a/debian/patches/libclang-major-version-only.diff b/debian/patches/libclang-major-version-only.diff new file mode 100644 index 00000000..36800f38 --- /dev/null +++ b/debian/patches/libclang-major-version-only.diff @@ -0,0 +1,11 @@ +--- a/clang/tools/libclang/CMakeLists.txt ++++ b/clang/tools/libclang/CMakeLists.txt +@@ -196,7 +196,7 @@ + OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libclang.map) + + set_target_properties(libclang PROPERTIES +- VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}${LLVM_VERSION_SUFFIX} ++ VERSION ${LLVM_VERSION_MAJOR} + ${LIBCLANG_SOVERSION_ARG}) + endif() + endif() diff --git a/debian/patches/libclc-fix-prepare_builtins-rpath.diff b/debian/patches/libclc-fix-prepare_builtins-rpath.diff index 1e3e69b3..8ee965f8 100644 --- a/debian/patches/libclc-fix-prepare_builtins-rpath.diff +++ b/debian/patches/libclc-fix-prepare_builtins-rpath.diff @@ -1,10 +1,10 @@ set rpath for prepare_builtins build utility to find correct stage2 libs at runtime when executed as part of a build -Index: llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa.orig/libclc/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20221123082119+16bf359a3faa/libclc/CMakeLists.txt -@@ -115,6 +115,9 @@ add_llvm_executable( prepare_builtins ut +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libclc/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libclc/CMakeLists.txt +@@ -121,6 +121,9 @@ add_llvm_executable( prepare_builtins ut target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) diff --git a/debian/patches/libcxx-D124227-wasm.patch b/debian/patches/libcxx-D124227-wasm.patch index a09abb77..9b1b59e2 100644 --- a/debian/patches/libcxx-D124227-wasm.patch +++ b/debian/patches/libcxx-D124227-wasm.patch @@ -20,16 +20,16 @@ Differential Revision: https://reviews.llvm.org/D124227 libcxx/include/__support/solaris/xlocale.h | 55 +++++++++++----------- 4 files changed, 67 insertions(+), 75 deletions(-) -Index: llvm-toolchain-16-16.0.6/libcxx/include/__support/musl/xlocale.h +Index: llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a/libcxx/include/__support/musl/xlocale.h =================================================================== ---- llvm-toolchain-16-16.0.6.orig/libcxx/include/__support/musl/xlocale.h -+++ llvm-toolchain-16-16.0.6/libcxx/include/__support/musl/xlocale.h -@@ -37,7 +37,7 @@ inline _LIBCPP_HIDE_FROM_ABI_C long long +--- llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a.orig/libcxx/include/__support/musl/xlocale.h ++++ llvm-toolchain-15_15.0.6~++20230102020141+088f33605d8a/libcxx/include/__support/musl/xlocale.h +@@ -39,7 +39,7 @@ wcstoll_l(const wchar_t *__nptr, wchar_t return ::wcstoll(__nptr, __endptr, __base); } --inline _LIBCPP_HIDE_FROM_ABI_C long long wcstoull_l(const wchar_t* __nptr, wchar_t** __endptr, int __base, locale_t) { -+inline _LIBCPP_HIDE_FROM_ABI_C unsigned long long wcstoull_l(const wchar_t* __nptr, wchar_t** __endptr, int __base, locale_t) { +-inline _LIBCPP_HIDE_FROM_ABI long long ++inline _LIBCPP_HIDE_FROM_ABI unsigned long long + wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) { return ::wcstoull(__nptr, __endptr, __base); } - diff --git a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff index fde8436a..46d63e30 100644 --- a/debian/patches/libcxx/libcxx-armhf-ftbfs.diff +++ b/debian/patches/libcxx/libcxx-armhf-ftbfs.diff @@ -1,18 +1,17 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/include/atomic +Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/include/atomic -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/include/atomic -@@ -2640,9 +2640,13 @@ typedef conditional<_LIBCPP_CONTENTION_L +--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxx/include/__atomic/aliases.h ++++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxx/include/__atomic/aliases.h +@@ -107,9 +107,12 @@ using __libcpp_unsigned_lock_free = __co #endif #if !defined(_LIBCPP_NO_LOCK_FREE_TYPES) +#ifndef NO_LOCK_FREE - typedef atomic<__libcpp_signed_lock_free> atomic_signed_lock_free; - typedef atomic<__libcpp_unsigned_lock_free> atomic_unsigned_lock_free; + using atomic_signed_lock_free = atomic<__libcpp_signed_lock_free>; + using atomic_unsigned_lock_free = atomic<__libcpp_unsigned_lock_free>; #endif +#endif -+ +#undef NO_LOCK_FREE - #define ATOMIC_FLAG_INIT {false} - #define ATOMIC_VAR_INIT(__v) {__v} + _LIBCPP_END_NAMESPACE_STD + diff --git a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff index 3a53afe6..8020fdef 100644 --- a/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff +++ b/debian/patches/libcxx/libcxx-libatomic-only-with-gcc-rtlib.diff @@ -1,9 +1,9 @@ if libatomic is found only link it if libgcc is the rtlib -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/CMakeLists.txt -@@ -777,12 +777,14 @@ function(cxx_link_system_libraries targe +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/CMakeLists.txt +@@ -707,12 +707,14 @@ function(cxx_link_system_libraries targe endif() elseif (LIBCXX_HAS_GCC_LIB) target_link_libraries(${target} PRIVATE gcc) diff --git a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff index bfa5f565..5a596877 100644 --- a/debian/patches/libcxx/libcxx-silent-failure-arm64.diff +++ b/debian/patches/libcxx/libcxx-silent-failure-arm64.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp -+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp +--- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.condition/thread.condition.condvar/wait_for.pass.cpp @@ -8,6 +8,7 @@ // // UNSUPPORTED: no-threads @@ -10,15 +10,15 @@ Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/ // -Index: llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -+++ llvm-toolchain-snapshot_15~++20220530092849+bcf3d5248678/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp -@@ -11,7 +11,7 @@ +--- llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50.orig/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230328075740+568be31c9e50/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +@@ -10,7 +10,7 @@ + // UNSUPPORTED: c++03, c++11 // ALLOW_RETRIES: 2 - // dylib support for shared_mutex was added in macosx10.12 --// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} +-// XFAIL: availability-shared_mutex-missing +// XFAIL: * // diff --git a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff index 69330c1c..e6a642b0 100644 --- a/debian/patches/libcxx/libcxx-silent-test-libcxx.diff +++ b/debian/patches/libcxx/libcxx-silent-test-libcxx.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/numerics/rand/rand.util/rand.util.canonical/generate_canonical.pass.cpp @@ -11,6 +11,8 @@ // template // RealType generate_canonical(URNG& g); @@ -11,10 +11,10 @@ Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/re/re.traits/isctype.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/re/re.traits/isctype.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/re/re.traits/isctype.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/re/re.traits/isctype.pass.cpp @@ -12,6 +12,7 @@ // bool isctype(charT c, char_class_type f) const; @@ -23,23 +23,23 @@ Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/ #include #include -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxxabi/test/catch_multi_level_pointer.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxxabi/test/catch_multi_level_pointer.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxxabi/test/catch_multi_level_pointer.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxxabi/test/catch_multi_level_pointer.pass.cpp @@ -11,6 +11,8 @@ // 1b00fc5d8133 made it in the dylib in macOS 10.11 - // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} + // XFAIL: stdlib=apple-libc++ && target={{.+}}-apple-macosx10.{{9|10}} +// XFAIL: * + #include #include #include -Index: llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220911073400+c3c930d57365/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp +--- llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83.orig/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230330020402+b0c892296b83/libcxx/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct.pass.cpp @@ -15,6 +15,8 @@ // template void construct(T* p, Args&&... args); diff --git a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch index ba43d6ed..c7b97eeb 100644 --- a/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch +++ b/debian/patches/libcxx/libcxx-test-fix-lockfree-test-for-i386.patch @@ -10,11 +10,11 @@ To set instruction support one can check __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 defi Bug: https://llvm.org/bugs/show_bug.cgi?id=19355 -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp -@@ -17,6 +17,14 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxx/test/std/atomics/atomics.lockfree/isalwayslockfree.pass.cpp +@@ -18,6 +18,14 @@ #include "test_macros.h" diff --git a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff index dae292a0..9c4f834d 100644 --- a/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff +++ b/debian/patches/libcxx/libcxxabi-fix-link-builtins.diff @@ -1,9 +1,9 @@ if LIBCXXABI_USE_COMPILER_RT=ON, add builtins to libcxxabi library flags, otherwise add libgcc following how libunwind does the same -Index: llvm-toolchain-snapshot_15~++20220517092516+a09af8669396/libcxxabi/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220517092516+a09af8669396.orig/libcxxabi/src/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220517092516+a09af8669396/libcxxabi/src/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d.orig/libcxxabi/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230222041723+465ee9bfb26d/libcxxabi/src/CMakeLists.txt @@ -77,7 +77,9 @@ else() add_library_flags_if(LIBCXXABI_HAS_C_LIB c) endif() diff --git a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch index 929398ee..7712e3a8 100644 --- a/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch +++ b/debian/patches/libcxx/libcxxabi-test-don-t-fail-extended-long-double.patch @@ -2,11 +2,11 @@ Powerpc has extended double that doesn't match x86 coding. Power format would need special tests to verify correctness but for now it is enough to prevent incorrect test from running. -Index: llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp =================================================================== ---- llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415.orig/libcxxabi/test/test_demangle.pass.cpp -+++ llvm-toolchain-snapshot_14~++20211114120952+5b4bfd8c2415/libcxxabi/test/test_demangle.pass.cpp -@@ -29902,7 +29902,7 @@ const char* invalid_cases[] = +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/libcxxabi/test/test_demangle.pass.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/libcxxabi/test/test_demangle.pass.cpp +@@ -30163,7 +30163,7 @@ const char* invalid_cases[] = "NSoERj5E=Y1[uM:ga", "Aon_PmKVPDk7?fg4XP5smMUL6;Vl<>IL8ayHpiVDDDXTY;^o9;i", "_ZNSt16allocator_traitsISaIN4llvm3sys2fs18directory_iteratorEEE9constructIS3_IS3_EEEDTcl12_S_constructfp_fp0_spcl7forwardIT0_Efp1_EEERS4_PT_DpOS7_", diff --git a/debian/patches/libsanitizer-timebits.diff b/debian/patches/libsanitizer-timebits.diff new file mode 100644 index 00000000..f5ee919a --- /dev/null +++ b/debian/patches/libsanitizer-timebits.diff @@ -0,0 +1,22 @@ +# DP: Add another #undef for _TIME_BITS + +--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +#--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +#+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +#@@ -18,6 +18,7 @@ +# // depends on _FILE_OFFSET_BITS setting. +# // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. +# #undef _FILE_OFFSET_BITS +#+#undef _TIME_BITS +# #endif +# +# // Must go after undef _FILE_OFFSET_BITS. diff --git a/debian/patches/link-grpc.diff b/debian/patches/link-grpc.diff index 13fa0d5c..708e5bc8 100644 --- a/debian/patches/link-grpc.diff +++ b/debian/patches/link-grpc.diff @@ -1,7 +1,8 @@ -diff --git a/clang/cmake/modules/AddGRPC.cmake b/clang/cmake/modules/AddGRPC.cmake ---- a/clang/cmake/modules/AddGRPC.cmake -+++ b/clang/cmake/modules/AddGRPC.cmake -@@ -4,8 +4,13 @@ +Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/clang/cmake/modules/AddGRPC.cmake +=================================================================== +--- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/clang/cmake/modules/AddGRPC.cmake ++++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/clang/cmake/modules/AddGRPC.cmake +@@ -4,8 +4,13 @@ function(generate_clang_protos_library L # Take the first two args and forward the remaining to generate_proto_sources. cmake_parse_arguments(PARSE_ARGV 2 PROTO "" "" "") generate_proto_sources(ProtoSource ${ProtoFile} ${PROTO_UNPARSED_ARGUMENTS}) @@ -16,10 +17,11 @@ diff --git a/clang/cmake/modules/AddGRPC.cmake b/clang/cmake/modules/AddGRPC.cma + LINK_LIBS PUBLIC ${LINKED_GRPC_LIBRARIES}) + endfunction() -diff --git a/cmake/Modules/FindGRPC.cmake b/cmake/Modules/FindGRPC.cmake ---- a/cmake/Modules/FindGRPC.cmake -+++ b/cmake/Modules/FindGRPC.cmake -@@ -82,11 +82,28 @@ +Index: llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/cmake/Modules/FindGRPC.cmake +=================================================================== +--- llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55.orig/cmake/Modules/FindGRPC.cmake ++++ llvm-toolchain-snapshot_17~++20230517080653+e9a17453ee55/cmake/Modules/FindGRPC.cmake +@@ -82,11 +82,28 @@ else() endif() endif() if(NOT TARGET grpc++) diff --git a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch index 1ad147d9..cd822211 100644 --- a/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch +++ b/debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch @@ -12,11 +12,11 @@ which could then break something else. This probably should have upstream bug but I couldn't find any existing report. -Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp -@@ -34,6 +34,7 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp +@@ -33,6 +33,7 @@ #include "lldb/Utility/StreamString.h" #include "llvm/ADT/SmallString.h" #include "llvm/Support/ScopedPrinter.h" @@ -24,7 +24,7 @@ Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/lldb/source/Plug #include "ProcessGDBRemoteLog.h" -@@ -42,7 +43,7 @@ +@@ -41,7 +42,7 @@ #elif defined(_WIN32) #define DEBUGSERVER_BASENAME "lldb-server.exe" #else diff --git a/debian/patches/lldb/lldb-missing-install.diff b/debian/patches/lldb/lldb-missing-install.diff index 9bc83284..78f96947 100644 --- a/debian/patches/lldb/lldb-missing-install.diff +++ b/debian/patches/lldb/lldb-missing-install.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdumper/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/tools/argdumper/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdumper/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/argdumper/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/argdumper/CMakeLists.txt @@ -6,3 +6,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM ) @@ -9,11 +9,11 @@ Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/argdu + +install(TARGETS lldb-argdumper + RUNTIME DESTINATION bin) -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/lldb-server/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/lldb/tools/lldb-server/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/lldb/tools/lldb-server/CMakeLists.txt -@@ -66,3 +66,7 @@ add_dependencies(lldb-server +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/tools/lldb-server/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/tools/lldb-server/CMakeLists.txt +@@ -68,3 +68,7 @@ add_dependencies(lldb-server ) target_include_directories(lldb-server PRIVATE "${LLDB_SOURCE_DIR}/source") target_link_libraries(lldb-server PRIVATE ${LLDB_SYSTEM_LIBS}) diff --git a/debian/patches/lldb/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff index 363397be..3989a52c 100644 --- a/debian/patches/lldb/lldb-soname.diff +++ b/debian/patches/lldb/lldb-soname.diff @@ -2,11 +2,11 @@ lldb/source/API/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284.orig/lldb/source/API/CMakeLists.txt -+++ llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/CMakeLists.txt -@@ -15,7 +15,12 @@ if(LLDB_ENABLE_LUA) +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/lldb/source/API/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/lldb/source/API/CMakeLists.txt +@@ -20,7 +20,12 @@ if(LLDB_ENABLE_LUA) set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp) endif() @@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/ SBAddress.cpp SBAttachInfo.cpp SBBlock.cpp -@@ -158,7 +163,7 @@ endif() +@@ -164,7 +169,7 @@ endif() set_target_properties(liblldb PROPERTIES @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_14~++20220119063448+5fa826f4e284/lldb/source/API/ ) target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) -@@ -178,12 +183,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo +@@ -184,12 +189,12 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() diff --git a/debian/patches/lldb/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch index 1b11531f..b9bb3b79 100644 --- a/debian/patches/lldb/print-lldb-path.patch +++ b/debian/patches/lldb/print-lldb-path.patch @@ -1,11 +1,11 @@ Author: Gianfranco Costamagna Last-Update: 2023-01-19 -Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py =================================================================== ---- llvm-toolchain-15-15.0.6.orig/lldb/bindings/python/get-python-config.py -+++ llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py -@@ -15,6 +15,7 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/bindings/python/get-python-config.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/bindings/python/get-python-config.py +@@ -15,6 +15,7 @@ def relpath_nodots(path, base): return rel def main(): @@ -13,7 +13,7 @@ Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py parser = argparse.ArgumentParser(description="extract cmake variables from python") parser.add_argument("variable_name") args = parser.parse_args() -@@ -31,7 +32,19 @@ +@@ -31,7 +32,19 @@ def main(): # If not, you'll have to use lldb -P or lldb -print-script-interpreter-info # to figure out where it is. try: @@ -34,11 +34,11 @@ Index: llvm-toolchain-15-15.0.6/lldb/bindings/python/get-python-config.py except ValueError: # Try to fall back to something reasonable if sysconfig's platlib # is outside of sys.prefix -Index: llvm-toolchain-15-15.0.6/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp =================================================================== ---- llvm-toolchain-15-15.0.6.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -+++ llvm-toolchain-15-15.0.6/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp -@@ -238,6 +238,7 @@ +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp +@@ -240,6 +240,7 @@ void ScriptInterpreterPython::ComputePyt // the real python interpreter uses. (e.g. lib for most, lib64 on RHEL // x86_64, or bin on Windows). llvm::sys::path::remove_filename(path); diff --git a/debian/patches/llvm-fix-lld-linker-check.diff b/debian/patches/llvm-fix-lld-linker-check.diff index 2f4e7bfd..c96e02a6 100644 --- a/debian/patches/llvm-fix-lld-linker-check.diff +++ b/debian/patches/llvm-fix-lld-linker-check.diff @@ -1,10 +1,10 @@ remove regex anchor in lld linker detection to account for vendor, if specified, being prepended to lld version string -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/llvm/cmake/modules/AddLLVM.cmake -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/llvm/cmake/modules/AddLLVM.cmake -@@ -217,7 +217,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/cmake/modules/AddLLVM.cmake ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/cmake/modules/AddLLVM.cmake +@@ -233,7 +233,7 @@ if (NOT DEFINED LLVM_LINKER_DETECTED AND set(LLVM_LINKER_DETECTED YES CACHE INTERNAL "") set(LLVM_LINKER_IS_GOLD YES CACHE INTERNAL "") message(STATUS "Linker detection: GNU Gold") diff --git a/debian/patches/llvm-runtimes-builtins-build-check.diff b/debian/patches/llvm-runtimes-builtins-build-check.diff index b92225b3..eec769df 100644 --- a/debian/patches/llvm-runtimes-builtins-build-check.diff +++ b/debian/patches/llvm-runtimes-builtins-build-check.diff @@ -1,10 +1,10 @@ add a check and only set up and build compiler-rt builtins if they have not been disabled -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/runtimes/CMakeLists.txt -@@ -124,7 +124,12 @@ endfunction() +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/runtimes/CMakeLists.txt +@@ -129,7 +129,12 @@ endfunction() # is required because the other runtimes need the builtin libraries present # before the just-built compiler can pass the configuration tests. get_compiler_rt_path(compiler_rt_path) diff --git a/debian/patches/lower-python-dep.diff b/debian/patches/lower-python-dep.diff index e00aed77..1116fa9b 100644 --- a/debian/patches/lower-python-dep.diff +++ b/debian/patches/lower-python-dep.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/CMakeLists.txt -@@ -811,8 +811,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/llvm/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/llvm/CMakeLists.txt +@@ -843,8 +843,8 @@ set(LLVM_PROFDATA_FILE "" CACHE FILEPATH "Profiling data file to use when compiling in order to improve runtime performance.") if(LLVM_INCLUDE_TESTS) diff --git a/debian/patches/mips/D154390-pre-R6.diff b/debian/patches/mips/D154390-pre-R6.diff new file mode 100644 index 00000000..1ce768e1 --- /dev/null +++ b/debian/patches/mips/D154390-pre-R6.diff @@ -0,0 +1,53 @@ +see https://reviews.llvm.org/D158491, still unreviewed upstream + +--- a/compiler-rt/lib/interception/interception.h ++++ b/compiler-rt/lib/interception/interception.h +@@ -199,8 +199,9 @@ + ".type " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", %function\n" \ + SANITIZER_STRINGIFY(TRAMPOLINE(func)) ":\n" \ + SANITIZER_STRINGIFY(CFI_STARTPROC) "\n" \ +- SANITIZER_STRINGIFY(ASM_TAIL_CALL) " __interceptor_" \ +- SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func)) "\n" \ ++ C_ASM_TAIL_CALL(SANITIZER_STRINGIFY(TRAMPOLINE(func)), \ ++ "__interceptor_" \ ++ SANITIZER_STRINGIFY(ASM_PREEMPTIBLE_SYM(func))) "\n" \ + SANITIZER_STRINGIFY(CFI_ENDPROC) "\n" \ + ".size " SANITIZER_STRINGIFY(TRAMPOLINE(func)) ", " \ + ".-" SANITIZER_STRINGIFY(TRAMPOLINE(func)) "\n" \ +--- a/compiler-rt/lib/sanitizer_common/sanitizer_asm.h ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_asm.h +@@ -44,6 +44,8 @@ + + #if defined(__x86_64__) || defined(__i386__) || defined(__sparc__) + # define ASM_TAIL_CALL jmp ++#elif defined(__mips__) && __mips_isa_rev >= 6 ++# define ASM_TAIL_CALL bc + #elif defined(__arm__) || defined(__aarch64__) || defined(__mips__) || \ + defined(__powerpc__) || defined(__loongarch_lp64) + # define ASM_TAIL_CALL b +@@ -53,6 +55,25 @@ + # define ASM_TAIL_CALL tail + #endif + ++#if defined(__mips64) && __mips_isa_rev < 6 ++# define C_ASM_TAIL_CALL(tfunc, ifunc) \ ++ "lui $t8, %hi(%neg(%gp_rel(" tfunc ")))\n" \ ++ "daddu $t8, $t8, $t9\n" \ ++ "daddu $t8, $t8, %lo(%neg(%gp_rel(" tfunc ")))\n" \ ++ "ld $t9, %got_disp(" ifunc ")($t8)\n" \ ++ "jr $t9\n" ++#elif defined(__mips__) && __mips_isa_rev < 6 ++# define C_ASM_TAIL_CALL(tfunc, ifunc) \ ++ ".set noreorder\n" \ ++ ".cpload $t9\n" \ ++ ".set reorder\n" \ ++ "lw $t9, %got(" ifunc ")($gp)\n" \ ++ "jr $t9\n" ++#elif defined(ASM_TAIL_CALL) ++# define C_ASM_TAIL_CALL(tfunc, ifunc) \ ++ SANITIZER_STRINGIFY(ASM_TAIL_CALL) " " ifunc ++#endif ++ + #if defined(__ELF__) && defined(__x86_64__) || defined(__i386__) || \ + defined(__riscv) + # define ASM_PREEMPTIBLE_SYM(sym) sym@plt diff --git a/debian/patches/mips/mips-D101773-reloc.patch b/debian/patches/mips/mips-D101773-reloc.patch index 09213f3c..ae99d678 100644 --- a/debian/patches/mips/mips-D101773-reloc.patch +++ b/debian/patches/mips/mips-D101773-reloc.patch @@ -24,11 +24,11 @@ Differential Revision: https://reviews.llvm.org/D101773 2 files changed, 33 insertions(+) create mode 100644 llvm/test/MC/Mips/mips_lo16.s -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/llvm/lib/MC/ELFObjectWriter.cpp -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/llvm/lib/MC/ELFObjectWriter.cpp -@@ -1369,6 +1369,17 @@ bool ELFObjectWriter::shouldRelocateWith +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/MC/ELFObjectWriter.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/MC/ELFObjectWriter.cpp +@@ -1401,6 +1401,17 @@ bool ELFObjectWriter::shouldRelocateWith if (TargetObjectWriter->getEMachine() == ELF::EM_MIPS && !hasRelocationAddend()) return true; diff --git a/debian/patches/mips/mips-force-nomadd4.patch b/debian/patches/mips/mips-force-nomadd4.patch index 95bf29b9..208b226e 100644 --- a/debian/patches/mips/mips-force-nomadd4.patch +++ b/debian/patches/mips/mips-force-nomadd4.patch @@ -6,11 +6,11 @@ support both, we have to disabled those instructions. For that, the patch below basically corresponds to the --with-madd4=no used on the GCC side. -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/Targets/Mips.h +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/clang/lib/Basic/Targets/Mips.h -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/clang/lib/Basic/Targets/Mips.h -@@ -332,6 +332,8 @@ public: +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/lib/Basic/Targets/Mips.h ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/lib/Basic/Targets/Mips.h +@@ -331,6 +331,8 @@ public: HasMSA = true; else if (Feature == "+nomadd4") DisableMadd4 = true; diff --git a/debian/patches/mips/mips-fpxx-enable.diff b/debian/patches/mips/mips-fpxx-enable.diff index d983d0c6..86c6b1d0 100644 --- a/debian/patches/mips/mips-fpxx-enable.diff +++ b/debian/patches/mips/mips-fpxx-enable.diff @@ -1,7 +1,7 @@ -Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/Mips/MipsSubtarget.cpp +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp -+++ llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/Mips/MipsSubtarget.cpp +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/lib/Target/Mips/MipsSubtarget.cpp ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/lib/Target/Mips/MipsSubtarget.cpp @@ -81,7 +81,7 @@ MipsSubtarget::MipsSubtarget(const Tripl InMips16HardFloat(Mips16HardFloat), InMicroMipsMode(false), HasDSP(false), HasDSPR2(false), HasDSPR3(false), AllowMixed16_32(Mixed16_32 || Mips_Os16), @@ -21,7 +21,7 @@ Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/ // MIPS-I has not been tested. if (MipsArchVersion == Mips1 && !MIPS1WarningPrinted) { errs() << "warning: MIPS-I support is experimental\n"; -@@ -243,6 +246,7 @@ MipsSubtarget & +@@ -242,6 +245,7 @@ MipsSubtarget & MipsSubtarget::initializeSubtargetDependencies(StringRef CPU, StringRef FS, const TargetMachine &TM) { StringRef CPUName = MIPS_MC::selectMipsCPU(TM.getTargetTriple(), CPU); @@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_16~++20221215021827+7b36538156b7/llvm/lib/Target/ // Parse features string. ParseSubtargetFeatures(CPUName, /*TuneCPU*/ CPUName, FS); -@@ -265,6 +269,13 @@ MipsSubtarget::initializeSubtargetDepend +@@ -264,6 +268,13 @@ MipsSubtarget::initializeSubtargetDepend report_fatal_error("64-bit code requested on a subtarget that doesn't " "support it!"); diff --git a/debian/patches/mips64el-ompt.patch b/debian/patches/mips64el-ompt.patch deleted file mode 100644 index 3e84a148..00000000 --- a/debian/patches/mips64el-ompt.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- llvm-toolchain-16-16.0.6.orig/openmp/runtime/cmake/config-ix.cmake -+++ llvm-toolchain-16-16.0.6/openmp/runtime/cmake/config-ix.cmake -@@ -328,6 +329,7 @@ else() - (LIBOMP_ARCH STREQUAL aarch64) OR - (LIBOMP_ARCH STREQUAL aarch64_a64fx) OR - (LIBOMP_ARCH STREQUAL ppc64le) OR -+ (LIBOMP_ARCH STREQUAL mips64) OR - (LIBOMP_ARCH STREQUAL ppc64) OR - (LIBOMP_ARCH STREQUAL riscv64) OR - (LIBOMP_ARCH STREQUAL loongarch64)) diff --git a/debian/patches/new-cmake-build-fix.patch b/debian/patches/new-cmake-build-fix.patch deleted file mode 100644 index 85e3c40f..00000000 --- a/debian/patches/new-cmake-build-fix.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 61967bbc7d4e9f72fb1fa082fa2235b99e36b698 Mon Sep 17 00:00:00 2001 -From: Nikita Popov -Date: Thu, 20 Apr 2023 14:59:27 +0200 -Subject: [PATCH] [OpenMP] Replace libomp_check_linker_flag with - llvm_check_compiler_linker_flag - -Replace the custom libomp_check_linker_flag() implementation with -llvm_check_compiler_linker_flag() from the common cmake utils. Due -to the way the custom implementation is implemented (capturing -output from an entire nested cmake invocation) it can easily end -up incorrectly detecting flags as unavailable, e.g. because "error", -"unknown" or similar occurs inside compiler flags, the directory -name, etc. - -Fixes https://github.com/llvm/llvm-project/issues/62240. - -Differential Revision: https://reviews.llvm.org/D148798 ---- - .../runtime/cmake/LibompCheckLinkerFlag.cmake | 72 ------------------- - openmp/runtime/cmake/config-ix.cmake | 18 ++--- - 2 files changed, 9 insertions(+), 81 deletions(-) - delete mode 100644 openmp/runtime/cmake/LibompCheckLinkerFlag.cmake - -diff --git a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake b/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake -deleted file mode 100644 -index bcc0ca80c866e..0000000000000 ---- a/openmp/runtime/cmake/LibompCheckLinkerFlag.cmake -+++ /dev/null -@@ -1,72 +0,0 @@ --# --#//===----------------------------------------------------------------------===// --#// --#// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. --#// See https://llvm.org/LICENSE.txt for license information. --#// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception --#// --#//===----------------------------------------------------------------------===// --# -- --include(GNUInstallDirs) -- --# Checking a linker flag to build a shared library --# There is no real trivial way to do this in CMake, so we implement it here --# this will have ${boolean} = TRUE if the flag succeeds, otherwise FALSE. --function(libomp_check_linker_flag flag boolean) -- if(NOT DEFINED "${boolean}") -- set(retval TRUE) -- set(library_source -- "int foo(int a) { return a*a; }") -- set(cmake_source -- "cmake_minimum_required(VERSION 3.13.4) -- project(foo C) -- set(CMAKE_SHARED_LINKER_FLAGS \"${flag}\") -- add_library(foo SHARED src_to_link.c)") -- # Compiling as a part of runtimes introduces ARCH-unknown-linux-gnu as a part -- # of a working directory. So adding a guard for unknown. -- set(failed_regexes "[Ee]rror;[Uu]nknown[^-];[Ss]kipping;LINK : warning;Unsupported command line") -- set(base_dir ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/link_flag_check_${boolean}) -- file(MAKE_DIRECTORY ${base_dir}) -- file(MAKE_DIRECTORY ${base_dir}/build) -- file(WRITE ${base_dir}/src_to_link.c "${library_source}") -- file(WRITE ${base_dir}/CMakeLists.txt "${cmake_source}") -- -- message(STATUS "Performing Test ${boolean}") -- try_compile( -- try_compile_result -- ${base_dir}/build -- ${base_dir} -- foo -- OUTPUT_VARIABLE OUTPUT) -- -- if(try_compile_result) -- foreach(regex IN LISTS failed_regexes) -- # Ignore the warning about the newer or unknown CUDA version. -- if(("${OUTPUT}" MATCHES ${regex}) AND NOT ("${OUTPUT}" MATCHES "Unknown CUDA version")) -- set(retval FALSE) -- endif() -- endforeach() -- else() -- set(retval FALSE) -- endif() -- -- if(${retval}) -- set(${boolean} 1 CACHE INTERNAL "Test ${boolean}") -- message(STATUS "Performing Test ${boolean} - Success") -- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -- "Performing C Linker Flag test ${boolean} succeeded with the following output:\n" -- "${OUTPUT}\n" -- "Source file was:\n${library_source}\n") -- else() -- set(${boolean} "" CACHE INTERNAL "Test ${boolean}") -- message(STATUS "Performing Test ${boolean} - Failed") -- file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log -- "Performing C Linker Flag test ${boolean} failed with the following output:\n" -- "${OUTPUT}\n" -- "Source file was:\n${library_source}\n") -- endif() -- -- set(${boolean} ${retval} PARENT_SCOPE) -- endif() --endfunction() -diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake -index d0eda6d8ca39a..ca3cb43c285db 100644 ---- a/openmp/runtime/cmake/config-ix.cmake -+++ b/openmp/runtime/cmake/config-ix.cmake -@@ -16,8 +16,8 @@ include(CheckIncludeFile) - include(CheckLibraryExists) - include(CheckIncludeFiles) - include(CheckSymbolExists) --include(LibompCheckLinkerFlag) - include(LibompCheckFortranFlag) -+include(LLVMCheckCompilerLinkerFlag) - - # Check for versioned symbols - function(libomp_check_version_symbols retval) -@@ -133,13 +133,13 @@ check_symbol_exists(_aligned_malloc "malloc.h" LIBOMP_HAVE__ALIGNED_MALLOC) - - # Check linker flags - if(WIN32) -- libomp_check_linker_flag(/SAFESEH LIBOMP_HAVE_SAFESEH_FLAG) -+ llvm_check_compiler_linker_flag(C /SAFESEH LIBOMP_HAVE_SAFESEH_FLAG) - elseif(NOT APPLE) -- libomp_check_linker_flag(-Wl,-x LIBOMP_HAVE_X_FLAG) -- libomp_check_linker_flag(-Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG) -- libomp_check_linker_flag("-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -- libomp_check_linker_flag(-static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG) -- libomp_check_linker_flag(-Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG) -+ llvm_check_compiler_linker_flag(C -Wl,-x LIBOMP_HAVE_X_FLAG) -+ llvm_check_compiler_linker_flag(C -Wl,--as-needed LIBOMP_HAVE_AS_NEEDED_FLAG) -+ llvm_check_compiler_linker_flag(C "-Wl,--version-script=${LIBOMP_SRC_DIR}/exports_test_so.txt" LIBOMP_HAVE_VERSION_SCRIPT_FLAG) -+ llvm_check_compiler_linker_flag(C -static-libgcc LIBOMP_HAVE_STATIC_LIBGCC_FLAG) -+ llvm_check_compiler_linker_flag(C -Wl,-z,noexecstack LIBOMP_HAVE_Z_NOEXECSTACK_FLAG) - endif() - - # Check Intel(R) C Compiler specific flags -@@ -150,8 +150,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Intel" OR CMAKE_C_COMPILER_ID STREQUAL "IntelLL - check_cxx_compiler_flag(-Qoption,cpp,--extended_float_types LIBOMP_HAVE_EXTENDED_FLOAT_TYPES_FLAG) - check_cxx_compiler_flag(-falign-stack=maintain-16-byte LIBOMP_HAVE_FALIGN_STACK_FLAG) - check_cxx_compiler_flag("-opt-streaming-stores never" LIBOMP_HAVE_OPT_STREAMING_STORES_FLAG) -- libomp_check_linker_flag(-static-intel LIBOMP_HAVE_STATIC_INTEL_FLAG) -- libomp_check_linker_flag(-no-intel-extensions LIBOMP_HAVE_NO_INTEL_EXTENSIONS_FLAG) -+ llvm_check_compiler_linker_flag(C -static-intel LIBOMP_HAVE_STATIC_INTEL_FLAG) -+ llvm_check_compiler_linker_flag(C -no-intel-extensions LIBOMP_HAVE_NO_INTEL_EXTENSIONS_FLAG) - check_library_exists(irc_pic _intel_fast_memcpy "" LIBOMP_HAVE_IRC_PIC_LIBRARY) - endif() - diff --git a/debian/patches/omp-riscv64.patch b/debian/patches/omp-riscv64.patch index bd781bb0..760aedfd 100644 --- a/debian/patches/omp-riscv64.patch +++ b/debian/patches/omp-riscv64.patch @@ -1,11 +1,11 @@ Description: Define the affinity for riscv64 Last-Update: 2021-08-27 -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/openmp/runtime/src/kmp_affinity.h -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/openmp/runtime/src/kmp_affinity.h -@@ -210,6 +210,17 @@ public: +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/openmp/runtime/src/kmp_affinity.h ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/openmp/runtime/src/kmp_affinity.h +@@ -212,6 +212,17 @@ public: #elif __NR_sched_getaffinity != 123 #error Wrong code for getaffinity system call. #endif /* __NR_sched_getaffinity */ diff --git a/debian/patches/openmp-fix-runtimes-build.diff b/debian/patches/openmp-fix-runtimes-build.diff index 3b30083a..1d6caad4 100644 --- a/debian/patches/openmp-fix-runtimes-build.diff +++ b/debian/patches/openmp-fix-runtimes-build.diff @@ -1,19 +1,20 @@ include required runtimes as dependencies to openmp targets to make sure they are built first when included as part of a runtimes build since openmp can depend on them -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/llvm/runtimes/CMakeLists.txt +<<<<<<< Updated upstream +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/llvm/runtimes/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/llvm/runtimes/CMakeLists.txt -@@ -233,6 +233,7 @@ function(runtime_default_target) +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/llvm/runtimes/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/llvm/runtimes/CMakeLists.txt +@@ -236,6 +236,7 @@ function(runtime_default_target) -DLLVM_ENABLE_PROJECTS_USED=${LLVM_ENABLE_PROJECTS_USED} - -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR_default} + -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=${LLVM_ENABLE_PER_TARGET_RUNTIME_DIR} -DLLVM_BUILD_TOOLS=${LLVM_BUILD_TOOLS} + -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR} -DCMAKE_C_COMPILER_WORKS=ON -DCMAKE_CXX_COMPILER_WORKS=ON -DCMAKE_ASM_COMPILER_WORKS=ON -@@ -480,7 +481,7 @@ if(runtimes) +@@ -496,7 +497,7 @@ if(runtimes) # build directory cannot find the C++ headers in certain configurations. # I need to build a mechanism for runtime projects to provide CMake code # that executes at LLVM configuration time to handle this case. @@ -22,12 +23,12 @@ Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/llvm/runtimes/CMak # We need to add the runtimes as a dependency because compiler-rt can be # built as part of runtimes and we need the profile runtime for PGO add_dependencies(clang-bootstrap-deps runtimes) -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/CMakeLists.txt -@@ -91,6 +91,28 @@ else() - set(LIBOMP_HEADERS_INSTALL_PATH "${OPENMP_INSTALL_LIBDIR}/clang/${CLANG_VERSION}/include") +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/CMakeLists.txt +@@ -94,6 +94,28 @@ else() + get_clang_resource_dir(LIBOMP_HEADERS_INSTALL_PATH SUBDIR include) endif() +option(OPENMP_USE_LLVM_UNWINDER "Build and use the LLVM unwinder" OFF) @@ -55,39 +56,39 @@ Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/CMakeLists. # Build host runtime library, after LIBOMPTARGET variables are set since they are needed # to enable time profiling support in the OpenMP runtime. add_subdirectory(runtime) -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarget/plugins/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/libomptarget/plugins/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarget/plugins/CMakeLists.txt -@@ -48,6 +48,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma - NO_INSTALL_RPATH - ) +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/plugins-nextgen/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/CMakeLists.txt +@@ -62,6 +62,8 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "${tma + "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/../exports") + endif() + add_runtimes_build_depends_if_needed("omptarget.rtl.${tmachine_libname}") + # Install plugin under the lib destination folder. install(TARGETS "omptarget.rtl.${tmachine_libname}" LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarget/plugins/cuda/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/libomptarget/plugins/cuda/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarget/plugins/cuda/CMakeLists.txt -@@ -83,6 +83,8 @@ else() - ) +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/plugins-nextgen/cuda/CMakeLists.txt +@@ -84,6 +84,8 @@ else() + " Use 'LIBOMPTARGET_FORCE_NVIDIA_TESTS' to override.") endif() +add_runtimes_build_depends_if_needed(omptarget.rtl.cuda) + # Install plugin under the lib destination folder. install(TARGETS omptarget.rtl.cuda LIBRARY DESTINATION "${OPENMP_INSTALL_LIBDIR}") - set_target_properties(omptarget.rtl.cuda PROPERTIES -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarget/src/CMakeLists.txt + set_target_properties(omptarget.rtl.cuda PROPERTIES +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/libomptarget/src/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarget/src/CMakeLists.txt -@@ -35,7 +35,9 @@ add_llvm_library(omptarget - PRIVATE - "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports" +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/libomptarget/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/libomptarget/src/CMakeLists.txt +@@ -36,7 +36,9 @@ add_llvm_library(omptarget + omp + NO_INSTALL_RPATH -) + ) @@ -95,11 +96,11 @@ Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/libomptarge + target_include_directories(omptarget PRIVATE ${LIBOMPTARGET_INCLUDE_DIR}) - # libomptarget.so needs to be aware of where the plugins live as they -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/CMakeLists.txt + if (LIBOMP_HAVE_VERSION_SCRIPT_FLAG) +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/CMakeLists.txt +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/CMakeLists.txt @@ -292,6 +292,10 @@ if(LIBOMP_STATS) set(LIBOMP_USE_STDCPPLIB TRUE) endif() @@ -111,11 +112,11 @@ Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/CMa # Shared library can be switched to a static library set(LIBOMP_ENABLE_SHARED TRUE CACHE BOOL "Shared library instead of static library?") -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/src/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/src/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/runtime/src/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/src/CMakeLists.txt -@@ -140,6 +140,7 @@ set_source_files_properties(${LIBOMP_GNU +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/runtime/src/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/runtime/src/CMakeLists.txt +@@ -139,6 +139,7 @@ set_source_files_properties(${LIBOMP_ASM if(NOT ${LIBOMP_USE_STDCPPLIB}) set(LIBOMP_LINKER_LANGUAGE C) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) @@ -123,7 +124,7 @@ Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/src else() set(LIBOMP_LINKER_LANGUAGE CXX) endif() -@@ -201,6 +202,8 @@ else() +@@ -200,6 +201,8 @@ else() ) endif() @@ -132,12 +133,12 @@ Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/runtime/src # Get the library's location within the build tree for the unit tester if(NOT WIN32) get_target_property(LIBOMP_LIBRARY_DIR omp LIBRARY_OUTPUT_DIRECTORY) -Index: llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/tools/archer/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/tools/archer/CMakeLists.txt =================================================================== ---- llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93.orig/openmp/tools/archer/CMakeLists.txt -+++ llvm-toolchain-16_16.0.0~++20230214094510+6d859df46e93/openmp/tools/archer/CMakeLists.txt -@@ -14,6 +14,9 @@ if(LIBOMP_OMPT_SUPPORT) - add_library(archer SHARED ompt-tsan.cpp) +--- llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61.orig/openmp/tools/archer/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230707101520+336d7281ad61/openmp/tools/archer/CMakeLists.txt +@@ -15,6 +15,9 @@ if(LIBOMP_OMPT_SUPPORT AND LIBOMP_ARCHER + target_link_libraries(archer ${CMAKE_DL_LIBS}) add_library(archer_static STATIC ompt-tsan.cpp) + add_runtimes_build_depends_if_needed(archer) diff --git a/debian/patches/openmp-soname.diff b/debian/patches/openmp-soname.diff index dc33a6e5..f3188bce 100644 --- a/debian/patches/openmp-soname.diff +++ b/debian/patches/openmp-soname.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/openmp/runtime/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/openmp/runtime/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/openmp/runtime/CMakeLists.txt -@@ -371,7 +371,8 @@ else() +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/openmp/runtime/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/openmp/runtime/CMakeLists.txt +@@ -380,7 +380,8 @@ else() set(LIBOMP_INSTALL_KIND ARCHIVE) endif() diff --git a/debian/patches/protobuf_3.21.patch b/debian/patches/protobuf_3.21.patch index 6ffe27a0..cdbf273d 100644 --- a/debian/patches/protobuf_3.21.patch +++ b/debian/patches/protobuf_3.21.patch @@ -1,15 +1,15 @@ -Index: llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +Index: llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp =================================================================== ---- llvm-toolchain-snapshot_16~++20221126040739+502c246519ec.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp -+++ llvm-toolchain-snapshot_16~++20221126040739+502c246519ec/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp -@@ -67,8 +67,8 @@ int main(int argc, char *argv[]) { - google::protobuf::util::MessageToJsonString(Response, &Output, Options); +--- llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c.orig/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp ++++ llvm-toolchain-snapshot_17~++20230223111257+4f0aa2517d0c/clang-tools-extra/clangd/index/remote/monitor/Monitor.cpp +@@ -68,8 +68,9 @@ int main(int argc, char *argv[]) { if (!JsonStatus.ok()) { clang::clangd::elog("Can not convert response ({0}) to JSON ({1}): {2}\n", -- Response.DebugString(), JsonStatus.error_code(), -- JsonStatus.error_message().as_string()); -+ Response.DebugString(), (int)JsonStatus.code(), -+ JsonStatus.message().as_string()); + Response.DebugString(), +- static_cast(JsonStatus.code()), ++ (int)JsonStatus.code(), + JsonStatus.message().as_string()); ++ return -1; } llvm::outs() << Output; diff --git a/debian/patches/python-clangpath.diff b/debian/patches/python-clangpath.diff index 5ccbb830..ce679260 100644 --- a/debian/patches/python-clangpath.diff +++ b/debian/patches/python-clangpath.diff @@ -2,16 +2,16 @@ clang/bindings/python/clang/cindex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/python/clang/cindex.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py =================================================================== ---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/bindings/python/clang/cindex.py -+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/bindings/python/clang/cindex.py -@@ -4162,7 +4162,7 @@ class Config(object): - elif name == 'Windows': - file = 'libclang.dll' +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/bindings/python/clang/cindex.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/bindings/python/clang/cindex.py +@@ -3937,7 +3937,7 @@ class Config(object): + elif name == "Windows": + file = "libclang.dll" else: -- file = 'libclang.so' -+ file = 'libclang-16.so' +- file = "libclang.so" ++ file = "libclang-17.so" if Config.library_path: - file = Config.library_path + '/' + file + file = Config.library_path + "/" + file diff --git a/debian/patches/python3-shebang.patch b/debian/patches/python3-shebang.patch index 7aa4e1b6..a57c8f7b 100644 --- a/debian/patches/python3-shebang.patch +++ b/debian/patches/python3-shebang.patch @@ -1,809 +1,779 @@ Description: change all shebangs to Python3 find . -name "*.py" -exec sed "s|\!/usr/bin/env python$|\!/usr/bin/env python3|g" -i {} \; -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/run-find-all-symbols.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # - #=- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python -*-=# + # =- run-find-all-symbols.py - Parallel find-all-symbols runner -*- python -*-=# # -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-dump.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - #===- clang-tidy-diff.py - ClangTidy Diff Checker -----------*- python -*--===# - # -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-dump.py -=================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/bindings/python/examples/cindex/cindex-dump.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-dump.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/bindings/python/examples/cindex/cindex-dump.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-dump.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===# + # ===- cindex-dump.py - cindex/Python Source Dump -------------*- python -*--===# # -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-includes.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-includes.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/bindings/python/examples/cindex/cindex-includes.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/bindings/python/examples/cindex/cindex-includes.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/bindings/python/examples/cindex/cindex-includes.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/bindings/python/examples/cindex/cindex-includes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===# + # ===- cindex-includes.py - cindex/Python Inclusion Graph -----*- python -*--===# # -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/bin/scan-view +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/bin/scan-view =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/tools/scan-view/bin/scan-view -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/bin/scan-view +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/tools/scan-view/bin/scan-view ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/bin/scan-view @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/share/startfile.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/share/startfile.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/tools/scan-view/share/startfile.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/tools/scan-view/share/startfile.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/tools/scan-view/share/startfile.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/tools/scan-view/share/startfile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- """Utility for opening a file using the default application in a cross-platform -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/ABITest/ABITestGen.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/ABITest/ABITestGen.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/ABITest/ABITestGen.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/ABITest/ABITestGen.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/ABITest/ABITestGen.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/ABITest/ABITestGen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function from pprint import pprint -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CIndex/completion_logger_server.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CIndex/completion_logger_server.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/CIndex/completion_logger_server.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CIndex/completion_logger_server.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CIndex/completion_logger_server.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CIndex/completion_logger_server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function import sys from socket import * -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CaptureCmd +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CaptureCmd =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/CaptureCmd -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CaptureCmd +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CaptureCmd ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CaptureCmd @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """CaptureCmd - A generic tool for capturing information about the invocations of another program. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CmpDriver +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CmpDriver =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/CmpDriver -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/CmpDriver +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/CmpDriver ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/CmpDriver @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ A simple utility that compares tool invocations and exit codes issued by -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FindSpecRefs +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FindSpecRefs =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/FindSpecRefs -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FindSpecRefs +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/FindSpecRefs ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FindSpecRefs @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FuzzTest +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FuzzTest =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/FuzzTest -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/FuzzTest +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/FuzzTest ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/FuzzTest @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This is a generic fuzz testing tool, see --help for more information. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/TestUtils/deep-stack.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/TestUtils/deep-stack.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/TestUtils/deep-stack.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/TestUtils/deep-stack.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/TestUtils/deep-stack.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/TestUtils/deep-stack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function - def pcall(f, N): -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/CmpRuns.py + +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/CmpRuns.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/CmpRuns.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/CmpRuns.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/CmpRuns.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/CmpRuns.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ CmpRuns - A simple tool for comparing two static analyzer runs to determine -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestAdd.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestAdd.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SATestAdd.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestAdd.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestAdd.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestAdd.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Static Analyzer qualification infrastructure: adding a new project to -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestBuild.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestBuild.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SATestBuild.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestBuild.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestBuild.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestBuild.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Static Analyzer qualification infrastructure. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestUpdateDiffs.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestUpdateDiffs.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SATestUpdateDiffs.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SATestUpdateDiffs.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SATestUpdateDiffs.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SATestUpdateDiffs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Update reference results for static analyzer. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SumTimerInfo.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SumTimerInfo.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/SumTimerInfo.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/SumTimerInfo.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/SumTimerInfo.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/SumTimerInfo.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Script to Summarize statistics in the scan-build output. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/exploded-graph-rewriter.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/exploded-graph-rewriter.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/analyzer/exploded-graph-rewriter.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/analyzer/exploded-graph-rewriter.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/analyzer/exploded-graph-rewriter.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/analyzer/exploded-graph-rewriter.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # - #===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--# + # ===- exploded-graph-rewriter.py - ExplodedGraph dump tool -----*- python -*--# # -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/check_cfc.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/check_cfc/check_cfc.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/check_cfc.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/check_cfc.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/check_cfc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Check CFC - Check Compile Flow Consistency -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/obj_diff.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/obj_diff.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/check_cfc/obj_diff.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/obj_diff.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/obj_diff.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/obj_diff.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/test_check_cfc.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/test_check_cfc.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/check_cfc/test_check_cfc.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/check_cfc/test_check_cfc.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/check_cfc/test_check_cfc.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/check_cfc/test_check_cfc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Test internal functions within check_cfc.py.""" -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/modfuzz.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/modfuzz.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/modfuzz.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/modfuzz.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/modfuzz.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/modfuzz.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # To use: # 1) Update the 'decls' list below with your fuzzing configuration. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/token-delta.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/token-delta.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/clang/utils/token-delta.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/clang/utils/token-delta.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/clang/utils/token-delta.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/clang/utils/token-delta.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import absolute_import, division, print_function import os -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/asan/scripts/asan_symbolize.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/asan/scripts/asan_symbolize.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/asan/scripts/asan_symbolize.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/asan/scripts/asan_symbolize.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/asan/scripts/asan_symbolize.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #===- lib/asan/scripts/asan_symbolize.py -----------------------------------===# + # ===- lib/asan/scripts/asan_symbolize.py -----------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/dfsan/scripts/build-libc-list.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/dfsan/scripts/build-libc-list.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/dfsan/scripts/build-libc-list.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #===- lib/dfsan/scripts/build-libc-list.py ---------------------------------===# + # ===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/fuzzer/scripts/unbalanced_allocs.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #===- lib/fuzzer/scripts/unbalanced_allocs.py ------------------------------===# + # ===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===# # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/sancov.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/gen_dynamic_list.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #===- lib/sanitizer_common/scripts/gen_dynamic_list.py ---------------------===# - # - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/sancov.py -=================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/compiler-rt/lib/sanitizer_common/scripts/sancov.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/compiler-rt/lib/sanitizer_common/scripts/sancov.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/compiler-rt/lib/sanitizer_common/scripts/sancov.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Merge or print the coverage data collected by asan's coverage. # Input files are sequences of 4-byte integers. # We need to merge these integers into a set and then -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/cat_files.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/cat_files.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/libcxx/utils/cat_files.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/cat_files.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/libcxx/utils/cat_files.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/cat_files.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 - #===----------------------------------------------------------------------===## + # ===----------------------------------------------------------------------===## # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/generate_feature_test_macro_components.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/generate_feature_test_macro_components.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/libcxx/utils/generate_feature_test_macro_components.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/generate_feature_test_macro_components.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/libcxx/utils/generate_feature_test_macro_components.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/libcxx/utils/generate_feature_test_macro_components.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os from builtins import range -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/sym_diff.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lld/utils/benchmark.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/libcxx/utils/sym_diff.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/libcxx/utils/sym_diff.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - #===----------------------------------------------------------------------===## - # - # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lld/utils/benchmark.py -=================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lld/utils/benchmark.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lld/utils/benchmark.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lld/utils/benchmark.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lld/utils/benchmark.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # See https://llvm.org/LICENSE.txt for license information. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/examples/python/file_extract.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/examples/python/file_extract.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/examples/python/file_extract.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/examples/python/file_extract.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/examples/python/file_extract.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/examples/python/file_extract.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import string import struct -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/bench.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/bench.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/packages/Python/lldbsuite/test/bench.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/bench.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/packages/Python/lldbsuite/test/bench.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/bench.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ A simple bench runner which delegates to the ./dotest.py test driver to run the -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/packages/Python/lldbsuite/test/tools/lldb-vscode/vscode.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import binascii import json -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/analyze-project-deps.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/analyze-project-deps.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/scripts/analyze-project-deps.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/analyze-project-deps.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/scripts/analyze-project-deps.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/analyze-project-deps.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import itertools -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/verify_api.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/verify_api.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/scripts/verify_api.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/scripts/verify_api.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/scripts/verify_api.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/scripts/verify_api.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess import optparse -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/third_party/Python/module/pexpect-4.6/pexpect/FSM.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 '''This module implements a Finite State Machine (FSM). In addition to state this FSM also maintains a user defined "memory". So this FSM can be used as a -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/lui.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/lui.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/utils/lui/lui.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/lui.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/utils/lui/lui.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/lui.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ##===-- lui.py -----------------------------------------------*- Python -*-===## ## # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/sandbox.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/sandbox.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/lldb/utils/lui/sandbox.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/lldb/utils/lui/sandbox.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/lldb/utils/lui/sandbox.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/lldb/utils/lui/sandbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 ##===-- sandbox.py -------------------------------------------*- Python -*-===## ## # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/genk-timing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/cached/split-lib.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/genk-timing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/complete/split-lib.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/examples/Kaleidoscope/MCJIT/lazy/genk-timing.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/BugPoint/compile-custom.ll.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/BugPoint/compile-custom.ll.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/test/BugPoint/compile-custom.ll.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/BugPoint/compile-custom.ll.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/BugPoint/compile-custom.ll.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/BugPoint/compile-custom.ll.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/Other/opt-bisect-helper.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/Other/opt-bisect-helper.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/test/Other/opt-bisect-helper.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/Other/opt-bisect-helper.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/Other/opt-bisect-helper.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/Other/opt-bisect-helper.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/TableGen/JSON-check.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/TableGen/JSON-check.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/test/TableGen/JSON-check.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/test/TableGen/JSON-check.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/test/TableGen/JSON-check.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/test/TableGen/JSON-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys import subprocess -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-diff.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-diff.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/opt-diff.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-diff.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-diff.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-diff.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-stats.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-stats.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/opt-stats.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-stats.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-stats.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-stats.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-viewer.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-viewer.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/opt-viewer.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/opt-viewer.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/opt-viewer.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/opt-viewer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/optrecord.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/optrecord.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/tools/opt-viewer/optrecord.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/tools/opt-viewer/optrecord.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/tools/opt-viewer/optrecord.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/tools/opt-viewer/optrecord.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/Misc/zkill +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/Misc/zkill =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/Misc/zkill -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/Misc/zkill +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/Misc/zkill ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/Misc/zkill @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import re -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/abtest.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/abtest.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/abtest.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/abtest.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/abtest.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/abtest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Given a previous good compile narrow down miscompiles. # Expects two directories named "before" and "after" each containing a set of -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/bisect -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bisect ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # The way you use this is you create a script that takes in as its first # argument a count. The script passes into LLVM the count via a command -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect-skip-count +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect-skip-count =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/bisect-skip-count -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bisect-skip-count +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bisect-skip-count ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bisect-skip-count @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This script is used to bisect skip and count arguments for --debug-counter. # It is similar to bisect, except it understands how to increase skip and decrease count # -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bugpoint_gisel_reducer.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bugpoint_gisel_reducer.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/bugpoint_gisel_reducer.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/bugpoint_gisel_reducer.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/bugpoint_gisel_reducer.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/bugpoint_gisel_reducer.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Reduces GlobalISel failures. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/clang-parse-diagnostics-file +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/clang-parse-diagnostics-file =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/clang-parse-diagnostics-file -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/clang-parse-diagnostics-file +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/clang-parse-diagnostics-file ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/clang-parse-diagnostics-file @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import plistlib -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/create_ladder_graph.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/create_ladder_graph.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/create_ladder_graph.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/create_ladder_graph.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/create_ladder_graph.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/create_ladder_graph.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A ladder graph creation program. This is a python program that creates c source code that will generate -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_symbols.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_symbols.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/extract_symbols.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_symbols.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/extract_symbols.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_symbols.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A tool for extracting a list of symbols to export -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_vplan.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_vplan.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/extract_vplan.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/extract_vplan.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/extract_vplan.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/extract_vplan.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # This script extracts the VPlan digraphs from the vectoriser debug messages # and saves them in individual dot files (one for each plan). Optionally, and -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/indirect_calls.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/indirect_calls.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/indirect_calls.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/indirect_calls.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/indirect_calls.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/indirect_calls.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A tool for looking for indirect jumps and calls in x86 binaries. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/lit/ProgressBar.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/lit/ProgressBar.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/lit/ProgressBar.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/lit/ProgressBar.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/lit/ProgressBar.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/lit/ProgressBar.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Source: http://code.activestate.com/recipes/475116/, with # modifications by Daniel Dunbar. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-format/DummySubDir/OneTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/googletest-timeout/DummySubDir/OneTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-env/print_environment.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-format/external_shell/write-bad-encoding.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_args.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import platform -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/check_path.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stderr.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/lit/tests/Inputs/shtest-shell/write-to-stdout-and-stderr.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import sys -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/llvm-gisel-cov.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/llvm-gisel-cov.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/llvm-gisel-cov.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/llvm-gisel-cov.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/llvm-gisel-cov.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/llvm-gisel-cov.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Summarize the information in the given coverage files. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/prepare-code-coverage-artifact.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/prepare-code-coverage-artifact.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/prepare-code-coverage-artifact.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/prepare-code-coverage-artifact.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/prepare-code-coverage-artifact.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/prepare-code-coverage-artifact.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-nightly.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-nightly.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/release/findRegressions-nightly.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-nightly.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/release/findRegressions-nightly.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-nightly.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import re, string, sys, os, time -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-simple.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-simple.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/release/findRegressions-simple.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/release/findRegressions-simple.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/release/findRegressions-simple.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/release/findRegressions-simple.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import re, string, sys, os, time, math -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_fuzz.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_fuzz.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/shuffle_fuzz.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_fuzz.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/shuffle_fuzz.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_fuzz.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A shuffle vector fuzz tester. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_select_fuzz_tester.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_select_fuzz_tester.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/shuffle_select_fuzz_tester.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/shuffle_select_fuzz_tester.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/shuffle_select_fuzz_tester.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/shuffle_select_fuzz_tester.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A shuffle-select vector fuzz tester. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/sort_includes.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/sort_includes.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/sort_includes.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/sort_includes.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/sort_includes.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/sort_includes.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Script to sort the top-most block of #include lines. -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/unicode-case-fold.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/unicode-case-fold.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/unicode-case-fold.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/unicode-case-fold.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/unicode-case-fold.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/unicode-case-fold.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Unicode case folding database conversion utility -Index: llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/wciia.py +Index: llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/wciia.py =================================================================== ---- llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00.orig/llvm/utils/wciia.py -+++ llvm-toolchain-snapshot_16~++20230110111828+ded988ed0c00/llvm/utils/wciia.py +--- llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb.orig/llvm/utils/wciia.py ++++ llvm-toolchain-snapshot_17~++20230723074821+3ebe606592fb/llvm/utils/wciia.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 diff --git a/debian/patches/remove-apple-clang-manpage.diff b/debian/patches/remove-apple-clang-manpage.diff index 47e7bd78..6548700c 100644 --- a/debian/patches/remove-apple-clang-manpage.diff +++ b/debian/patches/remove-apple-clang-manpage.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst =================================================================== ---- llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f.orig/clang/docs/CommandGuide/clang.rst -+++ llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/CommandGuide/clang.rst -@@ -345,24 +345,10 @@ Clang fully supports cross compilation a +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/docs/CommandGuide/clang.rst ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/docs/CommandGuide/clang.rst +@@ -353,24 +353,10 @@ Clang fully supports cross compilation a Depending on how your version of Clang is configured, it may have support for a number of cross compilers, or may only support a native target. @@ -27,7 +27,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/clang/docs/Comma .. option:: --print-supported-cpus Print out a list of supported processors for the given target (specified -@@ -681,11 +667,6 @@ ENVIRONMENT +@@ -705,11 +691,6 @@ ENVIRONMENT These environment variables specify additional paths, as for :envvar:`CPATH`, which are only used when processing the appropriate language. diff --git a/debian/patches/revert-update-doc.diff b/debian/patches/revert-update-doc.diff index aeea4c23..78cb249f 100644 --- a/debian/patches/revert-update-doc.diff +++ b/debian/patches/revert-update-doc.diff @@ -15,13 +15,13 @@ Date: Tue Feb 1 23:13:01 2022 -0800 Differential Revision: https://reviews.llvm.org/D112181 -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang-tools-extra/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extra/docs/conf.py -@@ -44,6 +44,15 @@ master_doc = 'index' - project = u'Extra Clang Tools' - copyright = u'2007-%d, The Clang Team' % date.today().year +--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang-tools-extra/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang-tools-extra/docs/conf.py +@@ -44,6 +44,15 @@ master_doc = "index" + project = "Extra Clang Tools" + copyright = "2007-%d, The Clang Team" % date.today().year +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the @@ -34,10 +34,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extr + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. - #language = None -@@ -78,11 +87,6 @@ pygments_style = 'friendly' + # language = None +@@ -78,11 +87,6 @@ pygments_style = "friendly" # A list of ignored prefixes for module index sorting. - #modindex_common_prefix = [] + # modindex_common_prefix = [] -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else "" - @@ -47,13 +47,13 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang-tools-extr # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/clang/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf.py -@@ -62,6 +62,15 @@ master_doc = 'index' - project = u'Clang' - copyright = u'2007-%d, The Clang Team' % date.today().year +--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/clang/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/clang/docs/conf.py +@@ -63,6 +63,15 @@ master_doc = "index" + project = "Clang" + copyright = "2007-%d, The Clang Team" % date.today().year +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the @@ -66,10 +66,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf. + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. - #language = None -@@ -93,11 +102,6 @@ exclude_patterns = ['_build'] + # language = None +@@ -94,11 +103,6 @@ exclude_patterns = ["_build"] # The name of the Pygments (syntax highlighting) style to use. - pygments_style = 'friendly' + pygments_style = "friendly" -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else "" - @@ -79,13 +79,13 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/clang/docs/conf. # -- Options for HTML output --------------------------------------------------- -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/lld/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py -@@ -43,6 +43,15 @@ master_doc = 'index' - project = u'lld' - copyright = u'2011-%d, LLVM Project' % date.today().year +--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/lld/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/lld/docs/conf.py +@@ -43,6 +43,15 @@ master_doc = "index" + project = "lld" + copyright = "2011-%d, LLVM Project" % date.today().year +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the @@ -98,11 +98,11 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/lld/docs/conf.py + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. - #language = None -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake + # language = None +Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/cmake/modules/AddSphinxTarget.cmake -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modules/AddSphinxTarget.cmake +--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/cmake/modules/AddSphinxTarget.cmake ++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/cmake/modules/AddSphinxTarget.cmake @@ -39,10 +39,6 @@ function (add_sphinx_target builder proj set(ARG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") endif() @@ -124,13 +124,13 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/cmake/modul ${SPHINX_WARNINGS_AS_ERRORS_FLAG} # Treat warnings as errors if requested "${ARG_SOURCE_DIR}" # Source "${SPHINX_BUILD_DIR}" # Output -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py +Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/llvm/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.py -@@ -61,6 +61,15 @@ master_doc = 'index' - project = u'LLVM' - copyright = u'2003-%d, LLVM Project' % date.today().year +--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/llvm/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/llvm/docs/conf.py +@@ -62,6 +62,15 @@ master_doc = "index" + project = "LLVM" + copyright = "2003-%d, LLVM Project" % date.today().year +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the @@ -143,14 +143,14 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/llvm/docs/conf.p + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. - #language = None -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py + # language = None +Index: llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/polly/docs/conf.py -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf.py -@@ -44,6 +44,15 @@ master_doc = 'index' - project = u'Polly' - copyright = u'2010-%d, The Polly Team' % date.today().year +--- llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e.orig/polly/docs/conf.py ++++ llvm-toolchain-snapshot_17~++20230526082102+a22ef958cb7e/polly/docs/conf.py +@@ -44,6 +44,15 @@ master_doc = "index" + project = "Polly" + copyright = "2010-%d, The Polly Team" % date.today().year +# The version info for the project you're documenting, acts as replacement for +# |version| and |release|, also used in various other places throughout the @@ -163,10 +163,10 @@ Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/polly/docs/conf. + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. - #language = None -@@ -78,11 +87,6 @@ pygments_style = 'friendly' + # language = None +@@ -78,11 +87,6 @@ pygments_style = "friendly" # A list of ignored prefixes for module index sorting. - #modindex_common_prefix = [] + # modindex_common_prefix = [] -in_progress_title = "(In-Progress) " if tags.has("PreRelease") else "" - diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 1470d4c6..cbc11e45 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -2,16 +2,16 @@ clang/tools/scan-build/bin/scan-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/bin/scan-build +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build =================================================================== ---- llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416.orig/clang/tools/scan-build/bin/scan-build -+++ llvm-toolchain-snapshot_16~++20211116120952+5b4bfd8c2416/clang/tools/scan-build/bin/scan-build -@@ -1686,7 +1686,7 @@ sub FindClang { +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/clang/tools/scan-build/bin/scan-build ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/clang/tools/scan-build/bin/scan-build +@@ -1485,7 +1485,7 @@ sub FindClang { if (!defined $Options{AnalyzerDiscoveryMethod}) { $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); if (!defined $Clang || ! -x $Clang) { - $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang"); -+ $Clang = Cwd::realpath("/usr/lib/llvm-16/bin/clang"); ++ $Clang = Cwd::realpath("/usr/lib/llvm-17/bin/clang"); if (!defined $Clang || ! -x $Clang) { # When an Xcode toolchain is present, look for a clang in the sibling bin # of the parent of the bin directory. So if scan-build is at diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff index 0cda8a2d..d2a3742d 100644 --- a/debian/patches/scan-build-py-fix-default-bin.diff +++ b/debian/patches/scan-build-py-fix-default-bin.diff @@ -1,13 +1,13 @@ -Index: llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-build-py/lib/libscanbuild/arguments.py =================================================================== ---- llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py -+++ llvm-toolchain-snapshot_16~++20210717105643+f95d26006e06/clang/tools/scan-build-py/lib/libscanbuild/arguments.py -@@ -266,7 +266,7 @@ def create_analyze_parser(from_build_com - '--use-analyzer', - metavar='', - dest='clang', -- default='clang', -+ default='clang-16', +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/clang/tools/scan-build-py/lib/libscanbuild/arguments.py ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/clang/tools/scan-build-py/lib/libscanbuild/arguments.py +@@ -293,7 +293,7 @@ def create_analyze_parser(from_build_com + "--use-analyzer", + metavar="", + dest="clang", +- default="clang", ++ default="clang-17", help="""'%(prog)s' uses the 'clang' executable relative to itself for static analysis. One can override this behavior with this option by - using the 'clang' packaged with Xcode (on OS X) or from the PATH.""") + using the 'clang' packaged with Xcode (on OS X) or from the PATH.""", diff --git a/debian/patches/series b/debian/patches/series index f1f063d2..257a14a1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -136,7 +136,6 @@ protobuf_3.21.patch compiler-rt/compilerrt-builtins-arch-fix-armhf.diff compiler-rt/compilerrt-build-scudo-standalone-option.diff - # wasm patches wasm/wasm-ld-path.diff wasm/wasm-compiler-rt-default.diff @@ -147,11 +146,11 @@ unwind-force-pthread-dl.diff force-sse2-compiler-rt.diff bolt-disable-emit-relocs.patch link-grpc.diff - -amdgpu/nonlinux.patch -ubuntu-releases.patch -new-cmake-build-fix.patch -HIP-search-path-fix.patch D158066-simd-ppc64el.patch -#mips64el-ompt.patch -libcxx-D124227-wasm.patch +ubuntu-releases.patch +libclang-major-version-only.diff +D148945-revert.diff +arm32-defaults.diff +mips/D154390-pre-R6.diff +libsanitizer-timebits.diff +D154931-revert-loong64.patch diff --git a/debian/patches/silent-MCJIIT-tests.diff b/debian/patches/silent-MCJIIT-tests.diff index 94f56a31..487788a4 100644 --- a/debian/patches/silent-MCJIIT-tests.diff +++ b/debian/patches/silent-MCJIIT-tests.diff @@ -18,27 +18,27 @@ test/Feature/load_module.ll | 1 - 17 files changed, 14 insertions(+), 17 deletions(-) -Index: llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll +Index: llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll -+++ llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll +--- llvm-toolchain-snapshot_17~++20230411103522+cd91992de838.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll ++++ llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-global-init-nonzero-sm-pic.ll @@ -1,6 +1,6 @@ ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: -relocation-model=pic -code-model=small %s > /dev/null -; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}} +; XFAIL: * ; XFAIL: target={{.*-windows-(gnu|msvc)}} + ; REQUIRES: thread_support ; UNSUPPORTED: target=target=powerpc64-unknown-linux-gnu - ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed -Index: llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll +Index: llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll =================================================================== ---- llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll -+++ llvm-toolchain-snapshot_16~++20221216102605+31f4859c3e4d/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll +--- llvm-toolchain-snapshot_17~++20230411103522+cd91992de838.orig/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll ++++ llvm-toolchain-snapshot_17~++20230411103522+cd91992de838/llvm/test/ExecutionEngine/MCJIT/remote/test-ptr-reloc-sm-pic.ll @@ -1,6 +1,6 @@ ; RUN: %lli -jit-kind=mcjit -remote-mcjit -mcjit-remote-process=lli-child-target%exeext \ ; RUN: -O0 -relocation-model=pic -code-model=small %s -; XFAIL: target={{(mips|mipsel)-.*}}, target={{(aarch64|arm).*}}, target={{(i686|i386).*}} +; XFAIL: * ; XFAIL: target={{.*-windows-(gnu|msvc)}} + ; REQUIRES: thread_support ; UNSUPPORTED: target=powerpc64-unknown-linux-gnu - ; Remove UNSUPPORTED for powerpc64-unknown-linux-gnu if problem caused by r266663 is fixed diff --git a/debian/patches/sparc/sparc-D98574-clang-def.patch b/debian/patches/sparc/sparc-D98574-clang-def.patch deleted file mode 100644 index 9f7fd837..00000000 --- a/debian/patches/sparc/sparc-D98574-clang-def.patch +++ /dev/null @@ -1,3762 +0,0 @@ ---- llvm-toolchain-12-12.0.1~+rc1.orig/clang/lib/Basic/Targets/Sparc.cpp -+++ llvm-toolchain-12-12.0.1~+rc1/clang/lib/Basic/Targets/Sparc.cpp -@@ -156,8 +156,6 @@ void SparcV8TargetInfo::getTargetDefines - Builder.defineMacro("__sparcv8__"); - break; - case CG_V9: -- Builder.defineMacro("__sparcv9"); -- Builder.defineMacro("__sparcv9__"); - Builder.defineMacro("__sparc_v9__"); - break; - } -@@ -239,13 +237,25 @@ void SparcV8TargetInfo::getTargetDefines - void SparcV9TargetInfo::getTargetDefines(const LangOptions &Opts, - MacroBuilder &Builder) const { - SparcTargetInfo::getTargetDefines(Opts, Builder); -- Builder.defineMacro("__sparcv9"); - Builder.defineMacro("__arch64__"); -- // Solaris doesn't need these variants, but the BSDs do. -- if (getTriple().getOS() != llvm::Triple::Solaris) { -+ switch (getTriple().getOS()) { -+ case llvm::Triple::Linux: -+ Builder.defineMacro("__sparc_v9__"); -+ break; -+ case llvm::Triple::FreeBSD: -+ case llvm::Triple::NetBSD: - Builder.defineMacro("__sparc64__"); - Builder.defineMacro("__sparc_v9__"); -+ Builder.defineMacro("__sparcv9"); -+ break; -+ case llvm::Triple::OpenBSD: -+ Builder.defineMacro("__sparc64__"); - Builder.defineMacro("__sparcv9__"); -+ Builder.defineMacro("__sparc_v9__"); -+ break; -+ case llvm::Triple::Solaris: -+ Builder.defineMacro("__sparcv9"); -+ break; - } - - Builder.defineMacro("__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1"); ---- llvm-toolchain-12-12.0.1~+rc1.orig/clang/test/Preprocessor/predefined-arch-macros.c -+++ llvm-toolchain-12-12.0.1~+rc1/clang/test/Preprocessor/predefined-arch-macros.c -@@ -3418,11 +3418,8 @@ - // CHECK_SPARC: #define __BIG_ENDIAN__ 1 - // CHECK_SPARC: #define __sparc 1 - // CHECK_SPARC: #define __sparc__ 1 --// CHECK_SPARC-NOT: #define __sparcv9 1 --// CHECK_SPARC-NOT: #define __sparcv9__ 1 - // CHECK_SPARC: #define __sparcv8 1 --// CHECK_SPARC-NOT: #define __sparcv9 1 --// CHECK_SPARC-NOT: #define __sparcv9__ 1 -+// CHECK_SPARC-NOT: #define __sparc_v9__ 1 - - // RUN: %clang -mcpu=v9 -E -dM %s -o - 2>&1 \ - // RUN: -target sparc-unknown-linux \ -@@ -3430,8 +3427,6 @@ - // CHECK_SPARC-V9-NOT: #define __sparcv8 1 - // CHECK_SPARC-V9-NOT: #define __sparcv8__ 1 - // CHECK_SPARC-V9: #define __sparc_v9__ 1 --// CHECK_SPARC-V9: #define __sparcv9 1 --// CHECK_SPARC-V9: #define __sparcv9__ 1 - - // RUN: %clang -E -dM %s -o - 2>&1 \ - // RUN: -target sparc-sun-solaris \ -@@ -3518,12 +3513,10 @@ - // RUN: -target sparcv9-unknown-linux \ - // RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCV9 - // CHECK_SPARCV9: #define __BIG_ENDIAN__ 1 -+// CHECK_SPARCV9: #define __arch64__ 1 - // CHECK_SPARCV9: #define __sparc 1 --// CHECK_SPARCV9: #define __sparc64__ 1 - // CHECK_SPARCV9: #define __sparc__ 1 - // CHECK_SPARCV9: #define __sparc_v9__ 1 --// CHECK_SPARCV9: #define __sparcv9 1 --// CHECK_SPARCV9: #define __sparcv9__ 1 - - // RUN: %clang -E -dM %s -o - 2>&1 \ - // RUN: -target sparcv9-unknown-linux \ ---- /dev/null -+++ llvm-toolchain-12-12.0.1~+rc1/clang/test/Preprocessor/predefined-arch-macros.c.orig -@@ -0,0 +1,3681 @@ -+// REQUIRES: amdgpu-registered-target -+// Begin X86/GCC/Linux tests ---------------- -+ -+// RUN: %clang -march=i386 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I386_M32 -+// CHECK_I386_M32: #define __LAHF_SAHF__ 1 -+// CHECK_I386_M32: #define __i386 1 -+// CHECK_I386_M32: #define __i386__ 1 -+// CHECK_I386_M32: #define __tune_i386__ 1 -+// CHECK_I386_M32: #define i386 1 -+// RUN: not %clang -march=i386 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I386_M64 -+// CHECK_I386_M64: error: {{.*}} -+ -+// RUN: %clang -march=i486 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I486_M32 -+// CHECK_I486_M32: #define __i386 1 -+// CHECK_I486_M32: #define __i386__ 1 -+// CHECK_I486_M32: #define __i486 1 -+// CHECK_I486_M32: #define __i486__ 1 -+// CHECK_I486_M32: #define __tune_i486__ 1 -+// CHECK_I486_M32: #define i386 1 -+// RUN: not %clang -march=i486 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I486_M64 -+// CHECK_I486_M64: error: {{.*}} -+ -+// RUN: %clang -march=i586 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I586_M32 -+// CHECK_I586_M32: #define __i386 1 -+// CHECK_I586_M32: #define __i386__ 1 -+// CHECK_I586_M32: #define __i586 1 -+// CHECK_I586_M32: #define __i586__ 1 -+// CHECK_I586_M32: #define __pentium 1 -+// CHECK_I586_M32: #define __pentium__ 1 -+// CHECK_I586_M32: #define __tune_i586__ 1 -+// CHECK_I586_M32: #define __tune_pentium__ 1 -+// CHECK_I586_M32: #define i386 1 -+// RUN: not %clang -march=i586 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I586_M64 -+// CHECK_I586_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M32 -+// CHECK_PENTIUM_M32: #define __i386 1 -+// CHECK_PENTIUM_M32: #define __i386__ 1 -+// CHECK_PENTIUM_M32: #define __i586 1 -+// CHECK_PENTIUM_M32: #define __i586__ 1 -+// CHECK_PENTIUM_M32: #define __pentium 1 -+// CHECK_PENTIUM_M32: #define __pentium__ 1 -+// CHECK_PENTIUM_M32: #define __tune_i586__ 1 -+// CHECK_PENTIUM_M32: #define __tune_pentium__ 1 -+// CHECK_PENTIUM_M32: #define i386 1 -+// RUN: not %clang -march=pentium -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M64 -+// CHECK_PENTIUM_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium-mmx -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_MMX_M32 -+// CHECK_PENTIUM_MMX_M32: #define __MMX__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __i386 1 -+// CHECK_PENTIUM_MMX_M32: #define __i386__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __i586 1 -+// CHECK_PENTIUM_MMX_M32: #define __i586__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __pentium 1 -+// CHECK_PENTIUM_MMX_M32: #define __pentium__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __pentium_mmx__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __tune_i586__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __tune_pentium__ 1 -+// CHECK_PENTIUM_MMX_M32: #define __tune_pentium_mmx__ 1 -+// CHECK_PENTIUM_MMX_M32: #define i386 1 -+// RUN: not %clang -march=pentium-mmx -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_MMX_M64 -+// CHECK_PENTIUM_MMX_M64: error: {{.*}} -+ -+// RUN: %clang -march=winchip-c6 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP_C6_M32 -+// CHECK_WINCHIP_C6_M32: #define __MMX__ 1 -+// CHECK_WINCHIP_C6_M32: #define __i386 1 -+// CHECK_WINCHIP_C6_M32: #define __i386__ 1 -+// CHECK_WINCHIP_C6_M32: #define __i486 1 -+// CHECK_WINCHIP_C6_M32: #define __i486__ 1 -+// CHECK_WINCHIP_C6_M32: #define __tune_i486__ 1 -+// CHECK_WINCHIP_C6_M32: #define i386 1 -+// RUN: not %clang -march=winchip-c6 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP_C6_M64 -+// CHECK_WINCHIP_C6_M64: error: {{.*}} -+ -+// RUN: %clang -march=winchip2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP2_M32 -+// CHECK_WINCHIP2_M32: #define __3dNOW__ 1 -+// CHECK_WINCHIP2_M32: #define __MMX__ 1 -+// CHECK_WINCHIP2_M32: #define __i386 1 -+// CHECK_WINCHIP2_M32: #define __i386__ 1 -+// CHECK_WINCHIP2_M32: #define __i486 1 -+// CHECK_WINCHIP2_M32: #define __i486__ 1 -+// CHECK_WINCHIP2_M32: #define __tune_i486__ 1 -+// CHECK_WINCHIP2_M32: #define i386 1 -+// RUN: not %clang -march=winchip2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_WINCHIP2_M64 -+// CHECK_WINCHIP2_M64: error: {{.*}} -+ -+// RUN: %clang -march=c3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_M32 -+// CHECK_C3_M32: #define __3dNOW__ 1 -+// CHECK_C3_M32: #define __MMX__ 1 -+// CHECK_C3_M32: #define __i386 1 -+// CHECK_C3_M32: #define __i386__ 1 -+// CHECK_C3_M32: #define __i486 1 -+// CHECK_C3_M32: #define __i486__ 1 -+// CHECK_C3_M32: #define __tune_i486__ 1 -+// CHECK_C3_M32: #define i386 1 -+// RUN: not %clang -march=c3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_M64 -+// CHECK_C3_M64: error: {{.*}} -+ -+// RUN: %clang -march=c3-2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_2_M32 -+// CHECK_C3_2_M32: #define __MMX__ 1 -+// CHECK_C3_2_M32: #define __SSE__ 1 -+// CHECK_C3_2_M32: #define __i386 1 -+// CHECK_C3_2_M32: #define __i386__ 1 -+// CHECK_C3_2_M32: #define __i686 1 -+// CHECK_C3_2_M32: #define __i686__ 1 -+// CHECK_C3_2_M32: #define __pentiumpro 1 -+// CHECK_C3_2_M32: #define __pentiumpro__ 1 -+// CHECK_C3_2_M32: #define __tune_i686__ 1 -+// CHECK_C3_2_M32: #define __tune_pentium2__ 1 -+// CHECK_C3_2_M32: #define __tune_pentiumpro__ 1 -+// CHECK_C3_2_M32: #define i386 1 -+// RUN: not %clang -march=c3-2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_C3_2_M64 -+// CHECK_C3_2_M64: error: {{.*}} -+ -+// RUN: %clang -march=i686 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I686_M32 -+// CHECK_I686_M32: #define __i386 1 -+// CHECK_I686_M32: #define __i386__ 1 -+// CHECK_I686_M32: #define __i686 1 -+// CHECK_I686_M32: #define __i686__ 1 -+// CHECK_I686_M32: #define __pentiumpro 1 -+// CHECK_I686_M32: #define __pentiumpro__ 1 -+// CHECK_I686_M32: #define __tune_i686__ 1 -+// CHECK_I686_M32: #define __tune_pentiumpro__ 1 -+// CHECK_I686_M32: #define i386 1 -+// RUN: not %clang -march=i686 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_I686_M64 -+// CHECK_I686_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentiumpro -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUMPRO_M32 -+// CHECK_PENTIUMPRO_M32: #define __i386 1 -+// CHECK_PENTIUMPRO_M32: #define __i386__ 1 -+// CHECK_PENTIUMPRO_M32: #define __i686 1 -+// CHECK_PENTIUMPRO_M32: #define __i686__ 1 -+// CHECK_PENTIUMPRO_M32: #define __pentiumpro 1 -+// CHECK_PENTIUMPRO_M32: #define __pentiumpro__ 1 -+// CHECK_PENTIUMPRO_M32: #define __tune_i686__ 1 -+// CHECK_PENTIUMPRO_M32: #define __tune_pentiumpro__ 1 -+// CHECK_PENTIUMPRO_M32: #define i386 1 -+// RUN: not %clang -march=pentiumpro -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUMPRO_M64 -+// CHECK_PENTIUMPRO_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM2_M32 -+// CHECK_PENTIUM2_M32: #define __FXSR__ 1 -+// CHECK_PENTIUM2_M32: #define __MMX__ 1 -+// CHECK_PENTIUM2_M32: #define __i386 1 -+// CHECK_PENTIUM2_M32: #define __i386__ 1 -+// CHECK_PENTIUM2_M32: #define __i686 1 -+// CHECK_PENTIUM2_M32: #define __i686__ 1 -+// CHECK_PENTIUM2_M32: #define __pentiumpro 1 -+// CHECK_PENTIUM2_M32: #define __pentiumpro__ 1 -+// CHECK_PENTIUM2_M32: #define __tune_i686__ 1 -+// CHECK_PENTIUM2_M32: #define __tune_pentium2__ 1 -+// CHECK_PENTIUM2_M32: #define __tune_pentiumpro__ 1 -+// CHECK_PENTIUM2_M32: #define i386 1 -+// RUN: not %clang -march=pentium2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM2_M64 -+// CHECK_PENTIUM2_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3_M32 -+// CHECK_PENTIUM3_M32: #define __MMX__ 1 -+// CHECK_PENTIUM3_M32: #define __SSE__ 1 -+// CHECK_PENTIUM3_M32: #define __i386 1 -+// CHECK_PENTIUM3_M32: #define __i386__ 1 -+// CHECK_PENTIUM3_M32: #define __i686 1 -+// CHECK_PENTIUM3_M32: #define __i686__ 1 -+// CHECK_PENTIUM3_M32: #define __pentiumpro 1 -+// CHECK_PENTIUM3_M32: #define __pentiumpro__ 1 -+// CHECK_PENTIUM3_M32: #define __tune_i686__ 1 -+// CHECK_PENTIUM3_M32: #define __tune_pentium2__ 1 -+// CHECK_PENTIUM3_M32: #define __tune_pentium3__ 1 -+// CHECK_PENTIUM3_M32: #define __tune_pentiumpro__ 1 -+// CHECK_PENTIUM3_M32: #define i386 1 -+// RUN: not %clang -march=pentium3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3_M64 -+// CHECK_PENTIUM3_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium3m -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3M_M32 -+// CHECK_PENTIUM3M_M32: #define __MMX__ 1 -+// CHECK_PENTIUM3M_M32: #define __SSE__ 1 -+// CHECK_PENTIUM3M_M32: #define __i386 1 -+// CHECK_PENTIUM3M_M32: #define __i386__ 1 -+// CHECK_PENTIUM3M_M32: #define __i686 1 -+// CHECK_PENTIUM3M_M32: #define __i686__ 1 -+// CHECK_PENTIUM3M_M32: #define __pentiumpro 1 -+// CHECK_PENTIUM3M_M32: #define __pentiumpro__ 1 -+// CHECK_PENTIUM3M_M32: #define __tune_i686__ 1 -+// CHECK_PENTIUM3M_M32: #define __tune_pentiumpro__ 1 -+// CHECK_PENTIUM3M_M32: #define i386 1 -+// RUN: not %clang -march=pentium3m -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM3M_M64 -+// CHECK_PENTIUM3M_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium-m -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M_M32 -+// CHECK_PENTIUM_M_M32: #define __MMX__ 1 -+// CHECK_PENTIUM_M_M32: #define __SSE2__ 1 -+// CHECK_PENTIUM_M_M32: #define __SSE__ 1 -+// CHECK_PENTIUM_M_M32: #define __i386 1 -+// CHECK_PENTIUM_M_M32: #define __i386__ 1 -+// CHECK_PENTIUM_M_M32: #define __i686 1 -+// CHECK_PENTIUM_M_M32: #define __i686__ 1 -+// CHECK_PENTIUM_M_M32: #define __pentiumpro 1 -+// CHECK_PENTIUM_M_M32: #define __pentiumpro__ 1 -+// CHECK_PENTIUM_M_M32: #define __tune_i686__ 1 -+// CHECK_PENTIUM_M_M32: #define __tune_pentiumpro__ 1 -+// CHECK_PENTIUM_M_M32: #define i386 1 -+// RUN: not %clang -march=pentium-m -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM_M_M64 -+// CHECK_PENTIUM_M_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium4 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4_M32 -+// CHECK_PENTIUM4_M32: #define __MMX__ 1 -+// CHECK_PENTIUM4_M32: #define __SSE2__ 1 -+// CHECK_PENTIUM4_M32: #define __SSE__ 1 -+// CHECK_PENTIUM4_M32: #define __i386 1 -+// CHECK_PENTIUM4_M32: #define __i386__ 1 -+// CHECK_PENTIUM4_M32: #define __pentium4 1 -+// CHECK_PENTIUM4_M32: #define __pentium4__ 1 -+// CHECK_PENTIUM4_M32: #define __tune_pentium4__ 1 -+// CHECK_PENTIUM4_M32: #define i386 1 -+// RUN: not %clang -march=pentium4 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4_M64 -+// CHECK_PENTIUM4_M64: error: {{.*}} -+ -+// RUN: %clang -march=pentium4m -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4M_M32 -+// CHECK_PENTIUM4M_M32: #define __MMX__ 1 -+// CHECK_PENTIUM4M_M32: #define __SSE2__ 1 -+// CHECK_PENTIUM4M_M32: #define __SSE__ 1 -+// CHECK_PENTIUM4M_M32: #define __i386 1 -+// CHECK_PENTIUM4M_M32: #define __i386__ 1 -+// CHECK_PENTIUM4M_M32: #define __pentium4 1 -+// CHECK_PENTIUM4M_M32: #define __pentium4__ 1 -+// CHECK_PENTIUM4M_M32: #define __tune_pentium4__ 1 -+// CHECK_PENTIUM4M_M32: #define i386 1 -+// RUN: not %clang -march=pentium4m -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PENTIUM4M_M64 -+// CHECK_PENTIUM4M_M64: error: {{.*}} -+ -+// RUN: %clang -march=yonah -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_YONAH_M32 -+// CHECK_YONAH_M32: #define __MMX__ 1 -+// CHECK_YONAH_M32: #define __SSE2__ 1 -+// CHECK_YONAH_M32: #define __SSE3__ 1 -+// CHECK_YONAH_M32: #define __SSE__ 1 -+// CHECK_YONAH_M32: #define __i386 1 -+// CHECK_YONAH_M32: #define __i386__ 1 -+// CHECK_YONAH_M32: #define __nocona 1 -+// CHECK_YONAH_M32: #define __nocona__ 1 -+// CHECK_YONAH_M32: #define __tune_nocona__ 1 -+// CHECK_YONAH_M32: #define i386 1 -+// RUN: not %clang -march=yonah -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_YONAH_M64 -+// CHECK_YONAH_M64: error: {{.*}} -+ -+// RUN: %clang -march=prescott -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PRESCOTT_M32 -+// CHECK_PRESCOTT_M32: #define __MMX__ 1 -+// CHECK_PRESCOTT_M32: #define __SSE2__ 1 -+// CHECK_PRESCOTT_M32: #define __SSE3__ 1 -+// CHECK_PRESCOTT_M32: #define __SSE__ 1 -+// CHECK_PRESCOTT_M32: #define __i386 1 -+// CHECK_PRESCOTT_M32: #define __i386__ 1 -+// CHECK_PRESCOTT_M32: #define __nocona 1 -+// CHECK_PRESCOTT_M32: #define __nocona__ 1 -+// CHECK_PRESCOTT_M32: #define __tune_nocona__ 1 -+// CHECK_PRESCOTT_M32: #define i386 1 -+// RUN: not %clang -march=prescott -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PRESCOTT_M64 -+// CHECK_PRESCOTT_M64: error: {{.*}} -+ -+// RUN: %clang -march=nocona -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_NOCONA_M32 -+// CHECK_NOCONA_M32: #define __MMX__ 1 -+// CHECK_NOCONA_M32: #define __SSE2__ 1 -+// CHECK_NOCONA_M32: #define __SSE3__ 1 -+// CHECK_NOCONA_M32: #define __SSE__ 1 -+// CHECK_NOCONA_M32: #define __i386 1 -+// CHECK_NOCONA_M32: #define __i386__ 1 -+// CHECK_NOCONA_M32: #define __nocona 1 -+// CHECK_NOCONA_M32: #define __nocona__ 1 -+// CHECK_NOCONA_M32: #define __tune_nocona__ 1 -+// CHECK_NOCONA_M32: #define i386 1 -+// RUN: %clang -march=nocona -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_NOCONA_M64 -+// CHECK_NOCONA_M64: #define __MMX__ 1 -+// CHECK_NOCONA_M64: #define __SSE2_MATH__ 1 -+// CHECK_NOCONA_M64: #define __SSE2__ 1 -+// CHECK_NOCONA_M64: #define __SSE3__ 1 -+// CHECK_NOCONA_M64: #define __SSE_MATH__ 1 -+// CHECK_NOCONA_M64: #define __SSE__ 1 -+// CHECK_NOCONA_M64: #define __amd64 1 -+// CHECK_NOCONA_M64: #define __amd64__ 1 -+// CHECK_NOCONA_M64: #define __nocona 1 -+// CHECK_NOCONA_M64: #define __nocona__ 1 -+// CHECK_NOCONA_M64: #define __tune_nocona__ 1 -+// CHECK_NOCONA_M64: #define __x86_64 1 -+// CHECK_NOCONA_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=core2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE2_M32 -+// CHECK_CORE2_M32: #define __MMX__ 1 -+// CHECK_CORE2_M32: #define __SSE2__ 1 -+// CHECK_CORE2_M32: #define __SSE3__ 1 -+// CHECK_CORE2_M32: #define __SSE__ 1 -+// CHECK_CORE2_M32: #define __SSSE3__ 1 -+// CHECK_CORE2_M32: #define __core2 1 -+// CHECK_CORE2_M32: #define __core2__ 1 -+// CHECK_CORE2_M32: #define __i386 1 -+// CHECK_CORE2_M32: #define __i386__ 1 -+// CHECK_CORE2_M32: #define __tune_core2__ 1 -+// CHECK_CORE2_M32: #define i386 1 -+ -+// RUN: %clang -march=core2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE2_M64 -+// CHECK_CORE2_M64: #define __MMX__ 1 -+// CHECK_CORE2_M64: #define __SSE2_MATH__ 1 -+// CHECK_CORE2_M64: #define __SSE2__ 1 -+// CHECK_CORE2_M64: #define __SSE3__ 1 -+// CHECK_CORE2_M64: #define __SSE_MATH__ 1 -+// CHECK_CORE2_M64: #define __SSE__ 1 -+// CHECK_CORE2_M64: #define __SSSE3__ 1 -+// CHECK_CORE2_M64: #define __amd64 1 -+// CHECK_CORE2_M64: #define __amd64__ 1 -+// CHECK_CORE2_M64: #define __core2 1 -+// CHECK_CORE2_M64: #define __core2__ 1 -+// CHECK_CORE2_M64: #define __tune_core2__ 1 -+// CHECK_CORE2_M64: #define __x86_64 1 -+// CHECK_CORE2_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=corei7 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_M32 -+// CHECK_COREI7_M32: #define __MMX__ 1 -+// CHECK_COREI7_M32: #define __POPCNT__ 1 -+// CHECK_COREI7_M32: #define __SSE2__ 1 -+// CHECK_COREI7_M32: #define __SSE3__ 1 -+// CHECK_COREI7_M32: #define __SSE4_1__ 1 -+// CHECK_COREI7_M32: #define __SSE4_2__ 1 -+// CHECK_COREI7_M32: #define __SSE__ 1 -+// CHECK_COREI7_M32: #define __SSSE3__ 1 -+// CHECK_COREI7_M32: #define __corei7 1 -+// CHECK_COREI7_M32: #define __corei7__ 1 -+// CHECK_COREI7_M32: #define __i386 1 -+// CHECK_COREI7_M32: #define __i386__ 1 -+// CHECK_COREI7_M32: #define __tune_corei7__ 1 -+// CHECK_COREI7_M32: #define i386 1 -+ -+// RUN: %clang -march=corei7 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_M64 -+// CHECK_COREI7_M64: #define __MMX__ 1 -+// CHECK_COREI7_M64: #define __POPCNT__ 1 -+// CHECK_COREI7_M64: #define __SSE2_MATH__ 1 -+// CHECK_COREI7_M64: #define __SSE2__ 1 -+// CHECK_COREI7_M64: #define __SSE3__ 1 -+// CHECK_COREI7_M64: #define __SSE4_1__ 1 -+// CHECK_COREI7_M64: #define __SSE4_2__ 1 -+// CHECK_COREI7_M64: #define __SSE_MATH__ 1 -+// CHECK_COREI7_M64: #define __SSE__ 1 -+// CHECK_COREI7_M64: #define __SSSE3__ 1 -+// CHECK_COREI7_M64: #define __amd64 1 -+// CHECK_COREI7_M64: #define __amd64__ 1 -+// CHECK_COREI7_M64: #define __corei7 1 -+// CHECK_COREI7_M64: #define __corei7__ 1 -+// CHECK_COREI7_M64: #define __tune_corei7__ 1 -+// CHECK_COREI7_M64: #define __x86_64 1 -+// CHECK_COREI7_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=corei7-avx -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_AVX_M32 -+// CHECK_COREI7_AVX_M32: #define __AVX__ 1 -+// CHECK_COREI7_AVX_M32: #define __MMX__ 1 -+// CHECK_COREI7_AVX_M32: #define __PCLMUL__ 1 -+// CHECK_COREI7_AVX_M32-NOT: __RDRND__ -+// CHECK_COREI7_AVX_M32: #define __POPCNT__ 1 -+// CHECK_COREI7_AVX_M32: #define __SSE2__ 1 -+// CHECK_COREI7_AVX_M32: #define __SSE3__ 1 -+// CHECK_COREI7_AVX_M32: #define __SSE4_1__ 1 -+// CHECK_COREI7_AVX_M32: #define __SSE4_2__ 1 -+// CHECK_COREI7_AVX_M32: #define __SSE__ 1 -+// CHECK_COREI7_AVX_M32: #define __SSSE3__ 1 -+// CHECK_COREI7_AVX_M32: #define __XSAVEOPT__ 1 -+// CHECK_COREI7_AVX_M32: #define __XSAVE__ 1 -+// CHECK_COREI7_AVX_M32: #define __corei7 1 -+// CHECK_COREI7_AVX_M32: #define __corei7__ 1 -+// CHECK_COREI7_AVX_M32: #define __i386 1 -+// CHECK_COREI7_AVX_M32: #define __i386__ 1 -+// CHECK_COREI7_AVX_M32: #define __tune_corei7__ 1 -+// CHECK_COREI7_AVX_M32: #define i386 1 -+ -+// RUN: %clang -march=corei7-avx -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_COREI7_AVX_M64 -+// CHECK_COREI7_AVX_M64: #define __AVX__ 1 -+// CHECK_COREI7_AVX_M64: #define __MMX__ 1 -+// CHECK_COREI7_AVX_M64: #define __PCLMUL__ 1 -+// CHECK_COREI7_AVX_M64-NOT: __RDRND__ -+// CHECK_COREI7_AVX_M64: #define __POPCNT__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE2_MATH__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE2__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE3__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE4_1__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE4_2__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE_MATH__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSE__ 1 -+// CHECK_COREI7_AVX_M64: #define __SSSE3__ 1 -+// CHECK_COREI7_AVX_M64: #define __XSAVEOPT__ 1 -+// CHECK_COREI7_AVX_M64: #define __XSAVE__ 1 -+// CHECK_COREI7_AVX_M64: #define __amd64 1 -+// CHECK_COREI7_AVX_M64: #define __amd64__ 1 -+// CHECK_COREI7_AVX_M64: #define __corei7 1 -+// CHECK_COREI7_AVX_M64: #define __corei7__ 1 -+// CHECK_COREI7_AVX_M64: #define __tune_corei7__ 1 -+// CHECK_COREI7_AVX_M64: #define __x86_64 1 -+// CHECK_COREI7_AVX_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=core-avx-i -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX_I_M32 -+// CHECK_CORE_AVX_I_M32: #define __AVX__ 1 -+// CHECK_CORE_AVX_I_M32: #define __F16C__ 1 -+// CHECK_CORE_AVX_I_M32: #define __MMX__ 1 -+// CHECK_CORE_AVX_I_M32: #define __PCLMUL__ 1 -+// CHECK_CORE_AVX_I_M32: #define __RDRND__ 1 -+// CHECK_CORE_AVX_I_M32: #define __SSE2__ 1 -+// CHECK_CORE_AVX_I_M32: #define __SSE3__ 1 -+// CHECK_CORE_AVX_I_M32: #define __SSE4_1__ 1 -+// CHECK_CORE_AVX_I_M32: #define __SSE4_2__ 1 -+// CHECK_CORE_AVX_I_M32: #define __SSE__ 1 -+// CHECK_CORE_AVX_I_M32: #define __SSSE3__ 1 -+// CHECK_CORE_AVX_I_M32: #define __XSAVEOPT__ 1 -+// CHECK_CORE_AVX_I_M32: #define __XSAVE__ 1 -+// CHECK_CORE_AVX_I_M32: #define __corei7 1 -+// CHECK_CORE_AVX_I_M32: #define __corei7__ 1 -+// CHECK_CORE_AVX_I_M32: #define __i386 1 -+// CHECK_CORE_AVX_I_M32: #define __i386__ 1 -+// CHECK_CORE_AVX_I_M32: #define __tune_corei7__ 1 -+// CHECK_CORE_AVX_I_M32: #define i386 1 -+ -+// RUN: %clang -march=core-avx-i -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX_I_M64 -+// CHECK_CORE_AVX_I_M64: #define __AVX__ 1 -+// CHECK_CORE_AVX_I_M64: #define __F16C__ 1 -+// CHECK_CORE_AVX_I_M64: #define __MMX__ 1 -+// CHECK_CORE_AVX_I_M64: #define __PCLMUL__ 1 -+// CHECK_CORE_AVX_I_M64: #define __RDRND__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE2_MATH__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE2__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE3__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE4_1__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE4_2__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE_MATH__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSE__ 1 -+// CHECK_CORE_AVX_I_M64: #define __SSSE3__ 1 -+// CHECK_CORE_AVX_I_M64: #define __XSAVEOPT__ 1 -+// CHECK_CORE_AVX_I_M64: #define __XSAVE__ 1 -+// CHECK_CORE_AVX_I_M64: #define __amd64 1 -+// CHECK_CORE_AVX_I_M64: #define __amd64__ 1 -+// CHECK_CORE_AVX_I_M64: #define __corei7 1 -+// CHECK_CORE_AVX_I_M64: #define __corei7__ 1 -+// CHECK_CORE_AVX_I_M64: #define __tune_corei7__ 1 -+// CHECK_CORE_AVX_I_M64: #define __x86_64 1 -+// CHECK_CORE_AVX_I_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=core-avx2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX2_M32 -+// CHECK_CORE_AVX2_M32: #define __AVX2__ 1 -+// CHECK_CORE_AVX2_M32: #define __AVX__ 1 -+// CHECK_CORE_AVX2_M32: #define __BMI2__ 1 -+// CHECK_CORE_AVX2_M32: #define __BMI__ 1 -+// CHECK_CORE_AVX2_M32: #define __F16C__ 1 -+// CHECK_CORE_AVX2_M32: #define __FMA__ 1 -+// CHECK_CORE_AVX2_M32: #define __INVPCID__ 1 -+// CHECK_CORE_AVX2_M32: #define __LAHF_SAHF__ 1 -+// CHECK_CORE_AVX2_M32: #define __LZCNT__ 1 -+// CHECK_CORE_AVX2_M32: #define __MMX__ 1 -+// CHECK_CORE_AVX2_M32: #define __MOVBE__ 1 -+// CHECK_CORE_AVX2_M32: #define __PCLMUL__ 1 -+// CHECK_CORE_AVX2_M32: #define __POPCNT__ 1 -+// CHECK_CORE_AVX2_M32: #define __RDRND__ 1 -+// CHECK_CORE_AVX2_M32: #define __SSE2__ 1 -+// CHECK_CORE_AVX2_M32: #define __SSE3__ 1 -+// CHECK_CORE_AVX2_M32: #define __SSE4_1__ 1 -+// CHECK_CORE_AVX2_M32: #define __SSE4_2__ 1 -+// CHECK_CORE_AVX2_M32: #define __SSE__ 1 -+// CHECK_CORE_AVX2_M32: #define __SSSE3__ 1 -+// CHECK_CORE_AVX2_M32: #define __XSAVEOPT__ 1 -+// CHECK_CORE_AVX2_M32: #define __XSAVE__ 1 -+// CHECK_CORE_AVX2_M32: #define __corei7 1 -+// CHECK_CORE_AVX2_M32: #define __corei7__ 1 -+// CHECK_CORE_AVX2_M32: #define __i386 1 -+// CHECK_CORE_AVX2_M32: #define __i386__ 1 -+// CHECK_CORE_AVX2_M32: #define __tune_corei7__ 1 -+// CHECK_CORE_AVX2_M32: #define i386 1 -+ -+// RUN: %clang -march=core-avx2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CORE_AVX2_M64 -+// CHECK_CORE_AVX2_M64: #define __AVX2__ 1 -+// CHECK_CORE_AVX2_M64: #define __AVX__ 1 -+// CHECK_CORE_AVX2_M64: #define __BMI2__ 1 -+// CHECK_CORE_AVX2_M64: #define __BMI__ 1 -+// CHECK_CORE_AVX2_M64: #define __F16C__ 1 -+// CHECK_CORE_AVX2_M64: #define __FMA__ 1 -+// CHECK_CORE_AVX2_M64: #define __INVPCID__ 1 -+// CHECK_CORE_AVX2_M64: #define __LAHF_SAHF__ 1 -+// CHECK_CORE_AVX2_M64: #define __LZCNT__ 1 -+// CHECK_CORE_AVX2_M64: #define __MMX__ 1 -+// CHECK_CORE_AVX2_M64: #define __MOVBE__ 1 -+// CHECK_CORE_AVX2_M64: #define __PCLMUL__ 1 -+// CHECK_CORE_AVX2_M64: #define __POPCNT__ 1 -+// CHECK_CORE_AVX2_M64: #define __RDRND__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE2_MATH__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE2__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE3__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE4_1__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE4_2__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE_MATH__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSE__ 1 -+// CHECK_CORE_AVX2_M64: #define __SSSE3__ 1 -+// CHECK_CORE_AVX2_M64: #define __XSAVEOPT__ 1 -+// CHECK_CORE_AVX2_M64: #define __XSAVE__ 1 -+// CHECK_CORE_AVX2_M64: #define __amd64 1 -+// CHECK_CORE_AVX2_M64: #define __amd64__ 1 -+// CHECK_CORE_AVX2_M64: #define __corei7 1 -+// CHECK_CORE_AVX2_M64: #define __corei7__ 1 -+// CHECK_CORE_AVX2_M64: #define __tune_corei7__ 1 -+// CHECK_CORE_AVX2_M64: #define __x86_64 1 -+// CHECK_CORE_AVX2_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=broadwell -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BROADWELL_M32 -+// CHECK_BROADWELL_M32: #define __ADX__ 1 -+// CHECK_BROADWELL_M32: #define __AVX2__ 1 -+// CHECK_BROADWELL_M32: #define __AVX__ 1 -+// CHECK_BROADWELL_M32: #define __BMI2__ 1 -+// CHECK_BROADWELL_M32: #define __BMI__ 1 -+// CHECK_BROADWELL_M32: #define __F16C__ 1 -+// CHECK_BROADWELL_M32: #define __FMA__ 1 -+// CHECK_BROADWELL_M32: #define __INVPCID__ 1 -+// CHECK_BROADWELL_M32: #define __LAHF_SAHF__ 1 -+// CHECK_BROADWELL_M32: #define __LZCNT__ 1 -+// CHECK_BROADWELL_M32: #define __MMX__ 1 -+// CHECK_BROADWELL_M32: #define __MOVBE__ 1 -+// CHECK_BROADWELL_M32: #define __PCLMUL__ 1 -+// CHECK_BROADWELL_M32: #define __POPCNT__ 1 -+// CHECK_BROADWELL_M32: #define __PRFCHW__ 1 -+// CHECK_BROADWELL_M32: #define __RDRND__ 1 -+// CHECK_BROADWELL_M32: #define __RDSEED__ 1 -+// CHECK_BROADWELL_M32: #define __SSE2__ 1 -+// CHECK_BROADWELL_M32: #define __SSE3__ 1 -+// CHECK_BROADWELL_M32: #define __SSE4_1__ 1 -+// CHECK_BROADWELL_M32: #define __SSE4_2__ 1 -+// CHECK_BROADWELL_M32: #define __SSE__ 1 -+// CHECK_BROADWELL_M32: #define __SSSE3__ 1 -+// CHECK_BROADWELL_M32: #define __XSAVEOPT__ 1 -+// CHECK_BROADWELL_M32: #define __XSAVE__ 1 -+// CHECK_BROADWELL_M32: #define __corei7 1 -+// CHECK_BROADWELL_M32: #define __corei7__ 1 -+// CHECK_BROADWELL_M32: #define __i386 1 -+// CHECK_BROADWELL_M32: #define __i386__ 1 -+// CHECK_BROADWELL_M32: #define __tune_corei7__ 1 -+// CHECK_BROADWELL_M32: #define i386 1 -+ -+// RUN: %clang -march=broadwell -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BROADWELL_M64 -+// CHECK_BROADWELL_M64: #define __ADX__ 1 -+// CHECK_BROADWELL_M64: #define __AVX2__ 1 -+// CHECK_BROADWELL_M64: #define __AVX__ 1 -+// CHECK_BROADWELL_M64: #define __BMI2__ 1 -+// CHECK_BROADWELL_M64: #define __BMI__ 1 -+// CHECK_BROADWELL_M64: #define __F16C__ 1 -+// CHECK_BROADWELL_M64: #define __FMA__ 1 -+// CHECK_BROADWELL_M64: #define __INVPCID__ 1 -+// CHECK_BROADWELL_M64: #define __LAHF_SAHF__ 1 -+// CHECK_BROADWELL_M64: #define __LZCNT__ 1 -+// CHECK_BROADWELL_M64: #define __MMX__ 1 -+// CHECK_BROADWELL_M64: #define __MOVBE__ 1 -+// CHECK_BROADWELL_M64: #define __PCLMUL__ 1 -+// CHECK_BROADWELL_M64: #define __POPCNT__ 1 -+// CHECK_BROADWELL_M64: #define __PRFCHW__ 1 -+// CHECK_BROADWELL_M64: #define __RDRND__ 1 -+// CHECK_BROADWELL_M64: #define __RDSEED__ 1 -+// CHECK_BROADWELL_M64: #define __SSE2_MATH__ 1 -+// CHECK_BROADWELL_M64: #define __SSE2__ 1 -+// CHECK_BROADWELL_M64: #define __SSE3__ 1 -+// CHECK_BROADWELL_M64: #define __SSE4_1__ 1 -+// CHECK_BROADWELL_M64: #define __SSE4_2__ 1 -+// CHECK_BROADWELL_M64: #define __SSE_MATH__ 1 -+// CHECK_BROADWELL_M64: #define __SSE__ 1 -+// CHECK_BROADWELL_M64: #define __SSSE3__ 1 -+// CHECK_BROADWELL_M64: #define __XSAVEOPT__ 1 -+// CHECK_BROADWELL_M64: #define __XSAVE__ 1 -+// CHECK_BROADWELL_M64: #define __amd64 1 -+// CHECK_BROADWELL_M64: #define __amd64__ 1 -+// CHECK_BROADWELL_M64: #define __corei7 1 -+// CHECK_BROADWELL_M64: #define __corei7__ 1 -+// CHECK_BROADWELL_M64: #define __tune_corei7__ 1 -+// CHECK_BROADWELL_M64: #define __x86_64 1 -+// CHECK_BROADWELL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=skylake -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SKL_M32 -+// CHECK_SKL_M32: #define __ADX__ 1 -+// CHECK_SKL_M32: #define __AES__ 1 -+// CHECK_SKL_M32: #define __AVX2__ 1 -+// CHECK_SKL_M32: #define __AVX__ 1 -+// CHECK_SKL_M32: #define __BMI2__ 1 -+// CHECK_SKL_M32: #define __BMI__ 1 -+// CHECK_SKL_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_SKL_M32: #define __F16C__ 1 -+// CHECK_SKL_M32: #define __FMA__ 1 -+// CHECK_SKL_M32: #define __INVPCID__ 1 -+// CHECK_SKL_M32: #define __LZCNT__ 1 -+// CHECK_SKL_M32: #define __MMX__ 1 -+// CHECK_SKL_M32: #define __MOVBE__ 1 -+// CHECK_SKL_M32: #define __PCLMUL__ 1 -+// CHECK_SKL_M32: #define __POPCNT__ 1 -+// CHECK_SKL_M32: #define __PRFCHW__ 1 -+// CHECK_SKL_M32: #define __RDRND__ 1 -+// CHECK_SKL_M32: #define __RDSEED__ 1 -+// CHECK_SKL_M32: #define __SGX__ 1 -+// CHECK_SKL_M32: #define __SSE2__ 1 -+// CHECK_SKL_M32: #define __SSE3__ 1 -+// CHECK_SKL_M32: #define __SSE4_1__ 1 -+// CHECK_SKL_M32: #define __SSE4_2__ 1 -+// CHECK_SKL_M32: #define __SSE__ 1 -+// CHECK_SKL_M32: #define __SSSE3__ 1 -+// CHECK_SKL_M32: #define __XSAVEC__ 1 -+// CHECK_SKL_M32: #define __XSAVEOPT__ 1 -+// CHECK_SKL_M32: #define __XSAVES__ 1 -+// CHECK_SKL_M32: #define __XSAVE__ 1 -+// CHECK_SKL_M32: #define i386 1 -+ -+// RUN: %clang -march=skylake -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SKL_M64 -+// CHECK_SKL_M64: #define __ADX__ 1 -+// CHECK_SKL_M64: #define __AES__ 1 -+// CHECK_SKL_M64: #define __AVX2__ 1 -+// CHECK_SKL_M64: #define __AVX__ 1 -+// CHECK_SKL_M64: #define __BMI2__ 1 -+// CHECK_SKL_M64: #define __BMI__ 1 -+// CHECK_SKL_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_SKL_M64: #define __F16C__ 1 -+// CHECK_SKL_M64: #define __FMA__ 1 -+// CHECK_SKL_M64: #define __INVPCID__ 1 -+// CHECK_SKL_M64: #define __LZCNT__ 1 -+// CHECK_SKL_M64: #define __MMX__ 1 -+// CHECK_SKL_M64: #define __MOVBE__ 1 -+// CHECK_SKL_M64: #define __PCLMUL__ 1 -+// CHECK_SKL_M64: #define __POPCNT__ 1 -+// CHECK_SKL_M64: #define __PRFCHW__ 1 -+// CHECK_SKL_M64: #define __RDRND__ 1 -+// CHECK_SKL_M64: #define __RDSEED__ 1 -+// CHECK_SKL_M64: #define __SGX__ 1 -+// CHECK_SKL_M64: #define __SSE2_MATH__ 1 -+// CHECK_SKL_M64: #define __SSE2__ 1 -+// CHECK_SKL_M64: #define __SSE3__ 1 -+// CHECK_SKL_M64: #define __SSE4_1__ 1 -+// CHECK_SKL_M64: #define __SSE4_2__ 1 -+// CHECK_SKL_M64: #define __SSE_MATH__ 1 -+// CHECK_SKL_M64: #define __SSE__ 1 -+// CHECK_SKL_M64: #define __SSSE3__ 1 -+// CHECK_SKL_M64: #define __XSAVEC__ 1 -+// CHECK_SKL_M64: #define __XSAVEOPT__ 1 -+// CHECK_SKL_M64: #define __XSAVES__ 1 -+// CHECK_SKL_M64: #define __XSAVE__ 1 -+// CHECK_SKL_M64: #define __amd64 1 -+// CHECK_SKL_M64: #define __amd64__ 1 -+// CHECK_SKL_M64: #define __x86_64 1 -+// CHECK_SKL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=knl -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_KNL_M32 -+// CHECK_KNL_M32: #define __AES__ 1 -+// CHECK_KNL_M32: #define __AVX2__ 1 -+// CHECK_KNL_M32: #define __AVX512CD__ 1 -+// CHECK_KNL_M32: #define __AVX512ER__ 1 -+// CHECK_KNL_M32: #define __AVX512F__ 1 -+// CHECK_KNL_M32: #define __AVX512PF__ 1 -+// CHECK_KNL_M32: #define __AVX__ 1 -+// CHECK_KNL_M32: #define __BMI2__ 1 -+// CHECK_KNL_M32: #define __BMI__ 1 -+// CHECK_KNL_M32: #define __F16C__ 1 -+// CHECK_KNL_M32: #define __FMA__ 1 -+// CHECK_KNL_M32: #define __LZCNT__ 1 -+// CHECK_KNL_M32: #define __MMX__ 1 -+// CHECK_KNL_M32: #define __MOVBE__ 1 -+// CHECK_KNL_M32: #define __PCLMUL__ 1 -+// CHECK_KNL_M32: #define __POPCNT__ 1 -+// CHECK_KNL_M32: #define __PREFETCHWT1__ 1 -+// CHECK_KNL_M32: #define __PRFCHW__ 1 -+// CHECK_KNL_M32: #define __RDRND__ 1 -+// CHECK_KNL_M32: #define __SSE2__ 1 -+// CHECK_KNL_M32: #define __SSE3__ 1 -+// CHECK_KNL_M32: #define __SSE4_1__ 1 -+// CHECK_KNL_M32: #define __SSE4_2__ 1 -+// CHECK_KNL_M32: #define __SSE__ 1 -+// CHECK_KNL_M32: #define __SSSE3__ 1 -+// CHECK_KNL_M32: #define __XSAVEOPT__ 1 -+// CHECK_KNL_M32: #define __XSAVE__ 1 -+// CHECK_KNL_M32: #define __i386 1 -+// CHECK_KNL_M32: #define __i386__ 1 -+// CHECK_KNL_M32: #define __knl 1 -+// CHECK_KNL_M32: #define __knl__ 1 -+// CHECK_KNL_M32: #define __tune_knl__ 1 -+// CHECK_KNL_M32: #define i386 1 -+ -+// RUN: %clang -march=knl -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_KNL_M64 -+// CHECK_KNL_M64: #define __AES__ 1 -+// CHECK_KNL_M64: #define __AVX2__ 1 -+// CHECK_KNL_M64: #define __AVX512CD__ 1 -+// CHECK_KNL_M64: #define __AVX512ER__ 1 -+// CHECK_KNL_M64: #define __AVX512F__ 1 -+// CHECK_KNL_M64: #define __AVX512PF__ 1 -+// CHECK_KNL_M64: #define __AVX__ 1 -+// CHECK_KNL_M64: #define __BMI2__ 1 -+// CHECK_KNL_M64: #define __BMI__ 1 -+// CHECK_KNL_M64: #define __F16C__ 1 -+// CHECK_KNL_M64: #define __FMA__ 1 -+// CHECK_KNL_M64: #define __LZCNT__ 1 -+// CHECK_KNL_M64: #define __MMX__ 1 -+// CHECK_KNL_M64: #define __MOVBE__ 1 -+// CHECK_KNL_M64: #define __PCLMUL__ 1 -+// CHECK_KNL_M64: #define __POPCNT__ 1 -+// CHECK_KNL_M64: #define __PREFETCHWT1__ 1 -+// CHECK_KNL_M64: #define __PRFCHW__ 1 -+// CHECK_KNL_M64: #define __RDRND__ 1 -+// CHECK_KNL_M64: #define __SSE2_MATH__ 1 -+// CHECK_KNL_M64: #define __SSE2__ 1 -+// CHECK_KNL_M64: #define __SSE3__ 1 -+// CHECK_KNL_M64: #define __SSE4_1__ 1 -+// CHECK_KNL_M64: #define __SSE4_2__ 1 -+// CHECK_KNL_M64: #define __SSE_MATH__ 1 -+// CHECK_KNL_M64: #define __SSE__ 1 -+// CHECK_KNL_M64: #define __SSSE3__ 1 -+// CHECK_KNL_M64: #define __XSAVEOPT__ 1 -+// CHECK_KNL_M64: #define __XSAVE__ 1 -+// CHECK_KNL_M64: #define __amd64 1 -+// CHECK_KNL_M64: #define __amd64__ 1 -+// CHECK_KNL_M64: #define __knl 1 -+// CHECK_KNL_M64: #define __knl__ 1 -+// CHECK_KNL_M64: #define __tune_knl__ 1 -+// CHECK_KNL_M64: #define __x86_64 1 -+// CHECK_KNL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=knm -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_KNM_M32 -+// CHECK_KNM_M32: #define __AES__ 1 -+// CHECK_KNM_M32: #define __AVX2__ 1 -+// CHECK_KNM_M32: #define __AVX512CD__ 1 -+// CHECK_KNM_M32: #define __AVX512ER__ 1 -+// CHECK_KNM_M32: #define __AVX512F__ 1 -+// CHECK_KNM_M32: #define __AVX512PF__ 1 -+// CHECK_KNM_M32: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_KNM_M32: #define __AVX__ 1 -+// CHECK_KNM_M32: #define __BMI2__ 1 -+// CHECK_KNM_M32: #define __BMI__ 1 -+// CHECK_KNM_M32: #define __F16C__ 1 -+// CHECK_KNM_M32: #define __FMA__ 1 -+// CHECK_KNM_M32: #define __LZCNT__ 1 -+// CHECK_KNM_M32: #define __MMX__ 1 -+// CHECK_KNM_M32: #define __MOVBE__ 1 -+// CHECK_KNM_M32: #define __PCLMUL__ 1 -+// CHECK_KNM_M32: #define __POPCNT__ 1 -+// CHECK_KNM_M32: #define __PREFETCHWT1__ 1 -+// CHECK_KNM_M32: #define __PRFCHW__ 1 -+// CHECK_KNM_M32: #define __RDRND__ 1 -+// CHECK_KNM_M32: #define __SSE2__ 1 -+// CHECK_KNM_M32: #define __SSE3__ 1 -+// CHECK_KNM_M32: #define __SSE4_1__ 1 -+// CHECK_KNM_M32: #define __SSE4_2__ 1 -+// CHECK_KNM_M32: #define __SSE__ 1 -+// CHECK_KNM_M32: #define __SSSE3__ 1 -+// CHECK_KNM_M32: #define __XSAVEOPT__ 1 -+// CHECK_KNM_M32: #define __XSAVE__ 1 -+// CHECK_KNM_M32: #define __i386 1 -+// CHECK_KNM_M32: #define __i386__ 1 -+// CHECK_KNM_M32: #define i386 1 -+ -+// RUN: %clang -march=knm -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_KNM_M64 -+// CHECK_KNM_M64: #define __AES__ 1 -+// CHECK_KNM_M64: #define __AVX2__ 1 -+// CHECK_KNM_M64: #define __AVX512CD__ 1 -+// CHECK_KNM_M64: #define __AVX512ER__ 1 -+// CHECK_KNM_M64: #define __AVX512F__ 1 -+// CHECK_KNM_M64: #define __AVX512PF__ 1 -+// CHECK_KNM_M64: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_KNM_M64: #define __AVX__ 1 -+// CHECK_KNM_M64: #define __BMI2__ 1 -+// CHECK_KNM_M64: #define __BMI__ 1 -+// CHECK_KNM_M64: #define __F16C__ 1 -+// CHECK_KNM_M64: #define __FMA__ 1 -+// CHECK_KNM_M64: #define __LZCNT__ 1 -+// CHECK_KNM_M64: #define __MMX__ 1 -+// CHECK_KNM_M64: #define __MOVBE__ 1 -+// CHECK_KNM_M64: #define __PCLMUL__ 1 -+// CHECK_KNM_M64: #define __POPCNT__ 1 -+// CHECK_KNM_M64: #define __PREFETCHWT1__ 1 -+// CHECK_KNM_M64: #define __PRFCHW__ 1 -+// CHECK_KNM_M64: #define __RDRND__ 1 -+// CHECK_KNM_M64: #define __SSE2_MATH__ 1 -+// CHECK_KNM_M64: #define __SSE2__ 1 -+// CHECK_KNM_M64: #define __SSE3__ 1 -+// CHECK_KNM_M64: #define __SSE4_1__ 1 -+// CHECK_KNM_M64: #define __SSE4_2__ 1 -+// CHECK_KNM_M64: #define __SSE_MATH__ 1 -+// CHECK_KNM_M64: #define __SSE__ 1 -+// CHECK_KNM_M64: #define __SSSE3__ 1 -+// CHECK_KNM_M64: #define __XSAVEOPT__ 1 -+// CHECK_KNM_M64: #define __XSAVE__ 1 -+// CHECK_KNM_M64: #define __amd64 1 -+// CHECK_KNM_M64: #define __amd64__ 1 -+// CHECK_KNM_M64: #define __x86_64 1 -+// CHECK_KNM_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=skylake-avx512 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SKX_M32 -+// CHECK_SKX_M32: #define __AES__ 1 -+// CHECK_SKX_M32: #define __AVX2__ 1 -+// CHECK_SKX_M32: #define __AVX512BW__ 1 -+// CHECK_SKX_M32: #define __AVX512CD__ 1 -+// CHECK_SKX_M32: #define __AVX512DQ__ 1 -+// CHECK_SKX_M32: #define __AVX512F__ 1 -+// CHECK_SKX_M32: #define __AVX512VL__ 1 -+// CHECK_SKX_M32: #define __AVX__ 1 -+// CHECK_SKX_M32: #define __BMI2__ 1 -+// CHECK_SKX_M32: #define __BMI__ 1 -+// CHECK_SKX_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_SKX_M32: #define __CLWB__ 1 -+// CHECK_SKX_M32: #define __F16C__ 1 -+// CHECK_SKX_M32: #define __FMA__ 1 -+// CHECK_SKX_M32: #define __INVPCID__ 1 -+// CHECK_SKX_M32: #define __LZCNT__ 1 -+// CHECK_SKX_M32: #define __MMX__ 1 -+// CHECK_SKX_M32: #define __MOVBE__ 1 -+// CHECK_SKX_M32: #define __PCLMUL__ 1 -+// CHECK_SKX_M32: #define __PKU__ 1 -+// CHECK_SKX_M32: #define __POPCNT__ 1 -+// CHECK_SKX_M32: #define __PRFCHW__ 1 -+// CHECK_SKX_M32: #define __RDRND__ 1 -+// CHECK_SKX_M32: #define __RDSEED__ 1 -+// CHECK_SKX_M32-NOT: #define __SGX__ 1 -+// CHECK_SKX_M32: #define __SSE2__ 1 -+// CHECK_SKX_M32: #define __SSE3__ 1 -+// CHECK_SKX_M32: #define __SSE4_1__ 1 -+// CHECK_SKX_M32: #define __SSE4_2__ 1 -+// CHECK_SKX_M32: #define __SSE__ 1 -+// CHECK_SKX_M32: #define __SSSE3__ 1 -+// CHECK_SKX_M32: #define __XSAVEC__ 1 -+// CHECK_SKX_M32: #define __XSAVEOPT__ 1 -+// CHECK_SKX_M32: #define __XSAVES__ 1 -+// CHECK_SKX_M32: #define __XSAVE__ 1 -+// CHECK_SKX_M32: #define __corei7 1 -+// CHECK_SKX_M32: #define __corei7__ 1 -+// CHECK_SKX_M32: #define __i386 1 -+// CHECK_SKX_M32: #define __i386__ 1 -+// CHECK_SKX_M32: #define __tune_corei7__ 1 -+// CHECK_SKX_M32: #define i386 1 -+ -+// RUN: %clang -march=skylake-avx512 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SKX_M64 -+// CHECK_SKX_M64: #define __AES__ 1 -+// CHECK_SKX_M64: #define __AVX2__ 1 -+// CHECK_SKX_M64: #define __AVX512BW__ 1 -+// CHECK_SKX_M64: #define __AVX512CD__ 1 -+// CHECK_SKX_M64: #define __AVX512DQ__ 1 -+// CHECK_SKX_M64: #define __AVX512F__ 1 -+// CHECK_SKX_M64: #define __AVX512VL__ 1 -+// CHECK_SKX_M64: #define __AVX__ 1 -+// CHECK_SKX_M64: #define __BMI2__ 1 -+// CHECK_SKX_M64: #define __BMI__ 1 -+// CHECK_SKX_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_SKX_M64: #define __CLWB__ 1 -+// CHECK_SKX_M64: #define __F16C__ 1 -+// CHECK_SKX_M64: #define __FMA__ 1 -+// CHECK_SKX_M64: #define __INVPCID__ 1 -+// CHECK_SKX_M64: #define __LZCNT__ 1 -+// CHECK_SKX_M64: #define __MMX__ 1 -+// CHECK_SKX_M64: #define __MOVBE__ 1 -+// CHECK_SKX_M64: #define __PCLMUL__ 1 -+// CHECK_SKX_M64: #define __PKU__ 1 -+// CHECK_SKX_M64: #define __POPCNT__ 1 -+// CHECK_SKX_M64: #define __PRFCHW__ 1 -+// CHECK_SKX_M64: #define __RDRND__ 1 -+// CHECK_SKX_M64: #define __RDSEED__ 1 -+// CHECK_SKX_M64-NOT: #define __SGX__ 1 -+// CHECK_SKX_M64: #define __SSE2_MATH__ 1 -+// CHECK_SKX_M64: #define __SSE2__ 1 -+// CHECK_SKX_M64: #define __SSE3__ 1 -+// CHECK_SKX_M64: #define __SSE4_1__ 1 -+// CHECK_SKX_M64: #define __SSE4_2__ 1 -+// CHECK_SKX_M64: #define __SSE_MATH__ 1 -+// CHECK_SKX_M64: #define __SSE__ 1 -+// CHECK_SKX_M64: #define __SSSE3__ 1 -+// CHECK_SKX_M64: #define __XSAVEC__ 1 -+// CHECK_SKX_M64: #define __XSAVEOPT__ 1 -+// CHECK_SKX_M64: #define __XSAVES__ 1 -+// CHECK_SKX_M64: #define __XSAVE__ 1 -+// CHECK_SKX_M64: #define __amd64 1 -+// CHECK_SKX_M64: #define __amd64__ 1 -+// CHECK_SKX_M64: #define __corei7 1 -+// CHECK_SKX_M64: #define __corei7__ 1 -+// CHECK_SKX_M64: #define __tune_corei7__ 1 -+// CHECK_SKX_M64: #define __x86_64 1 -+// CHECK_SKX_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=cascadelake -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CLX_M32 -+// CHECK_CLX_M32: #define __AES__ 1 -+// CHECK_CLX_M32: #define __AVX2__ 1 -+// CHECK_CLX_M32: #define __AVX512BW__ 1 -+// CHECK_CLX_M32: #define __AVX512CD__ 1 -+// CHECK_CLX_M32: #define __AVX512DQ__ 1 -+// CHECK_CLX_M32: #define __AVX512F__ 1 -+// CHECK_CLX_M32: #define __AVX512VL__ 1 -+// CHECK_CLX_M32: #define __AVX512VNNI__ 1 -+// CHECK_CLX_M32: #define __AVX__ 1 -+// CHECK_CLX_M32: #define __BMI2__ 1 -+// CHECK_CLX_M32: #define __BMI__ 1 -+// CHECK_CLX_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_CLX_M32: #define __CLWB__ 1 -+// CHECK_CLX_M32: #define __F16C__ 1 -+// CHECK_CLX_M32: #define __FMA__ 1 -+// CHECK_CLX_M32: #define __INVPCID__ 1 -+// CHECK_CLX_M32: #define __LZCNT__ 1 -+// CHECK_CLX_M32: #define __MMX__ 1 -+// CHECK_CLX_M32: #define __MOVBE__ 1 -+// CHECK_CLX_M32: #define __PCLMUL__ 1 -+// CHECK_CLX_M32: #define __PKU__ 1 -+// CHECK_CLX_M32: #define __POPCNT__ 1 -+// CHECK_CLX_M32: #define __PRFCHW__ 1 -+// CHECK_CLX_M32: #define __RDRND__ 1 -+// CHECK_CLX_M32: #define __RDSEED__ 1 -+// CHECK_CLX_M32-NOT: #define __SGX__ 1 -+// CHECK_CLX_M32: #define __SSE2__ 1 -+// CHECK_CLX_M32: #define __SSE3__ 1 -+// CHECK_CLX_M32: #define __SSE4_1__ 1 -+// CHECK_CLX_M32: #define __SSE4_2__ 1 -+// CHECK_CLX_M32: #define __SSE__ 1 -+// CHECK_CLX_M32: #define __SSSE3__ 1 -+// CHECK_CLX_M32: #define __XSAVEC__ 1 -+// CHECK_CLX_M32: #define __XSAVEOPT__ 1 -+// CHECK_CLX_M32: #define __XSAVES__ 1 -+// CHECK_CLX_M32: #define __XSAVE__ 1 -+// CHECK_CLX_M32: #define __corei7 1 -+// CHECK_CLX_M32: #define __corei7__ 1 -+// CHECK_CLX_M32: #define __i386 1 -+// CHECK_CLX_M32: #define __i386__ 1 -+// CHECK_CLX_M32: #define __tune_corei7__ 1 -+// CHECK_CLX_M32: #define i386 1 -+ -+// RUN: %clang -march=cascadelake -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CLX_M64 -+// CHECK_CLX_M64: #define __AES__ 1 -+// CHECK_CLX_M64: #define __AVX2__ 1 -+// CHECK_CLX_M64: #define __AVX512BW__ 1 -+// CHECK_CLX_M64: #define __AVX512CD__ 1 -+// CHECK_CLX_M64: #define __AVX512DQ__ 1 -+// CHECK_CLX_M64: #define __AVX512F__ 1 -+// CHECK_CLX_M64: #define __AVX512VL__ 1 -+// CHECK_CLX_M64: #define __AVX512VNNI__ 1 -+// CHECK_CLX_M64: #define __AVX__ 1 -+// CHECK_CLX_M64: #define __BMI2__ 1 -+// CHECK_CLX_M64: #define __BMI__ 1 -+// CHECK_CLX_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_CLX_M64: #define __CLWB__ 1 -+// CHECK_CLX_M64: #define __F16C__ 1 -+// CHECK_CLX_M64: #define __FMA__ 1 -+// CHECK_CLX_M64: #define __INVPCID__ 1 -+// CHECK_CLX_M64: #define __LZCNT__ 1 -+// CHECK_CLX_M64: #define __MMX__ 1 -+// CHECK_CLX_M64: #define __MOVBE__ 1 -+// CHECK_CLX_M64: #define __PCLMUL__ 1 -+// CHECK_CLX_M64: #define __PKU__ 1 -+// CHECK_CLX_M64: #define __POPCNT__ 1 -+// CHECK_CLX_M64: #define __PRFCHW__ 1 -+// CHECK_CLX_M64: #define __RDRND__ 1 -+// CHECK_CLX_M64: #define __RDSEED__ 1 -+// CHECK_CLX_M64-NOT: #define __SGX__ 1 -+// CHECK_CLX_M64: #define __SSE2_MATH__ 1 -+// CHECK_CLX_M64: #define __SSE2__ 1 -+// CHECK_CLX_M64: #define __SSE3__ 1 -+// CHECK_CLX_M64: #define __SSE4_1__ 1 -+// CHECK_CLX_M64: #define __SSE4_2__ 1 -+// CHECK_CLX_M64: #define __SSE_MATH__ 1 -+// CHECK_CLX_M64: #define __SSE__ 1 -+// CHECK_CLX_M64: #define __SSSE3__ 1 -+// CHECK_CLX_M64: #define __XSAVEC__ 1 -+// CHECK_CLX_M64: #define __XSAVEOPT__ 1 -+// CHECK_CLX_M64: #define __XSAVES__ 1 -+// CHECK_CLX_M64: #define __XSAVE__ 1 -+// CHECK_CLX_M64: #define __amd64 1 -+// CHECK_CLX_M64: #define __amd64__ 1 -+// CHECK_CLX_M64: #define __corei7 1 -+// CHECK_CLX_M64: #define __corei7__ 1 -+// CHECK_CLX_M64: #define __tune_corei7__ 1 -+// CHECK_CLX_M64: #define __x86_64 1 -+// CHECK_CLX_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=cooperlake -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CPX_M32 -+// CHECK_CPX_M32: #define __AES__ 1 -+// CHECK_CPX_M32: #define __AVX2__ 1 -+// CHECK_CPX_M32: #define __AVX512BF16__ 1 -+// CHECK_CPX_M32: #define __AVX512BW__ 1 -+// CHECK_CPX_M32: #define __AVX512CD__ 1 -+// CHECK_CPX_M32: #define __AVX512DQ__ 1 -+// CHECK_CPX_M32: #define __AVX512F__ 1 -+// CHECK_CPX_M32: #define __AVX512VL__ 1 -+// CHECK_CPX_M32: #define __AVX512VNNI__ 1 -+// CHECK_CPX_M32: #define __AVX__ 1 -+// CHECK_CPX_M32: #define __BMI2__ 1 -+// CHECK_CPX_M32: #define __BMI__ 1 -+// CHECK_CPX_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_CPX_M32: #define __CLWB__ 1 -+// CHECK_CPX_M32: #define __F16C__ 1 -+// CHECK_CPX_M32: #define __FMA__ 1 -+// CHECK_CPX_M32: #define __INVPCID__ 1 -+// CHECK_CPX_M32: #define __LZCNT__ 1 -+// CHECK_CPX_M32: #define __MMX__ 1 -+// CHECK_CPX_M32: #define __MOVBE__ 1 -+// CHECK_CPX_M32: #define __PCLMUL__ 1 -+// CHECK_CPX_M32: #define __PKU__ 1 -+// CHECK_CPX_M32: #define __POPCNT__ 1 -+// CHECK_CPX_M32: #define __PRFCHW__ 1 -+// CHECK_CPX_M32: #define __RDRND__ 1 -+// CHECK_CPX_M32: #define __RDSEED__ 1 -+// CHECK_CPX_M32-NOT: #define __SGX__ 1 -+// CHECK_CPX_M32: #define __SSE2__ 1 -+// CHECK_CPX_M32: #define __SSE3__ 1 -+// CHECK_CPX_M32: #define __SSE4_1__ 1 -+// CHECK_CPX_M32: #define __SSE4_2__ 1 -+// CHECK_CPX_M32: #define __SSE__ 1 -+// CHECK_CPX_M32: #define __SSSE3__ 1 -+// CHECK_CPX_M32: #define __XSAVEC__ 1 -+// CHECK_CPX_M32: #define __XSAVEOPT__ 1 -+// CHECK_CPX_M32: #define __XSAVES__ 1 -+// CHECK_CPX_M32: #define __XSAVE__ 1 -+// CHECK_CPX_M32: #define __corei7 1 -+// CHECK_CPX_M32: #define __corei7__ 1 -+// CHECK_CPX_M32: #define __i386 1 -+// CHECK_CPX_M32: #define __i386__ 1 -+// CHECK_CPX_M32: #define __tune_corei7__ 1 -+// CHECK_CPX_M32: #define i386 1 -+ -+// RUN: %clang -march=cooperlake -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CPX_M64 -+// CHECK_CPX_M64: #define __AES__ 1 -+// CHECK_CPX_M64: #define __AVX2__ 1 -+// CHECK_CPX_M64: #define __AVX512BF16__ 1 -+// CHECK_CPX_M64: #define __AVX512BW__ 1 -+// CHECK_CPX_M64: #define __AVX512CD__ 1 -+// CHECK_CPX_M64: #define __AVX512DQ__ 1 -+// CHECK_CPX_M64: #define __AVX512F__ 1 -+// CHECK_CPX_M64: #define __AVX512VL__ 1 -+// CHECK_CPX_M64: #define __AVX512VNNI__ 1 -+// CHECK_CPX_M64: #define __AVX__ 1 -+// CHECK_CPX_M64: #define __BMI2__ 1 -+// CHECK_CPX_M64: #define __BMI__ 1 -+// CHECK_CPX_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_CPX_M64: #define __CLWB__ 1 -+// CHECK_CPX_M64: #define __F16C__ 1 -+// CHECK_CPX_M64: #define __FMA__ 1 -+// CHECK_CPX_M64: #define __INVPCID__ 1 -+// CHECK_CPX_M64: #define __LZCNT__ 1 -+// CHECK_CPX_M64: #define __MMX__ 1 -+// CHECK_CPX_M64: #define __MOVBE__ 1 -+// CHECK_CPX_M64: #define __PCLMUL__ 1 -+// CHECK_CPX_M64: #define __PKU__ 1 -+// CHECK_CPX_M64: #define __POPCNT__ 1 -+// CHECK_CPX_M64: #define __PRFCHW__ 1 -+// CHECK_CPX_M64: #define __RDRND__ 1 -+// CHECK_CPX_M64: #define __RDSEED__ 1 -+// CHECK_CPX_M64-NOT: #define __SGX__ 1 -+// CHECK_CPX_M64: #define __SSE2_MATH__ 1 -+// CHECK_CPX_M64: #define __SSE2__ 1 -+// CHECK_CPX_M64: #define __SSE3__ 1 -+// CHECK_CPX_M64: #define __SSE4_1__ 1 -+// CHECK_CPX_M64: #define __SSE4_2__ 1 -+// CHECK_CPX_M64: #define __SSE_MATH__ 1 -+// CHECK_CPX_M64: #define __SSE__ 1 -+// CHECK_CPX_M64: #define __SSSE3__ 1 -+// CHECK_CPX_M64: #define __XSAVEC__ 1 -+// CHECK_CPX_M64: #define __XSAVEOPT__ 1 -+// CHECK_CPX_M64: #define __XSAVES__ 1 -+// CHECK_CPX_M64: #define __XSAVE__ 1 -+// CHECK_CPX_M64: #define __amd64 1 -+// CHECK_CPX_M64: #define __amd64__ 1 -+// CHECK_CPX_M64: #define __corei7 1 -+// CHECK_CPX_M64: #define __corei7__ 1 -+// CHECK_CPX_M64: #define __tune_corei7__ 1 -+// CHECK_CPX_M64: #define __x86_64 1 -+// CHECK_CPX_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=cannonlake -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CNL_M32 -+// CHECK_CNL_M32: #define __AES__ 1 -+// CHECK_CNL_M32: #define __AVX2__ 1 -+// CHECK_CNL_M32: #define __AVX512BW__ 1 -+// CHECK_CNL_M32: #define __AVX512CD__ 1 -+// CHECK_CNL_M32: #define __AVX512DQ__ 1 -+// CHECK_CNL_M32: #define __AVX512F__ 1 -+// CHECK_CNL_M32: #define __AVX512IFMA__ 1 -+// CHECK_CNL_M32: #define __AVX512VBMI__ 1 -+// CHECK_CNL_M32: #define __AVX512VL__ 1 -+// CHECK_CNL_M32: #define __AVX__ 1 -+// CHECK_CNL_M32: #define __BMI2__ 1 -+// CHECK_CNL_M32: #define __BMI__ 1 -+// CHECK_CNL_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_CNL_M32-NOT: #define __CLWB__ 1 -+// CHECK_CNL_M32: #define __F16C__ 1 -+// CHECK_CNL_M32: #define __FMA__ 1 -+// CHECK_CNL_M32: #define __INVPCID__ 1 -+// CHECK_CNL_M32: #define __LZCNT__ 1 -+// CHECK_CNL_M32: #define __MMX__ 1 -+// CHECK_CNL_M32: #define __MOVBE__ 1 -+// CHECK_CNL_M32: #define __PCLMUL__ 1 -+// CHECK_CNL_M32: #define __PKU__ 1 -+// CHECK_CNL_M32: #define __POPCNT__ 1 -+// CHECK_CNL_M32: #define __PRFCHW__ 1 -+// CHECK_CNL_M32: #define __RDRND__ 1 -+// CHECK_CNL_M32: #define __RDSEED__ 1 -+// CHECK_CNL_M32: #define __SGX__ 1 -+// CHECK_CNL_M32: #define __SHA__ 1 -+// CHECK_CNL_M32: #define __SSE2__ 1 -+// CHECK_CNL_M32: #define __SSE3__ 1 -+// CHECK_CNL_M32: #define __SSE4_1__ 1 -+// CHECK_CNL_M32: #define __SSE4_2__ 1 -+// CHECK_CNL_M32: #define __SSE__ 1 -+// CHECK_CNL_M32: #define __SSSE3__ 1 -+// CHECK_CNL_M32: #define __XSAVEC__ 1 -+// CHECK_CNL_M32: #define __XSAVEOPT__ 1 -+// CHECK_CNL_M32: #define __XSAVES__ 1 -+// CHECK_CNL_M32: #define __XSAVE__ 1 -+// CHECK_CNL_M32: #define __corei7 1 -+// CHECK_CNL_M32: #define __corei7__ 1 -+// CHECK_CNL_M32: #define __i386 1 -+// CHECK_CNL_M32: #define __i386__ 1 -+// CHECK_CNL_M32: #define __tune_corei7__ 1 -+// CHECK_CNL_M32: #define i386 1 -+ -+// RUN: %clang -march=cannonlake -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_CNL_M64 -+// CHECK_CNL_M64: #define __AES__ 1 -+// CHECK_CNL_M64: #define __AVX2__ 1 -+// CHECK_CNL_M64: #define __AVX512BW__ 1 -+// CHECK_CNL_M64: #define __AVX512CD__ 1 -+// CHECK_CNL_M64: #define __AVX512DQ__ 1 -+// CHECK_CNL_M64: #define __AVX512F__ 1 -+// CHECK_CNL_M64: #define __AVX512IFMA__ 1 -+// CHECK_CNL_M64: #define __AVX512VBMI__ 1 -+// CHECK_CNL_M64: #define __AVX512VL__ 1 -+// CHECK_CNL_M64: #define __AVX__ 1 -+// CHECK_CNL_M64: #define __BMI2__ 1 -+// CHECK_CNL_M64: #define __BMI__ 1 -+// CHECK_CNL_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_CNL_M64-NOT: #define __CLWB__ 1 -+// CHECK_CNL_M64: #define __F16C__ 1 -+// CHECK_CNL_M64: #define __FMA__ 1 -+// CHECK_CNL_M64: #define __INVPCID__ 1 -+// CHECK_CNL_M64: #define __LZCNT__ 1 -+// CHECK_CNL_M64: #define __MMX__ 1 -+// CHECK_CNL_M64: #define __MOVBE__ 1 -+// CHECK_CNL_M64: #define __PCLMUL__ 1 -+// CHECK_CNL_M64: #define __PKU__ 1 -+// CHECK_CNL_M64: #define __POPCNT__ 1 -+// CHECK_CNL_M64: #define __PRFCHW__ 1 -+// CHECK_CNL_M64: #define __RDRND__ 1 -+// CHECK_CNL_M64: #define __RDSEED__ 1 -+// CHECK_CNL_M64: #define __SGX__ 1 -+// CHECK_CNL_M64: #define __SHA__ 1 -+// CHECK_CNL_M64: #define __SSE2__ 1 -+// CHECK_CNL_M64: #define __SSE3__ 1 -+// CHECK_CNL_M64: #define __SSE4_1__ 1 -+// CHECK_CNL_M64: #define __SSE4_2__ 1 -+// CHECK_CNL_M64: #define __SSE__ 1 -+// CHECK_CNL_M64: #define __SSSE3__ 1 -+// CHECK_CNL_M64: #define __XSAVEC__ 1 -+// CHECK_CNL_M64: #define __XSAVEOPT__ 1 -+// CHECK_CNL_M64: #define __XSAVES__ 1 -+// CHECK_CNL_M64: #define __XSAVE__ 1 -+// CHECK_CNL_M64: #define __amd64 1 -+// CHECK_CNL_M64: #define __amd64__ 1 -+// CHECK_CNL_M64: #define __corei7 1 -+// CHECK_CNL_M64: #define __corei7__ 1 -+// CHECK_CNL_M64: #define __tune_corei7__ 1 -+// CHECK_CNL_M64: #define __x86_64 1 -+// CHECK_CNL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=icelake-client -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ICL_M32 -+// CHECK_ICL_M32: #define __AES__ 1 -+// CHECK_ICL_M32: #define __AVX2__ 1 -+// CHECK_ICL_M32: #define __AVX512BITALG__ 1 -+// CHECK_ICL_M32: #define __AVX512BW__ 1 -+// CHECK_ICL_M32: #define __AVX512CD__ 1 -+// CHECK_ICL_M32: #define __AVX512DQ__ 1 -+// CHECK_ICL_M32: #define __AVX512F__ 1 -+// CHECK_ICL_M32: #define __AVX512IFMA__ 1 -+// CHECK_ICL_M32: #define __AVX512VBMI2__ 1 -+// CHECK_ICL_M32: #define __AVX512VBMI__ 1 -+// CHECK_ICL_M32: #define __AVX512VL__ 1 -+// CHECK_ICL_M32: #define __AVX512VNNI__ 1 -+// CHECK_ICL_M32: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_ICL_M32: #define __AVX__ 1 -+// CHECK_ICL_M32: #define __BMI2__ 1 -+// CHECK_ICL_M32: #define __BMI__ 1 -+// CHECK_ICL_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_ICL_M32: #define __CLWB__ 1 -+// CHECK_ICL_M32: #define __F16C__ 1 -+// CHECK_ICL_M32: #define __FMA__ 1 -+// CHECK_ICL_M32: #define __GFNI__ 1 -+// CHECK_ICL_M32: #define __INVPCID__ 1 -+// CHECK_ICL_M32: #define __LZCNT__ 1 -+// CHECK_ICL_M32: #define __MMX__ 1 -+// CHECK_ICL_M32: #define __MOVBE__ 1 -+// CHECK_ICL_M32: #define __PCLMUL__ 1 -+// CHECK_ICL_M32: #define __PKU__ 1 -+// CHECK_ICL_M32: #define __POPCNT__ 1 -+// CHECK_ICL_M32: #define __PRFCHW__ 1 -+// CHECK_ICL_M32: #define __RDPID__ 1 -+// CHECK_ICL_M32: #define __RDRND__ 1 -+// CHECK_ICL_M32: #define __RDSEED__ 1 -+// CHECK_ICL_M32: #define __SGX__ 1 -+// CHECK_ICL_M32: #define __SHA__ 1 -+// CHECK_ICL_M32: #define __SSE2__ 1 -+// CHECK_ICL_M32: #define __SSE3__ 1 -+// CHECK_ICL_M32: #define __SSE4_1__ 1 -+// CHECK_ICL_M32: #define __SSE4_2__ 1 -+// CHECK_ICL_M32: #define __SSE__ 1 -+// CHECK_ICL_M32: #define __SSSE3__ 1 -+// CHECK_ICL_M32: #define __VAES__ 1 -+// CHECK_ICL_M32: #define __VPCLMULQDQ__ 1 -+// CHECK_ICL_M32-NOT: #define __WBNOINVD__ 1 -+// CHECK_ICL_M32: #define __XSAVEC__ 1 -+// CHECK_ICL_M32: #define __XSAVEOPT__ 1 -+// CHECK_ICL_M32: #define __XSAVES__ 1 -+// CHECK_ICL_M32: #define __XSAVE__ 1 -+// CHECK_ICL_M32: #define __corei7 1 -+// CHECK_ICL_M32: #define __corei7__ 1 -+// CHECK_ICL_M32: #define __i386 1 -+// CHECK_ICL_M32: #define __i386__ 1 -+// CHECK_ICL_M32: #define __tune_corei7__ 1 -+// CHECK_ICL_M32: #define i386 1 -+ -+// RUN: %clang -march=icelake-client -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ICL_M64 -+// CHECK_ICL_M64: #define __AES__ 1 -+// CHECK_ICL_M64: #define __AVX2__ 1 -+// CHECK_ICL_M64: #define __AVX512BITALG__ 1 -+// CHECK_ICL_M64: #define __AVX512BW__ 1 -+// CHECK_ICL_M64: #define __AVX512CD__ 1 -+// CHECK_ICL_M64: #define __AVX512DQ__ 1 -+// CHECK_ICL_M64: #define __AVX512F__ 1 -+// CHECK_ICL_M64: #define __AVX512IFMA__ 1 -+// CHECK_ICL_M64: #define __AVX512VBMI2__ 1 -+// CHECK_ICL_M64: #define __AVX512VBMI__ 1 -+// CHECK_ICL_M64: #define __AVX512VL__ 1 -+// CHECK_ICL_M64: #define __AVX512VNNI__ 1 -+// CHECK_ICL_M64: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_ICL_M64: #define __AVX__ 1 -+// CHECK_ICL_M64: #define __BMI2__ 1 -+// CHECK_ICL_M64: #define __BMI__ 1 -+// CHECK_ICL_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_ICL_M64: #define __CLWB__ 1 -+// CHECK_ICL_M64: #define __F16C__ 1 -+// CHECK_ICL_M64: #define __FMA__ 1 -+// CHECK_ICL_M64: #define __GFNI__ 1 -+// CHECK_ICL_M64: #define __INVPCID__ 1 -+// CHECK_ICL_M64: #define __LZCNT__ 1 -+// CHECK_ICL_M64: #define __MMX__ 1 -+// CHECK_ICL_M64: #define __MOVBE__ 1 -+// CHECK_ICL_M64: #define __PCLMUL__ 1 -+// CHECK_ICL_M64: #define __PKU__ 1 -+// CHECK_ICL_M64: #define __POPCNT__ 1 -+// CHECK_ICL_M64: #define __PRFCHW__ 1 -+// CHECK_ICL_M64: #define __RDPID__ 1 -+// CHECK_ICL_M64: #define __RDRND__ 1 -+// CHECK_ICL_M64: #define __RDSEED__ 1 -+// CHECK_ICL_M64: #define __SGX__ 1 -+// CHECK_ICL_M64: #define __SHA__ 1 -+// CHECK_ICL_M64: #define __SSE2__ 1 -+// CHECK_ICL_M64: #define __SSE3__ 1 -+// CHECK_ICL_M64: #define __SSE4_1__ 1 -+// CHECK_ICL_M64: #define __SSE4_2__ 1 -+// CHECK_ICL_M64: #define __SSE__ 1 -+// CHECK_ICL_M64: #define __SSSE3__ 1 -+// CHECK_ICL_M64: #define __VAES__ 1 -+// CHECK_ICL_M64: #define __VPCLMULQDQ__ 1 -+// CHECK_ICL_M64-NOT: #define __WBNOINVD__ 1 -+// CHECK_ICL_M64: #define __XSAVEC__ 1 -+// CHECK_ICL_M64: #define __XSAVEOPT__ 1 -+// CHECK_ICL_M64: #define __XSAVES__ 1 -+// CHECK_ICL_M64: #define __XSAVE__ 1 -+// CHECK_ICL_M64: #define __amd64 1 -+// CHECK_ICL_M64: #define __amd64__ 1 -+// CHECK_ICL_M64: #define __corei7 1 -+// CHECK_ICL_M64: #define __corei7__ 1 -+// CHECK_ICL_M64: #define __tune_corei7__ 1 -+// CHECK_ICL_M64: #define __x86_64 1 -+// CHECK_ICL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=icelake-server -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ICX_M32 -+// CHECK_ICX_M32: #define __AES__ 1 -+// CHECK_ICX_M32: #define __AVX2__ 1 -+// CHECK_ICX_M32: #define __AVX512BITALG__ 1 -+// CHECK_ICX_M32: #define __AVX512BW__ 1 -+// CHECK_ICX_M32: #define __AVX512CD__ 1 -+// CHECK_ICX_M32: #define __AVX512DQ__ 1 -+// CHECK_ICX_M32: #define __AVX512F__ 1 -+// CHECK_ICX_M32: #define __AVX512IFMA__ 1 -+// CHECK_ICX_M32: #define __AVX512VBMI2__ 1 -+// CHECK_ICX_M32: #define __AVX512VBMI__ 1 -+// CHECK_ICX_M32: #define __AVX512VL__ 1 -+// CHECK_ICX_M32: #define __AVX512VNNI__ 1 -+// CHECK_ICX_M32: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_ICX_M32: #define __AVX__ 1 -+// CHECK_ICX_M32: #define __BMI2__ 1 -+// CHECK_ICX_M32: #define __BMI__ 1 -+// CHECK_ICX_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_ICX_M32: #define __CLWB__ 1 -+// CHECK_ICX_M32: #define __F16C__ 1 -+// CHECK_ICX_M32: #define __FMA__ 1 -+// CHECK_ICX_M32: #define __GFNI__ 1 -+// CHECK_ICX_M32: #define __INVPCID__ 1 -+// CHECK_ICX_M32: #define __LZCNT__ 1 -+// CHECK_ICX_M32: #define __MMX__ 1 -+// CHECK_ICX_M32: #define __MOVBE__ 1 -+// CHECK_ICX_M32: #define __PCLMUL__ 1 -+// CHECK_ICX_M32: #define __PCONFIG__ 1 -+// CHECK_ICX_M32: #define __PKU__ 1 -+// CHECK_ICX_M32: #define __POPCNT__ 1 -+// CHECK_ICX_M32: #define __PRFCHW__ 1 -+// CHECK_ICX_M32: #define __RDPID__ 1 -+// CHECK_ICX_M32: #define __RDRND__ 1 -+// CHECK_ICX_M32: #define __RDSEED__ 1 -+// CHECK_ICX_M32: #define __SGX__ 1 -+// CHECK_ICX_M32: #define __SHA__ 1 -+// CHECK_ICX_M32: #define __SSE2__ 1 -+// CHECK_ICX_M32: #define __SSE3__ 1 -+// CHECK_ICX_M32: #define __SSE4_1__ 1 -+// CHECK_ICX_M32: #define __SSE4_2__ 1 -+// CHECK_ICX_M32: #define __SSE__ 1 -+// CHECK_ICX_M32: #define __SSSE3__ 1 -+// CHECK_ICX_M32: #define __VAES__ 1 -+// CHECK_ICX_M32: #define __VPCLMULQDQ__ 1 -+// CHECK_ICX_M32: #define __WBNOINVD__ 1 -+// CHECK_ICX_M32: #define __XSAVEC__ 1 -+// CHECK_ICX_M32: #define __XSAVEOPT__ 1 -+// CHECK_ICX_M32: #define __XSAVES__ 1 -+// CHECK_ICX_M32: #define __XSAVE__ 1 -+// CHECK_ICX_M32: #define __corei7 1 -+// CHECK_ICX_M32: #define __corei7__ 1 -+// CHECK_ICX_M32: #define __i386 1 -+// CHECK_ICX_M32: #define __i386__ 1 -+// CHECK_ICX_M32: #define __tune_corei7__ 1 -+// CHECK_ICX_M32: #define i386 1 -+ -+// RUN: %clang -march=icelake-server -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ICX_M64 -+// CHECK_ICX_M64: #define __AES__ 1 -+// CHECK_ICX_M64: #define __AVX2__ 1 -+// CHECK_ICX_M64: #define __AVX512BITALG__ 1 -+// CHECK_ICX_M64: #define __AVX512BW__ 1 -+// CHECK_ICX_M64: #define __AVX512CD__ 1 -+// CHECK_ICX_M64: #define __AVX512DQ__ 1 -+// CHECK_ICX_M64: #define __AVX512F__ 1 -+// CHECK_ICX_M64: #define __AVX512IFMA__ 1 -+// CHECK_ICX_M64: #define __AVX512VBMI2__ 1 -+// CHECK_ICX_M64: #define __AVX512VBMI__ 1 -+// CHECK_ICX_M64: #define __AVX512VL__ 1 -+// CHECK_ICX_M64: #define __AVX512VNNI__ 1 -+// CHECK_ICX_M64: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_ICX_M64: #define __AVX__ 1 -+// CHECK_ICX_M64: #define __BMI2__ 1 -+// CHECK_ICX_M64: #define __BMI__ 1 -+// CHECK_ICX_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_ICX_M64: #define __CLWB__ 1 -+// CHECK_ICX_M64: #define __F16C__ 1 -+// CHECK_ICX_M64: #define __FMA__ 1 -+// CHECK_ICX_M64: #define __GFNI__ 1 -+// CHECK_ICX_M64: #define __INVPCID__ 1 -+// CHECK_ICX_M64: #define __LZCNT__ 1 -+// CHECK_ICX_M64: #define __MMX__ 1 -+// CHECK_ICX_M64: #define __MOVBE__ 1 -+// CHECK_ICX_M64: #define __PCLMUL__ 1 -+// CHECK_ICX_M64: #define __PCONFIG__ 1 -+// CHECK_ICX_M64: #define __PKU__ 1 -+// CHECK_ICX_M64: #define __POPCNT__ 1 -+// CHECK_ICX_M64: #define __PRFCHW__ 1 -+// CHECK_ICX_M64: #define __RDPID__ 1 -+// CHECK_ICX_M64: #define __RDRND__ 1 -+// CHECK_ICX_M64: #define __RDSEED__ 1 -+// CHECK_ICX_M64: #define __SGX__ 1 -+// CHECK_ICX_M64: #define __SHA__ 1 -+// CHECK_ICX_M64: #define __SSE2__ 1 -+// CHECK_ICX_M64: #define __SSE3__ 1 -+// CHECK_ICX_M64: #define __SSE4_1__ 1 -+// CHECK_ICX_M64: #define __SSE4_2__ 1 -+// CHECK_ICX_M64: #define __SSE__ 1 -+// CHECK_ICX_M64: #define __SSSE3__ 1 -+// CHECK_ICX_M64: #define __VAES__ 1 -+// CHECK_ICX_M64: #define __VPCLMULQDQ__ 1 -+// CHECK_ICX_M64: #define __WBNOINVD__ 1 -+// CHECK_ICX_M64: #define __XSAVEC__ 1 -+// CHECK_ICX_M64: #define __XSAVEOPT__ 1 -+// CHECK_ICX_M64: #define __XSAVES__ 1 -+// CHECK_ICX_M64: #define __XSAVE__ 1 -+// CHECK_ICX_M64: #define __amd64 1 -+// CHECK_ICX_M64: #define __amd64__ 1 -+// CHECK_ICX_M64: #define __corei7 1 -+// CHECK_ICX_M64: #define __corei7__ 1 -+// CHECK_ICX_M64: #define __tune_corei7__ 1 -+// CHECK_ICX_M64: #define __x86_64 1 -+// CHECK_ICX_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=tigerlake -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_TGL_M32 -+// CHECK_TGL_M32: #define __AES__ 1 -+// CHECK_TGL_M32: #define __AVX2__ 1 -+// CHECK_TGL_M32: #define __AVX512BITALG__ 1 -+// CHECK_TGL_M32: #define __AVX512BW__ 1 -+// CHECK_TGL_M32: #define __AVX512CD__ 1 -+// CHECK_TGL_M32: #define __AVX512DQ__ 1 -+// CHECK_TGL_M32: #define __AVX512F__ 1 -+// CHECK_TGL_M32: #define __AVX512IFMA__ 1 -+// CHECK_TGL_M32: #define __AVX512VBMI2__ 1 -+// CHECK_TGL_M32: #define __AVX512VBMI__ 1 -+// CHECK_TGL_M32: #define __AVX512VL__ 1 -+// CHECK_TGL_M32: #define __AVX512VNNI__ 1 -+// CHECK_TGL_M32: #define __AVX512VP2INTERSECT__ 1 -+// CHECK_TGL_M32: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_TGL_M32: #define __AVX__ 1 -+// CHECK_TGL_M32: #define __BMI2__ 1 -+// CHECK_TGL_M32: #define __BMI__ 1 -+// CHECK_TGL_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_TGL_M32: #define __CLWB__ 1 -+// CHECK_TGL_M32: #define __F16C__ 1 -+// CHECK_TGL_M32: #define __FMA__ 1 -+// CHECK_TGL_M32: #define __GFNI__ 1 -+// CHECK_TGL_M32: #define __INVPCID__ 1 -+// CHECK_TGL_M32: #define __LZCNT__ 1 -+// CHECK_TGL_M32: #define __MMX__ 1 -+// CHECK_TGL_M32: #define __MOVBE__ 1 -+// CHECK_TGL_M32: #define __MOVDIR64B__ 1 -+// CHECK_TGL_M32: #define __MOVDIRI__ 1 -+// CHECK_TGL_M32: #define __PCLMUL__ 1 -+// CHECK_TGL_M32-NOT: #define __PCONFIG__ 1 -+// CHECK_TGL_M32: #define __PKU__ 1 -+// CHECK_TGL_M32: #define __POPCNT__ 1 -+// CHECK_TGL_M32: #define __PRFCHW__ 1 -+// CHECK_TGL_M32: #define __RDPID__ 1 -+// CHECK_TGL_M32: #define __RDRND__ 1 -+// CHECK_TGL_M32: #define __RDSEED__ 1 -+// CHECK_TGL_M32: #define __SGX__ 1 -+// CHECK_TGL_M32: #define __SHA__ 1 -+// CHECK_TGL_M32: #define __SHSTK__ 1 -+// CHECK_TGL_M32: #define __SSE2__ 1 -+// CHECK_TGL_M32: #define __SSE3__ 1 -+// CHECK_TGL_M32: #define __SSE4_1__ 1 -+// CHECK_TGL_M32: #define __SSE4_2__ 1 -+// CHECK_TGL_M32: #define __SSE__ 1 -+// CHECK_TGL_M32: #define __SSSE3__ 1 -+// CHECK_TGL_M32: #define __VAES__ 1 -+// CHECK_TGL_M32: #define __VPCLMULQDQ__ 1 -+// CHECK_TGL_M32-NOT: #define __WBNOINVD__ 1 -+// CHECK_TGL_M32: #define __XSAVEC__ 1 -+// CHECK_TGL_M32: #define __XSAVEOPT__ 1 -+// CHECK_TGL_M32: #define __XSAVES__ 1 -+// CHECK_TGL_M32: #define __XSAVE__ 1 -+// CHECK_TGL_M32: #define __corei7 1 -+// CHECK_TGL_M32: #define __corei7__ 1 -+// CHECK_TGL_M32: #define __i386 1 -+// CHECK_TGL_M32: #define __i386__ 1 -+// CHECK_TGL_M32: #define __tune_corei7__ 1 -+// CHECK_TGL_M32: #define i386 1 -+ -+// RUN: %clang -march=tigerlake -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_TGL_M64 -+// CHECK_TGL_M64: #define __AES__ 1 -+// CHECK_TGL_M64: #define __AVX2__ 1 -+// CHECK_TGL_M64: #define __AVX512BITALG__ 1 -+// CHECK_TGL_M64: #define __AVX512BW__ 1 -+// CHECK_TGL_M64: #define __AVX512CD__ 1 -+// CHECK_TGL_M64: #define __AVX512DQ__ 1 -+// CHECK_TGL_M64: #define __AVX512F__ 1 -+// CHECK_TGL_M64: #define __AVX512IFMA__ 1 -+// CHECK_TGL_M64: #define __AVX512VBMI2__ 1 -+// CHECK_TGL_M64: #define __AVX512VBMI__ 1 -+// CHECK_TGL_M64: #define __AVX512VL__ 1 -+// CHECK_TGL_M64: #define __AVX512VNNI__ 1 -+// CHECK_TGL_M64: #define __AVX512VP2INTERSECT__ 1 -+// CHECK_TGL_M64: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_TGL_M64: #define __AVX__ 1 -+// CHECK_TGL_M64: #define __BMI2__ 1 -+// CHECK_TGL_M64: #define __BMI__ 1 -+// CHECK_TGL_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_TGL_M64: #define __CLWB__ 1 -+// CHECK_TGL_M64: #define __F16C__ 1 -+// CHECK_TGL_M64: #define __FMA__ 1 -+// CHECK_TGL_M64: #define __GFNI__ 1 -+// CHECK_TGL_M64: #define __INVPCID__ 1 -+// CHECK_TGL_M64: #define __LZCNT__ 1 -+// CHECK_TGL_M64: #define __MMX__ 1 -+// CHECK_TGL_M64: #define __MOVBE__ 1 -+// CHECK_TGL_M64: #define __MOVDIR64B__ 1 -+// CHECK_TGL_M64: #define __MOVDIRI__ 1 -+// CHECK_TGL_M64: #define __PCLMUL__ 1 -+// CHECK_TGL_M64-NOT: #define __PCONFIG__ 1 -+// CHECK_TGL_M64: #define __PKU__ 1 -+// CHECK_TGL_M64: #define __POPCNT__ 1 -+// CHECK_TGL_M64: #define __PRFCHW__ 1 -+// CHECK_TGL_M64: #define __RDPID__ 1 -+// CHECK_TGL_M64: #define __RDRND__ 1 -+// CHECK_TGL_M64: #define __RDSEED__ 1 -+// CHECK_TGL_M64: #define __SGX__ 1 -+// CHECK_TGL_M64: #define __SHA__ 1 -+// CHECK_TGL_M64: #define __SHSTK__ 1 -+// CHECK_TGL_M64: #define __SSE2__ 1 -+// CHECK_TGL_M64: #define __SSE3__ 1 -+// CHECK_TGL_M64: #define __SSE4_1__ 1 -+// CHECK_TGL_M64: #define __SSE4_2__ 1 -+// CHECK_TGL_M64: #define __SSE__ 1 -+// CHECK_TGL_M64: #define __SSSE3__ 1 -+// CHECK_TGL_M64: #define __VAES__ 1 -+// CHECK_TGL_M64: #define __VPCLMULQDQ__ 1 -+// CHECK_TGL_M64-NOT: #define __WBNOINVD__ 1 -+// CHECK_TGL_M64: #define __XSAVEC__ 1 -+// CHECK_TGL_M64: #define __XSAVEOPT__ 1 -+// CHECK_TGL_M64: #define __XSAVES__ 1 -+// CHECK_TGL_M64: #define __XSAVE__ 1 -+// CHECK_TGL_M64: #define __amd64 1 -+// CHECK_TGL_M64: #define __amd64__ 1 -+// CHECK_TGL_M64: #define __corei7 1 -+// CHECK_TGL_M64: #define __corei7__ 1 -+// CHECK_TGL_M64: #define __tune_corei7__ 1 -+// CHECK_TGL_M64: #define __x86_64 1 -+// CHECK_TGL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=sapphirerapids -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPR_M32 -+// CHECK_SPR_M32: #define __AES__ 1 -+// CHECK_SPR_M32: #define __AMXBF16__ 1 -+// CHECK_SPR_M32: #define __AMXINT8__ 1 -+// CHECK_SPR_M32: #define __AMXTILE__ 1 -+// CHECK_SPR_M32: #define __AVX2__ 1 -+// CHECK_SPR_M32: #define __AVX512BF16__ 1 -+// CHECK_SPR_M32: #define __AVX512BITALG__ 1 -+// CHECK_SPR_M32: #define __AVX512BW__ 1 -+// CHECK_SPR_M32: #define __AVX512CD__ 1 -+// CHECK_SPR_M32: #define __AVX512DQ__ 1 -+// CHECK_SPR_M32: #define __AVX512F__ 1 -+// CHECK_SPR_M32: #define __AVX512IFMA__ 1 -+// CHECK_SPR_M32: #define __AVX512VBMI2__ 1 -+// CHECK_SPR_M32: #define __AVX512VBMI__ 1 -+// CHECK_SPR_M32: #define __AVX512VL__ 1 -+// CHECK_SPR_M32: #define __AVX512VNNI__ 1 -+// CHECK_SPR_M32: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_SPR_M32: #define __AVXVNNI__ 1 -+// CHECK_SPR_M32: #define __AVX__ 1 -+// CHECK_SPR_M32: #define __BMI2__ 1 -+// CHECK_SPR_M32: #define __BMI__ 1 -+// CHECK_SPR_M32: #define __CLDEMOTE__ 1 -+// CHECK_SPR_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_SPR_M32: #define __CLWB__ 1 -+// CHECK_SPR_M32: #define __ENQCMD__ 1 -+// CHECK_SPR_M32: #define __F16C__ 1 -+// CHECK_SPR_M32: #define __FMA__ 1 -+// CHECK_SPR_M32: #define __GFNI__ 1 -+// CHECK_SPR_M32: #define __INVPCID__ 1 -+// CHECK_SPR_M32: #define __LZCNT__ 1 -+// CHECK_SPR_M32: #define __MMX__ 1 -+// CHECK_SPR_M32: #define __MOVBE__ 1 -+// CHECK_SPR_M32: #define __PCLMUL__ 1 -+// CHECK_SPR_M32: #define __PCONFIG__ 1 -+// CHECK_SPR_M32: #define __PKU__ 1 -+// CHECK_SPR_M32: #define __POPCNT__ 1 -+// CHECK_SPR_M32: #define __PRFCHW__ 1 -+// CHECK_SPR_M32: #define __PTWRITE__ 1 -+// CHECK_SPR_M32: #define __RDPID__ 1 -+// CHECK_SPR_M32: #define __RDRND__ 1 -+// CHECK_SPR_M32: #define __RDSEED__ 1 -+// CHECK_SPR_M32: #define __SERIALIZE__ 1 -+// CHECK_SPR_M32: #define __SGX__ 1 -+// CHECK_SPR_M32: #define __SHA__ 1 -+// CHECK_SPR_M32: #define __SHSTK__ 1 -+// CHECK_SPR_M32: #define __SSE2__ 1 -+// CHECK_SPR_M32: #define __SSE3__ 1 -+// CHECK_SPR_M32: #define __SSE4_1__ 1 -+// CHECK_SPR_M32: #define __SSE4_2__ 1 -+// CHECK_SPR_M32: #define __SSE__ 1 -+// CHECK_SPR_M32: #define __SSSE3__ 1 -+// CHECK_SPR_M32: #define __TSXLDTRK__ 1 -+// CHECK_SPR_M32: #define __UINTR__ 1 -+// CHECK_SPR_M32: #define __VAES__ 1 -+// CHECK_SPR_M32: #define __VPCLMULQDQ__ 1 -+// CHECK_SPR_M32: #define __WAITPKG__ 1 -+// CHECK_SPR_M32: #define __WBNOINVD__ 1 -+// CHECK_SPR_M32: #define __XSAVEC__ 1 -+// CHECK_SPR_M32: #define __XSAVEOPT__ 1 -+// CHECK_SPR_M32: #define __XSAVES__ 1 -+// CHECK_SPR_M32: #define __XSAVE__ 1 -+// CHECK_SPR_M32: #define __corei7 1 -+// CHECK_SPR_M32: #define __corei7__ 1 -+// CHECK_SPR_M32: #define __i386 1 -+// CHECK_SPR_M32: #define __i386__ 1 -+// CHECK_SPR_M32: #define __tune_corei7__ 1 -+// CHECK_SPR_M32: #define i386 1 -+ -+// RUN: %clang -march=sapphirerapids -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPR_M64 -+// CHECK_SPR_M64: #define __AES__ 1 -+// CHECK_SPR_M64: #define __AMXBF16__ 1 -+// CHECK_SPR_M64: #define __AMXINT8__ 1 -+// CHECK_SPR_M64: #define __AMXTILE__ 1 -+// CHECK_SPR_M64: #define __AVX2__ 1 -+// CHECK_SPR_M64: #define __AVX512BF16__ 1 -+// CHECK_SPR_M64: #define __AVX512BITALG__ 1 -+// CHECK_SPR_M64: #define __AVX512BW__ 1 -+// CHECK_SPR_M64: #define __AVX512CD__ 1 -+// CHECK_SPR_M64: #define __AVX512DQ__ 1 -+// CHECK_SPR_M64: #define __AVX512F__ 1 -+// CHECK_SPR_M64: #define __AVX512IFMA__ 1 -+// CHECK_SPR_M64: #define __AVX512VBMI2__ 1 -+// CHECK_SPR_M64: #define __AVX512VBMI__ 1 -+// CHECK_SPR_M64: #define __AVX512VL__ 1 -+// CHECK_SPR_M64: #define __AVX512VNNI__ 1 -+// CHECK_SPR_M64: #define __AVX512VPOPCNTDQ__ 1 -+// CHECK_SPR_M64: #define __AVXVNNI__ 1 -+// CHECK_SPR_M64: #define __AVX__ 1 -+// CHECK_SPR_M64: #define __BMI2__ 1 -+// CHECK_SPR_M64: #define __BMI__ 1 -+// CHECK_SPR_M64: #define __CLDEMOTE__ 1 -+// CHECK_SPR_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_SPR_M64: #define __CLWB__ 1 -+// CHECK_SPR_M64: #define __ENQCMD__ 1 -+// CHECK_SPR_M64: #define __F16C__ 1 -+// CHECK_SPR_M64: #define __FMA__ 1 -+// CHECK_SPR_M64: #define __GFNI__ 1 -+// CHECK_SPR_M64: #define __INVPCID__ 1 -+// CHECK_SPR_M64: #define __LZCNT__ 1 -+// CHECK_SPR_M64: #define __MMX__ 1 -+// CHECK_SPR_M64: #define __MOVBE__ 1 -+// CHECK_SPR_M64: #define __PCLMUL__ 1 -+// CHECK_SPR_M64: #define __PCONFIG__ 1 -+// CHECK_SPR_M64: #define __PKU__ 1 -+// CHECK_SPR_M64: #define __POPCNT__ 1 -+// CHECK_SPR_M64: #define __PRFCHW__ 1 -+// CHECK_SPR_M64: #define __PTWRITE__ 1 -+// CHECK_SPR_M64: #define __RDPID__ 1 -+// CHECK_SPR_M64: #define __RDRND__ 1 -+// CHECK_SPR_M64: #define __RDSEED__ 1 -+// CHECK_SPR_M64: #define __SERIALIZE__ 1 -+// CHECK_SPR_M64: #define __SGX__ 1 -+// CHECK_SPR_M64: #define __SHA__ 1 -+// CHECK_SPR_M64: #define __SHSTK__ 1 -+// CHECK_SPR_M64: #define __SSE2__ 1 -+// CHECK_SPR_M64: #define __SSE3__ 1 -+// CHECK_SPR_M64: #define __SSE4_1__ 1 -+// CHECK_SPR_M64: #define __SSE4_2__ 1 -+// CHECK_SPR_M64: #define __SSE__ 1 -+// CHECK_SPR_M64: #define __SSSE3__ 1 -+// CHECK_SPR_M64: #define __TSXLDTRK__ 1 -+// CHECK_SPR_M64: #define __UINTR__ 1 -+// CHECK_SPR_M64: #define __VAES__ 1 -+// CHECK_SPR_M64: #define __VPCLMULQDQ__ 1 -+// CHECK_SPR_M64: #define __WAITPKG__ 1 -+// CHECK_SPR_M64: #define __WBNOINVD__ 1 -+// CHECK_SPR_M64: #define __XSAVEC__ 1 -+// CHECK_SPR_M64: #define __XSAVEOPT__ 1 -+// CHECK_SPR_M64: #define __XSAVES__ 1 -+// CHECK_SPR_M64: #define __XSAVE__ 1 -+// CHECK_SPR_M64: #define __amd64 1 -+// CHECK_SPR_M64: #define __amd64__ 1 -+// CHECK_SPR_M64: #define __corei7 1 -+// CHECK_SPR_M64: #define __corei7__ 1 -+// CHECK_SPR_M64: #define __tune_corei7__ 1 -+// CHECK_SPR_M64: #define __x86_64 1 -+// CHECK_SPR_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=alderlake -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ADL_M32 -+// CHECK_ADL_M32: #define __ADX__ 1 -+// CHECK_ADL_M32: #define __AES__ 1 -+// CHECK_ADL_M32: #define __AVX2__ 1 -+// CHECK_ADL_M32-NOT: AVX512 -+// CHECK_ADL_M32: #define __AVXVNNI__ 1 -+// CHECK_ADL_M32: #define __AVX__ 1 -+// CHECK_ADL_M32: #define __BMI2__ 1 -+// CHECK_ADL_M32: #define __BMI__ 1 -+// CHECK_ADL_M32: #define __CLDEMOTE__ 1 -+// CHECK_ADL_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_ADL_M32: #define __F16C__ 1 -+// CHECK_ADL_M32: #define __FMA__ 1 -+// CHECK_ADL_M32: #define __HRESET__ 1 -+// CHECK_ADL_M32: #define __INVPCID__ 1 -+// CHECK_ADL_M32: #define __LZCNT__ 1 -+// CHECK_ADL_M32: #define __MMX__ 1 -+// CHECK_ADL_M32: #define __MOVBE__ 1 -+// CHECK_ADL_M32: #define __PCLMUL__ 1 -+// CHECK_ADL_M32: #define __POPCNT__ 1 -+// CHECK_ADL_M32: #define __PRFCHW__ 1 -+// CHECK_ADL_M32: #define __PTWRITE__ 1 -+// CHECK_ADL_M32: #define __RDRND__ 1 -+// CHECK_ADL_M32: #define __RDSEED__ 1 -+// CHECK_ADL_M32: #define __SERIALIZE__ 1 -+// CHECK_ADL_M32: #define __SGX__ 1 -+// CHECK_ADL_M32: #define __SSE2__ 1 -+// CHECK_ADL_M32: #define __SSE3__ 1 -+// CHECK_ADL_M32: #define __SSE4_1__ 1 -+// CHECK_ADL_M32: #define __SSE4_2__ 1 -+// CHECK_ADL_M32: #define __SSE__ 1 -+// CHECK_ADL_M32: #define __SSSE3__ 1 -+// CHECK_ADL_M32: #define __WAITPKG__ 1 -+// CHECK_ADL_M32: #define __XSAVEC__ 1 -+// CHECK_ADL_M32: #define __XSAVEOPT__ 1 -+// CHECK_ADL_M32: #define __XSAVES__ 1 -+// CHECK_ADL_M32: #define __XSAVE__ 1 -+// CHECK_ADL_M32: #define i386 1 -+ -+// RUN: %clang -march=alderlake -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ADL_M64 -+// CHECK_ADL_M64: #define __ADX__ 1 -+// CHECK_ADL_M64: #define __AES__ 1 -+// CHECK_ADL_M64: #define __AVX2__ 1 -+// CHECK_ADL_M64-NOT: AVX512 -+// CHECK_ADL_M64: #define __AVXVNNI__ 1 -+// CHECK_ADL_M64: #define __AVX__ 1 -+// CHECK_ADL_M64: #define __BMI2__ 1 -+// CHECK_ADL_M64: #define __BMI__ 1 -+// CHECK_ADL_M64: #define __CLDEMOTE__ 1 -+// CHECK_ADL_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_ADL_M64: #define __F16C__ 1 -+// CHECK_ADL_M64: #define __FMA__ 1 -+// CHECK_ADL_M64: #define __HRESET__ 1 -+// CHECK_ADL_M64: #define __INVPCID__ 1 -+// CHECK_ADL_M64: #define __LZCNT__ 1 -+// CHECK_ADL_M64: #define __MMX__ 1 -+// CHECK_ADL_M64: #define __MOVBE__ 1 -+// CHECK_ADL_M64: #define __PCLMUL__ 1 -+// CHECK_ADL_M64: #define __POPCNT__ 1 -+// CHECK_ADL_M64: #define __PRFCHW__ 1 -+// CHECK_ADL_M64: #define __PTWRITE__ 1 -+// CHECK_ADL_M64: #define __RDRND__ 1 -+// CHECK_ADL_M64: #define __RDSEED__ 1 -+// CHECK_ADL_M64: #define __SERIALIZE__ 1 -+// CHECK_ADL_M64: #define __SGX__ 1 -+// CHECK_ADL_M64: #define __SSE2_MATH__ 1 -+// CHECK_ADL_M64: #define __SSE2__ 1 -+// CHECK_ADL_M64: #define __SSE3__ 1 -+// CHECK_ADL_M64: #define __SSE4_1__ 1 -+// CHECK_ADL_M64: #define __SSE4_2__ 1 -+// CHECK_ADL_M64: #define __SSE_MATH__ 1 -+// CHECK_ADL_M64: #define __SSE__ 1 -+// CHECK_ADL_M64: #define __SSSE3__ 1 -+// CHECK_ADL_M64: #define __WAITPKG__ 1 -+// CHECK_ADL_M64: #define __XSAVEC__ 1 -+// CHECK_ADL_M64: #define __XSAVEOPT__ 1 -+// CHECK_ADL_M64: #define __XSAVES__ 1 -+// CHECK_ADL_M64: #define __XSAVE__ 1 -+// CHECK_ADL_M64: #define __amd64 1 -+// CHECK_ADL_M64: #define __amd64__ 1 -+// CHECK_ADL_M64: #define __x86_64 1 -+// CHECK_ADL_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=atom -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATOM_M32 -+// CHECK_ATOM_M32: #define __MMX__ 1 -+// CHECK_ATOM_M32: #define __MOVBE__ 1 -+// CHECK_ATOM_M32: #define __SSE2__ 1 -+// CHECK_ATOM_M32: #define __SSE3__ 1 -+// CHECK_ATOM_M32: #define __SSE__ 1 -+// CHECK_ATOM_M32: #define __SSSE3__ 1 -+// CHECK_ATOM_M32: #define __atom 1 -+// CHECK_ATOM_M32: #define __atom__ 1 -+// CHECK_ATOM_M32: #define __i386 1 -+// CHECK_ATOM_M32: #define __i386__ 1 -+// CHECK_ATOM_M32: #define __tune_atom__ 1 -+// CHECK_ATOM_M32: #define i386 1 -+ -+// RUN: %clang -march=atom -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATOM_M64 -+// CHECK_ATOM_M64: #define __MMX__ 1 -+// CHECK_ATOM_M64: #define __MOVBE__ 1 -+// CHECK_ATOM_M64: #define __SSE2_MATH__ 1 -+// CHECK_ATOM_M64: #define __SSE2__ 1 -+// CHECK_ATOM_M64: #define __SSE3__ 1 -+// CHECK_ATOM_M64: #define __SSE_MATH__ 1 -+// CHECK_ATOM_M64: #define __SSE__ 1 -+// CHECK_ATOM_M64: #define __SSSE3__ 1 -+// CHECK_ATOM_M64: #define __amd64 1 -+// CHECK_ATOM_M64: #define __amd64__ 1 -+// CHECK_ATOM_M64: #define __atom 1 -+// CHECK_ATOM_M64: #define __atom__ 1 -+// CHECK_ATOM_M64: #define __tune_atom__ 1 -+// CHECK_ATOM_M64: #define __x86_64 1 -+// CHECK_ATOM_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=goldmont -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_GLM_M32 -+// CHECK_GLM_M32: #define __AES__ 1 -+// CHECK_GLM_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_GLM_M32: #define __FSGSBASE__ 1 -+// CHECK_GLM_M32: #define __FXSR__ 1 -+// CHECK_GLM_M32: #define __MMX__ 1 -+// CHECK_GLM_M32: #define __MOVBE__ 1 -+// CHECK_GLM_M32: #define __PCLMUL__ 1 -+// CHECK_GLM_M32: #define __POPCNT__ 1 -+// CHECK_GLM_M32: #define __PRFCHW__ 1 -+// CHECK_GLM_M32: #define __RDRND__ 1 -+// CHECK_GLM_M32: #define __RDSEED__ 1 -+// CHECK_GLM_M32: #define __SHA__ 1 -+// CHECK_GLM_M32: #define __SSE2__ 1 -+// CHECK_GLM_M32: #define __SSE3__ 1 -+// CHECK_GLM_M32: #define __SSE4_1__ 1 -+// CHECK_GLM_M32: #define __SSE4_2__ 1 -+// CHECK_GLM_M32: #define __SSE_MATH__ 1 -+// CHECK_GLM_M32: #define __SSE__ 1 -+// CHECK_GLM_M32: #define __SSSE3__ 1 -+// CHECK_GLM_M32: #define __XSAVEC__ 1 -+// CHECK_GLM_M32: #define __XSAVEOPT__ 1 -+// CHECK_GLM_M32: #define __XSAVES__ 1 -+// CHECK_GLM_M32: #define __XSAVE__ 1 -+// CHECK_GLM_M32: #define __goldmont 1 -+// CHECK_GLM_M32: #define __goldmont__ 1 -+// CHECK_GLM_M32: #define __i386 1 -+// CHECK_GLM_M32: #define __i386__ 1 -+// CHECK_GLM_M32: #define __tune_goldmont__ 1 -+// CHECK_GLM_M32: #define i386 1 -+ -+// RUN: %clang -march=goldmont -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_GLM_M64 -+// CHECK_GLM_M64: #define __AES__ 1 -+// CHECK_GLM_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_GLM_M64: #define __FSGSBASE__ 1 -+// CHECK_GLM_M64: #define __FXSR__ 1 -+// CHECK_GLM_M64: #define __MMX__ 1 -+// CHECK_GLM_M64: #define __MOVBE__ 1 -+// CHECK_GLM_M64: #define __PCLMUL__ 1 -+// CHECK_GLM_M64: #define __POPCNT__ 1 -+// CHECK_GLM_M64: #define __PRFCHW__ 1 -+// CHECK_GLM_M64: #define __RDRND__ 1 -+// CHECK_GLM_M64: #define __RDSEED__ 1 -+// CHECK_GLM_M64: #define __SHA__ 1 -+// CHECK_GLM_M64: #define __SSE2__ 1 -+// CHECK_GLM_M64: #define __SSE3__ 1 -+// CHECK_GLM_M64: #define __SSE4_1__ 1 -+// CHECK_GLM_M64: #define __SSE4_2__ 1 -+// CHECK_GLM_M64: #define __SSE__ 1 -+// CHECK_GLM_M64: #define __SSSE3__ 1 -+// CHECK_GLM_M64: #define __XSAVEC__ 1 -+// CHECK_GLM_M64: #define __XSAVEOPT__ 1 -+// CHECK_GLM_M64: #define __XSAVES__ 1 -+// CHECK_GLM_M64: #define __XSAVE__ 1 -+// CHECK_GLM_M64: #define __goldmont 1 -+// CHECK_GLM_M64: #define __goldmont__ 1 -+// CHECK_GLM_M64: #define __tune_goldmont__ 1 -+// CHECK_GLM_M64: #define __x86_64 1 -+// CHECK_GLM_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=goldmont-plus -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_GLMP_M32 -+// CHECK_GLMP_M32: #define __AES__ 1 -+// CHECK_GLMP_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_GLMP_M32: #define __FSGSBASE__ 1 -+// CHECK_GLMP_M32: #define __FXSR__ 1 -+// CHECK_GLMP_M32: #define __MMX__ 1 -+// CHECK_GLMP_M32: #define __MOVBE__ 1 -+// CHECK_GLMP_M32: #define __PCLMUL__ 1 -+// CHECK_GLMP_M32: #define __POPCNT__ 1 -+// CHECK_GLMP_M32: #define __PRFCHW__ 1 -+// CHECK_GLMP_M32: #define __PTWRITE__ 1 -+// CHECK_GLMP_M32: #define __RDPID__ 1 -+// CHECK_GLMP_M32: #define __RDRND__ 1 -+// CHECK_GLMP_M32: #define __RDSEED__ 1 -+// CHECK_GLMP_M32: #define __SGX__ 1 -+// CHECK_GLMP_M32: #define __SHA__ 1 -+// CHECK_GLMP_M32: #define __SSE2__ 1 -+// CHECK_GLMP_M32: #define __SSE3__ 1 -+// CHECK_GLMP_M32: #define __SSE4_1__ 1 -+// CHECK_GLMP_M32: #define __SSE4_2__ 1 -+// CHECK_GLMP_M32: #define __SSE_MATH__ 1 -+// CHECK_GLMP_M32: #define __SSE__ 1 -+// CHECK_GLMP_M32: #define __SSSE3__ 1 -+// CHECK_GLMP_M32: #define __XSAVEC__ 1 -+// CHECK_GLMP_M32: #define __XSAVEOPT__ 1 -+// CHECK_GLMP_M32: #define __XSAVES__ 1 -+// CHECK_GLMP_M32: #define __XSAVE__ 1 -+// CHECK_GLMP_M32: #define __goldmont_plus 1 -+// CHECK_GLMP_M32: #define __goldmont_plus__ 1 -+// CHECK_GLMP_M32: #define __i386 1 -+// CHECK_GLMP_M32: #define __i386__ 1 -+// CHECK_GLMP_M32: #define __tune_goldmont_plus__ 1 -+// CHECK_GLMP_M32: #define i386 1 -+ -+// RUN: %clang -march=goldmont-plus -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_GLMP_M64 -+// CHECK_GLMP_M64: #define __AES__ 1 -+// CHECK_GLMP_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_GLMP_M64: #define __FSGSBASE__ 1 -+// CHECK_GLMP_M64: #define __FXSR__ 1 -+// CHECK_GLMP_M64: #define __MMX__ 1 -+// CHECK_GLMP_M64: #define __MOVBE__ 1 -+// CHECK_GLMP_M64: #define __PCLMUL__ 1 -+// CHECK_GLMP_M64: #define __POPCNT__ 1 -+// CHECK_GLMP_M64: #define __PRFCHW__ 1 -+// CHECK_GLMP_M64: #define __PTWRITE__ 1 -+// CHECK_GLMP_M64: #define __RDPID__ 1 -+// CHECK_GLMP_M64: #define __RDRND__ 1 -+// CHECK_GLMP_M64: #define __RDSEED__ 1 -+// CHECK_GLMP_M64: #define __SGX__ 1 -+// CHECK_GLMP_M64: #define __SHA__ 1 -+// CHECK_GLMP_M64: #define __SSE2__ 1 -+// CHECK_GLMP_M64: #define __SSE3__ 1 -+// CHECK_GLMP_M64: #define __SSE4_1__ 1 -+// CHECK_GLMP_M64: #define __SSE4_2__ 1 -+// CHECK_GLMP_M64: #define __SSE__ 1 -+// CHECK_GLMP_M64: #define __SSSE3__ 1 -+// CHECK_GLMP_M64: #define __XSAVEC__ 1 -+// CHECK_GLMP_M64: #define __XSAVEOPT__ 1 -+// CHECK_GLMP_M64: #define __XSAVES__ 1 -+// CHECK_GLMP_M64: #define __XSAVE__ 1 -+// CHECK_GLMP_M64: #define __goldmont_plus 1 -+// CHECK_GLMP_M64: #define __goldmont_plus__ 1 -+// CHECK_GLMP_M64: #define __tune_goldmont_plus__ 1 -+// CHECK_GLMP_M64: #define __x86_64 1 -+// CHECK_GLMP_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=tremont -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_TRM_M32 -+// CHECK_TRM_M32: #define __AES__ 1 -+// CHECK_TRM_M32-NOT: #define __CLDEMOTE__ 1 -+// CHECK_TRM_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_TRM_M32: #define __CLWB__ 1 -+// CHECK_TRM_M32: #define __FSGSBASE__ 1 -+// CHECK_TRM_M32: #define __FXSR__ 1 -+// CHECK_TRM_M32: #define __GFNI__ 1 -+// CHECK_TRM_M32: #define __MMX__ 1 -+// CHECK_TRM_M32: #define __MOVBE__ 1 -+// CHECK_TRM_M32-NOT: #define __MOVDIR64B__ 1 -+// CHECK_TRM_M32-NOT: #define __MOVDIRI__ 1 -+// CHECK_TRM_M32: #define __PCLMUL__ 1 -+// CHECK_TRM_M32: #define __POPCNT__ 1 -+// CHECK_TRM_M32: #define __PRFCHW__ 1 -+// CHECK_TRM_M32: #define __PTWRITE__ 1 -+// CHECK_TRM_M32: #define __RDPID__ 1 -+// CHECK_TRM_M32: #define __RDRND__ 1 -+// CHECK_TRM_M32: #define __RDSEED__ 1 -+// CHECK_TRM_M32: #define __SGX__ 1 -+// CHECK_TRM_M32: #define __SHA__ 1 -+// CHECK_TRM_M32: #define __SSE2__ 1 -+// CHECK_TRM_M32: #define __SSE3__ 1 -+// CHECK_TRM_M32: #define __SSE4_1__ 1 -+// CHECK_TRM_M32: #define __SSE4_2__ 1 -+// CHECK_TRM_M32: #define __SSE_MATH__ 1 -+// CHECK_TRM_M32: #define __SSE__ 1 -+// CHECK_TRM_M32: #define __SSSE3__ 1 -+// CHECK_TRM_M32-NOT: #define __WAITPKG__ 1 -+// CHECK_TRM_M32: #define __XSAVEC__ 1 -+// CHECK_TRM_M32: #define __XSAVEOPT__ 1 -+// CHECK_TRM_M32: #define __XSAVES__ 1 -+// CHECK_TRM_M32: #define __XSAVE__ 1 -+// CHECK_TRM_M32: #define __i386 1 -+// CHECK_TRM_M32: #define __i386__ 1 -+// CHECK_TRM_M32: #define __tremont 1 -+// CHECK_TRM_M32: #define __tremont__ 1 -+// CHECK_TRM_M32: #define __tune_tremont__ 1 -+// CHECK_TRM_M32: #define i386 1 -+ -+// RUN: %clang -march=tremont -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_TRM_M64 -+// CHECK_TRM_M64: #define __AES__ 1 -+// CHECK_TRM_M64-NOT: #define __CLDEMOTE__ 1 -+// CHECK_TRM_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_TRM_M64: #define __CLWB__ 1 -+// CHECK_TRM_M64: #define __FSGSBASE__ 1 -+// CHECK_TRM_M64: #define __FXSR__ 1 -+// CHECK_TRM_M64: #define __GFNI__ 1 -+// CHECK_TRM_M64: #define __MMX__ 1 -+// CHECK_TRM_M64: #define __MOVBE__ 1 -+// CHECK_TRM_M64-NOT: #define __MOVDIR64B__ 1 -+// CHECK_TRM_M64-NOT: #define __MOVDIRI__ 1 -+// CHECK_TRM_M64: #define __PCLMUL__ 1 -+// CHECK_TRM_M64: #define __POPCNT__ 1 -+// CHECK_TRM_M64: #define __PRFCHW__ 1 -+// CHECK_TRM_M64: #define __PTWRITE__ 1 -+// CHECK_TRM_M64: #define __RDPID__ 1 -+// CHECK_TRM_M64: #define __RDRND__ 1 -+// CHECK_TRM_M64: #define __RDSEED__ 1 -+// CHECK_TRM_M64: #define __SGX__ 1 -+// CHECK_TRM_M64: #define __SHA__ 1 -+// CHECK_TRM_M64: #define __SSE2__ 1 -+// CHECK_TRM_M64: #define __SSE3__ 1 -+// CHECK_TRM_M64: #define __SSE4_1__ 1 -+// CHECK_TRM_M64: #define __SSE4_2__ 1 -+// CHECK_TRM_M64: #define __SSE__ 1 -+// CHECK_TRM_M64: #define __SSSE3__ 1 -+// CHECK_TRM_M64-NOT: #define __WAITPKG__ 1 -+// CHECK_TRM_M64: #define __XSAVEC__ 1 -+// CHECK_TRM_M64: #define __XSAVEOPT__ 1 -+// CHECK_TRM_M64: #define __XSAVES__ 1 -+// CHECK_TRM_M64: #define __XSAVE__ 1 -+// CHECK_TRM_M64: #define __tremont 1 -+// CHECK_TRM_M64: #define __tremont__ 1 -+// CHECK_TRM_M64: #define __tune_tremont__ 1 -+// CHECK_TRM_M64: #define __x86_64 1 -+// CHECK_TRM_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=slm -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SLM_M32 -+// CHECK_SLM_M32: #define __FXSR__ 1 -+// CHECK_SLM_M32: #define __MMX__ 1 -+// CHECK_SLM_M32: #define __MOVBE__ 1 -+// CHECK_SLM_M32: #define __PCLMUL__ 1 -+// CHECK_SLM_M32: #define __POPCNT__ 1 -+// CHECK_SLM_M32: #define __PRFCHW__ 1 -+// CHECK_SLM_M32: #define __RDRND__ 1 -+// CHECK_SLM_M32: #define __SSE2__ 1 -+// CHECK_SLM_M32: #define __SSE3__ 1 -+// CHECK_SLM_M32: #define __SSE4_1__ 1 -+// CHECK_SLM_M32: #define __SSE4_2__ 1 -+// CHECK_SLM_M32: #define __SSE__ 1 -+// CHECK_SLM_M32: #define __SSSE3__ 1 -+// CHECK_SLM_M32: #define __i386 1 -+// CHECK_SLM_M32: #define __i386__ 1 -+// CHECK_SLM_M32: #define __slm 1 -+// CHECK_SLM_M32: #define __slm__ 1 -+// CHECK_SLM_M32: #define __tune_slm__ 1 -+// CHECK_SLM_M32: #define i386 1 -+ -+// RUN: %clang -march=slm -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SLM_M64 -+// CHECK_SLM_M64: #define __FXSR__ 1 -+// CHECK_SLM_M64: #define __MMX__ 1 -+// CHECK_SLM_M64: #define __MOVBE__ 1 -+// CHECK_SLM_M64: #define __PCLMUL__ 1 -+// CHECK_SLM_M64: #define __POPCNT__ 1 -+// CHECK_SLM_M64: #define __PRFCHW__ 1 -+// CHECK_SLM_M64: #define __RDRND__ 1 -+// CHECK_SLM_M64: #define __SSE2_MATH__ 1 -+// CHECK_SLM_M64: #define __SSE2__ 1 -+// CHECK_SLM_M64: #define __SSE3__ 1 -+// CHECK_SLM_M64: #define __SSE4_1__ 1 -+// CHECK_SLM_M64: #define __SSE4_2__ 1 -+// CHECK_SLM_M64: #define __SSE_MATH__ 1 -+// CHECK_SLM_M64: #define __SSE__ 1 -+// CHECK_SLM_M64: #define __SSSE3__ 1 -+// CHECK_SLM_M64: #define __amd64 1 -+// CHECK_SLM_M64: #define __amd64__ 1 -+// CHECK_SLM_M64: #define __slm 1 -+// CHECK_SLM_M64: #define __slm__ 1 -+// CHECK_SLM_M64: #define __tune_slm__ 1 -+// CHECK_SLM_M64: #define __x86_64 1 -+// CHECK_SLM_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=lakemont -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_LAKEMONT_M32 -+// CHECK_LAKEMONT_M32: #define __i386 1 -+// CHECK_LAKEMONT_M32: #define __i386__ 1 -+// CHECK_LAKEMONT_M32: #define __i586 1 -+// CHECK_LAKEMONT_M32: #define __i586__ 1 -+// CHECK_LAKEMONT_M32: #define __pentium 1 -+// CHECK_LAKEMONT_M32: #define __pentium__ 1 -+// CHECK_LAKEMONT_M32: #define __tune_lakemont__ 1 -+// CHECK_LAKEMONT_M32: #define i386 1 -+// RUN: not %clang -march=lakemont -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck %s -check-prefix=CHECK_LAKEMONT_M64 -+// CHECK_LAKEMONT_M64: error: -+ -+// RUN: %clang -march=geode -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GEODE_M32 -+// CHECK_GEODE_M32: #define __3dNOW_A__ 1 -+// CHECK_GEODE_M32: #define __3dNOW__ 1 -+// CHECK_GEODE_M32: #define __MMX__ 1 -+// CHECK_GEODE_M32: #define __geode 1 -+// CHECK_GEODE_M32: #define __geode__ 1 -+// CHECK_GEODE_M32: #define __i386 1 -+// CHECK_GEODE_M32: #define __i386__ 1 -+// CHECK_GEODE_M32: #define __tune_geode__ 1 -+// CHECK_GEODE_M32: #define i386 1 -+// RUN: not %clang -march=geode -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_GEODE_M64 -+// CHECK_GEODE_M64: error: {{.*}} -+ -+// RUN: %clang -march=k6 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_M32 -+// CHECK_K6_M32: #define __MMX__ 1 -+// CHECK_K6_M32: #define __i386 1 -+// CHECK_K6_M32: #define __i386__ 1 -+// CHECK_K6_M32: #define __k6 1 -+// CHECK_K6_M32: #define __k6__ 1 -+// CHECK_K6_M32: #define __tune_k6__ 1 -+// CHECK_K6_M32: #define i386 1 -+// RUN: not %clang -march=k6 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_M64 -+// CHECK_K6_M64: error: {{.*}} -+ -+// RUN: %clang -march=k6-2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_2_M32 -+// CHECK_K6_2_M32: #define __3dNOW__ 1 -+// CHECK_K6_2_M32: #define __MMX__ 1 -+// CHECK_K6_2_M32: #define __i386 1 -+// CHECK_K6_2_M32: #define __i386__ 1 -+// CHECK_K6_2_M32: #define __k6 1 -+// CHECK_K6_2_M32: #define __k6_2__ 1 -+// CHECK_K6_2_M32: #define __k6__ 1 -+// CHECK_K6_2_M32: #define __tune_k6_2__ 1 -+// CHECK_K6_2_M32: #define __tune_k6__ 1 -+// CHECK_K6_2_M32: #define i386 1 -+// RUN: not %clang -march=k6-2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_2_M64 -+// CHECK_K6_2_M64: error: {{.*}} -+ -+// RUN: %clang -march=k6-3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_3_M32 -+// CHECK_K6_3_M32: #define __3dNOW__ 1 -+// CHECK_K6_3_M32: #define __MMX__ 1 -+// CHECK_K6_3_M32: #define __i386 1 -+// CHECK_K6_3_M32: #define __i386__ 1 -+// CHECK_K6_3_M32: #define __k6 1 -+// CHECK_K6_3_M32: #define __k6_3__ 1 -+// CHECK_K6_3_M32: #define __k6__ 1 -+// CHECK_K6_3_M32: #define __tune_k6_3__ 1 -+// CHECK_K6_3_M32: #define __tune_k6__ 1 -+// CHECK_K6_3_M32: #define i386 1 -+// RUN: not %clang -march=k6-3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K6_3_M64 -+// CHECK_K6_3_M64: error: {{.*}} -+ -+// RUN: %clang -march=athlon -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_M32 -+// CHECK_ATHLON_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON_M32: #define __MMX__ 1 -+// CHECK_ATHLON_M32: #define __athlon 1 -+// CHECK_ATHLON_M32: #define __athlon__ 1 -+// CHECK_ATHLON_M32: #define __i386 1 -+// CHECK_ATHLON_M32: #define __i386__ 1 -+// CHECK_ATHLON_M32: #define __tune_athlon__ 1 -+// CHECK_ATHLON_M32: #define i386 1 -+// RUN: not %clang -march=athlon -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_M64 -+// CHECK_ATHLON_M64: error: {{.*}} -+ -+// RUN: %clang -march=athlon-tbird -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_TBIRD_M32 -+// CHECK_ATHLON_TBIRD_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_TBIRD_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON_TBIRD_M32: #define __MMX__ 1 -+// CHECK_ATHLON_TBIRD_M32: #define __athlon 1 -+// CHECK_ATHLON_TBIRD_M32: #define __athlon__ 1 -+// CHECK_ATHLON_TBIRD_M32: #define __i386 1 -+// CHECK_ATHLON_TBIRD_M32: #define __i386__ 1 -+// CHECK_ATHLON_TBIRD_M32: #define __tune_athlon__ 1 -+// CHECK_ATHLON_TBIRD_M32: #define i386 1 -+// RUN: not %clang -march=athlon-tbird -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_TBIRD_M64 -+// CHECK_ATHLON_TBIRD_M64: error: {{.*}} -+ -+// RUN: %clang -march=athlon-4 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_4_M32 -+// CHECK_ATHLON_4_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_4_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON_4_M32: #define __MMX__ 1 -+// CHECK_ATHLON_4_M32: #define __SSE__ 1 -+// CHECK_ATHLON_4_M32: #define __athlon 1 -+// CHECK_ATHLON_4_M32: #define __athlon__ 1 -+// CHECK_ATHLON_4_M32: #define __athlon_sse__ 1 -+// CHECK_ATHLON_4_M32: #define __i386 1 -+// CHECK_ATHLON_4_M32: #define __i386__ 1 -+// CHECK_ATHLON_4_M32: #define __tune_athlon__ 1 -+// CHECK_ATHLON_4_M32: #define __tune_athlon_sse__ 1 -+// CHECK_ATHLON_4_M32: #define i386 1 -+// RUN: not %clang -march=athlon-4 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_4_M64 -+// CHECK_ATHLON_4_M64: error: {{.*}} -+ -+// RUN: %clang -march=athlon-xp -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_XP_M32 -+// CHECK_ATHLON_XP_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_XP_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON_XP_M32: #define __MMX__ 1 -+// CHECK_ATHLON_XP_M32: #define __SSE__ 1 -+// CHECK_ATHLON_XP_M32: #define __athlon 1 -+// CHECK_ATHLON_XP_M32: #define __athlon__ 1 -+// CHECK_ATHLON_XP_M32: #define __athlon_sse__ 1 -+// CHECK_ATHLON_XP_M32: #define __i386 1 -+// CHECK_ATHLON_XP_M32: #define __i386__ 1 -+// CHECK_ATHLON_XP_M32: #define __tune_athlon__ 1 -+// CHECK_ATHLON_XP_M32: #define __tune_athlon_sse__ 1 -+// CHECK_ATHLON_XP_M32: #define i386 1 -+// RUN: not %clang -march=athlon-xp -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_XP_M64 -+// CHECK_ATHLON_XP_M64: error: {{.*}} -+ -+// RUN: %clang -march=athlon-mp -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_MP_M32 -+// CHECK_ATHLON_MP_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_MP_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON_MP_M32: #define __MMX__ 1 -+// CHECK_ATHLON_MP_M32: #define __SSE__ 1 -+// CHECK_ATHLON_MP_M32: #define __athlon 1 -+// CHECK_ATHLON_MP_M32: #define __athlon__ 1 -+// CHECK_ATHLON_MP_M32: #define __athlon_sse__ 1 -+// CHECK_ATHLON_MP_M32: #define __i386 1 -+// CHECK_ATHLON_MP_M32: #define __i386__ 1 -+// CHECK_ATHLON_MP_M32: #define __tune_athlon__ 1 -+// CHECK_ATHLON_MP_M32: #define __tune_athlon_sse__ 1 -+// CHECK_ATHLON_MP_M32: #define i386 1 -+// RUN: not %clang -march=athlon-mp -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_MP_M64 -+// CHECK_ATHLON_MP_M64: error: {{.*}} -+ -+// RUN: %clang -march=x86-64 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_X86_64_M32 -+// CHECK_X86_64_M32: #define __MMX__ 1 -+// CHECK_X86_64_M32: #define __SSE2__ 1 -+// CHECK_X86_64_M32: #define __SSE__ 1 -+// CHECK_X86_64_M32: #define __i386 1 -+// CHECK_X86_64_M32: #define __i386__ 1 -+// CHECK_X86_64_M32: #define __k8 1 -+// CHECK_X86_64_M32: #define __k8__ 1 -+// CHECK_X86_64_M32: #define i386 1 -+ -+// RUN: %clang -march=k8 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_M32 -+// CHECK_K8_M32: #define __3dNOW_A__ 1 -+// CHECK_K8_M32: #define __3dNOW__ 1 -+// CHECK_K8_M32: #define __MMX__ 1 -+// CHECK_K8_M32: #define __SSE2__ 1 -+// CHECK_K8_M32: #define __SSE__ 1 -+// CHECK_K8_M32: #define __i386 1 -+// CHECK_K8_M32: #define __i386__ 1 -+// CHECK_K8_M32: #define __k8 1 -+// CHECK_K8_M32: #define __k8__ 1 -+// CHECK_K8_M32: #define __tune_k8__ 1 -+// CHECK_K8_M32: #define i386 1 -+ -+// RUN: %clang -march=k8 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_M64 -+// CHECK_K8_M64: #define __3dNOW_A__ 1 -+// CHECK_K8_M64: #define __3dNOW__ 1 -+// CHECK_K8_M64: #define __MMX__ 1 -+// CHECK_K8_M64: #define __SSE2_MATH__ 1 -+// CHECK_K8_M64: #define __SSE2__ 1 -+// CHECK_K8_M64: #define __SSE_MATH__ 1 -+// CHECK_K8_M64: #define __SSE__ 1 -+// CHECK_K8_M64: #define __amd64 1 -+// CHECK_K8_M64: #define __amd64__ 1 -+// CHECK_K8_M64: #define __k8 1 -+// CHECK_K8_M64: #define __k8__ 1 -+// CHECK_K8_M64: #define __tune_k8__ 1 -+// CHECK_K8_M64: #define __x86_64 1 -+// CHECK_K8_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=k8-sse3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_SSE3_M32 -+// CHECK_K8_SSE3_M32: #define __3dNOW_A__ 1 -+// CHECK_K8_SSE3_M32: #define __3dNOW__ 1 -+// CHECK_K8_SSE3_M32: #define __MMX__ 1 -+// CHECK_K8_SSE3_M32: #define __SSE2__ 1 -+// CHECK_K8_SSE3_M32: #define __SSE3__ 1 -+// CHECK_K8_SSE3_M32: #define __SSE__ 1 -+// CHECK_K8_SSE3_M32: #define __i386 1 -+// CHECK_K8_SSE3_M32: #define __i386__ 1 -+// CHECK_K8_SSE3_M32: #define __k8 1 -+// CHECK_K8_SSE3_M32: #define __k8__ 1 -+// CHECK_K8_SSE3_M32: #define __tune_k8__ 1 -+// CHECK_K8_SSE3_M32: #define i386 1 -+ -+// RUN: %clang -march=k8-sse3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_K8_SSE3_M64 -+// CHECK_K8_SSE3_M64: #define __3dNOW_A__ 1 -+// CHECK_K8_SSE3_M64: #define __3dNOW__ 1 -+// CHECK_K8_SSE3_M64: #define __MMX__ 1 -+// CHECK_K8_SSE3_M64: #define __SSE2_MATH__ 1 -+// CHECK_K8_SSE3_M64: #define __SSE2__ 1 -+// CHECK_K8_SSE3_M64: #define __SSE3__ 1 -+// CHECK_K8_SSE3_M64: #define __SSE_MATH__ 1 -+// CHECK_K8_SSE3_M64: #define __SSE__ 1 -+// CHECK_K8_SSE3_M64: #define __amd64 1 -+// CHECK_K8_SSE3_M64: #define __amd64__ 1 -+// CHECK_K8_SSE3_M64: #define __k8 1 -+// CHECK_K8_SSE3_M64: #define __k8__ 1 -+// CHECK_K8_SSE3_M64: #define __tune_k8__ 1 -+// CHECK_K8_SSE3_M64: #define __x86_64 1 -+// CHECK_K8_SSE3_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=opteron -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_M32 -+// CHECK_OPTERON_M32: #define __3dNOW_A__ 1 -+// CHECK_OPTERON_M32: #define __3dNOW__ 1 -+// CHECK_OPTERON_M32: #define __MMX__ 1 -+// CHECK_OPTERON_M32: #define __SSE2__ 1 -+// CHECK_OPTERON_M32: #define __SSE__ 1 -+// CHECK_OPTERON_M32: #define __i386 1 -+// CHECK_OPTERON_M32: #define __i386__ 1 -+// CHECK_OPTERON_M32: #define __k8 1 -+// CHECK_OPTERON_M32: #define __k8__ 1 -+// CHECK_OPTERON_M32: #define __tune_k8__ 1 -+// CHECK_OPTERON_M32: #define i386 1 -+ -+// RUN: %clang -march=opteron -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_M64 -+// CHECK_OPTERON_M64: #define __3dNOW_A__ 1 -+// CHECK_OPTERON_M64: #define __3dNOW__ 1 -+// CHECK_OPTERON_M64: #define __MMX__ 1 -+// CHECK_OPTERON_M64: #define __SSE2_MATH__ 1 -+// CHECK_OPTERON_M64: #define __SSE2__ 1 -+// CHECK_OPTERON_M64: #define __SSE_MATH__ 1 -+// CHECK_OPTERON_M64: #define __SSE__ 1 -+// CHECK_OPTERON_M64: #define __amd64 1 -+// CHECK_OPTERON_M64: #define __amd64__ 1 -+// CHECK_OPTERON_M64: #define __k8 1 -+// CHECK_OPTERON_M64: #define __k8__ 1 -+// CHECK_OPTERON_M64: #define __tune_k8__ 1 -+// CHECK_OPTERON_M64: #define __x86_64 1 -+// CHECK_OPTERON_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=opteron-sse3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_SSE3_M32 -+// CHECK_OPTERON_SSE3_M32: #define __3dNOW_A__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __3dNOW__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __MMX__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __SSE2__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __SSE3__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __SSE__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __i386 1 -+// CHECK_OPTERON_SSE3_M32: #define __i386__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __k8 1 -+// CHECK_OPTERON_SSE3_M32: #define __k8__ 1 -+// CHECK_OPTERON_SSE3_M32: #define __tune_k8__ 1 -+// CHECK_OPTERON_SSE3_M32: #define i386 1 -+ -+// RUN: %clang -march=opteron-sse3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_OPTERON_SSE3_M64 -+// CHECK_OPTERON_SSE3_M64: #define __3dNOW_A__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __3dNOW__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __MMX__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __SSE2_MATH__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __SSE2__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __SSE3__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __SSE_MATH__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __SSE__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __amd64 1 -+// CHECK_OPTERON_SSE3_M64: #define __amd64__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __k8 1 -+// CHECK_OPTERON_SSE3_M64: #define __k8__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __tune_k8__ 1 -+// CHECK_OPTERON_SSE3_M64: #define __x86_64 1 -+// CHECK_OPTERON_SSE3_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=athlon64 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_M32 -+// CHECK_ATHLON64_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON64_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON64_M32: #define __MMX__ 1 -+// CHECK_ATHLON64_M32: #define __SSE2__ 1 -+// CHECK_ATHLON64_M32: #define __SSE__ 1 -+// CHECK_ATHLON64_M32: #define __i386 1 -+// CHECK_ATHLON64_M32: #define __i386__ 1 -+// CHECK_ATHLON64_M32: #define __k8 1 -+// CHECK_ATHLON64_M32: #define __k8__ 1 -+// CHECK_ATHLON64_M32: #define __tune_k8__ 1 -+// CHECK_ATHLON64_M32: #define i386 1 -+ -+// RUN: %clang -march=athlon64 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_M64 -+// CHECK_ATHLON64_M64: #define __3dNOW_A__ 1 -+// CHECK_ATHLON64_M64: #define __3dNOW__ 1 -+// CHECK_ATHLON64_M64: #define __MMX__ 1 -+// CHECK_ATHLON64_M64: #define __SSE2_MATH__ 1 -+// CHECK_ATHLON64_M64: #define __SSE2__ 1 -+// CHECK_ATHLON64_M64: #define __SSE_MATH__ 1 -+// CHECK_ATHLON64_M64: #define __SSE__ 1 -+// CHECK_ATHLON64_M64: #define __amd64 1 -+// CHECK_ATHLON64_M64: #define __amd64__ 1 -+// CHECK_ATHLON64_M64: #define __k8 1 -+// CHECK_ATHLON64_M64: #define __k8__ 1 -+// CHECK_ATHLON64_M64: #define __tune_k8__ 1 -+// CHECK_ATHLON64_M64: #define __x86_64 1 -+// CHECK_ATHLON64_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=athlon64-sse3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_SSE3_M32 -+// CHECK_ATHLON64_SSE3_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __MMX__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __SSE2__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __SSE3__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __SSE__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __i386 1 -+// CHECK_ATHLON64_SSE3_M32: #define __i386__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __k8 1 -+// CHECK_ATHLON64_SSE3_M32: #define __k8__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define __tune_k8__ 1 -+// CHECK_ATHLON64_SSE3_M32: #define i386 1 -+ -+// RUN: %clang -march=athlon64-sse3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON64_SSE3_M64 -+// CHECK_ATHLON64_SSE3_M64: #define __3dNOW_A__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __3dNOW__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __MMX__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __SSE2_MATH__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __SSE2__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __SSE3__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __SSE_MATH__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __SSE__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __amd64 1 -+// CHECK_ATHLON64_SSE3_M64: #define __amd64__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __k8 1 -+// CHECK_ATHLON64_SSE3_M64: #define __k8__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __tune_k8__ 1 -+// CHECK_ATHLON64_SSE3_M64: #define __x86_64 1 -+// CHECK_ATHLON64_SSE3_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=athlon-fx -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_FX_M32 -+// CHECK_ATHLON_FX_M32: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_FX_M32: #define __3dNOW__ 1 -+// CHECK_ATHLON_FX_M32: #define __MMX__ 1 -+// CHECK_ATHLON_FX_M32: #define __SSE2__ 1 -+// CHECK_ATHLON_FX_M32: #define __SSE__ 1 -+// CHECK_ATHLON_FX_M32: #define __i386 1 -+// CHECK_ATHLON_FX_M32: #define __i386__ 1 -+// CHECK_ATHLON_FX_M32: #define __k8 1 -+// CHECK_ATHLON_FX_M32: #define __k8__ 1 -+// CHECK_ATHLON_FX_M32: #define __tune_k8__ 1 -+// CHECK_ATHLON_FX_M32: #define i386 1 -+ -+// RUN: %clang -march=athlon-fx -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ATHLON_FX_M64 -+// CHECK_ATHLON_FX_M64: #define __3dNOW_A__ 1 -+// CHECK_ATHLON_FX_M64: #define __3dNOW__ 1 -+// CHECK_ATHLON_FX_M64: #define __MMX__ 1 -+// CHECK_ATHLON_FX_M64: #define __SSE2_MATH__ 1 -+// CHECK_ATHLON_FX_M64: #define __SSE2__ 1 -+// CHECK_ATHLON_FX_M64: #define __SSE_MATH__ 1 -+// CHECK_ATHLON_FX_M64: #define __SSE__ 1 -+// CHECK_ATHLON_FX_M64: #define __amd64 1 -+// CHECK_ATHLON_FX_M64: #define __amd64__ 1 -+// CHECK_ATHLON_FX_M64: #define __k8 1 -+// CHECK_ATHLON_FX_M64: #define __k8__ 1 -+// CHECK_ATHLON_FX_M64: #define __tune_k8__ 1 -+// CHECK_ATHLON_FX_M64: #define __x86_64 1 -+// CHECK_ATHLON_FX_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=amdfam10 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDFAM10_M32 -+// CHECK_AMDFAM10_M32: #define __3dNOW_A__ 1 -+// CHECK_AMDFAM10_M32: #define __3dNOW__ 1 -+// CHECK_AMDFAM10_M32: #define __LAHF_SAHF__ 1 -+// CHECK_AMDFAM10_M32: #define __LZCNT__ 1 -+// CHECK_AMDFAM10_M32: #define __MMX__ 1 -+// CHECK_AMDFAM10_M32: #define __POPCNT__ 1 -+// CHECK_AMDFAM10_M32: #define __PRFCHW__ 1 -+// CHECK_AMDFAM10_M32: #define __SSE2_MATH__ 1 -+// CHECK_AMDFAM10_M32: #define __SSE2__ 1 -+// CHECK_AMDFAM10_M32: #define __SSE3__ 1 -+// CHECK_AMDFAM10_M32: #define __SSE4A__ 1 -+// CHECK_AMDFAM10_M32: #define __SSE_MATH__ 1 -+// CHECK_AMDFAM10_M32: #define __SSE__ 1 -+// CHECK_AMDFAM10_M32-NOT: #define __SSSE3__ 1 -+// CHECK_AMDFAM10_M32: #define __amdfam10 1 -+// CHECK_AMDFAM10_M32: #define __amdfam10__ 1 -+// CHECK_AMDFAM10_M32: #define __i386 1 -+// CHECK_AMDFAM10_M32: #define __i386__ 1 -+// CHECK_AMDFAM10_M32: #define __tune_amdfam10__ 1 -+ -+// RUN: %clang -march=amdfam10 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDFAM10_M64 -+// CHECK_AMDFAM10_M64: #define __3dNOW_A__ 1 -+// CHECK_AMDFAM10_M64: #define __3dNOW__ 1 -+// CHECK_AMDFAM10_M64: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 1 -+// CHECK_AMDFAM10_M64: #define __LAHF_SAHF__ 1 -+// CHECK_AMDFAM10_M64: #define __LZCNT__ 1 -+// CHECK_AMDFAM10_M64: #define __MMX__ 1 -+// CHECK_AMDFAM10_M64: #define __POPCNT__ 1 -+// CHECK_AMDFAM10_M64: #define __PRFCHW__ 1 -+// CHECK_AMDFAM10_M64: #define __SSE2_MATH__ 1 -+// CHECK_AMDFAM10_M64: #define __SSE2__ 1 -+// CHECK_AMDFAM10_M64: #define __SSE3__ 1 -+// CHECK_AMDFAM10_M64: #define __SSE4A__ 1 -+// CHECK_AMDFAM10_M64: #define __SSE_MATH__ 1 -+// CHECK_AMDFAM10_M64: #define __SSE__ 1 -+// CHECK_AMDFAM10_M64-NOT: #define __SSSE3__ 1 -+// CHECK_AMDFAM10_M64: #define __amd64 1 -+// CHECK_AMDFAM10_M64: #define __amd64__ 1 -+// CHECK_AMDFAM10_M64: #define __amdfam10 1 -+// CHECK_AMDFAM10_M64: #define __amdfam10__ 1 -+// CHECK_AMDFAM10_M64: #define __tune_amdfam10__ 1 -+// CHECK_AMDFAM10_M64: #define __x86_64 1 -+// CHECK_AMDFAM10_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=btver1 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER1_M32 -+// CHECK_BTVER1_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_BTVER1_M32-NOT: #define __3dNOW__ 1 -+// CHECK_BTVER1_M32: #define __LAHF_SAHF__ 1 -+// CHECK_BTVER1_M32: #define __LZCNT__ 1 -+// CHECK_BTVER1_M32: #define __MMX__ 1 -+// CHECK_BTVER1_M32: #define __POPCNT__ 1 -+// CHECK_BTVER1_M32: #define __PRFCHW__ 1 -+// CHECK_BTVER1_M32: #define __SSE2_MATH__ 1 -+// CHECK_BTVER1_M32: #define __SSE2__ 1 -+// CHECK_BTVER1_M32: #define __SSE3__ 1 -+// CHECK_BTVER1_M32: #define __SSE4A__ 1 -+// CHECK_BTVER1_M32: #define __SSE_MATH__ 1 -+// CHECK_BTVER1_M32: #define __SSE__ 1 -+// CHECK_BTVER1_M32: #define __SSSE3__ 1 -+// CHECK_BTVER1_M32: #define __btver1 1 -+// CHECK_BTVER1_M32: #define __btver1__ 1 -+// CHECK_BTVER1_M32: #define __i386 1 -+// CHECK_BTVER1_M32: #define __i386__ 1 -+// CHECK_BTVER1_M32: #define __tune_btver1__ 1 -+ -+// RUN: %clang -march=btver1 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER1_M64 -+// CHECK_BTVER1_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_BTVER1_M64-NOT: #define __3dNOW__ 1 -+// CHECK_BTVER1_M64: #define __LAHF_SAHF__ 1 -+// CHECK_BTVER1_M64: #define __LZCNT__ 1 -+// CHECK_BTVER1_M64: #define __MMX__ 1 -+// CHECK_BTVER1_M64: #define __POPCNT__ 1 -+// CHECK_BTVER1_M64: #define __PRFCHW__ 1 -+// CHECK_BTVER1_M64: #define __SSE2_MATH__ 1 -+// CHECK_BTVER1_M64: #define __SSE2__ 1 -+// CHECK_BTVER1_M64: #define __SSE3__ 1 -+// CHECK_BTVER1_M64: #define __SSE4A__ 1 -+// CHECK_BTVER1_M64: #define __SSE_MATH__ 1 -+// CHECK_BTVER1_M64: #define __SSE__ 1 -+// CHECK_BTVER1_M64: #define __SSSE3__ 1 -+// CHECK_BTVER1_M64: #define __amd64 1 -+// CHECK_BTVER1_M64: #define __amd64__ 1 -+// CHECK_BTVER1_M64: #define __btver1 1 -+// CHECK_BTVER1_M64: #define __btver1__ 1 -+// CHECK_BTVER1_M64: #define __tune_btver1__ 1 -+// CHECK_BTVER1_M64: #define __x86_64 1 -+// CHECK_BTVER1_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=btver2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER2_M32 -+// CHECK_BTVER2_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_BTVER2_M32-NOT: #define __3dNOW__ 1 -+// CHECK_BTVER2_M32: #define __AES__ 1 -+// CHECK_BTVER2_M32: #define __AVX__ 1 -+// CHECK_BTVER2_M32: #define __BMI__ 1 -+// CHECK_BTVER2_M32: #define __F16C__ 1 -+// CHECK_BTVER2_M32: #define __LZCNT__ 1 -+// CHECK_BTVER2_M32: #define __MMX__ 1 -+// CHECK_BTVER2_M32: #define __MOVBE__ 1 -+// CHECK_BTVER2_M32: #define __PCLMUL__ 1 -+// CHECK_BTVER2_M32: #define __POPCNT__ 1 -+// CHECK_BTVER2_M32: #define __PRFCHW__ 1 -+// CHECK_BTVER2_M32: #define __SSE2_MATH__ 1 -+// CHECK_BTVER2_M32: #define __SSE2__ 1 -+// CHECK_BTVER2_M32: #define __SSE3__ 1 -+// CHECK_BTVER2_M32: #define __SSE4A__ 1 -+// CHECK_BTVER2_M32: #define __SSE_MATH__ 1 -+// CHECK_BTVER2_M32: #define __SSE__ 1 -+// CHECK_BTVER2_M32: #define __SSSE3__ 1 -+// CHECK_BTVER2_M32: #define __XSAVEOPT__ 1 -+// CHECK_BTVER2_M32: #define __XSAVE__ 1 -+// CHECK_BTVER2_M32: #define __btver2 1 -+// CHECK_BTVER2_M32: #define __btver2__ 1 -+// CHECK_BTVER2_M32: #define __i386 1 -+// CHECK_BTVER2_M32: #define __i386__ 1 -+// CHECK_BTVER2_M32: #define __tune_btver2__ 1 -+ -+// RUN: %clang -march=btver2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BTVER2_M64 -+// CHECK_BTVER2_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_BTVER2_M64-NOT: #define __3dNOW__ 1 -+// CHECK_BTVER2_M64: #define __AES__ 1 -+// CHECK_BTVER2_M64: #define __AVX__ 1 -+// CHECK_BTVER2_M64: #define __BMI__ 1 -+// CHECK_BTVER2_M64: #define __F16C__ 1 -+// CHECK_BTVER2_M64: #define __LZCNT__ 1 -+// CHECK_BTVER2_M64: #define __MMX__ 1 -+// CHECK_BTVER2_M64: #define __MOVBE__ 1 -+// CHECK_BTVER2_M64: #define __PCLMUL__ 1 -+// CHECK_BTVER2_M64: #define __POPCNT__ 1 -+// CHECK_BTVER2_M64: #define __PRFCHW__ 1 -+// CHECK_BTVER2_M64: #define __SSE2_MATH__ 1 -+// CHECK_BTVER2_M64: #define __SSE2__ 1 -+// CHECK_BTVER2_M64: #define __SSE3__ 1 -+// CHECK_BTVER2_M64: #define __SSE4A__ 1 -+// CHECK_BTVER2_M64: #define __SSE_MATH__ 1 -+// CHECK_BTVER2_M64: #define __SSE__ 1 -+// CHECK_BTVER2_M64: #define __SSSE3__ 1 -+// CHECK_BTVER2_M64: #define __XSAVEOPT__ 1 -+// CHECK_BTVER2_M64: #define __XSAVE__ 1 -+// CHECK_BTVER2_M64: #define __amd64 1 -+// CHECK_BTVER2_M64: #define __amd64__ 1 -+// CHECK_BTVER2_M64: #define __btver2 1 -+// CHECK_BTVER2_M64: #define __btver2__ 1 -+// CHECK_BTVER2_M64: #define __tune_btver2__ 1 -+// CHECK_BTVER2_M64: #define __x86_64 1 -+// CHECK_BTVER2_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=bdver1 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M32 -+// CHECK_BDVER1_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER1_M32-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER1_M32: #define __AES__ 1 -+// CHECK_BDVER1_M32: #define __AVX__ 1 -+// CHECK_BDVER1_M32: #define __FMA4__ 1 -+// CHECK_BDVER1_M32: #define __LWP__ 1 -+// CHECK_BDVER1_M32: #define __LZCNT__ 1 -+// CHECK_BDVER1_M32: #define __MMX__ 1 -+// CHECK_BDVER1_M32: #define __PCLMUL__ 1 -+// CHECK_BDVER1_M32: #define __POPCNT__ 1 -+// CHECK_BDVER1_M32: #define __PRFCHW__ 1 -+// CHECK_BDVER1_M32: #define __SSE2_MATH__ 1 -+// CHECK_BDVER1_M32: #define __SSE2__ 1 -+// CHECK_BDVER1_M32: #define __SSE3__ 1 -+// CHECK_BDVER1_M32: #define __SSE4A__ 1 -+// CHECK_BDVER1_M32: #define __SSE4_1__ 1 -+// CHECK_BDVER1_M32: #define __SSE4_2__ 1 -+// CHECK_BDVER1_M32: #define __SSE_MATH__ 1 -+// CHECK_BDVER1_M32: #define __SSE__ 1 -+// CHECK_BDVER1_M32: #define __SSSE3__ 1 -+// CHECK_BDVER1_M32: #define __XOP__ 1 -+// CHECK_BDVER1_M32: #define __XSAVE__ 1 -+// CHECK_BDVER1_M32: #define __bdver1 1 -+// CHECK_BDVER1_M32: #define __bdver1__ 1 -+// CHECK_BDVER1_M32: #define __i386 1 -+// CHECK_BDVER1_M32: #define __i386__ 1 -+// CHECK_BDVER1_M32: #define __tune_bdver1__ 1 -+ -+// RUN: %clang -march=bdver1 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER1_M64 -+// CHECK_BDVER1_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER1_M64-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER1_M64: #define __AES__ 1 -+// CHECK_BDVER1_M64: #define __AVX__ 1 -+// CHECK_BDVER1_M64: #define __FMA4__ 1 -+// CHECK_BDVER1_M64: #define __LWP__ 1 -+// CHECK_BDVER1_M64: #define __LZCNT__ 1 -+// CHECK_BDVER1_M64: #define __MMX__ 1 -+// CHECK_BDVER1_M64: #define __PCLMUL__ 1 -+// CHECK_BDVER1_M64: #define __POPCNT__ 1 -+// CHECK_BDVER1_M64: #define __PRFCHW__ 1 -+// CHECK_BDVER1_M64: #define __SSE2_MATH__ 1 -+// CHECK_BDVER1_M64: #define __SSE2__ 1 -+// CHECK_BDVER1_M64: #define __SSE3__ 1 -+// CHECK_BDVER1_M64: #define __SSE4A__ 1 -+// CHECK_BDVER1_M64: #define __SSE4_1__ 1 -+// CHECK_BDVER1_M64: #define __SSE4_2__ 1 -+// CHECK_BDVER1_M64: #define __SSE_MATH__ 1 -+// CHECK_BDVER1_M64: #define __SSE__ 1 -+// CHECK_BDVER1_M64: #define __SSSE3__ 1 -+// CHECK_BDVER1_M64: #define __XOP__ 1 -+// CHECK_BDVER1_M64: #define __XSAVE__ 1 -+// CHECK_BDVER1_M64: #define __amd64 1 -+// CHECK_BDVER1_M64: #define __amd64__ 1 -+// CHECK_BDVER1_M64: #define __bdver1 1 -+// CHECK_BDVER1_M64: #define __bdver1__ 1 -+// CHECK_BDVER1_M64: #define __tune_bdver1__ 1 -+// CHECK_BDVER1_M64: #define __x86_64 1 -+// CHECK_BDVER1_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=bdver2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER2_M32 -+// CHECK_BDVER2_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER2_M32-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER2_M32: #define __AES__ 1 -+// CHECK_BDVER2_M32: #define __AVX__ 1 -+// CHECK_BDVER2_M32: #define __BMI__ 1 -+// CHECK_BDVER2_M32: #define __F16C__ 1 -+// CHECK_BDVER2_M32: #define __FMA4__ 1 -+// CHECK_BDVER2_M32: #define __FMA__ 1 -+// CHECK_BDVER2_M32: #define __LWP__ 1 -+// CHECK_BDVER2_M32: #define __LZCNT__ 1 -+// CHECK_BDVER2_M32: #define __MMX__ 1 -+// CHECK_BDVER2_M32: #define __PCLMUL__ 1 -+// CHECK_BDVER2_M32: #define __POPCNT__ 1 -+// CHECK_BDVER2_M32: #define __PRFCHW__ 1 -+// CHECK_BDVER2_M32: #define __SSE2_MATH__ 1 -+// CHECK_BDVER2_M32: #define __SSE2__ 1 -+// CHECK_BDVER2_M32: #define __SSE3__ 1 -+// CHECK_BDVER2_M32: #define __SSE4A__ 1 -+// CHECK_BDVER2_M32: #define __SSE4_1__ 1 -+// CHECK_BDVER2_M32: #define __SSE4_2__ 1 -+// CHECK_BDVER2_M32: #define __SSE_MATH__ 1 -+// CHECK_BDVER2_M32: #define __SSE__ 1 -+// CHECK_BDVER2_M32: #define __SSSE3__ 1 -+// CHECK_BDVER2_M32: #define __TBM__ 1 -+// CHECK_BDVER2_M32: #define __XOP__ 1 -+// CHECK_BDVER2_M32: #define __XSAVE__ 1 -+// CHECK_BDVER2_M32: #define __bdver2 1 -+// CHECK_BDVER2_M32: #define __bdver2__ 1 -+// CHECK_BDVER2_M32: #define __i386 1 -+// CHECK_BDVER2_M32: #define __i386__ 1 -+// CHECK_BDVER2_M32: #define __tune_bdver2__ 1 -+ -+// RUN: %clang -march=bdver2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER2_M64 -+// CHECK_BDVER2_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER2_M64-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER2_M64: #define __AES__ 1 -+// CHECK_BDVER2_M64: #define __AVX__ 1 -+// CHECK_BDVER2_M64: #define __BMI__ 1 -+// CHECK_BDVER2_M64: #define __F16C__ 1 -+// CHECK_BDVER2_M64: #define __FMA4__ 1 -+// CHECK_BDVER2_M64: #define __FMA__ 1 -+// CHECK_BDVER2_M64: #define __LWP__ 1 -+// CHECK_BDVER2_M64: #define __LZCNT__ 1 -+// CHECK_BDVER2_M64: #define __MMX__ 1 -+// CHECK_BDVER2_M64: #define __PCLMUL__ 1 -+// CHECK_BDVER2_M64: #define __POPCNT__ 1 -+// CHECK_BDVER2_M64: #define __PRFCHW__ 1 -+// CHECK_BDVER2_M64: #define __SSE2_MATH__ 1 -+// CHECK_BDVER2_M64: #define __SSE2__ 1 -+// CHECK_BDVER2_M64: #define __SSE3__ 1 -+// CHECK_BDVER2_M64: #define __SSE4A__ 1 -+// CHECK_BDVER2_M64: #define __SSE4_1__ 1 -+// CHECK_BDVER2_M64: #define __SSE4_2__ 1 -+// CHECK_BDVER2_M64: #define __SSE_MATH__ 1 -+// CHECK_BDVER2_M64: #define __SSE__ 1 -+// CHECK_BDVER2_M64: #define __SSSE3__ 1 -+// CHECK_BDVER2_M64: #define __TBM__ 1 -+// CHECK_BDVER2_M64: #define __XOP__ 1 -+// CHECK_BDVER2_M64: #define __XSAVE__ 1 -+// CHECK_BDVER2_M64: #define __amd64 1 -+// CHECK_BDVER2_M64: #define __amd64__ 1 -+// CHECK_BDVER2_M64: #define __bdver2 1 -+// CHECK_BDVER2_M64: #define __bdver2__ 1 -+// CHECK_BDVER2_M64: #define __tune_bdver2__ 1 -+// CHECK_BDVER2_M64: #define __x86_64 1 -+// CHECK_BDVER2_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=bdver3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER3_M32 -+// CHECK_BDVER3_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER3_M32-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER3_M32: #define __AES__ 1 -+// CHECK_BDVER3_M32: #define __AVX__ 1 -+// CHECK_BDVER3_M32: #define __BMI__ 1 -+// CHECK_BDVER3_M32: #define __F16C__ 1 -+// CHECK_BDVER3_M32: #define __FMA4__ 1 -+// CHECK_BDVER3_M32: #define __FMA__ 1 -+// CHECK_BDVER3_M32: #define __FSGSBASE__ 1 -+// CHECK_BDVER3_M32: #define __LWP__ 1 -+// CHECK_BDVER3_M32: #define __LZCNT__ 1 -+// CHECK_BDVER3_M32: #define __MMX__ 1 -+// CHECK_BDVER3_M32: #define __PCLMUL__ 1 -+// CHECK_BDVER3_M32: #define __POPCNT__ 1 -+// CHECK_BDVER3_M32: #define __PRFCHW__ 1 -+// CHECK_BDVER3_M32: #define __SSE2_MATH__ 1 -+// CHECK_BDVER3_M32: #define __SSE2__ 1 -+// CHECK_BDVER3_M32: #define __SSE3__ 1 -+// CHECK_BDVER3_M32: #define __SSE4A__ 1 -+// CHECK_BDVER3_M32: #define __SSE4_1__ 1 -+// CHECK_BDVER3_M32: #define __SSE4_2__ 1 -+// CHECK_BDVER3_M32: #define __SSE_MATH__ 1 -+// CHECK_BDVER3_M32: #define __SSE__ 1 -+// CHECK_BDVER3_M32: #define __SSSE3__ 1 -+// CHECK_BDVER3_M32: #define __TBM__ 1 -+// CHECK_BDVER3_M32: #define __XOP__ 1 -+// CHECK_BDVER3_M32: #define __XSAVEOPT__ 1 -+// CHECK_BDVER3_M32: #define __XSAVE__ 1 -+// CHECK_BDVER3_M32: #define __bdver3 1 -+// CHECK_BDVER3_M32: #define __bdver3__ 1 -+// CHECK_BDVER3_M32: #define __i386 1 -+// CHECK_BDVER3_M32: #define __i386__ 1 -+// CHECK_BDVER3_M32: #define __tune_bdver3__ 1 -+ -+// RUN: %clang -march=bdver3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER3_M64 -+// CHECK_BDVER3_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER3_M64-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER3_M64: #define __AES__ 1 -+// CHECK_BDVER3_M64: #define __AVX__ 1 -+// CHECK_BDVER3_M64: #define __BMI__ 1 -+// CHECK_BDVER3_M64: #define __F16C__ 1 -+// CHECK_BDVER3_M64: #define __FMA4__ 1 -+// CHECK_BDVER3_M64: #define __FMA__ 1 -+// CHECK_BDVER3_M64: #define __FSGSBASE__ 1 -+// CHECK_BDVER3_M64: #define __LWP__ 1 -+// CHECK_BDVER3_M64: #define __LZCNT__ 1 -+// CHECK_BDVER3_M64: #define __MMX__ 1 -+// CHECK_BDVER3_M64: #define __PCLMUL__ 1 -+// CHECK_BDVER3_M64: #define __POPCNT__ 1 -+// CHECK_BDVER3_M64: #define __PRFCHW__ 1 -+// CHECK_BDVER3_M64: #define __SSE2_MATH__ 1 -+// CHECK_BDVER3_M64: #define __SSE2__ 1 -+// CHECK_BDVER3_M64: #define __SSE3__ 1 -+// CHECK_BDVER3_M64: #define __SSE4A__ 1 -+// CHECK_BDVER3_M64: #define __SSE4_1__ 1 -+// CHECK_BDVER3_M64: #define __SSE4_2__ 1 -+// CHECK_BDVER3_M64: #define __SSE_MATH__ 1 -+// CHECK_BDVER3_M64: #define __SSE__ 1 -+// CHECK_BDVER3_M64: #define __SSSE3__ 1 -+// CHECK_BDVER3_M64: #define __TBM__ 1 -+// CHECK_BDVER3_M64: #define __XOP__ 1 -+// CHECK_BDVER3_M64: #define __XSAVEOPT__ 1 -+// CHECK_BDVER3_M64: #define __XSAVE__ 1 -+// CHECK_BDVER3_M64: #define __amd64 1 -+// CHECK_BDVER3_M64: #define __amd64__ 1 -+// CHECK_BDVER3_M64: #define __bdver3 1 -+// CHECK_BDVER3_M64: #define __bdver3__ 1 -+// CHECK_BDVER3_M64: #define __tune_bdver3__ 1 -+// CHECK_BDVER3_M64: #define __x86_64 1 -+// CHECK_BDVER3_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=bdver4 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER4_M32 -+// CHECK_BDVER4_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER4_M32-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER4_M32: #define __AES__ 1 -+// CHECK_BDVER4_M32: #define __AVX2__ 1 -+// CHECK_BDVER4_M32: #define __AVX__ 1 -+// CHECK_BDVER4_M32: #define __BMI2__ 1 -+// CHECK_BDVER4_M32: #define __BMI__ 1 -+// CHECK_BDVER4_M32: #define __F16C__ 1 -+// CHECK_BDVER4_M32: #define __FMA4__ 1 -+// CHECK_BDVER4_M32: #define __FMA__ 1 -+// CHECK_BDVER4_M32: #define __FSGSBASE__ 1 -+// CHECK_BDVER4_M32: #define __LWP__ 1 -+// CHECK_BDVER4_M32: #define __LZCNT__ 1 -+// CHECK_BDVER4_M32: #define __MMX__ 1 -+// CHECK_BDVER4_M32: #define __MOVBE__ 1 -+// CHECK_BDVER4_M32: #define __PCLMUL__ 1 -+// CHECK_BDVER4_M32: #define __POPCNT__ 1 -+// CHECK_BDVER4_M32: #define __PRFCHW__ 1 -+// CHECK_BDVER4_M32: #define __RDRND__ 1 -+// CHECK_BDVER4_M32: #define __SSE2_MATH__ 1 -+// CHECK_BDVER4_M32: #define __SSE2__ 1 -+// CHECK_BDVER4_M32: #define __SSE3__ 1 -+// CHECK_BDVER4_M32: #define __SSE4A__ 1 -+// CHECK_BDVER4_M32: #define __SSE4_1__ 1 -+// CHECK_BDVER4_M32: #define __SSE4_2__ 1 -+// CHECK_BDVER4_M32: #define __SSE_MATH__ 1 -+// CHECK_BDVER4_M32: #define __SSE__ 1 -+// CHECK_BDVER4_M32: #define __SSSE3__ 1 -+// CHECK_BDVER4_M32: #define __TBM__ 1 -+// CHECK_BDVER4_M32: #define __XOP__ 1 -+// CHECK_BDVER4_M32: #define __XSAVE__ 1 -+// CHECK_BDVER4_M32: #define __bdver4 1 -+// CHECK_BDVER4_M32: #define __bdver4__ 1 -+// CHECK_BDVER4_M32: #define __i386 1 -+// CHECK_BDVER4_M32: #define __i386__ 1 -+// CHECK_BDVER4_M32: #define __tune_bdver4__ 1 -+ -+// RUN: %clang -march=bdver4 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_BDVER4_M64 -+// CHECK_BDVER4_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_BDVER4_M64-NOT: #define __3dNOW__ 1 -+// CHECK_BDVER4_M64: #define __AES__ 1 -+// CHECK_BDVER4_M64: #define __AVX2__ 1 -+// CHECK_BDVER4_M64: #define __AVX__ 1 -+// CHECK_BDVER4_M64: #define __BMI2__ 1 -+// CHECK_BDVER4_M64: #define __BMI__ 1 -+// CHECK_BDVER4_M64: #define __F16C__ 1 -+// CHECK_BDVER4_M64: #define __FMA4__ 1 -+// CHECK_BDVER4_M64: #define __FMA__ 1 -+// CHECK_BDVER4_M64: #define __FSGSBASE__ 1 -+// CHECK_BDVER4_M64: #define __LWP__ 1 -+// CHECK_BDVER4_M64: #define __LZCNT__ 1 -+// CHECK_BDVER4_M64: #define __MMX__ 1 -+// CHECK_BDVER4_M64: #define __MOVBE__ 1 -+// CHECK_BDVER4_M64: #define __PCLMUL__ 1 -+// CHECK_BDVER4_M64: #define __POPCNT__ 1 -+// CHECK_BDVER4_M64: #define __PRFCHW__ 1 -+// CHECK_BDVER4_M64: #define __RDRND__ 1 -+// CHECK_BDVER4_M64: #define __SSE2_MATH__ 1 -+// CHECK_BDVER4_M64: #define __SSE2__ 1 -+// CHECK_BDVER4_M64: #define __SSE3__ 1 -+// CHECK_BDVER4_M64: #define __SSE4A__ 1 -+// CHECK_BDVER4_M64: #define __SSE4_1__ 1 -+// CHECK_BDVER4_M64: #define __SSE4_2__ 1 -+// CHECK_BDVER4_M64: #define __SSE_MATH__ 1 -+// CHECK_BDVER4_M64: #define __SSE__ 1 -+// CHECK_BDVER4_M64: #define __SSSE3__ 1 -+// CHECK_BDVER4_M64: #define __TBM__ 1 -+// CHECK_BDVER4_M64: #define __XOP__ 1 -+// CHECK_BDVER4_M64: #define __XSAVE__ 1 -+// CHECK_BDVER4_M64: #define __amd64 1 -+// CHECK_BDVER4_M64: #define __amd64__ 1 -+// CHECK_BDVER4_M64: #define __bdver4 1 -+// CHECK_BDVER4_M64: #define __bdver4__ 1 -+// CHECK_BDVER4_M64: #define __tune_bdver4__ 1 -+// CHECK_BDVER4_M64: #define __x86_64 1 -+// CHECK_BDVER4_M64: #define __x86_64__ 1 -+ -+// RUN: %clang -march=znver1 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER1_M32 -+// CHECK_ZNVER1_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_ZNVER1_M32-NOT: #define __3dNOW__ 1 -+// CHECK_ZNVER1_M32: #define __ADX__ 1 -+// CHECK_ZNVER1_M32: #define __AES__ 1 -+// CHECK_ZNVER1_M32: #define __AVX2__ 1 -+// CHECK_ZNVER1_M32: #define __AVX__ 1 -+// CHECK_ZNVER1_M32: #define __BMI2__ 1 -+// CHECK_ZNVER1_M32: #define __BMI__ 1 -+// CHECK_ZNVER1_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_ZNVER1_M32: #define __CLZERO__ 1 -+// CHECK_ZNVER1_M32: #define __F16C__ 1 -+// CHECK_ZNVER1_M32-NOT: #define __FMA4__ 1 -+// CHECK_ZNVER1_M32: #define __FMA__ 1 -+// CHECK_ZNVER1_M32: #define __FSGSBASE__ 1 -+// CHECK_ZNVER1_M32: #define __LZCNT__ 1 -+// CHECK_ZNVER1_M32: #define __MMX__ 1 -+// CHECK_ZNVER1_M32: #define __MOVBE__ 1 -+// CHECK_ZNVER1_M32: #define __PCLMUL__ 1 -+// CHECK_ZNVER1_M32: #define __POPCNT__ 1 -+// CHECK_ZNVER1_M32: #define __PRFCHW__ 1 -+// CHECK_ZNVER1_M32: #define __RDRND__ 1 -+// CHECK_ZNVER1_M32: #define __RDSEED__ 1 -+// CHECK_ZNVER1_M32: #define __SHA__ 1 -+// CHECK_ZNVER1_M32: #define __SSE2_MATH__ 1 -+// CHECK_ZNVER1_M32: #define __SSE2__ 1 -+// CHECK_ZNVER1_M32: #define __SSE3__ 1 -+// CHECK_ZNVER1_M32: #define __SSE4A__ 1 -+// CHECK_ZNVER1_M32: #define __SSE4_1__ 1 -+// CHECK_ZNVER1_M32: #define __SSE4_2__ 1 -+// CHECK_ZNVER1_M32: #define __SSE_MATH__ 1 -+// CHECK_ZNVER1_M32: #define __SSE__ 1 -+// CHECK_ZNVER1_M32: #define __SSSE3__ 1 -+// CHECK_ZNVER1_M32-NOT: #define __TBM__ 1 -+// CHECK_ZNVER1_M32-NOT: #define __XOP__ 1 -+// CHECK_ZNVER1_M32: #define __XSAVEC__ 1 -+// CHECK_ZNVER1_M32: #define __XSAVEOPT__ 1 -+// CHECK_ZNVER1_M32: #define __XSAVES__ 1 -+// CHECK_ZNVER1_M32: #define __XSAVE__ 1 -+// CHECK_ZNVER1_M32: #define __i386 1 -+// CHECK_ZNVER1_M32: #define __i386__ 1 -+// CHECK_ZNVER1_M32: #define __tune_znver1__ 1 -+// CHECK_ZNVER1_M32: #define __znver1 1 -+// CHECK_ZNVER1_M32: #define __znver1__ 1 -+ -+// RUN: %clang -march=znver1 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER1_M64 -+// CHECK_ZNVER1_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_ZNVER1_M64-NOT: #define __3dNOW__ 1 -+// CHECK_ZNVER1_M64: #define __ADX__ 1 -+// CHECK_ZNVER1_M64: #define __AES__ 1 -+// CHECK_ZNVER1_M64: #define __AVX2__ 1 -+// CHECK_ZNVER1_M64: #define __AVX__ 1 -+// CHECK_ZNVER1_M64: #define __BMI2__ 1 -+// CHECK_ZNVER1_M64: #define __BMI__ 1 -+// CHECK_ZNVER1_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_ZNVER1_M64: #define __CLZERO__ 1 -+// CHECK_ZNVER1_M64: #define __F16C__ 1 -+// CHECK_ZNVER1_M64-NOT: #define __FMA4__ 1 -+// CHECK_ZNVER1_M64: #define __FMA__ 1 -+// CHECK_ZNVER1_M64: #define __FSGSBASE__ 1 -+// CHECK_ZNVER1_M64: #define __LAHF_SAHF__ 1 -+// CHECK_ZNVER1_M64: #define __LZCNT__ 1 -+// CHECK_ZNVER1_M64: #define __MMX__ 1 -+// CHECK_ZNVER1_M64: #define __MOVBE__ 1 -+// CHECK_ZNVER1_M64: #define __PCLMUL__ 1 -+// CHECK_ZNVER1_M64: #define __POPCNT__ 1 -+// CHECK_ZNVER1_M64: #define __PRFCHW__ 1 -+// CHECK_ZNVER1_M64: #define __RDRND__ 1 -+// CHECK_ZNVER1_M64: #define __RDSEED__ 1 -+// CHECK_ZNVER1_M64: #define __SHA__ 1 -+// CHECK_ZNVER1_M64: #define __SSE2_MATH__ 1 -+// CHECK_ZNVER1_M64: #define __SSE2__ 1 -+// CHECK_ZNVER1_M64: #define __SSE3__ 1 -+// CHECK_ZNVER1_M64: #define __SSE4A__ 1 -+// CHECK_ZNVER1_M64: #define __SSE4_1__ 1 -+// CHECK_ZNVER1_M64: #define __SSE4_2__ 1 -+// CHECK_ZNVER1_M64: #define __SSE_MATH__ 1 -+// CHECK_ZNVER1_M64: #define __SSE__ 1 -+// CHECK_ZNVER1_M64: #define __SSSE3__ 1 -+// CHECK_ZNVER1_M64-NOT: #define __TBM__ 1 -+// CHECK_ZNVER1_M64-NOT: #define __XOP__ 1 -+// CHECK_ZNVER1_M64: #define __XSAVEC__ 1 -+// CHECK_ZNVER1_M64: #define __XSAVEOPT__ 1 -+// CHECK_ZNVER1_M64: #define __XSAVES__ 1 -+// CHECK_ZNVER1_M64: #define __XSAVE__ 1 -+// CHECK_ZNVER1_M64: #define __amd64 1 -+// CHECK_ZNVER1_M64: #define __amd64__ 1 -+// CHECK_ZNVER1_M64: #define __tune_znver1__ 1 -+// CHECK_ZNVER1_M64: #define __x86_64 1 -+// CHECK_ZNVER1_M64: #define __x86_64__ 1 -+// CHECK_ZNVER1_M64: #define __znver1 1 -+// CHECK_ZNVER1_M64: #define __znver1__ 1 -+ -+// RUN: %clang -march=znver2 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER2_M32 -+// CHECK_ZNVER2_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_ZNVER2_M32-NOT: #define __3dNOW__ 1 -+// CHECK_ZNVER2_M32: #define __ADX__ 1 -+// CHECK_ZNVER2_M32: #define __AES__ 1 -+// CHECK_ZNVER2_M32: #define __AVX2__ 1 -+// CHECK_ZNVER2_M32: #define __AVX__ 1 -+// CHECK_ZNVER2_M32: #define __BMI2__ 1 -+// CHECK_ZNVER2_M32: #define __BMI__ 1 -+// CHECK_ZNVER2_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_ZNVER2_M32: #define __CLWB__ 1 -+// CHECK_ZNVER2_M32: #define __CLZERO__ 1 -+// CHECK_ZNVER2_M32: #define __F16C__ 1 -+// CHECK_ZNVER2_M32-NOT: #define __FMA4__ 1 -+// CHECK_ZNVER2_M32: #define __FMA__ 1 -+// CHECK_ZNVER2_M32: #define __FSGSBASE__ 1 -+// CHECK_ZNVER2_M32: #define __LAHF_SAHF__ 1 -+// CHECK_ZNVER2_M32: #define __LZCNT__ 1 -+// CHECK_ZNVER2_M32: #define __MMX__ 1 -+// CHECK_ZNVER2_M32: #define __PCLMUL__ 1 -+// CHECK_ZNVER2_M32: #define __POPCNT__ 1 -+// CHECK_ZNVER2_M32: #define __PRFCHW__ 1 -+// CHECK_ZNVER2_M32: #define __RDPID__ 1 -+// CHECK_ZNVER2_M32: #define __RDRND__ 1 -+// CHECK_ZNVER2_M32: #define __RDSEED__ 1 -+// CHECK_ZNVER2_M32: #define __SHA__ 1 -+// CHECK_ZNVER2_M32: #define __SSE2_MATH__ 1 -+// CHECK_ZNVER2_M32: #define __SSE2__ 1 -+// CHECK_ZNVER2_M32: #define __SSE3__ 1 -+// CHECK_ZNVER2_M32: #define __SSE4A__ 1 -+// CHECK_ZNVER2_M32: #define __SSE4_1__ 1 -+// CHECK_ZNVER2_M32: #define __SSE4_2__ 1 -+// CHECK_ZNVER2_M32: #define __SSE_MATH__ 1 -+// CHECK_ZNVER2_M32: #define __SSE__ 1 -+// CHECK_ZNVER2_M32: #define __SSSE3__ 1 -+// CHECK_ZNVER2_M32-NOT: #define __TBM__ 1 -+// CHECK_ZNVER2_M32: #define __WBNOINVD__ 1 -+// CHECK_ZNVER2_M32-NOT: #define __XOP__ 1 -+// CHECK_ZNVER2_M32: #define __XSAVEC__ 1 -+// CHECK_ZNVER2_M32: #define __XSAVEOPT__ 1 -+// CHECK_ZNVER2_M32: #define __XSAVES__ 1 -+// CHECK_ZNVER2_M32: #define __XSAVE__ 1 -+// CHECK_ZNVER2_M32: #define __i386 1 -+// CHECK_ZNVER2_M32: #define __i386__ 1 -+// CHECK_ZNVER2_M32: #define __tune_znver2__ 1 -+// CHECK_ZNVER2_M32: #define __znver2 1 -+// CHECK_ZNVER2_M32: #define __znver2__ 1 -+ -+// RUN: %clang -march=znver2 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER2_M64 -+// CHECK_ZNVER2_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_ZNVER2_M64-NOT: #define __3dNOW__ 1 -+// CHECK_ZNVER2_M64: #define __ADX__ 1 -+// CHECK_ZNVER2_M64: #define __AES__ 1 -+// CHECK_ZNVER2_M64: #define __AVX2__ 1 -+// CHECK_ZNVER2_M64: #define __AVX__ 1 -+// CHECK_ZNVER2_M64: #define __BMI2__ 1 -+// CHECK_ZNVER2_M64: #define __BMI__ 1 -+// CHECK_ZNVER2_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_ZNVER2_M64: #define __CLWB__ 1 -+// CHECK_ZNVER2_M64: #define __CLZERO__ 1 -+// CHECK_ZNVER2_M64: #define __F16C__ 1 -+// CHECK_ZNVER2_M64-NOT: #define __FMA4__ 1 -+// CHECK_ZNVER2_M64: #define __FMA__ 1 -+// CHECK_ZNVER2_M64: #define __FSGSBASE__ 1 -+// CHECK_ZNVER2_M64: #define __LAHF_SAHF__ 1 -+// CHECK_ZNVER2_M64: #define __LZCNT__ 1 -+// CHECK_ZNVER2_M64: #define __MMX__ 1 -+// CHECK_ZNVER2_M64: #define __PCLMUL__ 1 -+// CHECK_ZNVER2_M64: #define __POPCNT__ 1 -+// CHECK_ZNVER2_M64: #define __PRFCHW__ 1 -+// CHECK_ZNVER2_M64: #define __RDPID__ 1 -+// CHECK_ZNVER2_M64: #define __RDRND__ 1 -+// CHECK_ZNVER2_M64: #define __RDSEED__ 1 -+// CHECK_ZNVER2_M64: #define __SHA__ 1 -+// CHECK_ZNVER2_M64: #define __SSE2_MATH__ 1 -+// CHECK_ZNVER2_M64: #define __SSE2__ 1 -+// CHECK_ZNVER2_M64: #define __SSE3__ 1 -+// CHECK_ZNVER2_M64: #define __SSE4A__ 1 -+// CHECK_ZNVER2_M64: #define __SSE4_1__ 1 -+// CHECK_ZNVER2_M64: #define __SSE4_2__ 1 -+// CHECK_ZNVER2_M64: #define __SSE_MATH__ 1 -+// CHECK_ZNVER2_M64: #define __SSE__ 1 -+// CHECK_ZNVER2_M64: #define __SSSE3__ 1 -+// CHECK_ZNVER2_M64-NOT: #define __TBM__ 1 -+// CHECK_ZNVER2_M64: #define __WBNOINVD__ 1 -+// CHECK_ZNVER2_M64-NOT: #define __XOP__ 1 -+// CHECK_ZNVER2_M64: #define __XSAVEC__ 1 -+// CHECK_ZNVER2_M64: #define __XSAVEOPT__ 1 -+// CHECK_ZNVER2_M64: #define __XSAVES__ 1 -+// CHECK_ZNVER2_M64: #define __XSAVE__ 1 -+// CHECK_ZNVER2_M64: #define __amd64 1 -+// CHECK_ZNVER2_M64: #define __amd64__ 1 -+// CHECK_ZNVER2_M64: #define __tune_znver2__ 1 -+// CHECK_ZNVER2_M64: #define __x86_64 1 -+// CHECK_ZNVER2_M64: #define __x86_64__ 1 -+// CHECK_ZNVER2_M64: #define __znver2 1 -+// CHECK_ZNVER2_M64: #define __znver2__ 1 -+ -+// RUN: %clang -march=znver3 -m32 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER3_M32 -+// CHECK_ZNVER3_M32-NOT: #define __3dNOW_A__ 1 -+// CHECK_ZNVER3_M32-NOT: #define __3dNOW__ 1 -+// CHECK_ZNVER3_M32: #define __ADX__ 1 -+// CHECK_ZNVER3_M32: #define __AES__ 1 -+// CHECK_ZNVER3_M32: #define __AVX2__ 1 -+// CHECK_ZNVER3_M32: #define __AVX__ 1 -+// CHECK_ZNVER3_M32: #define __BMI2__ 1 -+// CHECK_ZNVER3_M32: #define __BMI__ 1 -+// CHECK_ZNVER3_M32: #define __CLFLUSHOPT__ 1 -+// CHECK_ZNVER3_M32: #define __CLWB__ 1 -+// CHECK_ZNVER3_M32: #define __CLZERO__ 1 -+// CHECK_ZNVER3_M32: #define __F16C__ 1 -+// CHECK_ZNVER3_M32-NOT: #define __FMA4__ 1 -+// CHECK_ZNVER3_M32: #define __FMA__ 1 -+// CHECK_ZNVER3_M32: #define __FSGSBASE__ 1 -+// CHECK_ZNVER3_M32: #define __LZCNT__ 1 -+// CHECK_ZNVER3_M32: #define __MMX__ 1 -+// CHECK_ZNVER3_M32: #define __PCLMUL__ 1 -+// CHECK_ZNVER3_M32: #define __PKU__ 1 -+// CHECK_ZNVER3_M32: #define __POPCNT__ 1 -+// CHECK_ZNVER3_M32: #define __PRFCHW__ 1 -+// CHECK_ZNVER3_M32: #define __RDPID__ 1 -+// CHECK_ZNVER3_M32: #define __RDRND__ 1 -+// CHECK_ZNVER3_M32: #define __RDSEED__ 1 -+// CHECK_ZNVER3_M32: #define __SHA__ 1 -+// CHECK_ZNVER3_M32: #define __SSE2_MATH__ 1 -+// CHECK_ZNVER3_M32: #define __SSE2__ 1 -+// CHECK_ZNVER3_M32: #define __SSE3__ 1 -+// CHECK_ZNVER3_M32: #define __SSE4A__ 1 -+// CHECK_ZNVER3_M32: #define __SSE4_1__ 1 -+// CHECK_ZNVER3_M32: #define __SSE4_2__ 1 -+// CHECK_ZNVER3_M32: #define __SSE_MATH__ 1 -+// CHECK_ZNVER3_M32: #define __SSE__ 1 -+// CHECK_ZNVER3_M32: #define __SSSE3__ 1 -+// CHECK_ZNVER3_M32-NOT: #define __TBM__ 1 -+// CHECK_ZNVER3_M32: #define __WBNOINVD__ 1 -+// CHECK_ZNVER3_M32-NOT: #define __XOP__ 1 -+// CHECK_ZNVER3_M32: #define __XSAVEC__ 1 -+// CHECK_ZNVER3_M32: #define __XSAVEOPT__ 1 -+// CHECK_ZNVER3_M32: #define __XSAVES__ 1 -+// CHECK_ZNVER3_M32: #define __XSAVE__ 1 -+// CHECK_ZNVER3_M32: #define __i386 1 -+// CHECK_ZNVER3_M32: #define __i386__ 1 -+// CHECK_ZNVER3_M32: #define __tune_znver3__ 1 -+// CHECK_ZNVER3_M32: #define __znver3 1 -+// CHECK_ZNVER3_M32: #define __znver3__ 1 -+ -+// RUN: %clang -march=znver3 -m64 -E -dM %s -o - 2>&1 \ -+// RUN: -target i386-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_ZNVER3_M64 -+// CHECK_ZNVER3_M64-NOT: #define __3dNOW_A__ 1 -+// CHECK_ZNVER3_M64-NOT: #define __3dNOW__ 1 -+// CHECK_ZNVER3_M64: #define __ADX__ 1 -+// CHECK_ZNVER3_M64: #define __AES__ 1 -+// CHECK_ZNVER3_M64: #define __AVX2__ 1 -+// CHECK_ZNVER3_M64: #define __AVX__ 1 -+// CHECK_ZNVER3_M64: #define __BMI2__ 1 -+// CHECK_ZNVER3_M64: #define __BMI__ 1 -+// CHECK_ZNVER3_M64: #define __CLFLUSHOPT__ 1 -+// CHECK_ZNVER3_M64: #define __CLWB__ 1 -+// CHECK_ZNVER3_M64: #define __CLZERO__ 1 -+// CHECK_ZNVER3_M64: #define __F16C__ 1 -+// CHECK_ZNVER3_M64-NOT: #define __FMA4__ 1 -+// CHECK_ZNVER3_M64: #define __FMA__ 1 -+// CHECK_ZNVER3_M64: #define __FSGSBASE__ 1 -+// CHECK_ZNVER3_M64: #define __LZCNT__ 1 -+// CHECK_ZNVER3_M64: #define __MMX__ 1 -+// CHECK_ZNVER3_M64: #define __PCLMUL__ 1 -+// CHECK_ZNVER3_M64: #define __PKU__ 1 -+// CHECK_ZNVER3_M64: #define __POPCNT__ 1 -+// CHECK_ZNVER3_M64: #define __PRFCHW__ 1 -+// CHECK_ZNVER3_M64: #define __RDPID__ 1 -+// CHECK_ZNVER3_M64: #define __RDRND__ 1 -+// CHECK_ZNVER3_M64: #define __RDSEED__ 1 -+// CHECK_ZNVER3_M64: #define __SHA__ 1 -+// CHECK_ZNVER3_M64: #define __SSE2_MATH__ 1 -+// CHECK_ZNVER3_M64: #define __SSE2__ 1 -+// CHECK_ZNVER3_M64: #define __SSE3__ 1 -+// CHECK_ZNVER3_M64: #define __SSE4A__ 1 -+// CHECK_ZNVER3_M64: #define __SSE4_1__ 1 -+// CHECK_ZNVER3_M64: #define __SSE4_2__ 1 -+// CHECK_ZNVER3_M64: #define __SSE_MATH__ 1 -+// CHECK_ZNVER3_M64: #define __SSE__ 1 -+// CHECK_ZNVER3_M64: #define __SSSE3__ 1 -+// CHECK_ZNVER3_M64-NOT: #define __TBM__ 1 -+// CHECK_ZNVER3_M64: #define __VAES__ 1 -+// CHECK_ZNVER3_M64: #define __VPCLMULQDQ__ 1 -+// CHECK_ZNVER3_M64: #define __WBNOINVD__ 1 -+// CHECK_ZNVER3_M64-NOT: #define __XOP__ 1 -+// CHECK_ZNVER3_M64: #define __XSAVEC__ 1 -+// CHECK_ZNVER3_M64: #define __XSAVEOPT__ 1 -+// CHECK_ZNVER3_M64: #define __XSAVES__ 1 -+// CHECK_ZNVER3_M64: #define __XSAVE__ 1 -+// CHECK_ZNVER3_M64: #define __amd64 1 -+// CHECK_ZNVER3_M64: #define __amd64__ 1 -+// CHECK_ZNVER3_M64: #define __tune_znver3__ 1 -+// CHECK_ZNVER3_M64: #define __x86_64 1 -+// CHECK_ZNVER3_M64: #define __x86_64__ 1 -+// CHECK_ZNVER3_M64: #define __znver3 1 -+// CHECK_ZNVER3_M64: #define __znver3__ 1 -+ -+// End X86/GCC/Linux tests ------------------ -+ -+// Begin PPC/GCC/Linux tests ---------------- -+// Check that VSX also turns on altivec. -+// RUN: %clang -mvsx -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_VSX_M32 -+// CHECK_PPC_VSX_M32: #define __ALTIVEC__ 1 -+// CHECK_PPC_VSX_M32: #define __VSX__ 1 -+ -+// RUN: %clang -mvsx -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_VSX_M64 -+// CHECK_PPC_VSX_M64: #define __VSX__ 1 -+ -+// RUN: %clang -mpower8-vector -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_POWER8_VECTOR_M64 -+// CHECK_PPC_POWER8_VECTOR_M64: #define __POWER8_VECTOR__ 1 -+ -+// RUN: %clang -mpower9-vector -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_POWER9_VECTOR_M64 -+// CHECK_PPC_POWER9_VECTOR_M64: #define __POWER9_VECTOR__ 1 -+ -+// RUN: %clang -mcrypto -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_CRYPTO_M64 -+// CHECK_PPC_CRYPTO_M64: #define __CRYPTO__ 1 -+ -+// HTM is available on power8 or later which includes all of powerpc64le as an -+// ABI choice. Test that, the cpus, and the option. -+// RUN: %clang -mhtm -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64le-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM -+// RUN: %clang -mcpu=pwr8 -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM -+// RUN: %clang -mcpu=pwr9 -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_HTM -+// CHECK_PPC_HTM: #define __HTM__ 1 -+ -+// RUN: %clang -mcpu=ppc64 -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-unknown \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_GCC_ATOMICS -+// RUN: %clang -mcpu=pwr8 -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64-unknown-unknown \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_GCC_ATOMICS -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target powerpc64le-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_PPC_GCC_ATOMICS -+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_PPC_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+ -+// End PPC/GCC/Linux tests ------------------ -+ -+// Begin Sparc/GCC/Linux tests ---------------- -+ -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target sparc-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC -+// CHECK_SPARC: #define __BIG_ENDIAN__ 1 -+// CHECK_SPARC: #define __sparc 1 -+// CHECK_SPARC: #define __sparc__ 1 -+// CHECK_SPARC-NOT: #define __sparcv9 1 -+// CHECK_SPARC-NOT: #define __sparcv9__ 1 -+// CHECK_SPARC: #define __sparcv8 1 -+// CHECK_SPARC-NOT: #define __sparcv9 1 -+// CHECK_SPARC-NOT: #define __sparcv9__ 1 -+ -+// RUN: %clang -mcpu=v9 -E -dM %s -o - 2>&1 \ -+// RUN: -target sparc-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC-V9 -+// CHECK_SPARC-V9-NOT: #define __sparcv8 1 -+// CHECK_SPARC-V9-NOT: #define __sparcv8__ 1 -+// CHECK_SPARC-V9: #define __sparc_v9__ 1 -+// CHECK_SPARC-V9: #define __sparcv9 1 -+// CHECK_SPARC-V9: #define __sparcv9__ 1 -+ -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target sparc-sun-solaris \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC_SOLARIS_GCC_ATOMICS -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+ -+// RUN: %clang -mcpu=v8 -E -dM %s -o - 2>&1 \ -+// RUN: -target sparc-sun-solaris \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SPARC_SOLARIS_GCC_ATOMICS-V8-NOT: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+ -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target sparcel-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCEL -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.1 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-1 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.2 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=myriad2.3 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2100 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-1 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2150 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2155 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2450 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2455 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2x5x 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-2 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2080 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2085 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2480 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2485 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// RUN: %clang -E -dM %s -o - -target sparcel-myriad -mcpu=ma2x8x 2>&1 \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_MYRIAD2-3 \ -+// RUN: -check-prefix=CHECK_SPARCEL -check-prefix=CHECK_MYRIAD2 -+// CHECK_SPARCEL: #define __LITTLE_ENDIAN__ 1 -+// CHECK_MYRIAD2: #define __leon__ 1 -+// CHECK_MYRIAD2-1: #define __myriad2 1 -+// CHECK_MYRIAD2-1: #define __myriad2__ 1 -+// CHECK_MYRIAD2-2: #define __ma2x5x 1 -+// CHECK_MYRIAD2-2: #define __ma2x5x__ 1 -+// CHECK_MYRIAD2-2: #define __myriad2 2 -+// CHECK_MYRIAD2-2: #define __myriad2__ 2 -+// CHECK_MYRIAD2-3: #define __ma2x8x 1 -+// CHECK_MYRIAD2-3: #define __ma2x8x__ 1 -+// CHECK_MYRIAD2-3: #define __myriad2 3 -+// CHECK_MYRIAD2-3: #define __myriad2__ 3 -+// CHECK_SPARCEL: #define __sparc 1 -+// CHECK_SPARCEL: #define __sparc__ 1 -+// CHECK_MYRIAD2: #define __sparc_v8__ 1 -+// CHECK_SPARCEL: #define __sparcv8 1 -+ -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target sparcv9-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCV9 -+// CHECK_SPARCV9: #define __BIG_ENDIAN__ 1 -+// CHECK_SPARCV9: #define __sparc 1 -+// CHECK_SPARCV9: #define __sparc64__ 1 -+// CHECK_SPARCV9: #define __sparc__ 1 -+// CHECK_SPARCV9: #define __sparc_v9__ 1 -+// CHECK_SPARCV9: #define __sparcv9 1 -+// CHECK_SPARCV9: #define __sparcv9__ 1 -+ -+// RUN: %clang -E -dM %s -o - 2>&1 \ -+// RUN: -target sparcv9-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SPARCV9_GCC_ATOMICS -+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SPARCV9_GCC_ATOMICS: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+ -+// Begin SystemZ/GCC/Linux tests ---------------- -+ -+// RUN: %clang -march=arch8 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH8 -+// RUN: %clang -march=z10 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH8 -+// CHECK_SYSTEMZ_ARCH8: #define __ARCH__ 8 -+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SYSTEMZ_ARCH8: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+// CHECK_SYSTEMZ_ARCH8: #define __LONG_DOUBLE_128__ 1 -+// CHECK_SYSTEMZ_ARCH8: #define __s390__ 1 -+// CHECK_SYSTEMZ_ARCH8: #define __s390x__ 1 -+// CHECK_SYSTEMZ_ARCH8: #define __zarch__ 1 -+ -+// RUN: %clang -march=arch9 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH9 -+// RUN: %clang -march=z196 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH9 -+// CHECK_SYSTEMZ_ARCH9: #define __ARCH__ 9 -+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SYSTEMZ_ARCH9: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+// CHECK_SYSTEMZ_ARCH9: #define __LONG_DOUBLE_128__ 1 -+// CHECK_SYSTEMZ_ARCH9: #define __s390__ 1 -+// CHECK_SYSTEMZ_ARCH9: #define __s390x__ 1 -+// CHECK_SYSTEMZ_ARCH9: #define __zarch__ 1 -+ -+// RUN: %clang -march=arch10 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH10 -+// RUN: %clang -march=zEC12 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH10 -+// CHECK_SYSTEMZ_ARCH10: #define __ARCH__ 10 -+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SYSTEMZ_ARCH10: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+// CHECK_SYSTEMZ_ARCH10: #define __HTM__ 1 -+// CHECK_SYSTEMZ_ARCH10: #define __LONG_DOUBLE_128__ 1 -+// CHECK_SYSTEMZ_ARCH10: #define __s390__ 1 -+// CHECK_SYSTEMZ_ARCH10: #define __s390x__ 1 -+// CHECK_SYSTEMZ_ARCH10: #define __zarch__ 1 -+ -+// RUN: %clang -march=arch11 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH11 -+// RUN: %clang -march=z13 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH11 -+// CHECK_SYSTEMZ_ARCH11: #define __ARCH__ 11 -+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SYSTEMZ_ARCH11: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+// CHECK_SYSTEMZ_ARCH11: #define __HTM__ 1 -+// CHECK_SYSTEMZ_ARCH11: #define __LONG_DOUBLE_128__ 1 -+// CHECK_SYSTEMZ_ARCH11: #define __VX__ 1 -+// CHECK_SYSTEMZ_ARCH11: #define __s390__ 1 -+// CHECK_SYSTEMZ_ARCH11: #define __s390x__ 1 -+// CHECK_SYSTEMZ_ARCH11: #define __zarch__ 1 -+ -+// RUN: %clang -march=arch12 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH12 -+// RUN: %clang -march=z14 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH12 -+// CHECK_SYSTEMZ_ARCH12: #define __ARCH__ 12 -+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SYSTEMZ_ARCH12: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+// CHECK_SYSTEMZ_ARCH12: #define __HTM__ 1 -+// CHECK_SYSTEMZ_ARCH12: #define __LONG_DOUBLE_128__ 1 -+// CHECK_SYSTEMZ_ARCH12: #define __VX__ 1 -+// CHECK_SYSTEMZ_ARCH12: #define __s390__ 1 -+// CHECK_SYSTEMZ_ARCH12: #define __s390x__ 1 -+// CHECK_SYSTEMZ_ARCH12: #define __zarch__ 1 -+ -+// RUN: %clang -march=arch13 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH13 -+// RUN: %clang -march=z15 -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ARCH13 -+// CHECK_SYSTEMZ_ARCH13: #define __ARCH__ 13 -+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1 -+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1 -+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1 -+// CHECK_SYSTEMZ_ARCH13: #define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1 -+// CHECK_SYSTEMZ_ARCH13: #define __HTM__ 1 -+// CHECK_SYSTEMZ_ARCH13: #define __LONG_DOUBLE_128__ 1 -+// CHECK_SYSTEMZ_ARCH13: #define __VX__ 1 -+// CHECK_SYSTEMZ_ARCH13: #define __s390__ 1 -+// CHECK_SYSTEMZ_ARCH13: #define __s390x__ 1 -+// CHECK_SYSTEMZ_ARCH13: #define __zarch__ 1 -+ -+// RUN: %clang -mhtm -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_HTM -+// CHECK_SYSTEMZ_HTM: #define __HTM__ 1 -+ -+// RUN: %clang -mvx -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_VX -+// CHECK_SYSTEMZ_VX: #define __VX__ 1 -+ -+// RUN: %clang -fzvector -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR -+// RUN: %clang -mzvector -E -dM %s -o - 2>&1 \ -+// RUN: -target s390x-unknown-linux \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_SYSTEMZ_ZVECTOR -+// CHECK_SYSTEMZ_ZVECTOR: #define __VEC__ 10303 -+ -+// Begin amdgcn tests ---------------- -+ -+// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \ -+// RUN: -target amdgcn-unknown-unknown \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_AMDGCN -+// CHECK_AMDGCN: #define __AMDGCN__ 1 -+// CHECK_AMDGCN: #define __HAS_FMAF__ 1 -+// CHECK_AMDGCN: #define __HAS_FP64__ 1 -+// CHECK_AMDGCN: #define __HAS_LDEXPF__ 1 -+ -+// Begin r600 tests ---------------- -+ -+// RUN: %clang -march=amdgcn -E -dM %s -o - 2>&1 \ -+// RUN: -target r600-unknown-unknown \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_R600 -+// CHECK_R600: #define __R600__ 1 -+// CHECK_R600-NOT: #define __HAS_FMAF__ 1 -+ -+// RUN: %clang -march=amdgcn -mcpu=cypress -E -dM %s -o - 2>&1 \ -+// RUN: -target r600-unknown-unknown \ -+// RUN: | FileCheck -match-full-lines %s -check-prefix=CHECK_R600_FP64 -+// CHECK_R600_FP64-DAG: #define __R600__ 1 -+// CHECK_R600_FP64-DAG: #define __HAS_FMAF__ 1 diff --git a/debian/patches/sparc/sparc-D98575-compiler-rt.patch b/debian/patches/sparc/sparc-D98575-compiler-rt.patch deleted file mode 100644 index f794a107..00000000 --- a/debian/patches/sparc/sparc-D98575-compiler-rt.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- llvm-toolchain-12-12.0.1~+rc1.orig/compiler-rt/cmake/base-config-ix.cmake -+++ llvm-toolchain-12-12.0.1~+rc1/compiler-rt/cmake/base-config-ix.cmake -@@ -189,8 +189,12 @@ macro(test_targets) - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "s390x") - test_target_arch(s390x "" "") - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "sparc") -- test_target_arch(sparc "" "-m32") -- test_target_arch(sparcv9 "" "-m64") -+ if (CMAKE_SIZEOF_VOID_P EQUAL 4) -+ test_target_arch(sparc "" "-mcpu=v9" "-m32") -+ append("-latomic" CMAKE_LD_FLAGS) -+ else() -+ test_target_arch(sparcv9 "" "-m64") -+ endif() - elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mipsel|mips64el") - # Gcc doesn't accept -m32/-m64 so we do the next best thing and use - # -mips32r2/-mips64r2. We don't use -mips1/-mips3 because we want to match diff --git a/debian/patches/symbolizer-path.diff b/debian/patches/symbolizer-path.diff index fab32bb2..d94593d3 100644 --- a/debian/patches/symbolizer-path.diff +++ b/debian/patches/symbolizer-path.diff @@ -1,19 +1,20 @@ -Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp =================================================================== ---- llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp -+++ llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp -@@ -25,6 +25,10 @@ - #include "sanitizer_symbolizer_internal.h" - #include "sanitizer_symbolizer_libbacktrace.h" - #include "sanitizer_symbolizer_mac.h" +--- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp ++++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cpp +@@ -33,6 +33,11 @@ + # include "sanitizer_symbolizer_libbacktrace.h" + # include "sanitizer_symbolizer_mac.h" + +#include "llvm/Config/llvm-config.h" // for LLVM_VERSION_MAJOR + +#define TOSTR2(X) #X +#define TOSTR(X) TOSTR2(X) - - #include // for dlsym() - #include -@@ -452,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym ++ + // C++ demangling function, as required by Itanium C++ ABI. This is weak, + // because we do not require a C++ ABI library to be linked to a program + // using sanitizers; if it's not present, we'll just use the mangled name. +@@ -451,7 +456,7 @@ static SymbolizerTool *ChooseExternalSym return new(*allocator) AtosSymbolizer(found_path, allocator); } #endif // SANITIZER_APPLE @@ -22,11 +23,11 @@ Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/ VReport(2, "Using llvm-symbolizer found at: %s\n", found_path); return new(*allocator) LLVMSymbolizer(found_path, allocator); } -Index: llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220525112612+8919447c71ab/compiler-rt/lib/sanitizer_common/CMakeLists.txt -@@ -202,6 +202,7 @@ set(SANITIZER_IMPL_HEADERS +--- llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a.orig/compiler-rt/lib/sanitizer_common/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230429100906+81b1f4746f8a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +@@ -203,6 +203,7 @@ set(SANITIZER_IMPL_HEADERS ) include_directories(..) diff --git a/debian/patches/test-keep-alive.diff b/debian/patches/test-keep-alive.diff index a1074816..ff20daa4 100644 --- a/debian/patches/test-keep-alive.diff +++ b/debian/patches/test-keep-alive.diff @@ -1,20 +1,20 @@ -Index: llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/ProgressBar.py +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/ProgressBar.py =================================================================== ---- llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487.orig/llvm/utils/lit/lit/ProgressBar.py -+++ llvm-toolchain-snapshot_15~++20220407011631+46f0e2ceb487/llvm/utils/lit/lit/ProgressBar.py -@@ -189,15 +189,7 @@ class SimpleProgressBar: +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/llvm/utils/lit/lit/ProgressBar.py ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/llvm/utils/lit/lit/ProgressBar.py +@@ -203,15 +203,7 @@ class SimpleProgressBar: return for i in range(self.atIndex, next): - idx = i % 5 - if idx == 0: -- sys.stdout.write('%2d' % (i*2)) +- sys.stdout.write("%2d" % (i * 2)) - elif idx == 1: -- pass # Skip second char +- pass # Skip second char - elif idx < 4: -- sys.stdout.write('.') +- sys.stdout.write(".") - else: -- sys.stdout.write(' ') +- sys.stdout.write(" ") + sys.stdout.write('%-2d ' % (i*2)) sys.stdout.flush() self.atIndex = next diff --git a/debian/patches/ubuntu-groovy.diff b/debian/patches/ubuntu-groovy.diff deleted file mode 100644 index 800a70a8..00000000 --- a/debian/patches/ubuntu-groovy.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- a/clang/include/clang/Driver/Distro.h -+++ b/clang/include/clang/Driver/Distro.h -@@ -67,6 +67,7 @@ public: - UbuntuDisco, - UbuntuEoan, - UbuntuFocal, -+ UbuntuGroovy, - UnknownDistro - }; - -@@ -120,7 +121,7 @@ public: - } - - bool IsUbuntu() const { -- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuFocal; -+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuGroovy; - } - - bool IsAlpineLinux() const { ---- a/clang/lib/Driver/Distro.cpp -+++ b/clang/lib/Driver/Distro.cpp -@@ -70,6 +70,7 @@ static Distro::DistroType DetectDistro(l - .Case("disco", Distro::UbuntuDisco) - .Case("eoan", Distro::UbuntuEoan) - .Case("focal", Distro::UbuntuFocal) -+ .Case("groovy", Distro::UbuntuGroovy) - .Default(Distro::UnknownDistro); - if (Version != Distro::UnknownDistro) - return Version; diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch index 8b2bec1c..60d21fe7 100644 --- a/debian/patches/ubuntu-releases.patch +++ b/debian/patches/ubuntu-releases.patch @@ -1,38 +1,88 @@ -Description: Update the list of Ubuntu release names -Forwarded: no -Author: Graham Inggs -Last-Update: 2023-04-29 +From 6266b964202336a02f40007928719e060bc81694 Mon Sep 17 00:00:00 2001 +From: Graham Inggs +Date: Wed, 1 Nov 2023 20:59:53 +0100 +Subject: [PATCH] Add support of the next Ubuntu (Ubuntu 24.04 - Noble Numbat) -Index: llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h -=================================================================== ---- llvm-toolchain-16-16.0.5.orig/clang/include/clang/Driver/Distro.h -+++ llvm-toolchain-16-16.0.5/clang/include/clang/Driver/Distro.h -@@ -77,6 +77,7 @@ - UbuntuJammy, +Co-authored-by: Sylvestre Ledru +--- + clang/include/clang/Driver/Distro.h | 3 ++- + clang/lib/Driver/Distro.cpp | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h +index 8291f6575a7114..a8de94163e8b0b 100644 +--- a/clang/include/clang/Driver/Distro.h ++++ b/clang/include/clang/Driver/Distro.h +@@ -78,6 +78,7 @@ class Distro { UbuntuKinetic, UbuntuLunar, -+ UbuntuMantic, + UbuntuMantic, ++ UbuntuNoble, UnknownDistro }; -@@ -128,7 +129,7 @@ +@@ -129,7 +130,7 @@ class Distro { } bool IsUbuntu() const { -- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuLunar; -+ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic; +- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic; ++ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble; } bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } -Index: llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp -=================================================================== ---- llvm-toolchain-16-16.0.5.orig/clang/lib/Driver/Distro.cpp -+++ llvm-toolchain-16-16.0.5/clang/lib/Driver/Distro.cpp -@@ -93,6 +93,7 @@ - .Case("jammy", Distro::UbuntuJammy) +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index 005c31bd38893c..36f828f8cae26d 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -94,6 +94,7 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { .Case("kinetic", Distro::UbuntuKinetic) .Case("lunar", Distro::UbuntuLunar) -+ .Case("mantic", Distro::UbuntuMantic) + .Case("mantic", Distro::UbuntuMantic) ++ .Case("noble", Distro::UbuntuNoble) + .Default(Distro::UnknownDistro); + return Version; + } +From 90bd7234e36e5b3d63155f481b739ea463985631 Mon Sep 17 00:00:00 2001 +From: Sylvestre Ledru +Date: Thu, 2 May 2024 22:54:08 +0200 +Subject: [PATCH] Add support of the next Ubuntu (Ubuntu 24.10 - Oracular + Oriol) + +--- + clang/include/clang/Driver/Distro.h | 3 ++- + clang/lib/Driver/Distro.cpp | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clang/include/clang/Driver/Distro.h b/clang/include/clang/Driver/Distro.h +index a8de94163e8b0b..1404e168684821 100644 +--- a/clang/include/clang/Driver/Distro.h ++++ b/clang/include/clang/Driver/Distro.h +@@ -79,6 +79,7 @@ class Distro { + UbuntuLunar, + UbuntuMantic, + UbuntuNoble, ++ UbuntuOracular, + UnknownDistro + }; + +@@ -130,7 +131,7 @@ class Distro { + } + + bool IsUbuntu() const { +- return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble; ++ return DistroVal >= UbuntuHardy && DistroVal <= UbuntuOracular; + } + + bool IsAlpineLinux() const { return DistroVal == AlpineLinux; } +diff --git a/clang/lib/Driver/Distro.cpp b/clang/lib/Driver/Distro.cpp +index a7e7f169dc1419..6f49e641104ccd 100644 +--- a/clang/lib/Driver/Distro.cpp ++++ b/clang/lib/Driver/Distro.cpp +@@ -95,6 +95,7 @@ static Distro::DistroType DetectLsbRelease(llvm::vfs::FileSystem &VFS) { + .Case("lunar", Distro::UbuntuLunar) + .Case("mantic", Distro::UbuntuMantic) + .Case("noble", Distro::UbuntuNoble) ++ .Case("oracular", Distro::UbuntuOracular) .Default(Distro::UnknownDistro); return Version; } diff --git a/debian/patches/unbreak-atomic-mips.diff b/debian/patches/unbreak-atomic-mips.diff index ddfb25fc..9b251453 100644 --- a/debian/patches/unbreak-atomic-mips.diff +++ b/debian/patches/unbreak-atomic-mips.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt -+++ llvm-toolchain-snapshot_15~++20220724113059+7feab85df8e8/compiler-rt/lib/scudo/standalone/CMakeLists.txt -@@ -145,6 +145,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH +--- llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d.orig/compiler-rt/lib/scudo/standalone/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230517015648+0b6264738f3d/compiler-rt/lib/scudo/standalone/CMakeLists.txt +@@ -178,6 +178,13 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCH list(APPEND SCUDO_LINK_LIBS atomic) endif() diff --git a/debian/patches/unwind-force-pthread-dl.diff b/debian/patches/unwind-force-pthread-dl.diff index d389bca4..08111df4 100644 --- a/debian/patches/unwind-force-pthread-dl.diff +++ b/debian/patches/unwind-force-pthread-dl.diff @@ -1,8 +1,8 @@ -Index: llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt +Index: llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt =================================================================== ---- llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee.orig/libunwind/CMakeLists.txt -+++ llvm-toolchain-snapshot_16~++20221201113805+5e50b8089aee/libunwind/CMakeLists.txt -@@ -308,14 +308,17 @@ if (MSVC) +--- llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79.orig/libunwind/CMakeLists.txt ++++ llvm-toolchain-snapshot_17~++20230523093327+96a003b9bf79/libunwind/CMakeLists.txt +@@ -277,14 +277,17 @@ if (MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() diff --git a/debian/patches/wasm/wasm-sysroot-usr.diff b/debian/patches/wasm/wasm-sysroot-usr.diff index 6587c1bd..b3bbf565 100644 --- a/debian/patches/wasm/wasm-sysroot-usr.diff +++ b/debian/patches/wasm/wasm-sysroot-usr.diff @@ -1,5 +1,7 @@ ---- a/clang/lib/Driver/ToolChains/WebAssembly.cpp -+++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp +Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp +=================================================================== +--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.cpp ++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.cpp @@ -174,7 +174,7 @@ WebAssembly::WebAssembly(const Driver &D getProgramPaths().push_back(getDriver().getInstalledDir()); @@ -17,7 +19,9 @@ if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) { SmallString<128> P(D.ResourceDir); -@@ -427,10 +428,18 @@ void WebAssembly::AddClangSystemIncludeA +@@ -425,12 +426,20 @@ void WebAssembly::AddClangSystemIncludeA + return; + } + // add the multiarch path on e.g. wasm32-wasi if (getTriple().getOS() != llvm::Triple::UnknownOS) { @@ -39,7 +43,7 @@ } void WebAssembly::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs, -@@ -478,6 +479,17 @@ Tool *WebAssembly::buildLinker() const { +@@ -478,6 +487,17 @@ Tool *WebAssembly::buildLinker() const { return new tools::wasm::Linker(*this); } @@ -57,18 +61,37 @@ void WebAssembly::addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, llvm::opt::ArgStringList &CC1Args) const { -@@ -499,7 +519,9 @@ void WebAssembly::addLibCxxIncludePaths( +@@ -488,18 +508,22 @@ void WebAssembly::addLibCxxIncludePaths( + getMultiarchTriple(D, getTriple(), SysRoot); + bool IsKnownOs = (getTriple().getOS() != llvm::Triple::UnknownOS); + +- std::string Version = detectLibcxxVersion(LibPath); +- if (Version.empty()) +- return; +- + // First add the per-target include path if the OS is known. + if (IsKnownOs) { +- std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version; +- addSystemInclude(DriverArgs, CC1Args, TargetDir); ++ std::string Version = detectLibcxxVersion(LibPath + "/" + MultiarchTriple); ++ if (!Version.empty()) { ++ std::string TargetDir = LibPath + "/" + MultiarchTriple + "/c++/" + Version; ++ addSystemInclude(DriverArgs, CC1Args, TargetDir); ++ } } // Second add the generic one. - addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version); + // don't include the host architecture's headers in the search path -+ if (!getDriver().SysRoot.empty()) -+ addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version); ++ if (!getDriver().SysRoot.empty()) { ++ std::string Version = detectLibcxxVersion(LibPath); ++ if (!Version.empty()) ++ addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version); ++ } } void WebAssembly::addLibStdCXXIncludePaths( -@@ -546,8 +568,11 @@ void WebAssembly::addLibStdCXXIncludePat +@@ -546,8 +570,11 @@ void WebAssembly::addLibStdCXXIncludePat addSystemInclude(DriverArgs, CC1Args, TargetDir); } @@ -84,8 +107,10 @@ + addSystemInclude(DriverArgs, CC1Args, LibPath + "/c++/" + Version + "/backward"); + } } ---- a/clang/lib/Driver/ToolChains/WebAssembly.h -+++ b/clang/lib/Driver/ToolChains/WebAssembly.h +Index: llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h +=================================================================== +--- llvm-toolchain-16-16.0.6.orig/clang/lib/Driver/ToolChains/WebAssembly.h ++++ llvm-toolchain-16-16.0.6/clang/lib/Driver/ToolChains/WebAssembly.h @@ -89,6 +89,8 @@ private: llvm::opt::ArgStringList &CC1Args) const; void addLibStdCXXIncludePaths(const llvm::opt::ArgList &DriverArgs, diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 189482ad..69dcd4c8 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,10 +1,10 @@ #!/bin/sh -ORIG_VERSION=15 -TARGET_VERSION=16 -ORIG_VERSION_2=15_0 -TARGET_VERSION_2=16_0 -ORIG_VERSION_3=150 -TARGET_VERSION_3=160 +ORIG_VERSION=16 +TARGET_VERSION=17 +ORIG_VERSION_2=16_0 +TARGET_VERSION_2=17_0 +ORIG_VERSION_3=160 +TARGET_VERSION_3=170 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/tests/integration-test-suite-test debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-default-bin.diff` for F in $LIST; do diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 962be053..9d2e4197 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}_all.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 libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${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 python3-clang-${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}_all.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 libclang-cpp${VERSION}_${DETAILED_VERSION}_amd64.deb clang-tidy-${VERSION}_${DETAILED_VERSION}_amd64.deb libclang-cpp${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclc-${VERSION}_${DETAILED_VERSION}_all.deb libclc-${VERSION}-dev_${DETAILED_VERSION}_all.deb llvm-${VERSION}-linker-tools_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}_${DETAILED_VERSION}_amd64.deb libunwind-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}_${DETAILED_VERSION}_amd64.deb libmlir-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb libclang-rt-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libclang-rt-${VERSION}-dev-wasm64_${DETAILED_VERSION}_all.deb libc++abi-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libc++-${VERSION}-dev-wasm32_${DETAILED_VERSION}_all.deb libpolly-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb bolt-${VERSION}_${DETAILED_VERSION}_amd64.deb libbolt-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb flang-${VERSION}_${DETAILED_VERSION}_amd64.deb libflang-${VERSION}-dev_${DETAILED_VERSION}_amd64.deb" echo "To install everything:" echo "sudo apt --purge remove 'libomp5-*' 'libc++*dev' 'libc++*' 'python3-lldb-*' 'libunwind-*' 'libclc-*' 'libclc-*dev' 'libmlir-*'" @@ -1376,6 +1376,7 @@ 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 +#include using namespace clang; @@ -1389,8 +1390,9 @@ int main() { llvm::Module* m; BackendAction* action; std::unique_ptr AsmOutStream; + IntrusiveRefCntPtr VFS; - EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, std::move(AsmOutStream)); + EmitBackendOutput(*diags, *hsOpts, *cgOpts, *tOpts, *lOpts, *tDesc, m, *action, VFS, 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 -lPollyISL @@ -1653,7 +1655,8 @@ fi echo "if it fails, please run" echo "apt-get install libc6-dev:i386 libgcc-5-dev:i386 libc6-dev-x32 libx32gcc-5-dev libx32gcc-9-dev" for SYSTEM in ""; do - for MARCH in -m64 -m32 -mx32 "-m32 -march=i686"; do + # add "-m32 -march=i686" -m32 -mx32 to test multiarch with i386 + for MARCH in -m64; do for LIB in --rtlib=compiler-rt -fsanitize=address -fsanitize=thread -fsanitize=memory -fsanitize=undefined -fsanitize=dataflow; do # -fsanitize=efficiency-working-set; do if test "$MARCH" == "-m32" -o "$MARCH" == "-mx32"; then if test $LIB == "-fsanitize=thread" -o $LIB == "-fsanitize=memory" -o $LIB == "-fsanitize=dataflow" -o $LIB == "-fsanitize=address" -o $LIB == "-fsanitize=undefined"; then diff --git a/debian/rules b/debian/rules index 6cb1ab63..8b11e427 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,6 @@ # polly & lldb aren't enabled for every platform PROJECTS = clang;clang-tools-extra;lld;cross-project-tests;mlir # openmp & libunwind aren't enabled for every platform -RUNTIMES = compiler-rt;libcxx;libcxxabi TARGET_BUILD := build-llvm TARGET_BUILD_STAGE2 := $(TARGET_BUILD)/tools/clang/stage2-bins @@ -13,12 +12,24 @@ GXX_VERSIONED_PACKAGE := $(shell dpkg-query -W -f '$${Depends}' g++ | grep -o GXX_VERSIONED_EXECUTABLE := $(shell dpkg -L $(GXX_VERSIONED_PACKAGE) | grep '/usr/bin/g++-[0-9][0-9.]*' | xargs ls -d | tail -n1 ) GCC_VERSION := $(subst /usr/bin/g++-,,$(GXX_VERSIONED_EXECUTABLE)) +LLVM_EPOCH := 1: LLVM_VERSION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9]+).*,\1,p") LLVM_VERSION_FULL := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\1,p") LLVM_VERSION_SNAPSHOT := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:(.*),\1,p") ifeq ($(LLVM_VERSION),$(LLVM_VERSION_FULL)) LLVM_VERSION_FULL := $(LLVM_VERSION).0.0 endif +LLVM_VERSION_NEXT := $(shell echo $(LLVM_VERSION_FULL) | awk -F. '{ OFS="."; $$NF+=1; print}') + +# dpkg-buildflags support +# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto +export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto +RUNTIMES = compiler-rt;libcxx;libcxxabi + +# dpkg-buildflags support +# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto +export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto +RUNTIMES = compiler-rt;libcxx;libcxxabi SOURCE_NAME := $(shell dpkg-parsechangelog -S Source) ifneq (,$(findstring snapshot,$(SOURCE_NAME))) @@ -27,18 +38,33 @@ else BRANCH_NAME=$(LLVM_VERSION) endif +VENDOR=$(shell lsb_release -is) +DISTRO=$(shell lsb_release -sc) + SONAME_EXT := 1 SONAME_OPENMP := 5 # Manage the case when the version is 3.5~svn213052-1~exp1 or 3.4.2-1 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne "s,^Version: 1:([0-9.]+)(~|-)(.*),\3,p") ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) - NJOBS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NCPUS := $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) else - NJOBS := $(shell nproc) + NCPUS := $(shell nproc) endif -VENDOR=$(shell lsb_release -is) -DISTRO=$(shell lsb_release -sc) +# this contains all packages to be built. Note that for at least the clean target, +# this always includes the binary-indep packages. +packages := $(shell dh_listpackages) + +# flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs +# based on the available memory +ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) + MEM_PER_CPU=4500 +else + MEM_PER_CPU=2100 +endif +NJOBS := $(shell mt=`awk '/^(MemAvail|SwapFree)/ { mt += $$2 } END {print mt}' /proc/meminfo`; \ + awk -vn=$(NCPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \ + 'END { mt/=1024; n2 = int(mt/m); print n==1 || n2<=1 ? 1 : n2<=n ? n2 : n }' < /dev/null) DH_VERSION := $(shell dpkg -s debhelper | grep '^Version' | awk '{print $$2}') @@ -46,13 +72,14 @@ include /usr/share/dpkg/architecture.mk CONFIGURE_EXTRA = -# dpkg-buildflags support -# disable fixfilepath in favor of the llvm-project supplied flavor, disable lto -export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath,-fixdebugpath optimize=-lto # these are handled on a per stage / build basis -export DEB_CFLAGS_MAINT_STRIP = -g -O2 -export DEB_CXXFLAGS_MAINT_STRIP = -g -O2 - +ifeq ($(VENDOR)-$(DEB_HOST_ARCH),Ubuntu-ppc64el) + export DEB_CFLAGS_MAINT_STRIP = -g -O3 + export DEB_CXXFLAGS_MAINT_STRIP = -g -O3 +else + export DEB_CFLAGS_MAINT_STRIP = -g -O2 + export DEB_CXXFLAGS_MAINT_STRIP = -g -O2 +endif include /usr/share/dpkg/buildflags.mk # We use a stage2 build. It means that a first clang is built using gcc, @@ -63,7 +90,13 @@ include /usr/share/dpkg/buildflags.mk # collect additional flags for all stages all builds CFLAGS_EXTRA = -Wno-unused-command-line-argument CXXFLAGS_EXTRA = -Wno-unused-command-line-argument + +ifeq (,$(filter $(DEB_HOST_ARCH), armel)) +LDFLAGS_EXTRA = -Wl,--build-id,--as-needed +else +# fails on armel. we are getting some missing latomic LDFLAGS_EXTRA = -Wl,--build-id +endif # collect all flags for stage 1 toolchain build only STAGE_1_CFLAGS = $(CFLAGS) $(CFLAGS_EXTRA) $(CPPFLAGS) @@ -136,7 +169,8 @@ STAGE_2_CMAKE_EXTRA += -DCLANG_SYSTEMZ_DEFAULT_ARCH=$(ZARCH) # clangd remote index support requires GRPC & protobuf. # Enable if minimum tested versions are available. CLANGD_GRPC_INSTALLED=no -ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libgrpc++-dev) gt 1.30.0; echo $$?),0) +ifeq (,$(filter stage1, $(DEB_BUILD_PROFILES))) +ifeq ($(shell v=$$(dpkg-query -W -f '$${Version}' libgrpc++-dev 2>/dev/null); if [ -z "$$v" ]; then echo 1; else dpkg --compare-versions $$v gt 1.30.0; echo $$?; fi),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler-grpc) gt 1.30.0; echo $$?),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libprotobuf-dev) gt 3.12.0; echo $$?),0) ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' protobuf-compiler) gt 3.12.0; echo $$?),0) @@ -146,13 +180,13 @@ endif endif endif endif +endif export CC=gcc-$(GCC_VERSION) export CXX=g++-$(GCC_VERSION) ifneq (,$(findstring $(DEB_HOST_ARCH),armel)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabi - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON # align arch profile with debian baseline # https://wiki.debian.org/ArmEabiPort CFLAGS_EXTRA += -march=armv5t @@ -168,7 +202,6 @@ endif ifneq (,$(findstring $(DEB_HOST_ARCH),armhf)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=arm-linux-gnueabihf - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON # align arch profile with debian baseline # https://wiki.debian.org/ArmHardFloatPort#Minimum_CPU_.26_FPU CFLAGS_EXTRA += -march=armv7-a -mfpu=vfpv3-d16 @@ -185,11 +218,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) # avoid an issue with search path on mips64el # https://bugs.llvm.org/show_bug.cgi?id=41204 STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=mips64el-linux-gnuabi64 + CFLAGS_EXTRA += -mxgot + CXXFLAGS_EXTRA += -mxgot endif ifneq (,$(filter $(DEB_HOST_ARCH),powerpc)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=powerpc-linux-gnu - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON endif # debug symbols OOM in Ubuntu Ubuntu and slows down build process. @@ -201,19 +235,16 @@ endif ifneq (,$(filter $(DEB_HOST_ARCH),sparc)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc-linux-gnu - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif ifneq (,$(filter $(DEB_HOST_ARCH),sparc64)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=sparc64-linux-gnu - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON STAGE_ALL_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4 endif ifneq (,$(filter $(DEB_HOST_ARCH),s390x)) STAGE_ALL_CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=s390x-linux-gnu - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON LIBCXX_EXCEPTIONS := OFF # disable compiler-rt builtins (not supported for s390x) STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF @@ -222,7 +253,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),s390x)) endif ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_BUILD_BUILTINS=OFF COMPILER_RT_USE_BUILTINS_LIBRARY := OFF LIBCXX_USE_COMPILER_RT := OFF @@ -237,7 +267,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),x32)) endif ifneq (,$(filter $(DEB_HOST_ARCH),hurd-i386)) - STAGE_ALL_CMAKE_EXTRA += -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON endif ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++-$(GCC_VERSION)) ge 4.8-20121128-1~ ; echo $$?),0) @@ -250,28 +279,37 @@ else control_vars = '-Vdep:devlibs=libstdc++6-$(GCC_VERSION)-dev' endif +ifneq (,$(filter stage1, $(DEB_BUILD_PROFILES))) + LLVM_SPIRV_INSTALLED = no +else LLVM_SPIRV_VERSION := $(LLVM_VERSION) LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) ifndef LLVM_SPIRV LLVM_SPIRV_VERSION := $(shell expr $(LLVM_VERSION) - 1) LLVM_SPIRV := $(shell bash -c "command -v llvm-spirv-$(LLVM_SPIRV_VERSION)" 2>/dev/null) endif + +# Disable spirv support for most of the distro versions +# It needs llvm-spirv-17 and it is rarely available +# Be prescritive +SPIRV_DISABLE_DISTRO := bionic buster lunar jammy focal buster bullseye bookworm ifndef LLVM_SPIRV LLVM_SPIRV_INSTALLED = no else - ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' llvm-spirv-$(LLVM_SPIRV_VERSION)) gt 14.0.0 ; echo $$?),0) + ifeq (,$(filter-out $(SPIRV_DISABLE_DISTRO), $(DISTRO))) # Too old llvm-spirv version are failing. See #52200 - LLVM_SPIRV_INSTALLED = yes - else LLVM_SPIRV_INSTALLED = no + else + LLVM_SPIRV_INSTALLED = yes endif endif +endif -LIBCLC_TARGETS_TO_BUILD="amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl" +LIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;amdgcn-mesa-mesa3d;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl LIBCLC_LLVM_SPIRV = ifeq ($(LLVM_SPIRV_INSTALLED),yes) - LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD)";spirv-mesa3d-;spirv64-mesa3d-" - LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)" + LIBCLC_TARGETS_TO_BUILD := $(LIBCLC_TARGETS_TO_BUILD);spirv-mesa3d-;spirv64-mesa3d- + LIBCLC_LLVM_SPIRV = -DLLVM_SPIRV=$(LLVM_SPIRV) endif BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 @@ -282,12 +320,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) endif endif -ifneq (,$(filter bolt-$(LLVM_VERSION), $(shell dh_listpackages))) +ifneq (,$(filter bolt-$(LLVM_VERSION), $(packages))) PROJECTS += ;bolt endif # flang is only for 64bits -ifneq (,$(filter flang-$(LLVM_VERSION), $(shell dh_listpackages))) +ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) PROJECTS += ;flang endif @@ -349,8 +387,8 @@ ifeq (riscv64,$(DEB_HOST_ARCH)) endif endif -# llvm tests timeout, disable it on mipsel -ifeq (mipsel,$(DEB_HOST_ARCH)) +# llvm tests timeout, disable it on mips64el +ifeq (mips64el,$(DEB_HOST_ARCH)) RUN_TEST=no endif @@ -398,9 +436,13 @@ else PROJECTS+=;lldb endif -ifneq (,$(filter $(DISTRO),buster)) +LLDB_PYTHON_DISABLE_DISTRO := bionic buster +LLDB_PYTHON_ENABLE=yes +# Disable zstd on old distro, fails on lld +ifeq (,$(filter-out $(LLDB_PYTHON_DISABLE_DISTRO), $(DISTRO))) # Don't enable lld python for old distros STAGE_ALL_CMAKE_EXTRA += -DLLDB_ENABLE_PYTHON=OFF + LLDB_PYTHON_ENABLE=no endif LIBCXX_WASM_ENABLE=yes @@ -487,7 +529,7 @@ SCCACHE_ENABLE=no SCCACHE_CMAKE = # if sccache is installed in the chroot, use it ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes) - ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) + ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64 s390x)) STAGE_1_CMAKE_EXTRA += $(SCCACHE_CMAKE) SCCACHE_ENABLE=yes SCCACHE_PATH=/opt/sccache/ @@ -497,6 +539,23 @@ ifeq ($(shell test -e /opt/sccache/sccache && echo -n yes),yes) endif endif +COVERITY_ENABLE=0 +ifneq (,$(filter coverity,$(DEB_BUILD_OPTIONS))) +# enable the build using coverity +# pbuilder contains BINDMOUNTS="/opt/cov-analysis/" +# And we have some pbuilder hooks to configure and pack the result +# Where the binaries are installed on the jenkins instance + PRE_PROCESS=PATH=$$PATH:/opt/cov-analysis/bin/ cov-build --dir cov-int +# We don't want to check the temporary files produced by the configure + PRE_PROCESS_CONF= + COVERITY_ENABLE=1 + CONFIGURE_EXTRA += --enable-assertions + STAGE_ALL_CMAKE_EXTRA += -DLLVM_ENABLE_ASSERTIONS=ON + SCCACHE_ENABLE=no +# no need to run tests in this case + RUN_TEST=no +endif + # enables cmake build targets like stage2-[target_name] ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clang-tools;check-lld;check-libcxx;check-libcxxabi;check-mlir;check-sanitizer;llvm-config;test-suite @@ -507,8 +566,9 @@ ENABLED_STAGE2_CMAKE_BUILD_TARGETS = check-all;check-llvm;check-clang;check-clan PROJECTS_LIST := $(shell echo "$(PROJECTS)"|sed -e "s| ||g") RUNTIMES_LIST := $(shell echo "$(RUNTIMES)"|sed -e "s| ||g") -preconfigure: +EXPERIMENTAL_TARGETS="M68k;Xtensa" +stamps/preconfigure: if ! grep -qs '/proc ' /proc/mounts; then \ echo "/proc needs to be mounted"; \ exit 1; \ @@ -518,6 +578,15 @@ preconfigure: echo "llvm spriv isn't detected while it should probably for this distro"; \ fi + @echo "Memory:" + @if [ -e /proc/meminfo ]; then \ + cat /proc/meminfo | grep -E '(Mem|Swap)Free|Cached'; \ + else \ + echo " No memory info available"; \ + fi + @echo "Processors: $$(cat /proc/cpuinfo | grep --count '^processor')" + @echo "Used Processors: $(NJOBS) (out of $(NCPUS)), $(MEM_PER_CPU)kb/processor" + @echo "DEB_BUILD_OPTIONS=$(DEB_BUILD_OPTIONS)" @echo "DEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)" @echo "DEB_HOST_GNU_TYPE=$(DEB_HOST_GNU_TYPE)" @@ -536,11 +605,14 @@ preconfigure: @echo "RUNTIMES_CXXFLAGS=$(RUNTIMES_CXXFLAGS)" @echo "STAGE_1_CXXFLAGS=$(STAGE_1_CXXFLAGS)" @echo "STAGE_2_CFLAGS=$(STAGE_2_CFLAGS)" + @echo "LDFLAGS_EXTRA=$(LDFLAGS_EXTRA)" @echo "LIBFUZZER_ENABLE=$(LIBFUZZER_ENABLE)" @echo "LTO_ENABLE=$(LTO_ENABLE)" @echo "COMPILER_RT_WASM_ENABLE=$(COMPILER_RT_WASM_ENABLE)" @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" @echo "SCCACHE_ENABLE=$(SCCACHE_ENABLE)" + @echo "LLVM_SPIRV=$(LLVM_SPIRV)" + @echo "LLVM_SPIRV_INSTALLED=$(LLVM_SPIRV_INSTALLED)" for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ @@ -548,7 +620,9 @@ preconfigure: sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ -e "s|@BRANCH_NAME@|$(BRANCH_NAME)|g" \ -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \ + -e "s|@LLVM_EPOCH@|$(LLVM_EPOCH)|g" \ -e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \ + -e "s|@LLVM_VERSION_NEXT@|$(LLVM_VERSION_NEXT)|g" \ -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \ done @@ -559,23 +633,37 @@ preconfigure: debian/libclang-rt-$(LLVM_VERSION)-dev.install \ debian/libpolly-$(LLVM_VERSION)-dev.install \ debian/libomp-$(LLVM_VERSION)-dev.install \ - debian/libomp5-$(LLVM_VERSION).install \ + debian/libomp5-$(LLVM_VERSION)t64.install \ debian/llvm-$(LLVM_VERSION)-dev.install \ debian/llvm-$(LLVM_VERSION)-linker-tools.install \ debian/llvm-$(LLVM_VERSION)-linker-tools.links \ debian/libbolt-$(LLVM_VERSION)-dev.install -ifdef LLVM_SPIRV + # workaround the breaks/replaces/conflicts introduced with the libc++ move + # we update the version to make it work with apt.llvm.org + # Yeah, this is ugly but I don't know how to do better + if test "$(LLVM_VERSION)" = "17"; then \ + sed -i -e "s|(<< 1:17.0.6-2)|(<< 1:17.0.6~++20231206041259)|g" debian/control; \ + fi + # llvm-spirv was found, so we can enable *.spv files. Debian # buster and Ubuntu 18.04 don't have llvm-spirv to create the # *.spv files. - sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install -endif + if test "$(LLVM_SPIRV_INSTALLED)" = "yes"; then \ + sed -i -e "s|#spv\ ||g" debian/libclc-$(LLVM_VERSION).install; \ + fi # disable libc++-X.Y-dev-wasm32.install.in on old distro if test "$(LIBCXX_WASM_ENABLE)" = "no"; then \ echo "" > debian/libc++-$(LLVM_VERSION)-dev-wasm32.install; \ echo "" > debian/libc++abi-$(LLVM_VERSION)-dev-wasm32.install; \ + else \ + if ! dpkg -l|grep -q wasi-libc; then \ + echo "Could not find wasi-libc on the system"; \ + echo "Please check that the package is available on the system"; \ + echo "it might be that the 'hello' package is installed by another constraint"; \ + exit 1; \ + fi; \ fi # Conditionally enable install clangd grpc files @@ -583,12 +671,23 @@ endif sed -i -e "s|#grpc\ ||g" debian/libclang-$(LLVM_VERSION)-dev.install; \ fi + if ! dh_listpackages|grep -q clang-$(LLVM_VERSION); then \ + echo "Could not find clang-$(LLVM_VERSION) in the list of packages"; \ + echo "Refresh debian/control ?"; \ + echo "Package list:"; \ + dh_listpackages; \ + exit 1; \ + fi + @mkdir -p stamps + touch $@ + # Override this two targets. They are trying to manage the .in conversion for me override_dh_ocamlinit: override_dh_ocamlclean: override_dh_ocaml: -override_dh_auto_configure: preconfigure +override_dh_auto_configure: stamps/configure +stamps/configure: stamps/preconfigure ifeq (${SCCACHE_ENABLE},yes) ls -al $(SCCACHE_PATH)* endif @@ -634,8 +733,13 @@ endif ifeq (${SCCACHE_ENABLE},yes) # Just in case... $(SCCACHE_CMD) --stop-server||true +ifneq (,$(filter $(DEB_HOST_ARCH),i386 amd64)) # Start the sccache server with the right set of options to use GCP SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_GCS_KEY_PATH=$(SCCACHE_PATH)/secret-gcp-storage.json SCCACHE_GCS_BUCKET=apt-llvm-org-sccache SCCACHE_GCS_RW_MODE=READ_WRITE $(SCCACHE_CMD) --start-server +else +# on s390x machine, use a local cache + SCCACHE_CACHE_SIZE=20G SCCACHE_LOG=sccache=debug SCCACHE_ERROR_LOG=$(SCCACHE_PATH)/sccache.log SCCACHE_DIR=/opt/sccache/cache/ SCCACHE_DIRECT=true SCCACHE_CACHE_SIZE="20G" $(SCCACHE_CMD) --start-server +endif endif echo "Running tests: $(RUN_TEST)" echo "Using cmake: $(CMAKE_BIN)"; \ @@ -662,7 +766,7 @@ endif -DLLVM_INCLUDE_GO_TESTS=OFF \ -DLLVM_USE_RELATIVE_PATHS_IN_FILES=ON \ -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ - -DLLVM_ENABLE_CURL=ON \ + -DLLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \ -DLLVM_USE_RELATIVE_PATHS_IN_DEBUG_INFO=ON \ -DCLANG_PLUGIN_SUPPORT=OFF \ -DCLANG_BUILD_EXAMPLES=OFF \ @@ -672,6 +776,7 @@ endif -DCOMPILER_RT_INCLUDE_TESTS=OFF \ -DCOMPILER_RT_USE_LIBCXX=OFF \ -DCOMPILER_RT_USE_BUILTINS_LIBRARY=$(COMPILER_RT_USE_BUILTINS_LIBRARY) \ + -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \ -DLIBUNWIND_USE_COMPILER_RT=ON \ -DLIBUNWIND_INSTALL_LIBRARY=OFF \ -DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ @@ -688,12 +793,13 @@ endif -DLIBOMP_ENABLE_RTTI=OFF \ -DLIBOMP_OMPT_SUPPORT=OFF \ -DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=ON \ + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=$(EXPERIMENTAL_TARGETS) \ $(CMAKE_EXTRA) \ -DBUILTINS_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ -DRUNTIMES_CMAKE_ARGS="-DCMAKE_C_FLAGS=$(STAGE_1_CFLAGS);-DCMAKE_CXX_FLAGS=$(STAGE_1_CXXFLAGS);-DCMAKE_EXE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_SHARED_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_MODULE_LINKER_FLAGS=$(STAGE_1_LDFLAGS);-DCMAKE_BUILD_TYPE=Release;-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF" \ -DCLANG_ENABLE_BOOTSTRAP=ON \ -DCLANG_BOOTSTRAP_TARGETS="$(ENABLED_STAGE2_CMAKE_BUILD_TARGETS)" \ - -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION" \ + -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_SUPPRESS_REGENERATION;ENABLE_LINKER_BUILD_ID;LLVM_ENABLE_PIC;LLVM_ENABLE_RTTI;LLVM_INCLUDE_GO_TESTS;LLVM_USE_RELATIVE_PATHS_IN_FILES;CLANG_DEFAULT_LINKER;CLANG_DEFAULT_CXX_STDLIB;CLANG_DEFAULT_RTLIB;COMPILER_RT_USE_LIBCXX;COMPILER_RT_USE_BUILTINS_LIBRARY;COMPILER_RT_DEFAULT_TARGET_ONLY;COMPILER_RT_INCLUDE_TESTS;LIBUNWIND_USE_COMPILER_RT;LIBCXXABI_ENABLE_EXCEPTIONS;LIBCXXABI_USE_COMPILER_RT;LIBCXX_USE_COMPILER_RT;LIBCXX_ENABLE_EXCEPTIONS;LIBCXX_ENABLE_STATIC_ABI_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY;LIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY;LIBOMP_ENABLE_RTTI;LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN;CLANG_FORCE_MATCHING_LIBCLANG_SOVERSION;CMAKE_C_COMPILER_LAUNCHER;CMAKE_CXX_COMPILER_LAUNCHER" \ -DBOOTSTRAP_CMAKE_BUILD_TYPE=RelWithDebInfo \ -DBOOTSTRAP_CMAKE_C_FLAGS_RELWITHDEBINFO="$(opt_flags)" \ -DBOOTSTRAP_CMAKE_CXX_FLAGS_RELWITHDEBINFO="$(opt_flags)" \ @@ -712,9 +818,9 @@ endif -DBOOTSTRAP_LLVM_INSTALL_UTILS=ON \ -DBOOTSTRAP_LLVM_VERSION_SUFFIX= \ -DBOOTSTRAP_LLVM_POLLY_LINK_INTO_TOOLS=ON \ - -DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD="M68k;Xtensa" \ + -DBOOTSTRAP_LLVM_EXPERIMENTAL_TARGETS_TO_BUILD=$(EXPERIMENTAL_TARGETS) \ -DBOOTSTRAP_LLVM_LINK_LLVM_DYLIB=ON \ - -DBOOTSTRAP_LLVM_ENABLE_CURL=ON \ + -DBOOTSTRAP_LLVM_ENABLE_CURL=$(if $(filter stage1, $(DEB_BUILD_PROFILES)),OFF,ON) \ -DBOOTSTRAP_CLANG_LINK_CLANG_DYLIB=ON \ -DBOOTSTRAP_LIBCLANG_LIBRARY_VERSION=$(SONAME_EXT) \ -DBOOTSTRAP_LIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON \ @@ -728,10 +834,12 @@ endif echo "mismatch of version. Found: $$FOUND_VERSION / Expected: $(LLVM_VERSION_FULL)"; \ exit 1; \ fi + @mkdir -p stamps + touch $@ VERBOSE=-v -debian-full-build: +stamps/debian-full-build: echo "Using cmake: $(CMAKE_BIN)" # linker hack so stage2 can link against stage1 libs at runtime LD_LIBRARY_PATH=$(STAGE_1_LIB_DIR):$$LD_LIBRARY_PATH \ @@ -754,7 +862,7 @@ debian-full-build: fi touch $@ -debian-libfuzzer-build: +stamps/debian-libfuzzer-build: ifeq (${LIBFUZZER_ENABLE},yes) cd $(TARGET_BUILD); \ CFLAGS="$(opt_flags) $(STAGE_2_CFLAGS)"; \ @@ -766,7 +874,9 @@ ifeq (${LIBFUZZER_ENABLE},yes) endif touch $@ -debian-libclc-build: +stamps/debian-libclc-build: +# workaround missing files on i386 + cd $(TARGET_BUILD_STAGE2) && ninja opt llvm-link llvm-as # Builds libclc mkdir -p libclc/build echo "Using cmake: $(CMAKE_BIN)" @@ -786,7 +896,7 @@ debian-libclc-build: -DCMAKE_INSTALL_INCLUDEDIR=include \ -DLLVM_CMAKE_DIR=$(STAGE_2_BIN_DIR)/../ \ $(LIBCLC_LLVM_SPIRV) \ - -DLIBCLC_TARGETS_TO_BUILD=$(LIBCLC_TARGETS_TO_BUILD); \ + -DLIBCLC_TARGETS_TO_BUILD="$(LIBCLC_TARGETS_TO_BUILD)"; \ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(STAGE_2_LIB_DIR) ninja -j $(NJOBS) $(VERBOSE) ifndef LLVM_SPIRV echo "libclc built without SPIRV (.spv) outputs because llvm-spirv wasn't found" @@ -794,8 +904,8 @@ endif touch $@ # Remove some new flags introduced by dpkg 1.22.0; -STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g") -STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g") +STAGE_2_WASM_CFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CFLAGS)) +STAGE_2_WASM_CXXFLAGS := $(filter-out -march=% -mfpu=% -fcf-protection% -mbranch-protection%, $(STAGE_2_CXXFLAGS)) build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: @@ -914,13 +1024,13 @@ endif # Build compiler-rt for wasm32 and wasm64. Build libcxx only for wasm32, as # libcxx requires wasi-libc, which only exists for wasm32 right now. -debian-wasm-build: \ +stamps/debian-wasm-build: \ build-wasm/compiler-rt-wasm32 \ build-wasm/libcxx-wasm32-wasi \ build-wasm/compiler-rt-wasm64 touch $@ -sccache-stats: +stamps/sccache-stats: # If we used sccache, shows stats if test -f $(SCCACHE_CMD); then \ ls -al $(SCCACHE_PATH)/; \ @@ -931,16 +1041,16 @@ sccache-stats: touch $@ override_dh_auto_build: \ - debian-full-build \ - debian-libfuzzer-build \ - debian-libclc-build \ - debian-wasm-build \ - sccache-stats + stamps/debian-full-build \ + stamps/debian-libfuzzer-build \ + $(if $(filter libclc-%, $(packages)),stamps/debian-libclc-build) \ + $(if $(filter %-wasm32 %-wasm64, $(packages)),stamps/debian-wasm-build) \ + stamps/sccache-stats -override_dh_prep: build_doc +override_dh_prep: stamps/build_doc dh_prep -build_doc: +stamps/build_doc: BUILDDIR="_build"; \ ALLSPHINXOPTS="-d $$BUILDDIR/doctrees ."; \ cd $(CURDIR)/llvm/docs && \ @@ -992,7 +1102,7 @@ endif echo "Generating manpage of $$f"; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \ done - # Create the following directory regardless as libomp-16-doc + # Create the following directory regardless as libomp-XX-doc # is Architecture: all mkdir -p openmp/runtime/doc/doxygen/generated/html/ @@ -1023,7 +1133,7 @@ override_dh_auto_install: # Only run on executable, not script chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` -ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe)) +ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe sparc sparc64)) ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) # To fix custom-library-search-path chrpath -d $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)*/lib/linux/*.so @@ -1085,10 +1195,16 @@ endif # Remove an osx file rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libbolt_rt_instr_osx.a - DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install + if test -d libclc/build; then \ + DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C libclc/build install; \ + fi - DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install - DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install + if test -d build-wasm/compiler-rt-wasm32; then \ + DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm32 install; \ + fi + if test -d build-wasm/compiler-rt-wasm64; then \ + DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/compiler-rt-wasm64 install; \ + fi if test -d build-wasm/libcxx-wasm32-wasi; then \ DESTDIR=$(DEB_INST) ninja $(VERBOSE) -C build-wasm/libcxx-wasm32-wasi install; \ fi @@ -1134,7 +1250,7 @@ endif rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT # Disable CMake's package validation checks for target files that we may remove. - sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake + sed -i '/_IMPORT_CHECK_TARGETS \(Polly\|sancov\|llvm-omp-device-info\|omptarget\|omp\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake # Also disable mlir-* checks in the cmake sed -i '/_IMPORT_CHECK_TARGETS \(mlir-\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake @@ -1142,14 +1258,11 @@ endif sed -i '/_cmake_import_check_files_for_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_.*\/bin\/.*/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|Polly\|MLIR\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake - sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake + sed -i '/_cmake_import_check_files_for_\(mlir\|Polly\|MLIR\|omp\|omptarget\)/ {s|^|#|}' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMExports-*.cmake $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/clang/ClangTargets-*.cmake # 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-*.cmake - # Managed in python*-lldb-X.Y.links.in rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/*-packages/lldb/_lldb.so @@ -1190,23 +1303,29 @@ endif # Disable the python binding for buster. not sure why it regressed # regressed de4364f1ecaa..0745b0c0354a - if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \ + if test "$(DISTRO)" = "buster" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \ touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \ + fi + if test "$(LLDB_PYTHON_ENABLE)" = no; then \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \ fi +# Remove some mlir example + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libMyExtensionCh*.a + # Delete the target build directory to save some space on the build systems # All the files have been installed in $(CURDIR)/debian/tmp/ already rm -rf $(TARGET_BUILD) +# FIXME: why a stamp for dh_override_install ? touch $@ override_dh_makeshlibs: - dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION) - dh_makeshlibs -pliblldb-$(LLVM_VERSION) - dh_makeshlibs -plibllvm$(LLVM_VERSION) - dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION) + dh_makeshlibs -plibclang$(SONAME_EXT)-$(LLVM_VERSION)t64 + dh_makeshlibs -pliblldb-$(LLVM_VERSION)t64 + dh_makeshlibs -plibllvm$(LLVM_VERSION)t64 + dh_makeshlibs -plibomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64 dh_makeshlibs --remaining-packages -V override_dh_shlibdeps: @@ -1227,10 +1346,10 @@ override_dh_strip: find $(TARGET_BUILD) -name '*.o' -o -name '*.a' -type f | xargs -r rm -f ifeq (0, $(strip $(shell dpkg --compare-versions $(DH_VERSION) ge 9.20160114; echo $$?))) : # If we don't have the right version of debhelper, don't run the option - dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION) --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)-dbg' - dh_strip -p libllvm$(LLVM_VERSION) --dbgsym-migration='libllvm$(LLVM_VERSION)-dbg' - dh_strip -p liblldb-$(LLVM_VERSION) --dbgsym-migration='liblldb-$(LLVM_VERSION)-dbg' - dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION) --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)-dbg' + dh_strip -p libclang$(SONAME_EXT)-$(LLVM_VERSION)t64 --dbgsym-migration='libclang$(SONAME_EXT)-$(LLVM_VERSION)t64-dbg' + dh_strip -p libllvm$(LLVM_VERSION)t64 --dbgsym-migration='libllvm$(LLVM_VERSION)t64-dbg' + dh_strip -p liblldb-$(LLVM_VERSION)t64 --dbgsym-migration='liblldb-$(LLVM_VERSION)t64-dbg' + dh_strip -p libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64 --dbgsym-migration='libomp$(SONAME_OPENMP)-$(LLVM_VERSION)t64-dbg' endif # ifeq (${LLD_ENABLE},yes) # PATH=$(CURDIR)/:$$PATH dh_strip -p liblld-$(LLVM_VERSION) --dbg-package=liblld-$(LLVM_VERSION)-dbg @@ -1261,7 +1380,7 @@ endif override_dh_install: ifeq (${POLLY_ENABLE},yes) # only for arch:any builds -ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(shell dh_listpackages))) +ifneq (,$(filter libpolly-$(LLVM_VERSION)-dev, $(packages))) dh_install -p libpolly-$(LLVM_VERSION)-dev usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly # On old Debian & Ubuntu, removing the files is necessary rm -rf debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/polly/*.cmake @@ -1272,7 +1391,7 @@ endif dh_install --fail-missing # Move the libc++ abi files from libc++ to libc++-abi for the wasm32 packages # These packages are arch: all, so only do so when the packages are built -ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(shell dh_listpackages))) +ifneq (,$(filter libc++-$(LLVM_VERSION)-dev-wasm32, $(packages))) mkdir -p $(CURDIR)/debian/libc++abi-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1 if test -f $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h; then \ mv $(CURDIR)/debian/libc++-$(LLVM_VERSION)-dev-wasm32/usr/lib/llvm-$(LLVM_VERSION)/include/wasm32-wasi/c++/v1/__cxxabi_config.h \ @@ -1286,7 +1405,7 @@ endif # So, we remove this directory from the package rm -fr $(CURDIR)/debian/libclang-rt-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION)/lib/wasi/ -repack_a_llvm_ir: +stamps/repack_a_llvm_ir: ifeq (${LTO_ENABLE},yes) # with LTO, .a contains llvm ir instead of native code. So, recompile them NJOBS="$(NJOBS)" P_TO_LLVM="$(CURDIR)" VERSION=$(LLVM_VERSION) bash -v debian/llvm-compile-lto-elf.sh $(CXXFLAGS_EXTRA) @@ -1294,7 +1413,7 @@ endif touch $@ -override_dh_installdeb: repack_a_llvm_ir +override_dh_installdeb: stamps/repack_a_llvm_ir # Managed by the package dh_installdeb -a @@ -1397,7 +1516,7 @@ override_dh_auto_test: endif -override_dh_gencontrol: sccache-stats +override_dh_gencontrol: stamps/sccache-stats dh_gencontrol -- $(control_vars) @@ -1429,6 +1548,7 @@ override_dh_auto_clean: : # for some reason, the docs are written to debian/usr and debian/man ... rm -rf debian/usr debian/man : # remove extra stamps - rm -f debian-*-build override_dh_auto_install sccache-stats build_doc + rm -f override_dh_auto_install + rm -rf stamps .PHONY: override_dh_strip preconfigure diff --git a/debian/tests/cmake-clang-test b/debian/tests/cmake-clang-test new file mode 100755 index 00000000..89aa8e55 --- /dev/null +++ b/debian/tests/cmake-clang-test @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e + +LLVM_VERSION=17 + +# this is taken from libjsoncpp package +# Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we +# can avoid duplicating the effort (signal handling, etc.) here. +if [ -z "$AUTOPKGTEST_TMP" ] +then + echo "Required envvar AUTOPKGTEST_TMP \"$AUTOPKGTEST_TMP\" is not set" >&2 + exit 1 +fi + + +# the idea was taken from spirv-llvm-translator package + +cd "$AUTOPKGTEST_TMP" +cat < CMakeLists.txt +cmake_minimum_required(VERSION 3.22) +project(cmake-clang-test) +find_package(Clang) + +EOF + + +mkdir build && cd build +cmake .. diff --git a/debian/tests/cmake-test b/debian/tests/cmake-llvm-test similarity index 89% rename from debian/tests/cmake-test rename to debian/tests/cmake-llvm-test index 65e1ef62..abaee6a2 100755 --- a/debian/tests/cmake-test +++ b/debian/tests/cmake-llvm-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=16 +LLVM_VERSION=17 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we @@ -18,8 +18,8 @@ fi cd "$AUTOPKGTEST_TMP" cat < CMakeLists.txt -cmake_minimum_required(VERSION 3.7) -project(cmake-test) +cmake_minimum_required(VERSION 3.22) +project(cmake-llvm-test) find_package(LLVM $LLVM_VERSION REQUIRED COMPONENTS Analysis diff --git a/debian/tests/control b/debian/tests/control index 026518dd..1e3e72a6 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -2,7 +2,7 @@ Test-Command: bash -v ./debian/qualify-clang.sh Depends: @, cmake, make, g++, file, dpkg-dev # Comment the dbgsym package because of bug #917528 # dbgsym packages not being available in testing -# clang-16-dbgsym, libclang1-16-dbgsym +# clang-17-dbgsym, libclang1-17-dbgsym Restrictions: allow-stderr Architecture: amd64 arm64 i386 @@ -11,11 +11,14 @@ Depends: @, cmake, make, g++, libstdc++-13-dev Restrictions: allow-stderr Architecture: amd64 arm64 -Tests: cmake-test -Depends: gcc, build-essential, cmake, llvm-16-dev +Tests: cmake-llvm-test +Depends: gcc, build-essential, cmake, llvm-17-dev + +Tests: cmake-clang-test +Depends: gcc, build-essential, cmake, llvm-17-dev, clang-17, libclang-17-dev Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)" -Depends: python3-lldb-16 +Depends: python3-lldb-17 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)" -Depends: python3-clang-16 +Depends: python3-clang-17 diff --git a/debian/tests/integration-test-suite-test b/debian/tests/integration-test-suite-test index c068782c..b3bd0a6e 100755 --- a/debian/tests/integration-test-suite-test +++ b/debian/tests/integration-test-suite-test @@ -2,7 +2,7 @@ set -e -LLVM_VERSION=16 +LLVM_VERSION=17 # this is taken from libjsoncpp package # Presence of $AUTOPKGTEST_TMP implies that someone will handle cleanup for us, so we diff --git a/debian/unpack.sh b/debian/unpack.sh index 200e61a1..77447f06 100644 --- a/debian/unpack.sh +++ b/debian/unpack.sh @@ -1,6 +1,6 @@ set -e -ORIG_VERSION=16 -MAJOR_VERSION=16 # 8.0.1 +ORIG_VERSION=17 +MAJOR_VERSION=17.0.0 # 8.0.1 REV=`ls -1 *${ORIG_VERSION}_${MAJOR_VERSION}*~+*xz | tail -1|perl -ne 'print "$1\n" if /~\+(.*)\.orig/;' | sort -ru` VERSION=$REV