diff --git a/CMakeLists.txt b/CMakeLists.txt index d504cdebe40bb..b441e3bdab94e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,10 +58,6 @@ option(SWIFT_ENABLE_TARGET_LINUX "Enable compiler support for targeting Linux" TRUE) -option(SWIFT_ENABLE_TARGET_TVOS - "Enable compiler support for targeting tvOS" - TRUE) - set(SWIFT_VERSION "2.2" CACHE STRING "The user-visible version of the Swift compiler") set(SWIFT_VENDOR "" CACHE STRING @@ -468,29 +464,27 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") IOS_SIMULATOR-R "iOS Release" IOS_SIMULATOR R "Release") endif() - if(${SWIFT_ENABLE_TARGET_TVOS}) - is_sdk_requested(TVOS swift_build_tvos) - if(swift_build_tvos AND ${swift_can_crosscompile_stdlib}) - configure_sdk_darwin( - TVOS "tvOS" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS}" - appletvos tvos tvos "arm64") - configure_target_variant(TVOS-DA "tvOS Debug+Asserts" TVOS DA "Debug+Asserts") - configure_target_variant(TVOS-RA "tvOS Release+Asserts" TVOS RA "Release+Asserts") - configure_target_variant(TVOS-R "tvOS Release" TVOS R "Release") - endif() + is_sdk_requested(TVOS swift_build_tvos) + if(swift_build_tvos AND ${swift_can_crosscompile_stdlib}) + configure_sdk_darwin( + TVOS "tvOS" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS}" + appletvos tvos tvos "arm64") + configure_target_variant(TVOS-DA "tvOS Debug+Asserts" TVOS DA "Debug+Asserts") + configure_target_variant(TVOS-RA "tvOS Release+Asserts" TVOS RA "Release+Asserts") + configure_target_variant(TVOS-R "tvOS Release" TVOS R "Release") + endif() - is_sdk_requested(TVOS_SIMULATOR swift_build_tvos_simulator) - if(swift_build_tvos_simulator AND ${swift_can_crosscompile_stdlib}) - configure_sdk_darwin( - TVOS_SIMULATOR "tvOS Simulator" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS}" - appletvsimulator tvos-simulator tvos "x86_64") - configure_target_variant( - TVOS_SIMULATOR-DA "tvOS Debug+Asserts" TVOS_SIMULATOR DA "Debug+Asserts") - configure_target_variant( - TVOS_SIMULATOR-RA "tvOS Release+Asserts" TVOS_SIMULATOR RA "Release+Asserts") - configure_target_variant( - TVOS_SIMULATOR-R "tvOS Release" TVOS_SIMULATOR R "Release") - endif() + is_sdk_requested(TVOS_SIMULATOR swift_build_tvos_simulator) + if(swift_build_tvos_simulator AND ${swift_can_crosscompile_stdlib}) + configure_sdk_darwin( + TVOS_SIMULATOR "tvOS Simulator" "${SWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS}" + appletvsimulator tvos-simulator tvos "x86_64") + configure_target_variant( + TVOS_SIMULATOR-DA "tvOS Debug+Asserts" TVOS_SIMULATOR DA "Debug+Asserts") + configure_target_variant( + TVOS_SIMULATOR-RA "tvOS Release+Asserts" TVOS_SIMULATOR RA "Release+Asserts") + configure_target_variant( + TVOS_SIMULATOR-R "tvOS Release" TVOS_SIMULATOR R "Release") endif() is_sdk_requested(WATCHOS swift_build_watchos) diff --git a/include/swift/AST/PlatformKinds.def b/include/swift/AST/PlatformKinds.def index 3232ac0a59fa8..0a97d241d8907 100644 --- a/include/swift/AST/PlatformKinds.def +++ b/include/swift/AST/PlatformKinds.def @@ -23,15 +23,11 @@ // Reordering these platforms will break serialization. AVAILABILITY_PLATFORM(iOS, "iOS") -#if defined(SWIFT_ENABLE_TARGET_TVOS) AVAILABILITY_PLATFORM(tvOS, "tvOS") -#endif // SWIFT_ENABLE_TARGET_TVOS AVAILABILITY_PLATFORM(watchOS, "watchOS") AVAILABILITY_PLATFORM(OSX, "OS X") AVAILABILITY_PLATFORM(iOSApplicationExtension, "iOS application extension") -#if defined(SWIFT_ENABLE_TARGET_TVOS) AVAILABILITY_PLATFORM(tvOSApplicationExtension, "tvOS application extension") -#endif // SWIFT_ENABLE_TARGET_TVOS AVAILABILITY_PLATFORM(watchOSApplicationExtension, "watchOS application extension") AVAILABILITY_PLATFORM(OSXApplicationExtension, "OS X application extension") diff --git a/include/swift/Basic/Platform.h b/include/swift/Basic/Platform.h index d6842394f695e..c60444a42ebfe 100644 --- a/include/swift/Basic/Platform.h +++ b/include/swift/Basic/Platform.h @@ -25,10 +25,8 @@ namespace swift { /// Returns true if the given triple represents iOS running in a simulator. bool tripleIsiOSSimulator(const llvm::Triple &triple); -#if defined(SWIFT_ENABLE_TARGET_TVOS) /// Returns true if the given triple represents AppleTV running in a simulator. bool tripleIsAppleTVSimulator(const llvm::Triple &triple); -#endif // SWIFT_ENABLE_TARGET_TVOS /// Returns true if the given triple represents watchOS running in a simulator. bool tripleIsWatchSimulator(const llvm::Triple &triple); diff --git a/include/swift/Config.h.in b/include/swift/Config.h.in index 5a14a73def893..a60eeb78487a2 100644 --- a/include/swift/Config.h.in +++ b/include/swift/Config.h.in @@ -4,7 +4,6 @@ #ifndef SWIFT_CONFIG_H #define SWIFT_CONFIG_H -#cmakedefine SWIFT_ENABLE_TARGET_TVOS 1 #cmakedefine SWIFT_HAVE_WORKING_STD_REGEX 1 #endif // SWIFT_CONFIG_H diff --git a/lib/AST/PlatformKind.cpp b/lib/AST/PlatformKind.cpp index 4482e98309678..dc1f5a51ffb05 100644 --- a/lib/AST/PlatformKind.cpp +++ b/lib/AST/PlatformKind.cpp @@ -70,16 +70,10 @@ bool swift::isPlatformActive(PlatformKind Platform, LangOptions &LangOpts) { return LangOpts.Target.isMacOSX(); case PlatformKind::iOS: case PlatformKind::iOSApplicationExtension: - return LangOpts.Target.isiOS() -#if defined(SWIFT_ENABLE_TARGET_TVOS) - && !LangOpts.Target.isTvOS() -#endif // SWIFT_ENABLE_TARGET_TVOS - ; -#if defined(SWIFT_ENABLE_TARGET_TVOS) + return LangOpts.Target.isiOS() && !LangOpts.Target.isTvOS(); case PlatformKind::tvOS: case PlatformKind::tvOSApplicationExtension: return LangOpts.Target.isTvOS(); -#endif // SWIFT_ENABLE_TARGET_TVOS case PlatformKind::watchOS: case PlatformKind::watchOSApplicationExtension: return LangOpts.Target.isWatchOS(); @@ -96,13 +90,11 @@ PlatformKind swift::targetPlatform(LangOptions &LangOpts) { : PlatformKind::OSX); } -#if defined(SWIFT_ENABLE_TARGET_TVOS) if (LangOpts.Target.isTvOS()) { return (LangOpts.EnableAppExtensionRestrictions ? PlatformKind::tvOSApplicationExtension : PlatformKind::tvOS); } -#endif // SWIFT_ENABLE_TARGET_TVOS if (LangOpts.Target.isWatchOS()) { return (LangOpts.EnableAppExtensionRestrictions diff --git a/lib/Basic/LangOptions.cpp b/lib/Basic/LangOptions.cpp index 5f56bbe9603ba..4ad980cbb4e40 100644 --- a/lib/Basic/LangOptions.cpp +++ b/lib/Basic/LangOptions.cpp @@ -25,9 +25,7 @@ using namespace swift; const std::vector LangOptions::SupportedOSBuildConfigArguments = { "OSX", -#if defined(SWIFT_ENABLE_TARGET_TVOS) "tvOS", -#endif "watchOS", "iOS", "Linux" @@ -92,10 +90,8 @@ std::pair LangOptions::setTarget(llvm::Triple triple) { // Set the "os" target configuration. if (Target.isMacOSX()) addTargetConfigOption("os", "OSX"); -#if defined(SWIFT_ENABLE_TARGET_TVOS) else if (triple.isTvOS()) addTargetConfigOption("os", "tvOS"); -#endif // SWIFT_ENABLE_TARGET_TVOS else if (triple.isWatchOS()) addTargetConfigOption("os", "watchOS"); else if (triple.isiOS()) diff --git a/lib/Basic/Platform.cpp b/lib/Basic/Platform.cpp index d2ecce74f7ada..a4808d1db918b 100644 --- a/lib/Basic/Platform.cpp +++ b/lib/Basic/Platform.cpp @@ -21,13 +21,11 @@ bool swift::tripleIsiOSSimulator(const llvm::Triple &triple) { (arch == llvm::Triple::x86 || arch == llvm::Triple::x86_64)); } -#if defined(SWIFT_ENABLE_TARGET_TVOS) bool swift::tripleIsAppleTVSimulator(const llvm::Triple &triple) { llvm::Triple::ArchType arch = triple.getArch(); return (triple.isTvOS() && (arch == llvm::Triple::x86 || arch == llvm::Triple::x86_64)); } -#endif // SWIFT_ENABLE_TARGET_TVOS bool swift::tripleIsWatchSimulator(const llvm::Triple &triple) { llvm::Triple::ArchType arch = triple.getArch(); @@ -36,23 +34,18 @@ bool swift::tripleIsWatchSimulator(const llvm::Triple &triple) { } bool swift::tripleIsAnySimulator(const llvm::Triple &triple) { -#if defined(SWIFT_ENABLE_TARGET_TVOS) - if (tripleIsAppleTVSimulator(triple)) - return true; -#endif // SWIFT_ENABLE_TARGET_TVOS - - return tripleIsiOSSimulator(triple) || tripleIsWatchSimulator(triple); + return tripleIsiOSSimulator(triple) || + tripleIsWatchSimulator(triple) || + tripleIsAppleTVSimulator(triple); } StringRef swift::getPlatformNameForTriple(const llvm::Triple &triple) { if (triple.isiOS()) { -#if defined(SWIFT_ENABLE_TARGET_TVOS) if (triple.isTvOS()) { if (tripleIsAppleTVSimulator(triple)) return "appletvsimulator"; return "appletvos"; } -#endif // SWIFT_ENABLE_TARGET_TVOS if (tripleIsiOSSimulator(triple)) return "iphonesimulator"; diff --git a/lib/ClangImporter/ClangImporter.cpp b/lib/ClangImporter/ClangImporter.cpp index ac15faa098d03..52ff387b6d380 100644 --- a/lib/ClangImporter/ClangImporter.cpp +++ b/lib/ClangImporter/ClangImporter.cpp @@ -364,11 +364,7 @@ getNormalInvocationArguments(std::vector &invocationArgStrs, unsigned major, minor, micro; if (triple.isiOS()) { bool isiOSSimulator = swift::tripleIsiOSSimulator(triple); -#if defined(SWIFT_ENABLE_TARGET_TVOS) if (triple.isTvOS()) { -#else - if (/* DISABLES CODE */ (false)) { -#endif // SWIFT_ENABLE_TARGET_TVOS if (isiOSSimulator) minVersionOpt << "-mtvos-simulator-version-min="; else @@ -1031,11 +1027,7 @@ ClangImporter::Implementation::Implementation(ASTContext &ctx, // applies in Swift, and if so, what is the cutoff for deprecated // declarations that are now considered unavailable in Swift. - if (ctx.LangOpts.Target.isiOS() -#if defined(SWIFT_ENABLE_TARGET_TVOS) - && !ctx.LangOpts.Target.isTvOS() -#endif // SWIFT_ENABLE_TARGET_TVOS - ) { + if (ctx.LangOpts.Target.isiOS() && !ctx.LangOpts.Target.isTvOS()) { if (!ctx.LangOpts.EnableAppExtensionRestrictions) { PlatformAvailabilityFilter = [](StringRef Platform) { return Platform == "ios"; }; @@ -1052,7 +1044,6 @@ ClangImporter::Implementation::Implementation(ASTContext &ctx, DeprecatedAsUnavailableMessage = "APIs deprecated as of iOS 7 and earlier are unavailable in Swift"; } -#if defined(SWIFT_ENABLE_TARGET_TVOS) else if (ctx.LangOpts.Target.isTvOS()) { if (!ctx.LangOpts.EnableAppExtensionRestrictions) { PlatformAvailabilityFilter = @@ -1070,7 +1061,6 @@ ClangImporter::Implementation::Implementation(ASTContext &ctx, DeprecatedAsUnavailableMessage = "APIs deprecated as of iOS 7 and earlier are unavailable in Swift"; } -#endif // SWIFT_ENABLE_TARGET_TVOS else if (ctx.LangOpts.Target.isWatchOS()) { if (!ctx.LangOpts.EnableAppExtensionRestrictions) { PlatformAvailabilityFilter = diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp index 2d1fa3a478bc8..cec89ba3147c1 100644 --- a/lib/ClangImporter/ImportDecl.cpp +++ b/lib/ClangImporter/ImportDecl.cpp @@ -5761,17 +5761,13 @@ void ClangImporter::Implementation::importAttributes( llvm::StringSwitch>(Platform) .Case("ios", PlatformKind::iOS) .Case("macosx", PlatformKind::OSX) -#if defined(SWIFT_ENABLE_TARGET_TVOS) .Case("tvos", PlatformKind::tvOS) -#endif // SWIFT_ENABLE_TARGET_TVOS .Case("watchos", PlatformKind::watchOS) .Case("ios_app_extension", PlatformKind::iOSApplicationExtension) .Case("macosx_app_extension", PlatformKind::OSXApplicationExtension) -#if defined(SWIFT_ENABLE_TARGET_TVOS) .Case("tvos_app_extension", PlatformKind::tvOSApplicationExtension) -#endif // SWIFT_ENABLE_TARGET_TVOS .Case("watchos_app_extension", PlatformKind::watchOSApplicationExtension) .Default(None); diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp index 19a151fdd0510..64fd4b6ba4149 100644 --- a/lib/Driver/Driver.cpp +++ b/lib/Driver/Driver.cpp @@ -129,7 +129,6 @@ static void validateArgs(DiagnosticEngine &diags, const ArgList &Args) { diags.diagnose(SourceLoc(), diag::error_os_minimum_deployment, "OS X 10.9"); } else if (triple.isiOS()) { -#if defined(SWIFT_ENABLE_TARGET_TVOS) if (triple.isTvOS()) { if (triple.isOSVersionLT(9, 0)) { diags.diagnose(SourceLoc(), diag::error_os_minimum_deployment, @@ -137,7 +136,6 @@ static void validateArgs(DiagnosticEngine &diags, const ArgList &Args) { return; } } -#endif // SWIFT_ENABLE_TARGET_TVOS if (triple.isOSVersionLT(7)) diags.diagnose(SourceLoc(), diag::error_os_minimum_deployment, "iOS 7"); @@ -2024,9 +2022,7 @@ const ToolChain *Driver::getToolChain(const ArgList &Args) const { case llvm::Triple::Darwin: case llvm::Triple::MacOSX: case llvm::Triple::IOS: -#if defined(SWIFT_ENABLE_TARGET_TVOS) case llvm::Triple::TvOS: -#endif // SWIFT_ENABLE_TARGET_TVOS case llvm::Triple::WatchOS: TC = new toolchains::Darwin(*this, Target); break; diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 95c4ca4c1a045..8434da7ce2ba1 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -866,11 +866,9 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job, StringRef RT; if (Triple.isiOS()) { -#if defined(SWIFT_ENABLE_TARGET_TVOS) if (Triple.isTvOS()) RT = "tvos"; else -#endif // SWIFT_ENABLE_TARGET_TVOS RT = "ios"; } else if (Triple.isWatchOS()) @@ -891,15 +889,12 @@ toolchains::Darwin::constructInvocation(const LinkJobAction &job, assert(Triple.isiOS() || Triple.isWatchOS() || Triple.isMacOSX()); if (Triple.isiOS()) { bool isiOSSimulator = tripleIsiOSSimulator(Triple); -#if defined(SWIFT_ENABLE_TARGET_TVOS) if (Triple.isTvOS()) { if (isiOSSimulator) Arguments.push_back("-tvos_simulator_version_min"); else Arguments.push_back("-tvos_version_min"); - } else -#endif // SWIFT_ENABLE_TARGET_TVOS - { + } else { if (isiOSSimulator) Arguments.push_back("-ios_simulator_version_min"); else diff --git a/test/BuildConfigurations/arm64AppleTVOSTarget.swift b/test/BuildConfigurations/arm64AppleTVOSTarget.swift index 85fe286cf033a..43259400cc419 100644 --- a/test/BuildConfigurations/arm64AppleTVOSTarget.swift +++ b/test/BuildConfigurations/arm64AppleTVOSTarget.swift @@ -1,8 +1,6 @@ // RUN: %swift -parse %s -verify -D FOO -D BAR -target arm64-apple-tvos9.0 -D FOO -parse-stdlib // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target arm64-apple-tvos9.0 -// REQUIRES: enable_target_appletvos - #if os(iOS) // This block should not parse. // os(tvOS) or os(watchOS) does not imply os(iOS). diff --git a/test/BuildConfigurations/i386AppleTVOSTarget.swift b/test/BuildConfigurations/i386AppleTVOSTarget.swift index b092b770e939f..0a4183945bd52 100644 --- a/test/BuildConfigurations/i386AppleTVOSTarget.swift +++ b/test/BuildConfigurations/i386AppleTVOSTarget.swift @@ -1,8 +1,6 @@ // RUN: %swift -parse %s -verify -D FOO -D BAR -target i386-apple-tvos9.0 -D FOO -parse-stdlib // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target i386-apple-tvos9.0 -// REQUIRES: enable_target_appletvos - #if os(iOS) // This block should not parse. // os(tvOS) or os(watchOS) does not imply os(iOS). diff --git a/test/BuildConfigurations/x64AppleTVOSTarget.swift b/test/BuildConfigurations/x64AppleTVOSTarget.swift index adf02ce4571c7..4f240ae010f5b 100644 --- a/test/BuildConfigurations/x64AppleTVOSTarget.swift +++ b/test/BuildConfigurations/x64AppleTVOSTarget.swift @@ -1,8 +1,6 @@ // RUN: %swift -parse %s -verify -D FOO -D BAR -target x86_64-apple-tvos9.0 -D FOO -parse-stdlib // RUN: %swift-ide-test -test-input-complete -source-filename=%s -target x86_64-apple-tvos9.0 -// REQUIRES: enable_target_appletvos - #if os(iOS) // This block should not parse. // os(tvOS) or os(watchOS) does not imply os(iOS). diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6dae0be614f3c..d5b74f0470da7 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -105,11 +105,6 @@ if(PYTHONINTERP_FOUND) list(APPEND SWIFT_TEST_EXTRA_ARGS "--param" "leaks-all") endif() - if(NOT SWIFT_ENABLE_TARGET_APPLETVOS) - list(APPEND SWIFT_TEST_EXTRA_ARGS - "--param" "swift_enable_target_appletvos=false") - endif() - if(NOT CMAKE_CFG_INTDIR STREQUAL ".") list(APPEND SWIFT_TEST_EXTRA_ARGS "--param" "build_mode=${CMAKE_CFG_INTDIR}") diff --git a/test/Driver/linker.swift b/test/Driver/linker.swift index bf082aad32e13..d25c4af80fc26 100644 --- a/test/Driver/linker.swift +++ b/test/Driver/linker.swift @@ -177,5 +177,3 @@ // Clean up the test executable because hard links are expensive. // RUN: rm -rf %t/DISTINCTIVE-PATH/usr/bin/swiftc -// REQUIRES: enable_target_appletvos - diff --git a/test/Driver/os-deployment.swift b/test/Driver/os-deployment.swift index a3888e90667c0..4e97f69c7b329 100644 --- a/test/Driver/os-deployment.swift +++ b/test/Driver/os-deployment.swift @@ -9,4 +9,3 @@ // CHECK-tvOS: Swift requires a minimum deployment target of tvOS 9.0 // CHECK-watchOS: Swift requires a minimum deployment target of watchOS 2.0 -// REQUIRES: enable_target_appletvos diff --git a/test/Driver/profiling.swift b/test/Driver/profiling.swift index 5a2540496a112..7c09d439dbfaa 100644 --- a/test/Driver/profiling.swift +++ b/test/Driver/profiling.swift @@ -26,5 +26,3 @@ // LINUX: clang++{{"? }} // LINUX: lib/swift/clang/{{[^ ]*}}/lib/linux/libclang_rt.profile-x86_64.a -// REQUIRES: enable_target_appletvos - diff --git a/test/Driver/sdk-apple.swift b/test/Driver/sdk-apple.swift index 734e3c7cd92fa..271a36bca3ef9 100644 --- a/test/Driver/sdk-apple.swift +++ b/test/Driver/sdk-apple.swift @@ -1,4 +1,3 @@ -// REQUIRES: enable_target_appletvos // XFAIL: linux // Test SDK detection for immediate mode. diff --git a/test/IDE/complete_decl_attribute.swift b/test/IDE/complete_decl_attribute.swift index 0938a84a6c1e0..115ca3bed1258 100644 --- a/test/IDE/complete_decl_attribute.swift +++ b/test/IDE/complete_decl_attribute.swift @@ -7,8 +7,6 @@ // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD5 | FileCheck %s -check-prefix=KEYWORD5 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=KEYWORD_LAST | FileCheck %s -check-prefix=KEYWORD_LAST -// REQUIRES: enable_target_appletvos - @available(#^AVAILABILITY1^#) // AVAILABILITY1: Begin completions, 9 items diff --git a/test/IRGen/generic_metatypes.swift b/test/IRGen/generic_metatypes.swift index 954668d843192..42d2fcf47649f 100644 --- a/test/IRGen/generic_metatypes.swift +++ b/test/IRGen/generic_metatypes.swift @@ -12,7 +12,6 @@ // RUN: %swift -target x86_64-unknown-linux-gnu -disable-objc-interop -emit-ir -parse-stdlib -primary-file %s | FileCheck --check-prefix=CHECK --check-prefix=CHECK-64 %s // REQUIRES: X86 -// REQUIRES: enable_target_appletvos // CHECK: define hidden %swift.type* [[GENERIC_TYPEOF:@_TF17generic_metatypes13genericTypeof.*]](%swift.opaque* noalias nocapture, %swift.type* [[TYPE:%.*]]) func genericTypeof(x: T) -> T.Type { diff --git a/test/Interpreter/availability_weak_linking.swift b/test/Interpreter/availability_weak_linking.swift index c4093fb12b8eb..cd09c11baa6e4 100644 --- a/test/Interpreter/availability_weak_linking.swift +++ b/test/Interpreter/availability_weak_linking.swift @@ -17,7 +17,6 @@ // REQUIRES: objc_interop // REQUIRES: executable_test -// REQUIRES: enable_target_appletvos import StdlibUnittest diff --git a/test/Misc/target-cpu.swift b/test/Misc/target-cpu.swift index 7d10d73845202..124eb6b8a28d0 100644 --- a/test/Misc/target-cpu.swift +++ b/test/Misc/target-cpu.swift @@ -37,5 +37,3 @@ // RUN: not %swift -parse -target x86_64-apple-watchos2 -Xcc -### %s 2>&1 | FileCheck -check-prefix=WATCHSIMULATOR64_CPU %s // WATCHSIMULATOR64_CPU: "-target-cpu" "core2" -// REQUIRES: enable_target_appletvos - diff --git a/test/attr/attr_availability.swift b/test/attr/attr_availability.swift index 626331b4ab158..4e004b04bd20f 100644 --- a/test/attr/attr_availability.swift +++ b/test/attr/attr_availability.swift @@ -1,7 +1,5 @@ // RUN: %target-parse-verify-swift -// REQUIRES: enable_target_appletvos - @available(*, unavailable) func unavailable_func() {} diff --git a/test/attr/attr_availability_tvos.swift b/test/attr/attr_availability_tvos.swift index b5a38e8908ba2..3e2a852d93642 100644 --- a/test/attr/attr_availability_tvos.swift +++ b/test/attr/attr_availability_tvos.swift @@ -1,7 +1,5 @@ // RUN: %swift -parse -verify -parse-stdlib -target i386-apple-tvos9.0 %s -// REQUIRES: enable_target_appletvos - @available(tvOS, introduced=1.0, deprecated=2.0, obsoleted=9.0, message="you don't want to do that anyway") func doSomething() { } diff --git a/test/lit.cfg b/test/lit.cfg index 162cecfe3fc71..2dbdc5f3760ea 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -412,9 +412,6 @@ if swift_run_only_tests != 'all': else: config.available_features.add("executable_test") -if lit_config.params.get('swift_enable_target_appletvos', 'true') == 'true': - config.available_features.add("enable_target_appletvos") - # Add substitutions for the run target triple, CPU, OS, and pointer size. config.substitutions.append(('%target-triple', config.variant_triple)) config.substitutions.append(('%target-cpu', run_cpu)) diff --git a/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp b/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp index 4bb3bfc78cf62..e8e9716687e94 100644 --- a/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp +++ b/tools/SourceKit/lib/SwiftLang/SwiftDocSupport.cpp @@ -301,15 +301,11 @@ static void reportAttributes(ASTContext &Ctx, static UIdent AvailableAttrKind("source.lang.swift.attribute.availability"); static UIdent PlatformIOS("source.availability.platform.ios"); static UIdent PlatformOSX("source.availability.platform.osx"); -#if defined(SWIFT_ENABLE_TARGET_TVOS) static UIdent PlatformtvOS("source.availability.platform.tvos"); -#endif // SWIFT_ENABLE_TARGET_TVOS static UIdent PlatformWatchOS("source.availability.platform.watchos"); static UIdent PlatformIOSAppExt("source.availability.platform.ios_app_extension"); static UIdent PlatformOSXAppExt("source.availability.platform.osx_app_extension"); -#if defined(SWIFT_ENABLE_TARGET_TVOS) static UIdent PlatformtvOSAppExt("source.availability.platform.tvos_app_extension"); -#endif // SWIFT_ENABLE_TARGET_TVOS static UIdent PlatformWatchOSAppExt("source.availability.platform.watchos_app_extension"); for (auto Attr : D->getAttrs()) { @@ -322,20 +318,16 @@ static void reportAttributes(ASTContext &Ctx, PlatformUID = PlatformIOS; break; case PlatformKind::OSX: PlatformUID = PlatformOSX; break; -#if defined(SWIFT_ENABLE_TARGET_TVOS) case PlatformKind::tvOS: PlatformUID = PlatformtvOS; break; -#endif // SWIFT_ENABLE_TARGET_TVOS case PlatformKind::watchOS: PlatformUID = PlatformWatchOS; break; case PlatformKind::iOSApplicationExtension: PlatformUID = PlatformIOSAppExt; break; case PlatformKind::OSXApplicationExtension: PlatformUID = PlatformOSXAppExt; break; -#if defined(SWIFT_ENABLE_TARGET_TVOS) case PlatformKind::tvOSApplicationExtension: PlatformUID = PlatformtvOSAppExt; break; -#endif // SWIFT_ENABLE_TARGET_TVOS case PlatformKind::watchOSApplicationExtension: PlatformUID = PlatformWatchOSAppExt; break; } diff --git a/utils/build-script-impl b/utils/build-script-impl index 8c060d8a99fe8..c42f35a0c5fad 100755 --- a/utils/build-script-impl +++ b/utils/build-script-impl @@ -171,7 +171,6 @@ KNOWN_SETTINGS=( sil-verify-all "0" "If enabled, run the sil verifier be run after every SIL pass" swift-enable-ast-verifier "1" "If enabled, and the assertions are enabled, the built Swift compiler will run the AST verifier every time it is invoked" swift-enable-target-linux "1" "Enable compiler support for targeting Linux" - swift-enable-target-appletvos "1" "Enable compiler support for targeting tvOS" swift-runtime-enable-dtrace "0" "Enable runtime dtrace support" swift-runtime-enable-leak-checker "0" "Enable leaks checking routines in the runtime" use-gold-linker "" "Enable using the gold linker" @@ -1421,7 +1420,6 @@ for deployment_target in "${NATIVE_TOOLS_DEPLOYMENT_TARGETS[@]}" "${CROSS_TOOLS_ -D${PRODUCT}_PATH_TO_LLVM_BUILD:PATH="${llvm_build_dir}" -D${PRODUCT}_PATH_TO_CMARK_SOURCE:PATH="${CMARK_SOURCE_DIR}" -D${PRODUCT}_PATH_TO_CMARK_BUILD:PATH="$(build_directory $deployment_target cmark)" - -DSWIFT_ENABLE_TARGET_APPLETVOS:BOOL=$(true_false "${SWIFT_ENABLE_TARGET_APPLETVOS}") ) if [[ "${CMAKE_GENERATOR}" != "Ninja" ]] ; then