From 29875c2e5e5b264f5e8f3c086b38a77a38b327cd Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 4 May 2016 10:14:36 -0700 Subject: [PATCH] rustc: Change target_env for ARM targets to `gnu` Right now they're `gnueabihf` and `gnueabi`, but when adding new platforms like musl on ARM it's unfortunate to have to test for all three (`musl`, `musleabi`, and `musleabihf`). This PR switches everything currently to `gnu`, and the new musl targets can also use `musl` when they land. Closes #33244 --- src/librustc_back/target/arm_unknown_linux_gnueabi.rs | 2 +- src/librustc_back/target/arm_unknown_linux_gnueabihf.rs | 2 +- src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/librustc_back/target/arm_unknown_linux_gnueabi.rs b/src/librustc_back/target/arm_unknown_linux_gnueabi.rs index 0cb0949d462..29ab7120389 100644 --- a/src/librustc_back/target/arm_unknown_linux_gnueabi.rs +++ b/src/librustc_back/target/arm_unknown_linux_gnueabi.rs @@ -19,7 +19,7 @@ pub fn target() -> Target { data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), arch: "arm".to_string(), target_os: "linux".to_string(), - target_env: "gnueabi".to_string(), + target_env: "gnu".to_string(), target_vendor: "unknown".to_string(), options: TargetOptions { diff --git a/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs b/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs index 05b9401a063..8ca7c23eb55 100644 --- a/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs +++ b/src/librustc_back/target/arm_unknown_linux_gnueabihf.rs @@ -19,7 +19,7 @@ pub fn target() -> Target { data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), arch: "arm".to_string(), target_os: "linux".to_string(), - target_env: "gnueabihf".to_string(), + target_env: "gnu".to_string(), target_vendor: "unknown".to_string(), options: TargetOptions { diff --git a/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs b/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs index 9c9bb72f76c..549da058d51 100644 --- a/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs +++ b/src/librustc_back/target/armv7_unknown_linux_gnueabihf.rs @@ -19,7 +19,7 @@ pub fn target() -> Target { data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), arch: "arm".to_string(), target_os: "linux".to_string(), - target_env: "gnueabihf".to_string(), + target_env: "gnu".to_string(), target_vendor: "unknown".to_string(), options: TargetOptions {