WebAssembly: add more ifdefs for WebAssembly

Author: zhuowei

include/swift/SwiftRemoteMirror/Platform.h

@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 #if defined(swiftRemoteMirror_EXPORTS)
-# if defined(__ELF__)
+# if defined(__ELF__) || defined(__wasm__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("protected")))
 # elif defined(__MACH__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("default")))
@@ -30,7 +30,7 @@ extern "C" {
 #   endif
 # endif
 #else
-# if defined(__ELF__)
+# if defined(__ELF__) || defined(__wasm__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("default")))
 # elif defined(__MACH__)
 #   define SWIFT_REMOTE_MIRROR_LINKAGE __attribute__((__visibility__("default")))

stdlib/private/StdlibUnittest/InterceptTraps.cpp

@@ -26,6 +26,9 @@
 
 #include "swift/Runtime/Config.h"
 
+// WebAssembly: no signals on WASI yet
+#ifndef __wasi__
+
 static void CrashCatcher(int Sig) {
   const char *Msg;
   switch (Sig) {
@@ -65,11 +68,16 @@ VectoredCrashHandler(PEXCEPTION_POINTERS ExceptionInfo) {
 }
 #endif
 
+#endif // __wasi__
+
 SWIFT_CC(swift) SWIFT_RUNTIME_LIBRARY_VISIBILITY extern "C"
 void installTrapInterceptor() {
   // Disable buffering on stdout so that everything is printed before crashing.
   setbuf(stdout, 0);
 
+// WebAssembly: no signals on WASI
+#ifndef __wasi__
+
 #if defined(_WIN32)
   _set_abort_behavior(0, _WRITE_ABORT_MSG);
 #endif
@@ -85,5 +93,6 @@ void installTrapInterceptor() {
   signal(SIGBUS,  CrashCatcher);
   signal(SIGSYS,  CrashCatcher);
 #endif
-}
 
+#endif // __wasi__
+}

stdlib/private/StdlibUnittest/RaceTest.swift

@@ -41,7 +41,7 @@ import SwiftPrivateLibcExtras
 import SwiftPrivateThreadExtras
 #if os(macOS) || os(iOS)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(Wasm)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
@@ -562,7 +562,12 @@ class _InterruptibleSleep {
       return
     }
 
+#if os(Wasm)
+// WebAssembly/WASI on wasm32 is the only 32-bit platform with Int64 time_t
+    var timeout = timeval(tv_sec: time_t(duration), tv_usec: 0)
+#else
     var timeout = timeval(tv_sec: duration, tv_usec: 0)
+#endif
 
     var readFDs = _stdlib_fd_set()
     var writeFDs = _stdlib_fd_set()

stdlib/private/StdlibUnittest/StdlibCoreExtras.swift

@@ -14,7 +14,7 @@ import SwiftPrivate
 import SwiftPrivateLibcExtras
 #if os(macOS) || os(iOS)
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(Wasm)
 import Glibc
 #elseif os(Windows)
 import MSVCRT

stdlib/private/StdlibUnittest/StdlibUnittest.swift

@@ -18,7 +18,7 @@ import SwiftPrivateLibcExtras
 #if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
 import Foundation
 import Darwin
-#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
+#elseif os(Linux) || os(FreeBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku) || os(Wasm)
 import Glibc
 #elseif os(Windows)
 import MSVCRT
@@ -748,6 +748,8 @@ extension ProcessTerminationStatus {
     case .signal(let signal):
 #if os(Windows)
       return CInt(signal) == SIGILL
+#elseif os(Wasm)
+      return false
 #else
       return CInt(signal) == SIGILL || CInt(signal) == SIGTRAP
 #endif
@@ -1746,6 +1748,7 @@ public enum OSVersion : CustomStringConvertible {
   case windowsCygnus
   case windows
   case haiku
+  case wasm
 
   public var description: String {
     switch self {
@@ -1777,6 +1780,8 @@ public enum OSVersion : CustomStringConvertible {
       return "Windows"
     case .haiku:
       return "Haiku"
+    case .wasm:
+      return "Wasm"
     }
   }
 }
@@ -1821,6 +1826,8 @@ func _getOSVersion() -> OSVersion {
   return .windows
 #elseif os(Haiku)
   return .haiku
+#elseif os(Wasm)
+  return .wasm
 #else
   let productVersion = _getSystemVersionPlistProperty("ProductVersion")!
   let (major, minor, bugFix) = _parseDottedVersionTriple(productVersion)

stdlib/public/Platform/Glibc.swift.gyb

@@ -72,5 +72,6 @@ public let ${prefix}_TRUE_MIN = ${type}.leastNonzeroMagnitude
 
 #if os(Wasm)
 // WebAssembly's error.h uses a macro that Swift can't import.
+public let EINTR:Int32 = 27
 public let EINVAL:Int32 = 28
 #endif

stdlib/tools/swift-reflection-test/swift-reflection-test.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
+#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__wasi__)
 #include <unistd.h>
 #elif defined(_WIN32)
 #include <io.h>