Merge pull request #3157 from compnerd/full-runtime

Author: swift-ci

stdlib/public/runtime/CMakeLists.txt

@@ -17,23 +17,9 @@ if(SWIFT_RUNTIME_ENABLE_LEAK_CHECKER)
   set(swift_runtime_leaks_sources Leaks.mm)
 endif()
 
-set(swift_runtime_port_sources)
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
-  set(swift_runtime_port_sources
-      MutexWin32.cpp
-      CygwinPort.cpp)
-elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "CYGWIN")
-  set(swift_runtime_port_sources
-      MutexPThread.cpp
-      CygwinPort.cpp)
-else()
-  set(swift_runtime_port_sources
-      MutexPThread.cpp)
-endif()
-
 list(APPEND swift_runtime_compile_flags
      "-D__SWIFT_CURRENT_DYLIB=swiftCore")
-    
+
 set(swift_runtime_objc_sources)
 set(swift_runtime_unicode_normalization_sources)
 if(SWIFT_HOST_VARIANT MATCHES "${SWIFT_DARWIN_VARIANTS}")
@@ -47,6 +33,7 @@ endif()
 
 set(swift_runtime_sources
     Casting.cpp
+    CygwinPort.cpp
     Demangle.cpp
     Enum.cpp
     ErrorObjectNative.cpp
@@ -56,6 +43,8 @@ set(swift_runtime_sources
     KnownMetadata.cpp
     Metadata.cpp
     MetadataLookup.cpp
+    MutexPThread.cpp
+    MutexWin32.cpp
     Once.cpp
     Portability.cpp
     ProtocolConformance.cpp
@@ -78,7 +67,6 @@ add_swift_library(swiftRuntime OBJECT_LIBRARY TARGET_LIBRARY
   ${swift_runtime_sources}
   ${swift_runtime_objc_sources}
   ${swift_runtime_leaks_sources}
-  ${swift_runtime_port_sources}
   C_COMPILE_FLAGS ${swift_runtime_compile_flags}
   INSTALL_IN_COMPONENT never_install)
 

stdlib/public/runtime/CygwinPort.cpp

@@ -14,6 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if defined(_WIN32) || defined(__CYGWIN__)
 #include "Private.h"
 #include "swift/Runtime/Debug.h"
 #include <stdint.h>
@@ -136,6 +137,7 @@ uint8_t *swift::_swift_getSectionDataPE(void *handle, const char *sectionName,
 
   return nullptr;
 }
+
 #if !defined(_MSC_VER)
 void swift::_swift_once_f(uintptr_t *predicate, void *context,
                           void (*function)(void *)) {
@@ -152,3 +154,4 @@ void swift::_swift_once_f(uintptr_t *predicate, void *context,
     swiftOnceMutex.unlock();
 }
 #endif
+#endif

stdlib/public/runtime/MutexPThread.cpp

@@ -15,6 +15,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if !defined(_WIN32)
 #include "swift/Runtime/Mutex.h"
 
 #include "swift/Runtime/Debug.h"
@@ -142,3 +143,4 @@ void ReadWriteLockPlatformHelper::readUnlock(pthread_rwlock_t &rwlock) {
 void ReadWriteLockPlatformHelper::writeUnlock(pthread_rwlock_t &rwlock) {
   reportError(pthread_rwlock_unlock(&rwlock));
 }
+#endif

stdlib/public/runtime/MutexWin32.cpp

@@ -15,6 +15,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if defined(_WIN32) || defined(__CYGWIN__)
 #include "swift/Runtime/Mutex.h"
 #include "swift/Runtime/Debug.h"
 
@@ -30,3 +31,4 @@ void ConditionPlatformHelper::wait(CONDITION_VARIABLE &condition,
                errorcode);
   }
 }
+#endif