[arch-commits] Commit in rust/trunk (0001-Change-LLVM-targets.patch PKGBUILD)

[Jan Steffens]

    Date: Thursday, May 6, 2021 @ 18:10:34
  Author: heftig
Revision: 414527

1.52.0-1

Modified:
  rust/trunk/0001-Change-LLVM-targets.patch
  rust/trunk/PKGBUILD

--------------------------------+
 0001-Change-LLVM-targets.patch |   30 ++++++++++++++++--------------
 PKGBUILD                       |    6 +++---
 2 files changed, 19 insertions(+), 17 deletions(-)

Modified: 0001-Change-LLVM-targets.patch
===================================================================
--- 0001-Change-LLVM-targets.patch	2021-05-06 17:17:21 UTC (rev 414526)
+++ 0001-Change-LLVM-targets.patch	2021-05-06 18:10:34 UTC (rev 414527)
@@ -9,12 +9,12 @@
 Add aliases to match.
 ---
  compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs   | 2 +-
- compiler/rustc_target/src/spec/mod.rs                      | 3 +++
+ compiler/rustc_target/src/spec/mod.rs                      | 4 ++--
  compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs | 2 +-
- 3 files changed, 5 insertions(+), 2 deletions(-)
+ 3 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-index 656136c4972..fea9aadfbd4 100644
+index 9daf1d37dd2..b38e1888047 100644
 --- a/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
 @@ -9,7 +9,7 @@ pub fn target() -> Target {
@@ -27,21 +27,23 @@
          data_layout: "e-m:e-p:32:32-p270:32:32-p271:32:32-p272:64:64-\
              f64:32:64-f80:32-n8:16:32-S128"
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 7a93bac72ca..cb844be88a3 100644
+index c9fffd213d7..5538f1bdb20 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1995,6 +1995,9 @@ macro_rules! target_aliases {
-         }
+@@ -621,9 +621,9 @@ fn to_json(&self) -> Json {
+ }
  
-         target_aliases! {
-+            ("x86_64-pc-linux-gnu", "x86_64-unknown-linux-gnu"),
-+            ("i686-pc-linux-gnu", "i686-unknown-linux-gnu"),
-+
-             // `x86_64-pc-solaris` is an alias for `x86_64_sun_solaris` for backwards compatibility reasons.
-             // (See <https://github.com/rust-lang/rust/issues/40531>.)
-             ("x86_64-pc-solaris", "x86_64-sun-solaris"),
+ supported_targets! {
+-    ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu),
++    ("x86_64-unknown-linux-gnu", "x86_64-pc-linux-gnu", x86_64_unknown_linux_gnu),
+     ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32),
+-    ("i686-unknown-linux-gnu", i686_unknown_linux_gnu),
++    ("i686-unknown-linux-gnu", "i686-pc-linux-gnu", i686_unknown_linux_gnu),
+     ("i586-unknown-linux-gnu", i586_unknown_linux_gnu),
+     ("mips-unknown-linux-gnu", mips_unknown_linux_gnu),
+     ("mips64-unknown-linux-gnuabi64", mips64_unknown_linux_gnuabi64),
 diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
-index 2ba6d368484..7322745d9f6 100644
+index 04499bc5bbe..63f983bff0b 100644
 --- a/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
 +++ b/compiler/rustc_target/src/spec/x86_64_unknown_linux_gnu.rs
 @@ -9,7 +9,7 @@ pub fn target() -> Target {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-06 17:17:21 UTC (rev 414526)
+++ PKGBUILD	2021-05-06 18:10:34 UTC (rev 414527)
@@ -6,7 +6,7 @@
 
 pkgname=('rust' 'lib32-rust-libs' 'rust-musl' 'rust-docs')
 epoch=1
-pkgver=1.51.0
+pkgver=1.52.0
 pkgrel=1
 
 _llvm_ver=11.1.0
@@ -28,11 +28,11 @@
   0001-Change-LLVM-targets.patch
   libexec.diff
 )
-sha256sums=('7a6b9bafc8b3d81bbc566e7c0d1f17c9f499fd22b95142f7ea3a8e4d1f9eb847'
+sha256sums=('33bec45b11a24fae2178cdd76794c3dc3c23c24ade7dfaedc09a74c278379a63'
             'SKIP'
             'def1fc00c764cd3abbba925c712ac38860a756a43b696b291f46fee09e453274'
             'SKIP'
-            '3703c3defd3af5498a492f80fbb0b0b67c58a5ce0d1bab51328e65598141b745'
+            'e182b27caacd70ad1c7b40c679a4152bead1c4b592148bb3009c2f10b30e0e88'
             '9ba3070dbc877ab5e045b6a20be9134f80d8aece42766b4cfbad2a4a60c27514')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar at redhat.com>