Porting to Cygwin

Author: tinysun212

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 2.8.12)
+cmake_policy(SET CMP0054 NEW)
 
 # Add path for custom CMake modules.
 list(APPEND CMAKE_MODULE_PATH
@@ -437,6 +438,19 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
 
   set(SWIFT_PRIMARY_VARIANT_SDK_default "FREEBSD")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
+  configure_sdk_unix(CYGWIN "Cygwin" "windows" "cygwin" "x86_64" "x86_64-unknown-windows-cygnus")
+
+#  set(CMAKE_EXECUTABLE_FORMAT "ELF")
+
+  set(SWIFT_HOST_VARIANT "windows" CACHE STRING
+      "Deployment OS for Swift host tools (the compiler) [windows].")
+
+  set(SWIFT_HOST_VARIANT_SDK "CYGWIN")
+  set(SWIFT_HOST_VARIANT_ARCH "x86_64")
+  
+  set(SWIFT_PRIMARY_VARIANT_SDK_default "CYGWIN")
+  set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
   # Set defaults.
 

cmake/modules/AddSwift.cmake

@@ -176,6 +176,8 @@ function(_add_variant_link_flags
     list(APPEND result "-lpthread" "-ldl" "-Wl,-Bsymbolic")
   elseif("${sdk}" STREQUAL "FREEBSD")
     list(APPEND result "-lpthread" "-Wl,-Bsymbolic")
+  elseif("${sdk}" STREQUAL "CYGWIN")
+    # No extra libraries required.
   else()
     list(APPEND result "-lobjc")
   endif()

include/swift/Basic/Dwarf.h

@@ -21,7 +21,11 @@
 
 namespace swift {
   /// The DWARF version emitted by the Swift compiler.
+#if defined(__CYGWIN__)
+  const unsigned DWARFVersion = 4;
+#else
   const unsigned DWARFVersion = 3;
+#endif
   static const char MachOASTSegmentName[] = "__SWIFT";
   static const char MachOASTSectionName[] = "__ast";
   static const char ELFASTSectionName[] = ".swift_ast";

include/swift/Basic/LangOptions.h

@@ -173,6 +173,7 @@ namespace swift {
       } else if (Target.isWatchOS()) {
         Target.getOSVersion(major, minor, revision);
       } else if (Target.isOSLinux() || Target.isOSFreeBSD() ||
+                 Target.isOSWindows() ||
                  Target.getTriple().empty())
       {
         major = minor = revision = 0;

include/swift/Runtime/Once.h

@@ -27,6 +27,11 @@ namespace swift {
 // On OS X and iOS, swift_once_t matches dispatch_once_t.
 typedef long swift_once_t;
 
+#elif defined(__CYGWIN__)
+
+// On Cygwin, std::once_flag can not be used because it is larger than the
+// platform word.
+typedef unsigned long swift_once_t;
 #else
 
 // On other platforms swift_once_t is std::once_flag

lib/Basic/Demangle.cpp

@@ -23,6 +23,7 @@
 #include "llvm/ADT/StringRef.h"
 #include <functional>
 #include <vector>
+#include <cstdio>
 #include <cstdlib>
 
 using namespace swift;

lib/Basic/LangOptions.cpp

@@ -29,7 +29,8 @@ const std::vector<std::string> LangOptions::SupportedOSBuildConfigArguments = {
   "watchOS",
   "iOS",
   "Linux",
-  "FreeBSD"
+  "FreeBSD",
+  "Windows"
 };
 
 const std::vector<std::string> LangOptions::SupportedArchBuildConfigArguments = {
@@ -103,6 +104,8 @@ std::pair<bool, bool> LangOptions::setTarget(llvm::Triple triple) {
     addTargetConfigOption("os", "Linux");
   else if (triple.isOSFreeBSD())
     addTargetConfigOption("os", "FreeBSD");
+  else if (triple.isOSWindows())
+    addTargetConfigOption("os", "Windows");
   else {
     UnsupportedOS = true;
   }

lib/Basic/Platform.cpp

@@ -66,6 +66,9 @@ StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) {
 
   if (triple.isOSFreeBSD())
     return "freebsd";
+	
+  if (triple.isOSWindows())
+    return  "windows";
 
   return "";
 }

lib/Basic/Remangle.cpp

@@ -24,6 +24,7 @@
 #include "swift/Strings.h"
 #include "llvm/ADT/StringRef.h"
 #include <vector>
+#include <cstdio>
 #include <cstdlib>
 #include <unordered_map>
 

lib/Basic/TaskQueue.cpp

@@ -23,7 +23,7 @@ using namespace swift;
 using namespace swift::sys;
 
 // Include the correct TaskQueue implementation.
-#if LLVM_ON_UNIX
+#if LLVM_ON_UNIX && !defined(__CYGWIN__)
 #include "Unix/TaskQueue.inc"
 #else
 #include "Default/TaskQueue.inc"