Merge commit 'e4fe941b11a55c5005630696e9b6d81c65f7bd04' into subtree-update_cg_gcc_2023-10-25

2023-10-26 17:42:02 -04:00
parent 8396efecf7 e4fe941b11
commit c797cccda6
47 changed files with 2659 additions and 502 deletions
--- 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")]