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

Jorge Aparicio · Jorge Aparicio · commit 9ffd0fe5a75b · 2016-07-30T15:39:13.000-05:00
diff --git 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
@@ -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
@@ -1 +1 @@
-Subproject commit b0d62534d48b711c8978d1bbe8cca0558ae7b1cb
+Subproject commit 23a5092adcecc8c755e7887337e52f357353cad7
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pub fn target() -> Target {`
`26`	`26`	`data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),`
`27`	`27`	`arch: "arm".to_string(),`
`28`	`28`	`target_os: "linux".to_string(),`
`29`		`- target_env: "musleabi".to_string(),`
	`29`	`+ target_env: "musl".to_string(),`
`30`	`30`	`target_vendor: "unknown".to_string(),`
`31`	`31`	`options: base,`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ pub fn target() -> Target {`
`27`	`27`	`data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),`
`28`	`28`	`arch: "arm".to_string(),`
`29`	`29`	`target_os: "linux".to_string(),`
`30`		`- target_env: "musleabi".to_string(),`
	`30`	`+ target_env: "musl".to_string(),`
`31`	`31`	`target_vendor: "unknown".to_string(),`
`32`	`32`	`options: base,`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -171,9 +171,7 @@ impl Drop for Thread {`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`-#[cfg(all(not(all(target_os = "linux", not(any(target_env = "musl",`
`175`		`- target_env = "musleabi",`
`176`		`- target_env = "musleabihf")))),`
	`174`	`+#[cfg(all(not(all(target_os = "linux", not(any(target_env = "musl")))),`
`177`	`175`	`not(target_os = "freebsd"),`
`178`	`176`	`not(target_os = "macos"),`
`179`	`177`	`not(target_os = "bitrig"),`
`@@ -187,9 +185,7 @@ pub mod guard {`
`187`	`185`	`}`
`188`	`186`
`189`	`187`
`190`		`-#[cfg(any(all(target_os = "linux", not(any(target_env = "musl",`
`191`		`- target_env = "musleabi",`
`192`		`- target_env = "musleabihf"))),`
	`188`	`+#[cfg(any(all(target_os = "linux", not(any(target_env = "musl"))),`
`193`	`189`	`target_os = "freebsd",`
`194`	`190`	`target_os = "macos",`
`195`	`191`	`target_os = "bitrig",`