Skip to content

Commit 93387f8

Browse files
authored
Merge pull request #60459 from etcwilde/ewilde/revert-backdeploy56
revert backdeploy 5.6
2 parents 88304c3 + 15b3659 commit 93387f8

33 files changed

+7
-4263
lines changed

SwiftCompilerSources/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,6 @@ else()
295295
set(compatibility_libs
296296
"swiftCompatibility50-${platform}"
297297
"swiftCompatibility51-${platform}"
298-
"swiftCompatibility56-${platform}"
299-
"swiftCompatibilityConcurrency-${platform}"
300298
"swiftCompatibilityDynamicReplacements-${platform}")
301299

302300
list(APPEND b0_deps ${compatibility_libs})

include/swift/Frontend/BackDeploymentLibs.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ BACK_DEPLOYMENT_LIB((5, 0), all, "swiftCompatibility50")
2828
BACK_DEPLOYMENT_LIB((5, 1), all, "swiftCompatibility51")
2929
BACK_DEPLOYMENT_LIB((5, 0), executable, "swiftCompatibilityDynamicReplacements")
3030
BACK_DEPLOYMENT_LIB((5, 4), all, "swiftCompatibilityConcurrency")
31-
BACK_DEPLOYMENT_LIB((5, 6), all, "swiftCompatibility56")
3231

3332
#undef BACK_DEPLOYMENT_LIB

lib/Driver/DarwinToolChains.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,6 @@ toolchains::Darwin::addArgsToLinkStdlib(ArgStringList &Arguments,
411411
runtimeCompatibilityVersion = llvm::VersionTuple(5, 1);
412412
} else if (value.equals("5.5")) {
413413
runtimeCompatibilityVersion = llvm::VersionTuple(5, 5);
414-
} else if (value.equals("5.6")) {
415-
runtimeCompatibilityVersion = llvm::VersionTuple(5, 6);
416414
} else if (value.equals("none")) {
417415
runtimeCompatibilityVersion = None;
418416
} else {

lib/Frontend/CompilerInvocation.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2292,8 +2292,6 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
22922292
runtimeCompatibilityVersion = llvm::VersionTuple(5, 1);
22932293
} else if (version.equals("5.5")) {
22942294
runtimeCompatibilityVersion = llvm::VersionTuple(5, 5);
2295-
} else if (version.equals("5.6")) {
2296-
runtimeCompatibilityVersion = llvm::VersionTuple(5, 6);
22972295
} else {
22982296
Diags.diagnose(SourceLoc(), diag::error_invalid_arg_value,
22992297
versionArg->getAsString(Args), version);

stdlib/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ include(StdlibOptions)
3939
# End of user-configurable options.
4040
#
4141

42-
set(SWIFT_STDLIB_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
43-
4442
# Remove llvm-project/llvm/include directory from -I search part when building
4543
# the stdlib. We have our own fork of LLVM includes (Support, ADT) in
4644
# stdlib/include/llvm and we don't want to silently use headers from LLVM.

stdlib/toolchain/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ if(SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT)
5050
add_subdirectory(legacy_layouts)
5151
add_subdirectory(Compatibility50)
5252
add_subdirectory(Compatibility51)
53-
add_subdirectory(Compatibility56)
5453
add_subdirectory(CompatibilityDynamicReplacements)
5554
add_subdirectory(CompatibilityConcurrency)
5655
endif()

stdlib/toolchain/Compatibility56/CMakeLists.txt

Lines changed: 0 additions & 39 deletions
This file was deleted.

stdlib/toolchain/Compatibility56/CompatibilityOverride.h

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)