about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-07-18 11:29:48 -0400
committerGitHub <noreply@github.com>2019-07-18 11:29:48 -0400
commitee9d4e310e130a51c85338fa6548b6ef9fc7fd5c (patch)
treeaaf8e646b99ae4b16c867a15661dc22d0833922b
parentd961eb6034c19011905b806a8610a3b3346f6ea7 (diff)
parentb7939173decca5ea2c681882c538e66a0ea8f84e (diff)
downloadrust-ee9d4e310e130a51c85338fa6548b6ef9fc7fd5c.tar.gz
rust-ee9d4e310e130a51c85338fa6548b6ef9fc7fd5c.zip
Rollup merge of #62745 - BaoshanPang:master, r=nikic
update data_layout and features for armv7-wrs-vxworks
-rw-r--r--src/librustc_target/spec/arm_wrs_vxworks.rs5
-rw-r--r--src/librustc_target/spec/armv7_wrs_vxworks.rs5
2 files changed, 4 insertions, 6 deletions
diff --git a/src/librustc_target/spec/arm_wrs_vxworks.rs b/src/librustc_target/spec/arm_wrs_vxworks.rs
index 7db587d9b35..06c51ae6106 100644
--- a/src/librustc_target/spec/arm_wrs_vxworks.rs
+++ b/src/librustc_target/spec/arm_wrs_vxworks.rs
@@ -10,7 +10,7 @@ pub fn target() -> TargetResult {
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_c_int_width: "32".to_string(),
-        data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
+        data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
         arch: "arm".to_string(),
         target_os: "vxworks".to_string(),
         target_env: "gnu".to_string(),
@@ -19,12 +19,11 @@ pub fn target() -> TargetResult {
 
         options: TargetOptions {
             // Info about features at https://wiki.debian.org/ArmHardFloatPort
-            features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(),
+            features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
             cpu: "generic".to_string(),
             max_atomic_width: Some(64),
             abi_blacklist: super::arm_base::abi_blacklist(),
             target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
-//          tls_model: "local-exec".to_string(),
             position_independent_executables: false,
             .. base
         }
diff --git a/src/librustc_target/spec/armv7_wrs_vxworks.rs b/src/librustc_target/spec/armv7_wrs_vxworks.rs
index 7db587d9b35..06c51ae6106 100644
--- a/src/librustc_target/spec/armv7_wrs_vxworks.rs
+++ b/src/librustc_target/spec/armv7_wrs_vxworks.rs
@@ -10,7 +10,7 @@ pub fn target() -> TargetResult {
         target_endian: "little".to_string(),
         target_pointer_width: "32".to_string(),
         target_c_int_width: "32".to_string(),
-        data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
+        data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
         arch: "arm".to_string(),
         target_os: "vxworks".to_string(),
         target_env: "gnu".to_string(),
@@ -19,12 +19,11 @@ pub fn target() -> TargetResult {
 
         options: TargetOptions {
             // Info about features at https://wiki.debian.org/ArmHardFloatPort
-            features: "+v7,+vfp3,+d16,+thumb2,-neon".to_string(),
+            features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
             cpu: "generic".to_string(),
             max_atomic_width: Some(64),
             abi_blacklist: super::arm_base::abi_blacklist(),
             target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
-//          tls_model: "local-exec".to_string(),
             position_independent_executables: false,
             .. base
         }