Merge pull request #429 from laanwj/2019_08_rv_correct_abi

risc-v: Set ABI correctly for 32-bit targets
rust-lang · Aug 8, 2019 · c7cd5dd · c7cd5dd
2 parents f6f6c81 + b154938
commit c7cd5dd
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1436,7 +1436,11 @@ impl Build {
                         cmd.args.push(("-march=rv".to_owned() + arch).into());
                         // ABI is always soft-float right now, update this when this is no longer the
                         // case:
-                        cmd.args.push("-mabi=lp64".into());
+                        if arch.starts_with("64") {
+                            cmd.args.push("-mabi=lp64".into());
+                        } else {
+                            cmd.args.push("-mabi=ilp32".into());
+                        }
                     }
                 }
             }