From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Fri, 2 Dec 2022 12:59:36 +0000 (+0100)
Subject: switch to LLVM-15
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a5951730e60ae6b3d50b3b872fd9b706f9c7f4d4;p=rustc.git

switch to LLVM-15

upstream uses it since 1.65, stay in sync.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

diff --git a/debian/bin/rust-lld b/debian/bin/rust-lld
index 04aec84b47..285f1b0dad 100755
--- a/debian/bin/rust-lld
+++ b/debian/bin/rust-lld
@@ -6,4 +6,4 @@
 # However the tests fail for other reasons, namely we can't build rustdoc
 # (which runs the tests) in wasm32 yet. So this is just WIP at the moment,
 # it is not expect to work nor to be installed on user machines.
-exec /usr/bin/lld-14 "${@/#-Wl,/}"
+exec /usr/bin/lld-15 "${@/#-Wl,/}"
diff --git a/debian/control b/debian/control
index 846231f5dd..423e615bd2 100644
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,11 @@ Build-Depends:
  cargo:native (>= 0.60.0)      <!pkg.rustc.dlstage0>,
  rustc:native (>= 1.64.0+dfsg) <!pkg.rustc.dlstage0>,
  rustc:native (<= 1.65.0++)    <!pkg.rustc.dlstage0>,
- llvm-14-dev:native,
- llvm-14-tools:native,
+ llvm-15-dev:native,
+ llvm-15-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
  gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
- libllvm14 (>= 1:14.0.0),
+ libllvm15 (>= 1:15.0.0),
  cmake (>= 3.0) | cmake3,
 # needed by some vendor crates
  pkg-config,
@@ -40,7 +40,7 @@ Build-Depends:
 Build-Depends-Indep:
  wasi-libc (>= 0.0~git20220510.9886d3d~~) <!nowasm>,
  wasi-libc (<= 0.0~git20220510.9886d3d++) <!nowasm>,
- clang-14:native,
+ clang-15:native,
 Build-Conflicts: gdb-minimal <!nocheck>
 Standards-Version: 4.2.1
 Homepage: http://www.rust-lang.org/
@@ -57,10 +57,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
 Recommends:
  cargo (>= 0.66.0~~), cargo (<< 0.67.0~~),
 # llvm is needed for llvm-dwp for -C split-debuginfo=packed
- llvm-14,
+ llvm-15,
 Suggests:
 # lld and clang are needed for wasm compilation
- lld-14, clang-14,
+ lld-15, clang-15,
 Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
@@ -155,7 +155,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 # Embeds wasi-libc so doesn't need to depend on it
 # None of its licenses require source redistrib, so no need for Built-Using
 Recommends:
- lld-14, clang-14,
+ lld-15, clang-15,
 Suggests:
 # nodejs contains wasi-node for running the program
  nodejs (>= 12.16),
@@ -201,7 +201,7 @@ Description: Rust debugger (gdb)
 Package: rust-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
-Depends: lldb-14, ${misc:Depends}, python3-lldb-14
+Depends: lldb-15, ${misc:Depends}, python3-lldb-15
 Replaces: rustc (<< 1.1.0+dfsg1-1)
 Description: Rust debugger (lldb)
  Rust is a curly-brace, block-structured expression language.  It
diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths
index 15028a68f4..bea7a38442 100644
--- a/debian/patches/d-rust-lldb-paths
+++ b/debian/patches/d-rust-lldb-paths
@@ -23,7 +23,7 @@ index bce72f1..793f593 100755
  RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
  
 -lldb=lldb
-+lldb=lldb-14
++lldb=lldb-15
  if [ -f "$RUST_LLDB" ]; then
      lldb="$RUST_LLDB"
  else
diff --git a/debian/rules b/debian/rules
index b3a2e8c7e0..276a809359 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ export RUST_LONG_VERSION
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
 # Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 14
-OLD_LLVM_VERSION = 13
+LLVM_VERSION = 15
+OLD_LLVM_VERSION = 14
 # Make it easier to test against a custom LLVM
 ifneq (,$(LLVM_DESTDIR))
 LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib
diff --git a/debian/rust-lldb.links b/debian/rust-lldb.links
index d9de18f771..561aff8b52 100644
--- a/debian/rust-lldb.links
+++ b/debian/rust-lldb.links
@@ -1 +1 @@
-usr/share/man/man1/lldb-14.1.gz usr/share/man/man1/rust-lldb.1.gz
+usr/share/man/man1/lldb-15.1.gz usr/share/man/man1/rust-lldb.1.gz
diff --git a/debian/rustc.links b/debian/rustc.links
index db024ff245..10826e2efe 100644
--- a/debian/rustc.links
+++ b/debian/rustc.links
@@ -1,6 +1,6 @@
-usr/bin/lld-14 usr/bin/rust-lld
-usr/bin/clang-14 usr/bin/rust-clang
-usr/bin/llvm-dwp-14 usr/bin/rust-llvm-dwp
+usr/bin/lld-15 usr/bin/rust-lld
+usr/bin/clang-15 usr/bin/rust-clang
+usr/bin/llvm-dwp-15 usr/bin/rust-llvm-dwp
 # for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic
 usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld
 usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64