New upstream version 1.61.0+dfsg1

[rustc.git] / compiler / rustc_target / src / spec / riscv32gc_unknown_linux_gnu.rs

diff --git a/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_gnu.rs
index 28710c60175b0ab479e9f628db6f43e04ac56701..bffd377bc4a19790093b7a13d2ecdc5eaf1275f9 100644 (file)
--- a/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_gnu.rs
+++ b/compiler/rustc_target/src/spec/riscv32gc_unknown_linux_gnu.rs
@@ -1,25 +1,18 @@
-use crate::spec::{CodeModel, LinkerFlavor, Target, TargetOptions, TargetResult};
+use crate::spec::{CodeModel, Target, TargetOptions};
 
-pub fn target() -> TargetResult {
-    Ok(Target {
-        llvm_target: "riscv32-unknown-linux-gnu".to_string(),
-        target_endian: "little".to_string(),
-        target_pointer_width: "32".to_string(),
-        target_c_int_width: "32".to_string(),
-        target_env: "gnu".to_string(),
-        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".to_string(),
-        arch: "riscv32".to_string(),
-        target_os: "linux".to_string(),
-        target_vendor: "unknown".to_string(),
-        linker_flavor: LinkerFlavor::Gcc,
+pub fn target() -> Target {
+    Target {
+        llvm_target: "riscv32-unknown-linux-gnu".into(),
+        pointer_width: 32,
+        data_layout: "e-m:e-p:32:32-i64:64-n32-S128".into(),
+        arch: "riscv32".into(),
         options: TargetOptions {
-            unsupported_abis: super::riscv_base::unsupported_abis(),
             code_model: Some(CodeModel::Medium),
-            cpu: "generic-rv32".to_string(),
-            features: "+m,+a,+f,+d,+c".to_string(),
-            llvm_abiname: "ilp32d".to_string(),
+            cpu: "generic-rv32".into(),
+            features: "+m,+a,+f,+d,+c".into(),
+            llvm_abiname: "ilp32d".into(),
             max_atomic_width: Some(32),
-            ..super::linux_base::opts()
+            ..super::linux_gnu_base::opts()
         },
-    })
+    }
 }