mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-05 20:36:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/rust: rebuild with llvm 18

Browse Source
This commit is contained in:
ptrcnull 2024-06-25 13:40:46 +02:00 committed by Patrycja Rosa
parent 5d40ce9645
commit 3cd7f2313d
2 changed files with 2 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
main/rust/0006-Revert-loongarch-add-frecipe-and-relax-target-featur.patch
View File

@ -1,51 +0,0 @@
Though leaving these features enabled on LLVM17 does not
cause compilation to fail, it floods the log output with
a large number of "not a recognized feature" messages.
Remove this patch when switching to LLVM18.
From 32c68ac95130fc50482fd27f5d75e0d0fc3fb199 Mon Sep 17 00:00:00 2001
From: WANG Rui <wangrui@loongson.cn>
Date: Sun, 28 Apr 2024 15:55:27 +0800
Subject: [PATCH] Revert "loongarch: add frecipe and relax target feature"
This reverts commit e81df3f3225ce53921a87b9e490959c41b783b02.
---
compiler/rustc_target/src/target_features.rs | 2 --
tests/ui/abi/compatibility.rs | 2 +-
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs
index c003982278e..af5a565fdc9 100644
--- a/compiler/rustc_target/src/target_features.rs
+++ b/compiler/rustc_target/src/target_features.rs
@@ -377,12 +377,10 @@ pub fn is_stable(self) -> bool {
// tidy-alphabetical-start
("d", Unstable(sym::loongarch_target_feature)),
("f", Unstable(sym::loongarch_target_feature)),
- ("frecipe", Unstable(sym::loongarch_target_feature)),
("lasx", Unstable(sym::loongarch_target_feature)),
("lbt", Unstable(sym::loongarch_target_feature)),
("lsx", Unstable(sym::loongarch_target_feature)),
("lvz", Unstable(sym::loongarch_target_feature)),
- ("relax", Unstable(sym::loongarch_target_feature)),
("ual", Unstable(sym::loongarch_target_feature)),
// tidy-alphabetical-end
];
diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs
index 3ee4542810c..a4f60ea2684 100644
--- a/tests/ui/abi/compatibility.rs
+++ b/tests/ui/abi/compatibility.rs
@@ -39,7 +39,7 @@
//@ revisions: loongarch64
//@[loongarch64] compile-flags: --target loongarch64-unknown-linux-gnu
//@[loongarch64] needs-llvm-components: loongarch
-//@[loongarch64] min-llvm-version: 18
+//@[loongarch64] min-llvm-version: 17
//@ revisions: wasm
//@[wasm] compile-flags: --target wasm32-unknown-unknown
//@[wasm] needs-llvm-components: webassembly
--
2.44.0

7
main/rust/APKBUILD
View File

@ -8,9 +8,9 @@
# Maintainer: team/rust <alpine@ptrcnull.me>
pkgname=rust
pkgver=1.79.0
_llvmver=17
_llvmver=18
_bootver=1.78.0
pkgrel=0
pkgrel=1
pkgdesc="Rust Programming Language toolchain"
url="https://www.rust-lang.org/"
arch="all"
@ -103,7 +103,6 @@ source="https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.xz
0003-vendor-libc-0.2.151-Add-support-for-loongarch64-linu.patch
0004-vendor-libc-0.2.153-Add-support-for-loongarch64-linu.patch
0005-vendor-openssl-src-Add-support-for-loongarch64-linux.patch
0006-Revert-loongarch-add-frecipe-and-relax-target-featur.patch
check-rustc
"
@ -227,7 +226,6 @@ build() {
--set=target.wasm32-unknown-unknown.sanitizers=false
--set=target.wasm32-unknown-unknown.profiler=false
--set=target.wasm32-unknown-unknown.linker=lld
--set=target.wasm32-wasi.ar=llvm17-ar
--set=target.wasm32-wasi.sanitizers=false
--set=target.wasm32-wasi.profiler=false
--set=target.wasm32-wasi.wasi-root=/usr/share/wasi-sysroot
@ -503,6 +501,5 @@ c5a94cc3518f3dbefb2011d1c4267530062843262133332cff96db2e779d7f9b57bdab336c50b927
ca8880cdf0c5a5e55d5b0ad6441d90d42e4a143bc8183cf1eefa8f0300e461f57ddc8bfb58547f3693c8e746f75ac6f5a89a85679e5cb43f71a27d69df520da7 0003-vendor-libc-0.2.151-Add-support-for-loongarch64-linu.patch
1f0489040fd834bf146b97ae9843760b5342d329d11c1e45cb14871baae0c27d0375447f689668d3dd5f4415f3431a7d41ac7202f4643670285134006353a8cd 0004-vendor-libc-0.2.153-Add-support-for-loongarch64-linu.patch
9ef13df73b3970c8720d34ae5fa7806719de4d74fff308b91aed338aee34d51fd0b7c6a9d549d62b38ab59e47cfc82507f495c27378d82668c294b74c41a8138 0005-vendor-openssl-src-Add-support-for-loongarch64-linux.patch
096fe80dc6a5589aee187b6654f6caf3e9c56f0920f773a670af0654ead7f65b6874bd175c81805bdc2e2b8f23127b86b46db4c58e93735f5c2e59646de30aaa 0006-Revert-loongarch-add-frecipe-and-relax-target-featur.patch
c31fdfe8a9b3411576c75da46645cf0465b9053000a2ab49cf9b2f2733f679d6d33acbf236d67a20e14935d094a685453b7f1840180249f39d610fd0902c3125 check-rustc
"