mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #94415 - bjorn3:cfg_default_backend, r=Mark-Simulacrum

Browse Source 
Use the first codegen backend in the config.toml as default

It is currently hard coded to llvm if enabled and cranelift otherwise.
This made some sense when cranelift was the only alternative codegen
backend. Since the introduction of the gcc backend this doesn't make
much sense anymore. Before this PR bootstrapping rustc using a backend
other than llvm or cranelift required changing the source of
rustc_interface. With this PR it becomes a matter of putting the right
backend as first enabled backend in config.toml.

cc ```@antoyo```
This commit is contained in:
Matthias Krüger 2022-02-27 21:46:36 +01:00 committed by GitHub
commit c930884619
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/rustc_interface/src/util.rs
View File

@ -236,13 +236,9 @@ pub fn get_codegen_backend(
static LOAD: SyncOnceCell<unsafe fn() -> Box<dyn CodegenBackend>> = SyncOnceCell::new(); static LOAD: SyncOnceCell<unsafe fn() -> Box<dyn CodegenBackend>> = SyncOnceCell::new();
let load = LOAD.get_or_init(|| { let load = LOAD.get_or_init(|| {
#[cfg(feature = "llvm")] let default_codegen_backend = option_env!("CFG_DEFAULT_CODEGEN_BACKEND").unwrap_or("llvm");
const DEFAULT_CODEGEN_BACKEND: &str = "llvm";
#[cfg(not(feature = "llvm"))] match backend_name.unwrap_or(default_codegen_backend) {
const DEFAULT_CODEGEN_BACKEND: &str = "cranelift";
match backend_name.unwrap_or(DEFAULT_CODEGEN_BACKEND) {
filename if filename.contains('.') => load_backend_from_dylib(filename.as_ref()), filename if filename.contains('.') => load_backend_from_dylib(filename.as_ref()),
#[cfg(feature = "llvm")] #[cfg(feature = "llvm")]
"llvm" => rustc_codegen_llvm::LlvmCodegenBackend::new, "llvm" => rustc_codegen_llvm::LlvmCodegenBackend::new,

4
config.toml.example
View File

@ -551,7 +551,9 @@ changelog-seen = 2
# This is an array of the codegen backends that will be compiled for the rustc # This is an array of the codegen backends that will be compiled for the rustc
# that's being compiled. The default is to only build the LLVM codegen backend, # that's being compiled. The default is to only build the LLVM codegen backend,
# and currently the only standard options supported are `"llvm"` and `"cranelift"`. # and currently the only standard options supported are `"llvm"`, `"cranelift"`
# and `"gcc"`. The first backend in this list will be used as default by rustc
# when no explicit backend is specified.
#codegen-backends = ["llvm"] #codegen-backends = ["llvm"]
# Indicates whether LLD will be compiled and made available in the sysroot for # Indicates whether LLD will be compiled and made available in the sysroot for

4
src/bootstrap/compile.rs
View File

@ -662,6 +662,10 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetS
.env("CFG_RELEASE_CHANNEL", &builder.config.channel) .env("CFG_RELEASE_CHANNEL", &builder.config.channel)
.env("CFG_VERSION", builder.rust_version()); .env("CFG_VERSION", builder.rust_version());
if let Some(backend) = builder.config.rust_codegen_backends.get(0) {
cargo.env("CFG_DEFAULT_CODEGEN_BACKEND", backend);
}
let libdir_relative = builder.config.libdir_relative().unwrap_or_else(|| Path::new("lib")); let libdir_relative = builder.config.libdir_relative().unwrap_or_else(|| Path::new("lib"));
let target_config = builder.config.target_config.get(&target); let target_config = builder.config.target_config.get(&target);