Skip to content

stdlib: remove swiftMSVCRT, replace with swiftCRT on Windows #34299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 20, 2020
Merged

stdlib: remove swiftMSVCRT, replace with swiftCRT on Windows #34299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/private/RuntimeUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ add_swift_target_library(swiftRuntimeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
SWIFT_MODULE_DEPENDS_WINDOWS CRT
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibCollectionUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ add_swift_target_library(swiftStdlibCollectionUnittest ${SWIFT_STDLIB_LIBRARY_BU
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
SWIFT_MODULE_DEPENDS_WINDOWS CRT
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnicodeUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_swift_target_library(swiftStdlibUnicodeUnittest ${SWIFT_STDLIB_LIBRARY_BUILD
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
SWIFT_MODULE_DEPENDS_WINDOWS CRT
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ add_swift_target_library(swiftStdlibUnittest ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES}
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
SWIFT_COMPILE_FLAGS ${swift_stdlib_unittest_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/RaceTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/StdlibCoreExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#endif

#if _runtime(_ObjC)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/StdlibUnittest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/StdlibUnittest/SymbolLookup.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#else
#error("Unsupported platform")
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivate/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ add_swift_target_library(swiftSwiftPrivate ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
GYB_SOURCES
AtomicInt.swift.gyb

SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
SWIFT_COMPILE_FLAGS ${swift_swiftprivate_compile_flags} ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivate/IO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import Swift
import SwiftShims

#if os(Windows)
import MSVCRT
import CRT
import WinSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ add_swift_target_library(swiftSwiftPrivateLibcExtras ${SWIFT_STDLIB_LIBRARY_BUIL
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateLibcExtras/SwiftPrivateLibcExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#endif

public func _stdlib_mkstemps(_ template: inout String, _ suffixlen: CInt) -> CInt {
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateThreadExtras/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ add_swift_target_library(swiftSwiftPrivateThreadExtras ${SWIFT_STDLIB_LIBRARY_BU
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT WinSDK
SWIFT_MODULE_DEPENDS_WINDOWS CRT WinSDK
SWIFT_COMPILE_FLAGS ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
TARGET_SDKS ALL_APPLE_PLATFORMS CYGWIN FREEBSD OPENBSD HAIKU LINUX WINDOWS ANDROID
INSTALL_IN_COMPONENT stdlib-experimental
Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftPrivateThreadExtras/ThreadBarriers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Darwin
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#endif

Expand Down
2 changes: 1 addition & 1 deletion stdlib/private/SwiftReflectionTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (SWIFT_INCLUDE_TESTS)
SWIFT_MODULE_DEPENDS_TVOS Darwin
SWIFT_MODULE_DEPENDS_WATCHOS Darwin
SWIFT_MODULE_DEPENDS_LINUX Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
SWIFT_MODULE_DEPENDS_WINDOWS CRT
INSTALL_IN_COMPONENT stdlib-experimental
DARWIN_INSTALL_NAME_DIR "${SWIFT_DARWIN_STDLIB_PRIVATE_INSTALL_NAME_DIR}")

Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Concurrency/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ add_swift_target_library(swift_Concurrency ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} I
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
SWIFT_MODULE_DEPENDS_WINDOWS CRT

LINK_LIBRARIES swiftCore

Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Differentiation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ add_swift_target_library(swift_Differentiation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPE
SWIFT_MODULE_DEPENDS_OPENBSD Glibc
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_MODULE_DEPENDS_WINDOWS MSVCRT
SWIFT_MODULE_DEPENDS_WINDOWS CRT

SWIFT_COMPILE_FLAGS
${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/Differentiation/TgmathDerivatives.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Swift
#elseif os(Linux) || os(FreeBSD) || os(OpenBSD) || os(PS4) || os(Android) || os(Cygwin) || os(Haiku)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
4 changes: 2 additions & 2 deletions stdlib/public/Platform/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ add_swift_target_library(swiftGlibc ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_O
INSTALL_IN_COMPONENT sdk-overlay
DEPENDS glibc_modulemap)

add_swift_target_library(swiftMSVCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
msvcrt.swift
add_swift_target_library(swiftCRT ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
ucrt.swift
${swift_platform_sources}
POSIXError.swift

Expand Down
4 changes: 0 additions & 4 deletions stdlib/public/Platform/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
import SwiftShims
import SwiftOverlayShims

#if os(Windows)
import ucrt
#endif

#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS)
//===----------------------------------------------------------------------===//
// MacTypes.h
Expand Down
1 change: 0 additions & 1 deletion stdlib/public/Platform/msvcrt.swift → stdlib/public/Platform/ucrt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
//===----------------------------------------------------------------------===//

@_exported import ucrt // Clang module
@_exported import visualc // Clang module

@available(swift, deprecated: 3.0, message: "Please use 'Double.pi' or '.pi' to get the value of correct type and avoid casting.")
public let M_PI = Double.pi
Expand Down
2 changes: 1 addition & 1 deletion test/AutoDiff/stdlib/tgmath_derivatives.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/AutoDiff/validation-test/custom_derivatives.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import ucrt
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/AutoDiff/validation-test/separate_tangent_type.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import ucrt
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/ClangImporter/availability_returns_twice-msvc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %target-typecheck-verify-swift
// REQUIRES: OS=windows-msvc

import MSVCRT
import visualc
typealias JumpBuffer = _JBTYPE

func test_unavailable_returns_twice_function() {
Expand Down
2 changes: 1 addition & 1 deletion test/ClangImporter/clang_builtins.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/IRGen/builtin_math.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/IRGen/sanitize_coverage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/Interpreter/SDK/libc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT

let S_IRUSR: Int32 = ucrt._S_IREAD
let S_IWUSR: Int32 = 0
Expand Down
2 changes: 1 addition & 1 deletion test/Interpreter/dynamicReplacement_property_observer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#else
#error("Unsupported platform")
Expand Down
2 changes: 1 addition & 1 deletion test/Interpreter/dynamic_replacement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#else
#error("Unsupported platform")
Expand Down
2 changes: 1 addition & 1 deletion test/Interpreter/dynamic_replacement_chaining.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#else
#error("Unsupported platform")
Expand Down
2 changes: 1 addition & 1 deletion test/Interpreter/dynamic_replacement_without_previous_calls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#else
#error("Unsupported platform")
Expand Down
2 changes: 1 addition & 1 deletion test/Prototypes/BigInt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/Sanitizers/tsan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/FloatConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/MathConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/PrintFloat.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import StdlibUnittest
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/Runtime.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import SwiftShims
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
import WinSDK
#else
#error("Unsupported platform")
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/VarArgs.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Swift
import Glibc
typealias CGFloat = Double
#elseif os(Windows)
import MSVCRT
import CRT
#if arch(x86_64) || arch(arm64)
typealias CGFloat = Double
#else
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/tgmath.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down
2 changes: 1 addition & 1 deletion test/stdlib/tgmath_optimized.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#elseif canImport(Glibc)
import Glibc
#elseif os(Windows)
import MSVCRT
import CRT
#else
#error("Unsupported platform")
#endif
Expand Down