about summary refs log tree commit diff
path: root/src/libstd/os
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2017-07-17 09:24:05 -0700
committerAlex Crichton <alex@alexcrichton.com>2017-08-28 07:58:19 -0700
commite5b123cba250b02e2cd8fad0c0bd6bb519e051d2 (patch)
tree4b78884b6d17a0fa242a4432057708797193b22f /src/libstd/os
parenteb8f2586ebd842dec49d3d7f50e49a985ab31493 (diff)
downloadrust-e5b123cba250b02e2cd8fad0c0bd6bb519e051d2.tar.gz
rust-e5b123cba250b02e2cd8fad0c0bd6bb519e051d2.zip
Update the libc submodule
Brings in a few fixes for wasm/asmjs
Diffstat (limited to 'src/libstd/os')
-rw-r--r--src/libstd/os/raw.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs
index c34491941d6..fe0427d4e5f 100644
--- a/src/libstd/os/raw.rs
+++ b/src/libstd/os/raw.rs
@@ -14,8 +14,7 @@
 
 use fmt;
 
-#[cfg(any(target_os = "emscripten",
-          all(target_os = "linux", any(target_arch = "aarch64",
+#[cfg(any(all(target_os = "linux", any(target_arch = "aarch64",
                                        target_arch = "arm",
                                        target_arch = "powerpc",
                                        target_arch = "powerpc64",
@@ -24,8 +23,7 @@ use fmt;
                                          target_arch = "arm")),
           all(target_os = "fuchsia", target_arch = "aarch64")))]
 #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8;
-#[cfg(not(any(target_os = "emscripten",
-              all(target_os = "linux", any(target_arch = "aarch64",
+#[cfg(not(any(all(target_os = "linux", any(target_arch = "aarch64",
                                            target_arch = "arm",
                                            target_arch = "powerpc",
                                            target_arch = "powerpc64",