about summary refs log tree commit diff
path: root/src/libtest
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2016-09-06 00:41:50 +0000
committerBrian Anderson <banderson@mozilla.com>2016-09-30 14:02:45 -0700
commitb8b50f0eda08e19e7c96377681f82ac17c76775d (patch)
tree411e10f72395aca9ce8581582f9450681fb384a8 /src/libtest
parentb2dfeac6907ab63a3261cfa66c04db239d138433 (diff)
downloadrust-b8b50f0eda08e19e7c96377681f82ac17c76775d.tar.gz
rust-b8b50f0eda08e19e7c96377681f82ac17c76775d.zip
Preliminary wasm32 support
Diffstat (limited to 'src/libtest')
-rw-r--r--src/libtest/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index dcfd3f754c7..12dd8e615e8 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -1291,7 +1291,7 @@ impl MetricMap {
 ///
 /// This function is a no-op, and does not even read from `dummy`.
 #[cfg(not(any(all(target_os = "nacl", target_arch = "le32"),
-              target_arch = "asmjs")))]
+              target_arch = "asmjs", target_arch = "wasm32")))]
 pub fn black_box<T>(dummy: T) -> T {
     // we need to "use" the argument in some way LLVM can't
     // introspect.
@@ -1299,7 +1299,7 @@ pub fn black_box<T>(dummy: T) -> T {
     dummy
 }
 #[cfg(any(all(target_os = "nacl", target_arch = "le32"),
-          target_arch = "asmjs"))]
+          target_arch = "asmjs", target_arch = "wasm32"))]
 #[inline(never)]
 pub fn black_box<T>(dummy: T) -> T {
     dummy