diff options
| author | bors <bors@rust-lang.org> | 2023-11-02 06:25:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-11-02 06:25:50 +0000 |
| commit | 1a08886b782c25387c4c864597dd4a64a0ce98f9 (patch) | |
| tree | 9f784af107e7583dbe6d8962afab16cf1cb01513 /compiler/rustc_codegen_gcc/src/gcc_util.rs | |
| parent | de09bf55e3752dd2e87d74ba0ffc62718e0ef118 (diff) | |
| parent | 869827fd86c6c9a15793a690227ceaf6de2dc45e (diff) | |
| download | rust-1a08886b782c25387c4c864597dd4a64a0ce98f9.tar.gz rust-1a08886b782c25387c4c864597dd4a64a0ce98f9.zip | |
Auto merge of #3153 - rust-lang:rustup-2023-11-02, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/gcc_util.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/gcc_util.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/gcc_util.rs b/compiler/rustc_codegen_gcc/src/gcc_util.rs index 0514c9988e0..1248fdcd259 100644 --- a/compiler/rustc_codegen_gcc/src/gcc_util.rs +++ b/compiler/rustc_codegen_gcc/src/gcc_util.rs @@ -198,9 +198,16 @@ pub fn check_tied_features(sess: &Session, features: &FxHashMap<&str, bool>) -> None } +fn arch_to_gcc(name: &str) -> &str { + match name { + "M68020" => "68020", + _ => name, + } +} + fn handle_native(name: &str) -> &str { if name != "native" { - return name; + return arch_to_gcc(name); } #[cfg(feature="master")] |
