arm-musl targets now use cfg(env = "musl")

8 files changed, 8 insertions, 16 deletions

diff --git a/.gitmodules b/.gitmodules
index 39288a7ae49..61697a37960 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,4 +16,4 @@
 	url = https://github.com/rust-lang/rust-installer.git
 [submodule "src/liblibc"]
 	path = src/liblibc
-	url = https://github.com/rust-lang/libc.git
+	url = https://github.com/japaric/libc.git
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs
index ccf3d978fe4..347e97e6ffc 100644
--- a/src/liballoc_jemalloc/lib.rs
+++ b/src/liballoc_jemalloc/lib.rs
@@ -36,9 +36,7 @@ use libc::{c_int, c_void, size_t};
 #[cfg_attr(target_os = "android", link(name = "gcc"))]
 #[cfg_attr(all(not(windows),
                not(target_os = "android"),
-               not(target_env = "musl"),
-               not(target_env = "musleabi"),
-               not(target_env = "musleabihf")),
+               not(target_env = "musl")),
            link(name = "pthread"))]
 #[cfg(not(cargobuild))]
 extern "C" {}
diff --git a/src/liblibc b/src/liblibc
-Subproject b0d62534d48b711c8978d1bbe8cca0558ae7b1c
+Subproject 23a5092adcecc8c755e7887337e52f357353cad
diff --git a/src/librustc_back/target/arm_unknown_linux_musleabi.rs b/src/librustc_back/target/arm_unknown_linux_musleabi.rs
index 906f60f1c9a..f2dff16a284 100644
--- a/src/librustc_back/target/arm_unknown_linux_musleabi.rs
+++ b/src/librustc_back/target/arm_unknown_linux_musleabi.rs
@@ -26,7 +26,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: "musleabi".to_string(),
+        target_env: "musl".to_string(),
         target_vendor: "unknown".to_string(),
         options: base,
     }
diff --git a/src/librustc_back/target/arm_unknown_linux_musleabihf.rs b/src/librustc_back/target/arm_unknown_linux_musleabihf.rs
index 3051721b8c2..89da0213198 100644
--- a/src/librustc_back/target/arm_unknown_linux_musleabihf.rs
+++ b/src/librustc_back/target/arm_unknown_linux_musleabihf.rs
@@ -26,7 +26,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: "musleabi".to_string(),
+        target_env: "musl".to_string(),
         target_vendor: "unknown".to_string(),
         options: base,
     }
diff --git a/src/librustc_back/target/armv7_unknown_linux_musleabihf.rs b/src/librustc_back/target/armv7_unknown_linux_musleabihf.rs
index 8732681fb49..3b9ac8e21f2 100644
--- a/src/librustc_back/target/armv7_unknown_linux_musleabihf.rs
+++ b/src/librustc_back/target/armv7_unknown_linux_musleabihf.rs
@@ -27,7 +27,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: "musleabi".to_string(),
+        target_env: "musl".to_string(),
         target_vendor: "unknown".to_string(),
         options: base,
     }
diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs
index f23ac32f51c..c2572dfa5e1 100644
--- a/src/libstd/rtdeps.rs
+++ b/src/libstd/rtdeps.rs
@@ -19,9 +19,7 @@
 //
 // On Linux, librt and libdl are indirect dependencies via std,
 // and binutils 2.22+ won't add them automatically
-#[cfg(all(target_os = "linux", not(any(target_env = "musl",
-                                       target_env = "musleabi",
-                                       target_env = "musleabihf"))))]
+#[cfg(all(target_os = "linux", not(any(target_env = "musl"))))]
 #[link(name = "dl")]
 #[link(name = "pthread")]
 extern {}
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
index 7f05aec4e6e..65ebce0baa2 100644
--- a/src/libstd/sys/unix/thread.rs
+++ b/src/libstd/sys/unix/thread.rs
@@ -171,9 +171,7 @@ impl Drop for Thread {
     }
 }
 
-#[cfg(all(not(all(target_os = "linux", not(any(target_env = "musl",
-                                               target_env = "musleabi",
-                                               target_env = "musleabihf")))),
+#[cfg(all(not(all(target_os = "linux", not(any(target_env = "musl")))),
           not(target_os = "freebsd"),
           not(target_os = "macos"),
           not(target_os = "bitrig"),
@@ -187,9 +185,7 @@ pub mod guard {
 }
 
 
-#[cfg(any(all(target_os = "linux", not(any(target_env = "musl",
-                                           target_env = "musleabi",
-                                           target_env = "musleabihf"))),
+#[cfg(any(all(target_os = "linux", not(any(target_env = "musl"))),
           target_os = "freebsd",
           target_os = "macos",
           target_os = "bitrig",