update to LLVM 12

diff --git a/debian/bin/rust-lld b/debian/bin/rust-lld
index 1dcc1864d3b122fd5b588258d0250084f6b81439..019016c844bf1b2e1d844e3b97ae3d580a3b3a59 100755 (executable)
--- 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-11 "${@/#-Wl,/}"
+exec /usr/bin/lld-12 "${@/#-Wl,/}"

diff --git a/debian/changelog b/debian/changelog
index 73db57e448b7efdf7788caf1c01923acfde38130..d14d497a5436159e41457b65a6bc10436af54d0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rustc (1.52.1+dfsg1-1~exp3) UNRELEASED; urgency=medium
+
+  * Update to LLVM 12.
+
+ -- Ximin Luo <infinity0@debian.org>  Wed, 19 May 2021 17:47:57 +0100
+
 rustc (1.52.1+dfsg1-1~exp2) experimental; urgency=medium
 
   * Fix rust-clippy dependency on libstd-rust-*

diff --git a/debian/control b/debian/control
index 536b51bc1836002ba479cf536e63abfaf347d457..19331eeda0ab140df7921870be5bb163715881fa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -15,11 +15,11 @@ Build-Depends:
  cargo:native (>= 0.40.0)      <!pkg.rustc.dlstage0>,
  rustc:native (>= 1.51.0+dfsg) <!pkg.rustc.dlstage0>,
  rustc:native (<= 1.52.1++)    <!pkg.rustc.dlstage0>,
- llvm-11-dev:native,
- llvm-11-tools:native,
+ llvm-12-dev:native,
+ llvm-12-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
  gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
- libllvm11,
+ libllvm12,
  cmake (>= 3.0) | cmake3,
 # needed by some vendor crates
  pkg-config,
@@ -40,7 +40,7 @@ Build-Depends:
 Build-Depends-Indep:
  wasi-libc (>= 0.0~git20201130.5879558~~) <!nowasm>,
  wasi-libc (<= 0.0~git20201130.5879558++) <!nowasm>,
- clang-11:native,
+ clang-12:native,
 Build-Conflicts: gdb-minimal <!nocheck>
 Standards-Version: 4.2.1
 Homepage: http://www.rust-lang.org/
@@ -56,7 +56,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version
 Recommends: cargo (>= 0.53.0~~), cargo (<< 0.54.0~~), rust-gdb | rust-lldb
 # lld is needed for wasm compilation
 # llvm is needed for llvm-dwp for split-debuginfo
-Suggests: rust-doc, rust-src, lld-11, llvm-11
+Suggests: rust-doc, rust-src, lld-12, llvm-12
 Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
@@ -149,8 +149,8 @@ Multi-Arch: foreign
 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-11
-Suggests: clang-11, nodejs (>= 12.16)
+Recommends: lld-12
+Suggests: clang-12, nodejs (>= 12.16)
 # nodejs contains wasi-node for running the program
 Build-Profiles: <!nowasm>
 Description: Rust standard libraries - development files
@@ -194,7 +194,7 @@ Description: Rust debugger (gdb)
 Package: rust-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
-Depends: lldb-11, ${misc:Depends}, python3-lldb-11
+Depends: lldb-12, ${misc:Depends}, python3-lldb-12
 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 4abca08a24d5dbab2015c8785483d3fd090578c1..cd5d3cb82a3845c182f65206ad11f439d9068a12 100644 (file)
--- a/debian/patches/d-rust-lldb-paths
+++ b/debian/patches/d-rust-lldb-paths
@@ -15,7 +15,7 @@ Forwarded: not-needed
  RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb"
  
 -lldb=lldb
-+lldb=lldb-11
++lldb=lldb-12
  if [ -f "$RUST_LLDB" ]; then
      lldb="$RUST_LLDB"
  else

diff --git a/debian/rules b/debian/rules
index 6517654466856c3ccfa02877de5f973b5e9687b7..1f188c7e4b93ae9dec669a6b0ac7db89220d1ef0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,8 @@ export DEB_HOST_RUST_TYPE
 DEB_DESTDIR := $(CURDIR)/debian/tmp
 
 # Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 11
-OLD_LLVM_VERSION = 10
+LLVM_VERSION = 12
+OLD_LLVM_VERSION = 11
 # 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 01492249e9eb913f5c35c1c57c1c6b78932a96eb..fd4831a9ef089177b59c7c5c2ae6e824e66c6290 100644 (file)
--- a/debian/rust-lldb.links
+++ b/debian/rust-lldb.links
@@ -1 +1 @@
-usr/share/man/man1/lldb-11.1.gz usr/share/man/man1/rust-lldb.1.gz
+usr/share/man/man1/lldb-12.1.gz usr/share/man/man1/rust-lldb.1.gz

diff --git a/debian/rustc.links b/debian/rustc.links
index 1db87e62ab88f8b5bfd7423d3a2bb430e4ae3aa1..00c08671eecd24a94a898b89c62991602a9239f3 100644 (file)
--- a/debian/rustc.links
+++ b/debian/rustc.links
@@ -1,3 +1,3 @@
-usr/bin/lld-11 usr/bin/rust-lld
-usr/bin/clang-11 usr/bin/rust-clang
-usr/bin/llvm-dwp-11 usr/bin/rust-llvm-dwp
+usr/bin/lld-12 usr/bin/rust-lld
+usr/bin/clang-12 usr/bin/rust-clang
+usr/bin/llvm-dwp-12 usr/bin/rust-llvm-dwp