[SH] Changes to compile with wasi-sdk

cmake/modules/Hermes.cmake

@@ -57,6 +57,8 @@ else (WIN32)
     else ()
       set(LLVM_HAVE_LINK_VERSION_SCRIPT 1)
     endif ()
+  elseif (WASI)
+    # Do nothing for WASI. It will be detected at compile time.
   else (FUCHSIA OR UNIX)
     MESSAGE(SEND_ERROR "Unable to determine platform")
   endif (FUCHSIA OR UNIX)

external/dtoa/locks.cpp

@@ -1,3 +1,6 @@
+#include "llvh/Config/llvm-config.h"
+
+#if LLVM_ENABLE_THREADS
 #include <cassert>
 #include <mutex>
 
@@ -15,3 +18,10 @@ extern "C" void FREE_DTOA_LOCK(int n) {
   assert(n == 1 && "only dtoa lock 1 is supported");
   mutex.unlock();
 }
+#else
+extern "C" void ACQUIRE_DTOA_LOCK(int) {
+}
+
+extern "C" void FREE_DTOA_LOCK(int) {
+}
+#endif

external/llvh/CMakeLists.txt

@@ -11,7 +11,9 @@ set(PACKAGE_NAME "LLVH")
 set(PACKAGE_STRING "LLVH 8.0.0svn")
 set(PACKAGE_VERSION "8.0.0svn")
 
-set(LLVM_ENABLE_THREADS 1)
+if ("${LLVM_ENABLE_THREADS}" STREQUAL "")
+  set(LLVM_ENABLE_THREADS 1)
+endif ()
 if (LLVH_REVERSE_ITERATION)
   set(LLVM_ENABLE_REVERSE_ITERATION 1)
 endif ()

external/llvh/cmake/config-ix.cmake

@@ -213,6 +213,7 @@ check_symbol_exists(strerror string.h HAVE_STRERROR)
 check_symbol_exists(strerror_r string.h HAVE_STRERROR_R)
 check_symbol_exists(strerror_s string.h HAVE_DECL_STRERROR_S)
 check_symbol_exists(setenv stdlib.h HAVE_SETENV)
+check_symbol_exists(tzset time.h HAVE_TZSET)
 if( PURE_WINDOWS )
   check_symbol_exists(_chsize_s io.h HAVE__CHSIZE_S)
 

external/llvh/include/llvh/Config/config.h.cmake

@@ -166,6 +166,9 @@
 /* Define to 1 if you have the `setenv' function. */
 #cmakedefine HAVE_SETENV ${HAVE_SETENV}
 
+/* Define to 1 if you have the `tzset' function. */
+#cmakedefine HAVE_TZSET ${HAVE_TZSET}
+
 /* Define to 1 if you have the `sched_getaffinity' function. */
 #cmakedefine HAVE_SCHED_GETAFFINITY ${HAVE_SCHED_GETAFFINITY}
 

external/llvh/include/llvh/Support/Atomic.h

@@ -40,4 +40,20 @@ namespace llvh {
   }
 }
 
+#ifdef __GNUC__
+
+namespace llvh::sys {
+    inline void MemoryFence() {
+      __sync_synchronize();
+    }
+    inline cas_flag CompareAndSwap(volatile cas_flag* ptr,
+                            cas_flag new_value,
+                            cas_flag old_value) {
+      return __sync_val_compare_and_swap(ptr, old_value, new_value);
+    }
+
+}
+
+#endif
+
 #endif

external/llvh/include/llvh/Support/FileSystem.h

@@ -157,7 +157,7 @@ class UniqueID {
 /// represents the information provided by Windows FileFirstFile/FindNextFile.
 class basic_file_status {
 protected:
-  #if defined(LLVM_ON_UNIX)
+  #if defined(LLVM_ON_UNIX) || defined(__wasi__)
   time_t fs_st_atime = 0;
   time_t fs_st_mtime = 0;
   uid_t fs_st_uid = 0;
@@ -179,7 +179,7 @@ class basic_file_status {
 
   explicit basic_file_status(file_type Type) : Type(Type) {}
 
-  #if defined(LLVM_ON_UNIX)
+  #if defined(LLVM_ON_UNIX) || defined(__wasi__)
   basic_file_status(file_type Type, perms Perms, time_t ATime, time_t MTime,
                     uid_t UID, gid_t GID, off_t Size)
       : fs_st_atime(ATime), fs_st_mtime(MTime), fs_st_uid(UID), fs_st_gid(GID),
@@ -202,7 +202,7 @@ class basic_file_status {
   TimePoint<> getLastAccessedTime() const;
   TimePoint<> getLastModificationTime() const;
 
-  #if defined(LLVM_ON_UNIX)
+  #if defined(LLVM_ON_UNIX) || defined(__wasi__)
   uint32_t getUser() const { return fs_st_uid; }
   uint32_t getGroup() const { return fs_st_gid; }
   uint64_t getSize() const { return fs_st_size; }
@@ -229,7 +229,7 @@ class basic_file_status {
 class file_status : public basic_file_status {
   friend bool equivalent(file_status A, file_status B);
 
-  #if defined(LLVM_ON_UNIX)
+  #if defined(LLVM_ON_UNIX) || defined(__wasi__)
   dev_t fs_st_dev = 0;
   nlink_t fs_st_nlinks = 0;
   ino_t fs_st_ino = 0;
@@ -245,7 +245,7 @@ class file_status : public basic_file_status {
 
   explicit file_status(file_type Type) : basic_file_status(Type) {}
 
-  #if defined(LLVM_ON_UNIX)
+  #if defined(LLVM_ON_UNIX) || defined(__wasi__)
   file_status(file_type Type, perms Perms, dev_t Dev, nlink_t Links, ino_t Ino,
               time_t ATime, time_t MTime, uid_t UID, gid_t GID, off_t Size)
       : basic_file_status(Type, Perms, ATime, MTime, UID, GID, Size),

external/llvh/include/llvh/Support/Program.h

@@ -26,7 +26,7 @@ namespace sys {
 
   /// This is the OS-specific separator for PATH like environment variables:
   // a colon on Unix or a semicolon on Windows.
-#if defined(LLVM_ON_UNIX)
+#if defined(LLVM_ON_UNIX) || defined(__wasi__)
   const char EnvPathSeparator = ':';
 #elif defined (_WIN32)
   const char EnvPathSeparator = ';';

external/llvh/lib/Support/Host.cpp

@@ -33,6 +33,9 @@
 #ifdef _WIN32
 #include "Windows/Host.inc"
 #endif
+#ifdef __wasi__
+#include "Wasi/Host.inc"
+#endif
 #ifdef _MSC_VER
 #include <intrin.h>
 #endif

external/llvh/lib/Support/Path.cpp

@@ -1113,6 +1113,9 @@ ErrorOr<perms> getPermissions(const Twine &Path) {
 #if defined(_WIN32)
 #include "Windows/Path.inc"
 #endif
+#ifdef __wasi__
+#include "Wasi/Path.inc"
+#endif
 
 namespace llvh {
 namespace sys {

external/llvh/lib/Support/Process.cpp

@@ -96,3 +96,6 @@ bool Process::AreCoreFilesPrevented() { return coreFilesPrevented; }
 #ifdef _WIN32
 #include "Windows/Process.inc"
 #endif
+#ifdef __wasi__
+#include "Wasi/Process.inc"
+#endif

external/llvh/lib/Support/Program.cpp

@@ -81,3 +81,6 @@ bool sys::commandLineFitsWithinSystemLimits(StringRef Program,
 #ifdef _WIN32
 #include "Windows/Program.inc"
 #endif
+#ifdef __wasi__
+#include "Wasi/Program.inc"
+#endif

external/llvh/lib/Support/Signals.cpp

@@ -246,3 +246,6 @@ static bool printSymbolizedStackTrace(StringRef Argv0, void **StackTrace,
 #ifdef _WIN32
 #include "Windows/Signals.inc"
 #endif
+#ifdef __wasi__
+#include "Wasi/Signals.inc"
+#endif

external/llvh/lib/Support/Wasi/Host.inc

@@ -0,0 +1,68 @@
+//===- llvm/Support/Unix/Host.inc -------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the UNIX Host support.
+//
+//===----------------------------------------------------------------------===//
+
+//===----------------------------------------------------------------------===//
+//=== WARNING: Implementation here must contain only generic UNIX code that
+//===          is guaranteed to work on *all* UNIX variants.
+//===----------------------------------------------------------------------===//
+
+#include "Unix.h"
+#include "llvh/ADT/StringRef.h"
+#include "llvh/Config/config.h"
+#include <cctype>
+#include <string>
+#include <sys/utsname.h>
+
+using namespace llvh;
+
+static std::string getOSVersion() {
+  struct utsname info;
+
+  if (uname(&info))
+    return "";
+
+  return info.release;
+}
+
+static std::string updateTripleOSVersion(std::string TargetTripleString) {
+  // On darwin, we want to update the version to match that of the target.
+  std::string::size_type DarwinDashIdx = TargetTripleString.find("-darwin");
+  if (DarwinDashIdx != std::string::npos) {
+    TargetTripleString.resize(DarwinDashIdx + strlen("-darwin"));
+    TargetTripleString += getOSVersion();
+    return TargetTripleString;
+  }
+  std::string::size_type MacOSDashIdx = TargetTripleString.find("-macos");
+  if (MacOSDashIdx != std::string::npos) {
+    TargetTripleString.resize(MacOSDashIdx);
+    // Reset the OS to darwin as the OS version from `uname` doesn't use the
+    // macOS version scheme.
+    TargetTripleString += "-darwin";
+    TargetTripleString += getOSVersion();
+  }
+  return TargetTripleString;
+}
+
+std::string sys::getDefaultTargetTriple() {
+  std::string TargetTripleString =
+      updateTripleOSVersion(LLVM_DEFAULT_TARGET_TRIPLE);
+
+  // Override the default target with an environment variable named by
+  // LLVM_TARGET_TRIPLE_ENV.
+#if defined(LLVM_TARGET_TRIPLE_ENV)
+  if (const char *EnvTriple = std::getenv(LLVM_TARGET_TRIPLE_ENV))
+    TargetTripleString = EnvTriple;
+#endif
+
+  return TargetTripleString;
+}