Compare commits
15 Commits
rawhide
...
f37-riscv6
Author | SHA1 | Date |
---|---|---|
David Abdurachmanov | ceca7985d2 | |
David Abdurachmanov | 4a3b701b39 | |
David Abdurachmanov | 68726fa32d | |
David Abdurachmanov | f4046803f9 | |
David Abdurachmanov | d2549134a9 | |
David Abdurachmanov | 96dc0c89e7 | |
David Abdurachmanov | 77bce84d63 | |
David Abdurachmanov | 6bdc0ace9d | |
David Abdurachmanov | ae25172117 | |
David Abdurachmanov | 7399d42c21 | |
David Abdurachmanov | f67044a228 | |
David Abdurachmanov | 05aaef4716 | |
David Abdurachmanov | 4a32e1dd76 | |
David Abdurachmanov | a08b5e5e1b | |
David Abdurachmanov | 7089aa2bdb |
|
@ -0,0 +1,17 @@
|
|||
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
|
||||
index 12585e80e..360b7b6c7 100644
|
||||
--- a/src/bootstrap/dist.rs
|
||||
+++ b/src/bootstrap/dist.rs
|
||||
@@ -1086,12 +1086,6 @@ impl Step for RustAnalyzer {
|
||||
let compiler = self.compiler;
|
||||
let target = self.target;
|
||||
|
||||
- if target.contains("riscv64") {
|
||||
- // riscv64 currently has an LLVM bug that makes rust-analyzer unable
|
||||
- // to build. See #74813 for details.
|
||||
- return None;
|
||||
- }
|
||||
-
|
||||
let rust_analyzer = builder
|
||||
.ensure(tool::RustAnalyzer { compiler, target })
|
||||
.expect("rust-analyzer always builds");
|
21
rust.spec
21
rust.spec
|
@ -1,6 +1,6 @@
|
|||
# Only x86_64 and i686 are Tier 1 platforms at this time.
|
||||
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
||||
%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x
|
||||
%global rust_arches x86_64 i686 armv7hl aarch64 ppc64le s390x riscv64
|
||||
|
||||
# The channel can be stable, beta, or nightly
|
||||
%{!?channel: %global channel stable}
|
||||
|
@ -76,15 +76,19 @@
|
|||
%endif
|
||||
|
||||
# LLDB isn't available everywhere...
|
||||
%ifnarch riscv64
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
%bcond_with lldb
|
||||
%else
|
||||
%bcond_without lldb
|
||||
%endif
|
||||
%else
|
||||
%bcond_with lldb
|
||||
%endif
|
||||
|
||||
Name: rust
|
||||
Version: 1.66.1
|
||||
Release: 1%{?dist}
|
||||
Release: 1.1.riscv64%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||
# ^ written as: (rust itself) and (bundled libraries)
|
||||
|
@ -131,6 +135,8 @@ Patch101: rustc-1.65.0-disable-http2.patch
|
|||
# (affects RHEL6 kernels when building for RHEL7)
|
||||
Patch102: rustc-1.65.0-no-default-pie.patch
|
||||
|
||||
# Enable rust-analyzer on riscv64
|
||||
Patch103: rust-enable-ra-for-riscv64.patch
|
||||
|
||||
# Get the Rust triple for any arch.
|
||||
%{lua: function rust_triple(arch)
|
||||
|
@ -606,6 +612,8 @@ rm -rf vendor/libnghttp2-sys/
|
|||
%patch102 -p1
|
||||
%endif
|
||||
|
||||
%patch103 -p1
|
||||
|
||||
# Use our explicit python3 first
|
||||
sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure
|
||||
|
||||
|
@ -676,7 +684,7 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+'
|
|||
%build
|
||||
%{export_rust_env}
|
||||
|
||||
%ifarch %{arm} %{ix86}
|
||||
%ifarch %{arm} %{ix86} riscv64
|
||||
# full debuginfo is exhausting memory; just do libstd for now
|
||||
# https://github.com/rust-lang/rust/issues/45854
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
|
@ -1056,6 +1064,13 @@ end}
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 16 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.66.1-1.1.riscv64
|
||||
- Enable riscv-analyzer for riscv64
|
||||
|
||||
* Fri Jan 13 2022 David Abdurachmanov <davidlt@rivosinc.com> - 1.66.1-1.0.riscv64
|
||||
- Do not package rust-analyzer on riscv64
|
||||
- Enable riscv64
|
||||
|
||||
* Tue Jan 10 2023 Josh Stone <jistone@redhat.com> - 1.66.1-1
|
||||
- Update to 1.66.1.
|
||||
- Security fix for CVE-2022-46176
|
||||
|
|
Loading…
Reference in New Issue