diff --git a/src/librustc_back/target/arm_unknown_linux_gnueabi.rs b/src/librustc_back/target/arm_unknown_linux_gnueabi.rs
index 0cb0949d4622fa7066adc8f3820fdbac4c6bdf9d..29ab712038911ad90863d0aec7c40f9f23415929 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 05b9401a0635c99d1337c8092b6f45924bd2e1e3..8ca7c23eb55379c4b64f7832baf9603ed7cc8d28 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 9c9bb72f76cfdecfd43c6d1536e7ecde98a3052e..549da058d518dc430e3fba02c20e3a075906bba9 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 {