diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index 72c055dee17..ca93d069d46 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -66,12 +66,12 @@ llvmVersion.macos_x64 = 8.0.0 # Mac OS X. # Can be an absolute path instead of predefined value. llvmHome.macos_x64 = $llvm.macos_x64.dev -targetToolchain.macos_x64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64 = target-toolchain-xcode_12_2-macos_x64 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos -additionalToolsDir.macos_x64 = xcode-addon-xcode_12_0-macos_x64 +additionalToolsDir.macos_x64 = xcode-addon-xcode_12_2-macos_x64 arch.macos_x64 = x86_64 -targetSysRoot.macos_x64 = target-sysroot-xcode_12_0-macos_x64 +targetSysRoot.macos_x64 = target-sysroot-xcode_12_2-macos_x64 targetCpu.macos_x64 = core2 clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.macos_x64 = -O1 @@ -93,27 +93,27 @@ dependencies.macos_x64 = \ libffi-3.2.1-3-darwin-macos \ lldb-3-macos -target-sysroot-xcode_12_0-macos_x64.default = \ +target-sysroot-xcode_12_2-macos_x64.default = \ remote:internal -target-toolchain-xcode_12_0-macos_x64.default = \ +target-toolchain-xcode_12_2-macos_x64.default = \ remote:internal -xcode-addon-xcode_12_0-macos_x64.default = \ +xcode-addon-xcode_12_2-macos_x64.default = \ remote:internal # Apple's 32-bit iOS. -targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-ios_arm32 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-ios_arm32 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-ios_arm32.default = \ +target-sysroot-xcode_12_2-ios_arm32.default = \ remote:internal arch.ios_arm32 = armv7 # Shared with 64-bit version. -targetSysRoot.ios_arm32 = target-sysroot-xcode_12_0-ios_arm64 +targetSysRoot.ios_arm32 = target-sysroot-xcode_12_2-ios_arm64 targetCpu.ios_arm32 = generic clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir clangNooptFlags.ios_arm32 = -O1 @@ -137,15 +137,15 @@ runtimeDefinitions.ios_arm32 = KONAN_OBJC_INTEROP=1 KONAN_IOS KONAN_ARM32=1 \ KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # Apple's 64-bit iOS. -targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-ios_arm64 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-ios_arm64 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-ios_arm64.default = \ +target-sysroot-xcode_12_2-ios_arm64.default = \ remote:internal arch.ios_arm64 = arm64 -targetSysRoot.ios_arm64 = target-sysroot-xcode_12_0-ios_arm64 +targetSysRoot.ios_arm64 = target-sysroot-xcode_12_2-ios_arm64 targetCpu.ios_arm64 = cyclone clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_arm64 = -O1 @@ -167,15 +167,15 @@ runtimeDefinitions.ios_arm64 = KONAN_OBJC_INTEROP=1 KONAN_IOS=1 KONAN_ARM64=1 \ KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1 KONAN_REPORT_BACKTRACE_TO_IOS_CRASH_LOG=1 MACHSIZE=64 # Apple's iOS simulator. -targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-ios_x64 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-ios_x64 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-ios_x64.default = \ +target-sysroot-xcode_12_2-ios_x64.default = \ remote:internal arch.ios_x64 = x86_64 -targetSysRoot.ios_x64 = target-sysroot-xcode_12_0-ios_x64 +targetSysRoot.ios_x64 = target-sysroot-xcode_12_2-ios_x64 targetCpu.ios_x64 = core2 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.ios_x64 = -O1 @@ -194,15 +194,15 @@ runtimeDefinitions.ios_x64 = KONAN_OBJC_INTEROP=1 KONAN_IOS=1 KONAN_X64=1 \ KONAN_CORE_SYMBOLICATION=1 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1 # Apple's tvOS simulator. -targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-tvos_x64 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-tvos_x64 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-tvos_x64.default = \ +target-sysroot-xcode_12_2-tvos_x64.default = \ remote:internal arch.tvos_x64 = x86_64 -targetSysRoot.tvos_x64 = target-sysroot-xcode_12_0-tvos_x64 +targetSysRoot.tvos_x64 = target-sysroot-xcode_12_2-tvos_x64 targetCpu.tvos_x64 = core2 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_x64 = -O1 @@ -221,15 +221,15 @@ runtimeDefinitions.tvos_x64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_X64=1 \ KONAN_CORE_SYMBOLICATION=1 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1 # Apple's 64-bit tvOS. -targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-tvos_arm64 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-tvos_arm64 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-tvos_arm64.default = \ +target-sysroot-xcode_12_2-tvos_arm64.default = \ remote:internal arch.tvos_arm64 = arm64 -targetSysRoot.tvos_arm64 = target-sysroot-xcode_12_0-tvos_arm64 +targetSysRoot.tvos_arm64 = target-sysroot-xcode_12_2-tvos_arm64 targetCpu.tvos_arm64 = cyclone clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.tvos_arm64 = -O1 @@ -248,15 +248,15 @@ runtimeDefinitions.tvos_arm64 = KONAN_OBJC_INTEROP=1 KONAN_TVOS=1 KONAN_ARM64=1 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1 KONAN_REPORT_BACKTRACE_TO_IOS_CRASH_LOG=1 MACHSIZE=64 # watchOS armv7k -targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-watchos_arm32 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-watchos_arm32 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-watchos_arm32.default = \ +target-sysroot-xcode_12_2-watchos_arm32.default = \ remote:internal arch.watchos_arm32 = armv7k -targetSysRoot.watchos_arm32 = target-sysroot-xcode_12_0-watchos_arm32 +targetSysRoot.watchos_arm32 = target-sysroot-xcode_12_2-watchos_arm32 targetCpu.watchos_arm32 = cortex-a7 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir clangNooptFlags.watchos_arm32 = -O1 @@ -277,15 +277,15 @@ runtimeDefinitions.watchos_arm32 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS KONAN_ARM3 MACHSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # watchOS arm64_32 -targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-watchos_arm64 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-watchos_arm64 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-watchos_arm64.default = \ +target-sysroot-xcode_12_2-watchos_arm64.default = \ remote:internal arch.watchos_arm64 = arm64_32 -targetSysRoot.watchos_arm64 = target-sysroot-xcode_12_0-watchos_arm32 +targetSysRoot.watchos_arm64 = target-sysroot-xcode_12_2-watchos_arm32 targetCpu.watchos_arm64 = cortex-a7 clangFlags.watchos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir -mllvm -aarch64-watch-bitcode-compatibility \ -mllvm -arm-bitcode-compatibility -mllvm -fast-isel=false -mllvm -global-isel=false @@ -307,15 +307,15 @@ runtimeDefinitions.watchos_arm64 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS KONAN_ARM3 MACHSIZE=32 KONAN_NO_64BIT_ATOMIC=1 KONAN_NO_UNALIGNED_ACCESS=1 # Apple's watchOS i386 simulator. -targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-watchos_x86 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-watchos_x86 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-watchos_x86.default = \ +target-sysroot-xcode_12_2-watchos_x86.default = \ remote:internal arch.watchos_x86 = i386 -targetSysRoot.watchos_x86 = target-sysroot-xcode_12_0-watchos_x86 +targetSysRoot.watchos_x86 = target-sysroot-xcode_12_2-watchos_x86 # -target-cpu pentium4 makes sure that code-generator knows which CPU flavour to emit code for. # Can be seen on optimized build and FP tests, where value is passed on stack # by Kotlin and taken from SSE registers by C code. @@ -338,15 +338,15 @@ runtimeDefinitions.watchos_x86 = KONAN_OBJC_INTEROP=1 KONAN_WATCHOS=1 KONAN_NO_6 KONAN_X86=1 KONAN_CORE_SYMBOLICATION=1 KONAN_HAS_CXX11_EXCEPTION_FUNCTIONS=1 # watchOS x86_64 simulator. -targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_12_0-macos_x64 +targetToolchain.macos_x64-watchos_x64 = target-toolchain-xcode_12_2-macos_x64 dependencies.macos_x64-watchos_x64 = \ libffi-3.2.1-3-darwin-macos -target-sysroot-xcode_12_0-watchos_x64.default = \ +target-sysroot-xcode_12_2-watchos_x64.default = \ remote:internal arch.watchos_x64 = x86_64 -targetSysRoot.watchos_x64 = target-sysroot-xcode_12_0-watchos_x86 +targetSysRoot.watchos_x64 = target-sysroot-xcode_12_2-watchos_x86 targetCpu.watchos_x64 = core2 clangFlags.watchos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir -target-cpu $targetCpu.watchos_x64 clangNooptFlags.watchos_x64 = -O1 diff --git a/kotlin-native/tools/scripts/update_xcode.sh b/kotlin-native/tools/scripts/update_xcode.sh index ad275114af1..5952c7fe634 100755 --- a/kotlin-native/tools/scripts/update_xcode.sh +++ b/kotlin-native/tools/scripts/update_xcode.sh @@ -2,7 +2,7 @@ set -e # "brew install coreutils" for grealpath. -KONAN_TOOLCHAIN_VERSION=xcode_12_0 +KONAN_TOOLCHAIN_VERSION=xcode_12_2 SDKS="macosx iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator" TARBALL_macosx=target-sysroot-$KONAN_TOOLCHAIN_VERSION-macos_x64 TARBALL_iphoneos=target-sysroot-$KONAN_TOOLCHAIN_VERSION-ios_arm64