Merge pull request #26315 from Rostepher/toolchain-compat-libs-5.1

[Build System: CMake] Move the Compatibility libraries into stdlib/toolchain (5.1 branch).

Author: Rostepher

stdlib/public/CMakeLists.txt

@@ -61,8 +61,6 @@ if(SWIFT_BUILD_STDLIB)
   add_subdirectory(stubs)
   add_subdirectory(core)
   add_subdirectory(SwiftOnoneSupport)
-  add_subdirectory(Compatibility50)
-  add_subdirectory(CompatibilityDynamicReplacements)
 endif()
 
 if(SWIFT_BUILD_STDLIB OR SWIFT_BUILD_REMOTE_MIRROR)

stdlib/public/Compatibility50/CMakeLists.txt

@@ -1 +1,47 @@
+# Toolchain-only build products
+
+set(CXX_COMPILE_FLAGS)
+set(CXX_LINK_FLAGS)
+
+
+set(compile_flags
+  # Build the runtime with -Wall to catch, e.g., uninitialized variables
+  # warnings.
+  "-Wall"
+
+  # C++ code in the runtime and standard library should generally avoid
+  # introducing static constructors or destructors.
+  "-Wglobal-constructors"
+  "-Wexit-time-destructors"
+
+  # We don't want runtime C++ code to export symbols we didn't explicitly
+  # choose to.
+  "-fvisibility=hidden")
+
+
+# Build the runtime with -Wall to catch, e.g., uninitialized variables
+# warnings.
+if(SWIFT_COMPILER_IS_MSVC_LIKE)
+  list(APPEND compile_flags "/W3")
+else()
+  list(APPEND compile_flags "-Wall")
+endif()
+
+
+foreach(flag ${compile_flags})
+  check_cxx_compiler_flag("${flag}" is_supported)
+  if(is_supported)
+    list(APPEND CXX_COMPILE_FLAGS "${flag}")
+  endif()
+endforeach()
+unset(compile_flags)
+
+
+if("Thread" IN_LIST SWIFT_RUNTIME_USE_SANITIZERS)
+  list(APPEND CXX_LINK_FLAGS "-fsanitize=thread")
+endif()
+
+
 add_subdirectory(legacy_layouts)
+add_subdirectory(Compatibility50)
+add_subdirectory(CompatibilityDynamicReplacements)

stdlib/public/CompatibilityDynamicReplacements/CMakeLists.txt

@@ -0,0 +1,29 @@
+set(library_name "swiftCompatibility50")
+
+add_swift_target_library("${library_name}" STATIC TARGET_LIBRARY
+  ProtocolConformance.cpp
+  Overrides.cpp
+
+  TARGET_SDKS ${SWIFT_APPLE_PLATFORMS}
+
+  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
+  LINK_FLAGS ${CXX_LINK_FLAGS}
+  SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
+
+  INSTALL_IN_COMPONENT compiler
+  INSTALL_WITH_SHARED)
+
+
+# FIXME: We need a more flexible mechanism to add lipo targets generated by
+# add_swift_target_library to the ALL target. Until then this hack is necessary
+# to ensure these libraries build.
+foreach(sdk ${SWIFT_SDKS})
+  set(target_name "${library_name}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
+  if(NOT TARGET "${target_name}")
+    continue()
+  endif()
+
+  set_target_properties("${target_name}"
+    PROPERTIES
+      EXCLUDE_FROM_ALL FALSE)
+endforeach()

stdlib/toolchain/CMakeLists.txt

@@ -15,15 +15,15 @@
 //===----------------------------------------------------------------------===//
 
 #include "Overrides.h"
-#include "../runtime/CompatibilityOverride.h"
+#include "../../public/runtime/CompatibilityOverride.h"
 
 using namespace swift;
 
 struct OverrideSection {
   uintptr_t version;
 #define OVERRIDE(name, ret, attrs, ccAttrs, namespace, typedArgs, namedArgs) \
   Override_ ## name name;
-#include "../runtime/CompatibilityOverride.def"
+#include "../../public/runtime/CompatibilityOverride.def"
 };
 
 OverrideSection Overrides

stdlib/toolchain/Compatibility50/CMakeLists.txt

@@ -18,7 +18,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "Overrides.h"
-#include "../runtime/Private.h"
+#include "../../public/runtime/Private.h"
 #include "swift/Basic/Lazy.h"
 #include <objc/runtime.h>
 

stdlib/public/Compatibility50/Overrides.cpp renamed to stdlib/toolchain/Compatibility50/Overrides.cpp

@@ -0,0 +1,28 @@
+set(library_name "swiftCompatibilityDynamicReplacements")
+
+add_swift_target_library("${library_name}" STATIC TARGET_LIBRARY
+  DynamicReplaceable.cpp
+
+  TARGET_SDKS ${SWIFT_APPLE_PLATFORMS}
+
+  C_COMPILE_FLAGS ${CXX_COMPILE_FLAGS}
+  LINK_FLAGS ${CXX_LINK_FLAGS}
+  SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
+
+  INSTALL_IN_COMPONENT compiler
+  INSTALL_WITH_SHARED)
+
+
+# FIXME: We need a more flexible mechanism to add lipo targets generated by
+# add_swift_target_library to the ALL target. Until then this hack is necessary
+# to ensure these libraries build.
+foreach(sdk ${SWIFT_SDKS})
+  set(target_name "${library_name}-${SWIFT_SDK_${sdk}_LIB_SUBDIR}")
+  if(NOT TARGET "${target_name}")
+    continue()
+  endif()
+
+  set_target_properties("${target_name}"
+    PROPERTIES
+      EXCLUDE_FROM_ALL FALSE)
+endforeach()

stdlib/public/Compatibility50/Overrides.h renamed to stdlib/toolchain/Compatibility50/Overrides.h

@@ -19,7 +19,7 @@
 
 #include "swift/Runtime/Once.h"
 #include "swift/Runtime/Exclusivity.h"
-#include "../runtime/ThreadLocalStorage.h"
+#include "../../public/runtime/ThreadLocalStorage.h"
 
 using namespace swift;