Skip to content

feat: Use pic relocation model and dynlink by default #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shihange-vivo wants to merge 1 commit into
base: blueos-dev
Choose a base branch
from
Open

feat: Use pic relocation model and dynlink by default #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,19 +1981,19 @@ dependencies = [

[[package]]
name = "libffi"
version = "3.2.0"
version = "4.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce826c243048e3d5cec441799724de52e2d42f820468431fc3fceee2341871e2"
checksum = "b0feebbe0ccd382a2790f78d380540500d7b78ed7a3498b68fcfbc1593749a94"
dependencies = [
"libc",
"libffi-sys",
]

[[package]]
name = "libffi-sys"
version = "2.3.0"
version = "3.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36115160c57e8529781b4183c2bb51fdc1f6d6d1ed345591d84be7703befb3c"
checksum = "90c6c6e17136d4bc439d43a2f3c6ccf0731cccc016d897473a29791d3c2160c3"
dependencies = [
"cc",
]
Expand Down
12 changes: 7 additions & 5 deletions compiler/rustc_target/src/spec/targets/aarch64_vivo_blueos_newlib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@ pub(crate) fn target() -> Target {
linker_flavor: LinkerFlavor::Gnu(Cc::Yes, Lld::No),
linker: Some("aarch64-none-elf-gcc".into()),
// Enable the Cortex-A53 errata 843419 mitigation by default
pre_link_args: TargetOptions::link_args(LinkerFlavor::Gnu(Cc::No, Lld::No), &[
"--fix-cortex-a53-843419",
]),
pre_link_args: TargetOptions::link_args(
LinkerFlavor::Gnu(Cc::No, Lld::No),
&["--fix-cortex-a53-843419"],
),
features: "+v8a,+strict-align,+neon,+fp-armv8".into(),
supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
relocation_model: RelocModel::Static,
relocation_model: RelocModel::Pic,
dynamic_linking: true,
disable_redzone: true,
max_atomic_width: Some(128),
stack_probes: StackProbeType::Inline,
Expand All @@ -36,7 +38,7 @@ pub(crate) fn target() -> Target {
Target {
llvm_target: "aarch64-unknown-none".into(),
metadata: crate::spec::TargetMetadata {
description: Some("Bare ARM64, hardfloat".into()),
description: Some("vivo BlueOS on Bare ARM64, hardfloat".into()),
tier: Some(3),
host_tools: Some(false),
std: Some(true),
Expand Down
3 changes: 2 additions & 1 deletion compiler/rustc_target/src/spec/targets/riscv32_vivo_blueos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ pub(crate) fn target() -> Target {
max_atomic_width: Some(64),
features: "+m,+a,+c".into(),
panic_strategy: PanicStrategy::Abort,
relocation_model: RelocModel::Static,
relocation_model: RelocModel::Pic,
dynamic_linking: true,
code_model: Some(CodeModel::Medium),
emit_debug_gdb_scripts: false,
eh_frame_header: false,
Expand Down
8 changes: 6 additions & 2 deletions compiler/rustc_target/src/spec/targets/riscv32imc_vivo_blueos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use crate::spec::{PanicStrategy, RelocModel, Target, TargetOptions, TlsModel, cvs};
use crate::spec::{
Cc, LinkerFlavor, Lld, PanicStrategy, RelocModel, Target, TargetOptions, TlsModel, cvs,
};

pub(crate) fn target() -> Target {
Target {
Expand All @@ -18,6 +20,7 @@ pub(crate) fn target() -> Target {
env: "newlib".into(),
tls_model: TlsModel::Emulated,
vendor: "vivo".into(),
linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
linker: Some("rust-lld".into()),
cpu: "generic-rv32".into(),
// While the RiscV32IMC architecture does not natively
Expand All @@ -33,7 +36,8 @@ pub(crate) fn target() -> Target {
features: "+m,+c".into(),
llvm_abiname: "ilp32".into(),
panic_strategy: PanicStrategy::Abort,
relocation_model: RelocModel::Static,
relocation_model: RelocModel::Pic,
dynamic_linking: true,
emit_debug_gdb_scripts: false,
eh_frame_header: false,
..Default::default()
Expand Down
1 change: 1 addition & 0 deletions compiler/rustc_target/src/spec/targets/riscv64_vivo_blueos.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ pub(crate) fn target() -> Target {
features: "+m,+a,+c".into(),
panic_strategy: PanicStrategy::Abort,
relocation_model: RelocModel::Pic,
dynamic_linking: true,
code_model: Some(CodeModel::Medium),
emit_debug_gdb_scripts: false,
eh_frame_header: false,
Expand Down
7 changes: 4 additions & 3 deletions config.blueos.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ ranlib = "aarch64-none-elf-ranlib"
[target."riscv64-vivo-blueos"]
cc = "clang"
cxx = "clang++"
linker = "clang"
linker = "rust-lld"
ar = "llvm-ar"
ranlib = "llvm-ranlib"

[target."riscv32-vivo-blueos"]
cc = "clang"
cxx = "clang++"
linker = "clang"
linker = "rust-lld"
ar = "llvm-ar"
ranlib = "llvm-ranlib"

[target."riscv32imc-vivo-blueos"]
cc = "clang"
cxx = "clang++"
linker = "clang"
linker = "rust-lld"
ar = "llvm-ar"
ranlib = "llvm-ranlib"

Expand All @@ -59,6 +59,7 @@ sanitizers = true
omit-git-hash = false
deny-warnings = false
strip = true
rpath = false

[dist]
compression-formats = ["xz"]
Expand Down