cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move to riscv64gc-unknown-openbsd, upstream's preferred target name

Browse Source 
Zap the initial riscv64-unknown-openbsd target name.  Cross-compiled
riscv64gc bootstrap and lots of guidance from semarie@.  This commit uses
a native bootstrap.  ok semarie@ (maintainer)
This commit is contained in:
jca 2022-12-13 09:24:58 +00:00
parent 218cc14a5d
commit ed687e52da
4 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lang/rust/Makefile
View File

@ -14,14 +14,14 @@ COMMENT-rustfmt = Rust code formatter
V = 1.65.0
DISTNAME = rustc-${V}-src
REVISION-gdb = 0
REVISION = 1
# rustc bootstrap version
BV-aarch64 = 1.65.0-20221103
BV-amd64 = 1.65.0-20221101
BV-i386 = 1.65.0-20221101
BV-powerpc64 = 1.64.0-20221011
BV-riscv64 = 1.65.0-20221117
BV-riscv64 = 1.65.0-20221212
BV-sparc64 = 1.65.0-20221108
BV = ${BV-${MACHINE_ARCH}}
@ -75,7 +75,7 @@ TRIPLE_ARCH-aarch64 = aarch64-unknown-openbsd
TRIPLE_ARCH-amd64 = x86_64-unknown-openbsd
TRIPLE_ARCH-i386 = i686-unknown-openbsd
TRIPLE_ARCH-powerpc64 = powerpc64-unknown-openbsd
TRIPLE_ARCH-riscv64 = riscv64-unknown-openbsd
TRIPLE_ARCH-riscv64 = riscv64gc-unknown-openbsd
TRIPLE_ARCH-sparc64 = sparc64-unknown-openbsd
TRIPLE_ARCH = ${TRIPLE_ARCH-${MACHINE_ARCH}}

4
lang/rust/distinfo
View File

@ -3,12 +3,12 @@ SHA256 (rust/rustc-bootstrap-aarch64-1.65.0-20221103.tar.xz) = qogGV5KnJKObaR6PF
SHA256 (rust/rustc-bootstrap-amd64-1.65.0-20221101.tar.xz) = 9GAfqt0TLCZs1jKfKsgcPk5oJs9G4CE7tm/7KwOR3Qo=
SHA256 (rust/rustc-bootstrap-i386-1.65.0-20221101.tar.xz) = J0TyJMIOaLpvzCYFCJ76JT2h+pesmKrtpah9J0phTGI=
SHA256 (rust/rustc-bootstrap-powerpc64-1.64.0-20221011.tar.xz) = mpD2eUNZ1pCS3a5ATuYKsiN1ew26bG9KMynNLsUuJbA=
SHA256 (rust/rustc-bootstrap-riscv64-1.65.0-20221117.tar.xz) = ZQNhtPURfpA8+SFXW5kYar7gqMyskxhXZUT2pIeUgv4=
SHA256 (rust/rustc-bootstrap-riscv64-1.65.0-20221212.tar.xz) = qk7oYb0ajpIEH18gdUBzNm81z41Wd3MiKutLYS0XyXc=
SHA256 (rust/rustc-bootstrap-sparc64-1.65.0-20221108.tar.xz) = bWeZKKa2FZdA+9H6JyvQ0WKoPVEKVI6duo0P3IRflXY=
SIZE (rust/rustc-1.65.0-src.tar.xz) = 139674928
SIZE (rust/rustc-bootstrap-aarch64-1.65.0-20221103.tar.xz) = 60645464
SIZE (rust/rustc-bootstrap-amd64-1.65.0-20221101.tar.xz) = 67465684
SIZE (rust/rustc-bootstrap-i386-1.65.0-20221101.tar.xz) = 68959036
SIZE (rust/rustc-bootstrap-powerpc64-1.64.0-20221011.tar.xz) = 58564952
SIZE (rust/rustc-bootstrap-riscv64-1.65.0-20221117.tar.xz) = 66285644
SIZE (rust/rustc-bootstrap-riscv64-1.65.0-20221212.tar.xz) = 66263388
SIZE (rust/rustc-bootstrap-sparc64-1.65.0-20221108.tar.xz) = 60036460

13
lang/rust/patches/patch-compiler_rustc_target_src_spec_mod_rs
View File

@ -1,13 +0,0 @@
Keep riscv64-unknown-openbsd name for compat.
Index: compiler/rustc_target/src/spec/mod.rs
--- compiler/rustc_target/src/spec/mod.rs.orig
+++ compiler/rustc_target/src/spec/mod.rs
@@ -985,6 +985,7 @@ supported_targets! {
("powerpc-unknown-openbsd", powerpc_unknown_openbsd),
("powerpc64-unknown-openbsd", powerpc64_unknown_openbsd),
("riscv64gc-unknown-openbsd", riscv64gc_unknown_openbsd),
+ ("riscv64-unknown-openbsd", riscv64_unknown_openbsd),
("sparc64-unknown-openbsd", sparc64_unknown_openbsd),
("x86_64-unknown-openbsd", x86_64_unknown_openbsd),

24
lang/rust/patches/patch-compiler_rustc_target_src_spec_riscv64_unknown_openbsd_rs
View File

@ -1,24 +0,0 @@
Add riscv64-unknown-openbsd
Index: compiler/rustc_target/src/spec/riscv64_unknown_openbsd.rs
--- compiler/rustc_target/src/spec/riscv64_unknown_openbsd.rs.orig
+++ compiler/rustc_target/src/spec/riscv64_unknown_openbsd.rs
@@ -0,0 +1,18 @@
+use crate::spec::{CodeModel, Target, TargetOptions};
+
+pub fn target() -> Target {
+ Target {
+ llvm_target: "riscv64-unknown-openbsd".into(),
+ pointer_width: 64,
+ data_layout: "e-m:e-p:64:64-i64:64-i128:128-n64-S128".into(),
+ arch: "riscv64".into(),
+ options: TargetOptions {
+ code_model: Some(CodeModel::Medium),
+ cpu: "generic-rv64".into(),
+ features: "+m,+a,+f,+d,+c".into(),
+ llvm_abiname: "lp64d".into(),
+ max_atomic_width: Some(64),
+ ..super::openbsd_base::opts()
+ },
+ }
+}