Update to XCode 11. (#3375)

Interop/Indexer/build.gradle

@@ -53,7 +53,10 @@ List<String> ldflags = ["$llvmDir/$libclang", "-L$libclangextDir.absolutePath",
 
 if (libclangextIsEnabled) {
     assert(isMac())
-    ldflags.addAll(['-Wl,--no-demangle', '-Wl,-search_paths_first', '-Wl,-headerpad_max_install_names', '-Wl,-U,_futimens'])
+    ldflags.addAll(['-Wl,--no-demangle', '-Wl,-search_paths_first', '-Wl,-headerpad_max_install_names', '-Wl,-U,_futimens',
+                   '-Wl,-U,__ZN4llvm7remarks11parseFormatENS_9StringRefE',
+                   '-Wl,-U,__ZN4llvm7remarks22createRemarkSerializerENS0_6FormatENS0_14SerializerModeERNS_11raw_ostreamE',
+                   '-Wl,-U,__ZN4llvm7remarks14YAMLSerializerC1ERNS_11raw_ostreamENS0_14UseStringTableE'])
 
     List<String> llvmLibs = [
             "clangAST", "clangASTMatchers", "clangAnalysis", "clangBasic", "clangDriver", "clangEdit",

Interop/Indexer/src/main/kotlin/org/jetbrains/kotlin/native/interop/indexer/Indexer.kt

@@ -903,8 +903,8 @@ internal class NativeIndexImpl(val library: NativeLibrary, val verbose: Boolean
                 selector, encoding, parameters, returnType,
                 isVariadic = clang_Cursor_isVariadic(cursor) != 0,
                 isClass = isClass,
-                nsConsumesSelf = hasAttribute(cursor, NS_CONSUMES_SELF),
-                nsReturnsRetained = hasAttribute(cursor, NS_RETURNS_RETAINED),
+                nsConsumesSelf = clang_Cursor_isObjCConsumingSelfMethod(cursor) != 0,
+                nsReturnsRetained = clang_Cursor_isObjCReturningRetainedMethod(cursor) != 0,
                 isOptional = (clang_Cursor_isObjCOptional(cursor) != 0),
                 isInit = (clang_Cursor_isObjCInitMethod(cursor) != 0),
                 isExplicitlyDesignatedInitializer = hasAttribute(cursor, OBJC_DESGINATED_INITIALIZER)
@@ -933,8 +933,6 @@ internal class NativeIndexImpl(val library: NativeLibrary, val verbose: Boolean
     }
 
     private val NS_CONSUMED = "ns_consumed"
-    private val NS_CONSUMES_SELF = "ns_consumes_self"
-    private val NS_RETURNS_RETAINED = "ns_returns_retained"
     private val OBJC_DESGINATED_INITIALIZER = "objc_designated_initializer"
 
     private fun hasAttribute(cursor: CValue<CXCursor>, name: String): Boolean {

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/CAdapterCompile.kt

@@ -10,6 +10,6 @@ import org.jetbrains.kotlin.konan.target.*
 import org.jetbrains.kotlin.konan.file.*
 
 fun produceCAdapterBitcode(clang: ClangArgs, cppFileName: String, bitcodeFileName: String) {
-    val clangCommand = clang.clangCXX("-std=c++11", cppFileName, "-emit-llvm", "-c", "-o", bitcodeFileName)
+    val clangCommand = clang.clangCXX("-std=c++14", cppFileName, "-emit-llvm", "-c", "-o", bitcodeFileName)
     Command(clangCommand).execute()
 }

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt

@@ -14,7 +14,6 @@ import org.jetbrains.kotlin.backend.konan.llvm.objc.*
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.util.*
-import org.jetbrains.kotlin.konan.target.*
 import org.jetbrains.kotlin.backend.konan.descriptors.resolveFakeOverride
 import org.jetbrains.kotlin.backend.konan.ir.*
 import org.jetbrains.kotlin.descriptors.konan.CompiledKonanModuleOrigin
@@ -117,7 +116,7 @@ internal inline fun<R> generateFunction(codegen: CodeGenerator,
                                         function: IrFunction,
                                         startLocation: LocationInfo? = null,
                                         endLocation: LocationInfo? = null,
-                                        code:FunctionGenerationContext.(FunctionGenerationContext) -> R) {
+                                        code: FunctionGenerationContext.(FunctionGenerationContext) -> R) {
     val llvmFunction = codegen.llvmFunction(function)
 
     generateFunctionBody(FunctionGenerationContext(
@@ -126,6 +125,10 @@ internal inline fun<R> generateFunction(codegen: CodeGenerator,
             startLocation,
             endLocation,
             function), code)
+
+    // To perform per-function validation.
+    if (false)
+        LLVMVerifyFunction(llvmFunction, LLVMVerifierFailureAction.LLVMAbortProcessAction)
 }
 
 
@@ -969,7 +972,6 @@ internal class FunctionGenerationContext(val function: LLVMValueRef,
                 call(context.llvm.memsetFunction,
                         listOf(slotsMem, Int8(0).llvm,
                                 Int32(slotCount * codegen.runtime.pointerSize).llvm,
-                                Int32(codegen.runtime.pointerAlignment).llvm,
                                 Int1(0).llvm))
                 call(context.llvm.enterFrameFunction, listOf(slots, Int32(vars.skipSlots).llvm, Int32(slotCount).llvm))
             }

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt

@@ -297,8 +297,8 @@ internal class Llvm(val context: Context, val llvmModule: LLVMModuleRef) {
     }
 
     private fun importMemset(): LLVMValueRef {
-        val parameterTypes = cValuesOf(int8TypePtr, int8Type, int32Type, int32Type, int1Type)
-        val functionType = LLVMFunctionType(LLVMVoidType(), parameterTypes, 5, 0)
+        val parameterTypes = cValuesOf(int8TypePtr, int8Type, int32Type, int1Type)
+        val functionType = LLVMFunctionType(LLVMVoidType(), parameterTypes, 4, 0)
         return LLVMAddFunction(llvmModule, "llvm.memset.p0i8.i32", functionType)!!
     }
 

backend.native/llvm.def

@@ -16,7 +16,7 @@ linker = clang++
 linkerOpts = -fvisibility-inlines-hidden \
     -Wall -W -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers \
     -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor \
-    -std=c++11 \
+    -std=c++14 \
     -DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \
     -ldebugInfo -lcoverageMapping
 
@@ -24,16 +24,46 @@ linkerOpts = -fvisibility-inlines-hidden \
 linkerOpts.osx = -fPIC \
     -Wl,-search_paths_first -Wl,-headerpad_max_install_names \
     -lpthread -lz -lm  -lcurses -Wl,-U,_futimens -Wl,-U,_LLVMDumpType \
-    -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMIRReader -lLLVMAsmParser -lLLVMMipsDisassembler -lLLVMMipsCodeGen -lLLVMMipsAsmParser -lLLVMMipsDesc -lLLVMMipsInfo -lLLVMMipsAsmPrinter -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMWebAssemblyDisassembler -lLLVMWebAssemblyCodeGen -lLLVMWebAssemblyDesc -lLLVMWebAssemblyInfo -lLLVMWebAssemblyAsmPrinter -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils -lLLVMARMDisassembler -lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils -lLLVMCoverage -lLLVMTarget -lLLVMLinker -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle
+    -lLLVMMipsDisassembler -lLLVMMipsCodeGen -lLLVMMipsAsmParser -lLLVMMipsDesc -lLLVMMipsInfo -lLLVMMipsAsmPrinter \
+    -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter \
+    -lLLVMX86Utils -lLLVMWebAssemblyDisassembler -lLLVMWebAssemblyCodeGen -lLLVMWebAssemblyDesc \
+    -lLLVMWebAssemblyAsmPrinter -lLLVMWebAssemblyAsmParser -lLLVMWebAssemblyInfo -lLLVMAArch64Disassembler \
+    -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter \
+    -lLLVMAArch64Utils -lLLVMARMDisassembler -lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter \
+    -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils \
+    -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMCodeGen -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize \
+    -lLLVMScalarOpts -lLLVMIRReader -lLLVMAsmParser -lLLVMInstCombine -lLLVMAggressiveInstCombine -lLLVMCoverage \
+    -lLLVMTarget -lLLVMLinker -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject \
+    -lLLVMMCParser -lLLVMMC -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMBitReader -lLLVMCore \
+    -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle
+
+
 
 # ./llvm-config --libs analysis bitreader bitwriter core linker target coverage analysis ipo instrumentation lto arm aarch64 x86 mips
-linkerOpts.linux= -lLLVMMipsDisassembler -lLLVMMipsCodeGen -lLLVMMipsAsmParser -lLLVMMipsDesc -lLLVMMipsInfo -lLLVMMipsAsmPrinter -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils -lLLVMARMDisassembler -lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMCodeGen -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMScalarOpts -lLLVMIRReader -lLLVMAsmParser -lLLVMInstCombine -lLLVMCoverage -lLLVMTarget -lLLVMLinker -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle \
-     -fPIC \
+linkerOpts.linux =  -fPIC \
      -Wl,-z,noexecstack \
-     -lrt -ldl -lpthread -lz -lm
+     -lrt -ldl -lpthread -lz -lm \
+-lLLVMMipsDisassembler -lLLVMMipsCodeGen -lLLVMMipsAsmParser -lLLVMMipsDesc -lLLVMMipsInfo \
+-lLLVMMipsAsmPrinter -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info \
+-lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser \
+-lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils -lLLVMARMDisassembler \
+-lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMARMAsmParser -lLLVMARMDesc \
+-lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts \
+-lLLVMCodeGen -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMScalarOpts -lLLVMIRReader -lLLVMAsmParser \
+-lLLVMInstCombine -lLLVMAggressiveInstCombine -lLLVMCoverage -lLLVMTarget -lLLVMLinker -lLLVMTransformUtils \
+-lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMDebugInfoCodeView \
+-lLLVMDebugInfoMSF -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle
 
 # ./llvm-config --libs analysis bitreader bitwriter core linker target coverage analysis ipo instrumentation lto arm aarch64 x86
-linkerOpts.mingw = -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils -lLLVMARMDisassembler -lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts -lLLVMCodeGen -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMScalarOpts -lLLVMIRReader -lLLVMAsmParser -lLLVMInstCombine -lLLVMCoverage -lLLVMTarget -lLLVMLinker -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle \
+linkerOpts.mingw = -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info \
+-lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMAArch64Disassembler -lLLVMAArch64CodeGen -lLLVMAArch64AsmParser \
+-lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMAArch64Utils -lLLVMARMDisassembler \
+-lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMARMAsmParser -lLLVMARMDesc \
+-lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils -lLLVMLTO -lLLVMPasses -lLLVMObjCARCOpts \
+-lLLVMCodeGen -lLLVMipo -lLLVMInstrumentation -lLLVMVectorize -lLLVMScalarOpts -lLLVMIRReader -lLLVMAsmParser \
+-lLLVMInstCombine -lLLVMAggressiveInstCombine -lLLVMCoverage -lLLVMTarget -lLLVMLinker -lLLVMTransformUtils \
+-lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMDebugInfoCodeView \
+-lLLVMDebugInfoMSF -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle \
     -lole32 -luuid -static-libgcc -static-libstdc++ \
     -Wl,-Bstatic -lz \
     -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive,-Bdynamic \
@@ -47,6 +77,7 @@ excludedFunctions.mingw = LLVMDumpType
 
 excludedFunctions = LLVMInitializeAllAsmParsers LLVMInitializeAllAsmPrinters LLVMInitializeAllDisassemblers \
     LLVMInitializeAllTargetInfos LLVMInitializeAllTargetMCs LLVMInitializeAllTargets LLVMInitializeNativeTarget \
-    LLVMInitializeNativeAsmParser LLVMInitializeNativeAsmPrinter LLVMInitializeNativeDisassembler
+    LLVMInitializeNativeAsmParser LLVMInitializeNativeAsmPrinter LLVMInitializeNativeDisassembler \
+    LLVMConstInBoundsGEP2 LLVMConstGEP2
 
-strictEnums = LLVMIntPredicate LLVMOpcode LLVMDLLStorageClass LLVMCallConv LLVMThreadLocalMode LLVMAtomicOrdering
+strictEnums = LLVMIntPredicate LLVMOpcode LLVMDLLStorageClass LLVMCallConv LLVMThreadLocalMode LLVMAtomicOrdering

build-tools/src/main/groovy/org/jetbrains/kotlin/CompileToBitcode.groovy

@@ -21,7 +21,8 @@ import org.gradle.api.tasks.*
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
-
+import org.jetbrains.kotlin.konan.target.Family
+import org.jetbrains.kotlin.konan.target.HostManager
 import org.jetbrains.kotlin.konan.target.KonanTarget
 
 class CompileCppToBitcode extends DefaultTask {
@@ -98,6 +99,11 @@ class CompileCppToBitcode extends DefaultTask {
         linkerArgs.addAll(args)
     }
 
+    private Boolean targetingMinGW() {
+        def hostManager = new HostManager()
+        return hostManager.targetByName(this.target).family == Family.MINGW
+    }
+
     @TaskAction
     void compile() {
         // the strange code below seems to be required due to some Gradle (Groovy?) behaviour
@@ -107,12 +113,16 @@ class CompileCppToBitcode extends DefaultTask {
         List<String> linkerArgs = this.getLinkerArgs()
         File objDir = this.getObjDir()
         objDir.mkdirs()
+        Boolean targetingMinGW = this.targetingMinGW()
 
         project.execKonanClang(this.target) {
             workingDir objDir
             executable "clang++"
-            args '-std=c++11'
+            args '-std=c++14'
             args '-O2'
+            if (!targetingMinGW) {
+                args '-fPIC'
+            }
             args compilerArgs
 
             args "-I$headersDir"

build-tools/src/main/kotlin/org/jetbrains/kotlin/ExecutorService.kt

@@ -238,7 +238,7 @@ private fun simulator(project: Project) : ExecutorService = object : ExecutorSer
 
     private val device = project.findProperty("iosDevice")?.toString() ?: when (target) {
         KonanTarget.TVOS_X64 -> "Apple TV 4K"
-        KonanTarget.IOS_X64 -> "iPhone 6"
+        KonanTarget.IOS_X64 -> "iPhone 8"
         KonanTarget.WATCHOS_X64,
         KonanTarget.WATCHOS_X86 -> "Apple Watch Series 4 - 40mm"
         else -> error("Unexpected simulation target: $target")

build-tools/src/main/kotlin/org/jetbrains/kotlin/KotlinNativeTest.kt

@@ -407,9 +407,10 @@ open class KonanDynamicTest : KonanStandaloneTest() {
     // Replace testlib_api.h and all occurrences of the testlib with the actual name of the test
     private fun processCSource(): String {
         val sourceFile = File(cSource)
+        val prefixedName = if (HostManager.hostIsMingw) "$name" else "lib$name"
         val res = sourceFile.readText()
-                .replace("#include \"testlib_api.h\"", "#include \"lib${name}_api.h\"")
-                .replace("testlib", "lib${name}")
+                .replace("#include \"testlib_api.h\"", "#include \"${prefixedName}_api.h\"")
+                .replace("testlib", prefixedName)
         val newFileName = "$outputDirectory/${sourceFile.name}"
         println(newFileName)
         File(newFileName).run {

cmd/run_konan.bat

@@ -103,7 +103,7 @@ goto :eof
   rem libclang.dll is dynamically linked and thus requires correct PATH to be loaded.
   rem TODO: remove this hack.
   if "%KONAN_DATA_DIR%"=="" (set KONAN_DATA_DIR=%USERPROFILE%\.konan)
-  set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2\bin;%PATH%"
+  set "PATH=%KONAN_DATA_DIR%\dependencies\msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1\bin;%PATH%"
 goto :eof
 
 :end

konan/konan.properties

@@ -26,23 +26,26 @@ airplaneMode = false
 # if true, ignores Xcode version check.
 ignoreXcodeVersionCheck = false
 # Disabled until decided better mechanism.
-# useFixedXcodeVersion = 10.2
+# useFixedXcodeVersion = 11.0
 
 downloadingAttempts = 10
 downloadingAttemptIntervalMs = 3000
 homeDependencyCache = .konan/cache
 
 clangDebugFlags = -O0
-llvmVersion = 6.0.1
+llvmVersion.linux_x64 = 8.0.0
+llvmVersion.mingw_x64 = 8.0.1
+# We follow Apple versioning convention here.
+llvmVersion.macos_x64 = 8.0.0
 
 # Mac OS X.
-llvmHome.macos_x64 = clang-llvm-6.0.1-darwin-macos
-targetToolchain.macos_x64 = target-toolchain-9-macos_x64
+llvmHome.macos_x64 = clang-llvm-apple-8.0.0-darwin-macos
+targetToolchain.macos_x64 = target-toolchain-10-macos_x64
 libffiDir.macos_x64 = libffi-3.2.1-3-darwin-macos
-additionalToolsDir.macos_x64 = xcode-addon-9-macos_x64
+additionalToolsDir.macos_x64 = xcode-addon-10-macos_x64
 
 arch.macos_x64 = x86_64
-targetSysRoot.macos_x64 = target-sysroot-9-macos_x64
+targetSysRoot.macos_x64 = target-sysroot-10-macos_x64
 
 clangFlags.macos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.macos_x64 = -O1
@@ -61,30 +64,30 @@ osVersionMin.macos_x64 = 10.11
 dependencies.macos_x64 = \
     libffi-3.2.1-3-darwin-macos \
     lldb-1-macos \
-    clang-llvm-6.0.1-darwin-macos
+    clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-macos_x64.default = \
+target-sysroot-10-macos_x64.default = \
   remote:internal
 
-target-toolchain-9-macos_x64.default = \
+target-toolchain-10-macos_x64.default = \
   remote:internal
 
-xcode-addon-9-macos_x64.default = \
+xcode-addon-10-macos_x64.default = \
   remote:internal
 
 
 # Apple's 32-bit iOS.
-targetToolchain.macos_x64-ios_arm32 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-ios_arm32 = target-toolchain-10-macos_x64
 dependencies.macos_x64-ios_arm32 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-ios_arm32.default = \
+target-sysroot-10-ios_arm32.default = \
   remote:internal
 
 arch.ios_arm32 = armv7
 # Shared with 64-bit version.
-targetSysRoot.ios_arm32 = target-sysroot-9-ios_arm64
+targetSysRoot.ios_arm32 = target-sysroot-10-ios_arm64
 
 clangFlags.ios_arm32 = -cc1 -emit-obj -disable-llvm-optzns -x ir
 clangNooptFlags.ios_arm32 = -O1
@@ -100,16 +103,16 @@ osVersionMinFlagClang.ios_arm32 = -miphoneos-version-min
 osVersionMin.ios_arm32 = 9.0
 
 # Apple's 64-bit iOS.
-targetToolchain.macos_x64-ios_arm64 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-ios_arm64 = target-toolchain-10-macos_x64
 dependencies.macos_x64-ios_arm64 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-ios_arm64.default = \
+target-sysroot-10-ios_arm64.default = \
   remote:internal
 
 arch.ios_arm64 = arm64
-targetSysRoot.ios_arm64 = target-sysroot-9-ios_arm64
+targetSysRoot.ios_arm64 = target-sysroot-10-ios_arm64
 
 clangFlags.ios_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.ios_arm64 = -O1
@@ -129,16 +132,16 @@ osVersionMinFlagClang.ios_arm64 = -miphoneos-version-min
 osVersionMin.ios_arm64 = 9.0
 
 #  Apple's iOS simulator.
-targetToolchain.macos_x64-ios_x64 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-ios_x64 = target-toolchain-10-macos_x64
 dependencies.macos_x64-ios_x64 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-ios_x64.default = \
+target-sysroot-10-ios_x64.default = \
   remote:internal
 
 arch.ios_x64 = x86_64
-targetSysRoot.ios_x64 = target-sysroot-9-ios_x64
+targetSysRoot.ios_x64 = target-sysroot-10-ios_x64
 
 clangFlags.ios_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.ios_x64 = -O1
@@ -155,16 +158,16 @@ osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min
 osVersionMin.ios_x64 = 9.0
 
 #  Apple's tvOS simulator.
-targetToolchain.macos_x64-tvos_x64 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-tvos_x64 = target-toolchain-10-macos_x64
 dependencies.macos_x64-tvos_x64 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-tvos_x64.default = \
+target-sysroot-10-tvos_x64.default = \
   remote:internal
 
 arch.tvos_x64 = x86_64
-targetSysRoot.tvos_x64 = target-sysroot-9-tvos_x64
+targetSysRoot.tvos_x64 = target-sysroot-10-tvos_x64
 
 clangFlags.tvos_x64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.tvos_x64 = -O1
@@ -181,16 +184,16 @@ osVersionMinFlagClang.tvos_x64 = -mtvos-simulator-version-min
 osVersionMin.tvos_x64 = 9.0
 
 # Apple's 64-bit tvOS.
-targetToolchain.macos_x64-tvos_arm64 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-tvos_arm64 = target-toolchain-10-macos_x64
 dependencies.macos_x64-tvos_arm64 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-tvos_arm64.default = \
+target-sysroot-10-tvos_arm64.default = \
   remote:internal
 
 arch.tvos_arm64 = arm64
-targetSysRoot.tvos_arm64 = target-sysroot-9-tvos_arm64
+targetSysRoot.tvos_arm64 = target-sysroot-10-tvos_arm64
 
 clangFlags.tvos_arm64 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.tvos_arm64 = -O1
@@ -207,16 +210,16 @@ osVersionMinFlagClang.tvos_arm64 = -mtvos-version-min
 osVersionMin.tvos_arm64 = 9.0
 
 # watchOS armv7k
-targetToolchain.macos_x64-watchos_arm32 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-watchos_arm32 = target-toolchain-10-macos_x64
 dependencies.macos_x64-watchos_arm32 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-watchos_arm32.default = \
+target-sysroot-10-watchos_arm32.default = \
   remote:internal
 
 arch.watchos_arm32 = armv7k
-targetSysRoot.watchos_arm32 = target-sysroot-9-watchos_arm32
+targetSysRoot.watchos_arm32 = target-sysroot-10-watchos_arm32
 
 clangFlags.watchos_arm32 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.watchos_arm32 = -O1
@@ -233,16 +236,16 @@ osVersionMinFlagClang.watchos_arm32 = -mwatchos-version-min
 osVersionMin.watchos_arm32 = 5.0
 
 #  Apple's watchOS i386 simulator.
-targetToolchain.macos_x64-watchos_x86 = target-toolchain-9-macos_x64
+targetToolchain.macos_x64-watchos_x86 = target-toolchain-10-macos_x64
 dependencies.macos_x64-watchos_x86 = \
   libffi-3.2.1-3-darwin-macos \
-  clang-llvm-6.0.1-darwin-macos
+  clang-llvm-apple-8.0.0-darwin-macos
 
-target-sysroot-9-watchos_x86.default = \
+target-sysroot-10-watchos_x86.default = \
   remote:internal
 
 arch.watchos_x86 = i386
-targetSysRoot.watchos_x86 = target-sysroot-9-watchos_x86
+targetSysRoot.watchos_x86 = target-sysroot-10-watchos_x86
 
 clangFlags.watchos_x86 = -cc1 -emit-obj -disable-llvm-passes -x ir
 clangNooptFlags.watchos_x86 = -O1
@@ -259,28 +262,28 @@ osVersionMinFlagClang.watchos_x86 = -mwatchos-simulator-version-min
 osVersionMin.watchos_x86 = 5.0
 
 # Linux x86-64.
-llvmHome.linux_x64 = clang-llvm-6.0.1-linux-x86-64
+llvmHome.linux_x64 = clang-llvm-8.0.0-linux-x86-64
 libffiDir.linux_x64 = libffi-3.2.1-2-linux-x86-64
 
 gccToolchain.linux_x64 = target-gcc-toolchain-3-linux-x86-64
 targetToolchain.linux_x64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu
 dependencies.linux_x64 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     libffi-3.2.1-2-linux-x86-64 \
     lldb-1-linux
 
 gccToolchain.mingw_x64 = target-gcc-toolchain-3-linux-x86-64
-targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
+targetToolchain.mingw_x64-linux_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
 dependencies.mingw_x64-linux_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     libffi-3.2.1-mingw-w64-x86-64 \
     target-gcc-toolchain-3-linux-x86-64
 
 gccToolchain.macos_x64 = target-gcc-toolchain-3-linux-x86-64
-targetToolchain.macos_x64-linux_x64 = clang-llvm-6.0.1-darwin-macos
+targetToolchain.macos_x64-linux_x64 = clang-llvm-apple-8.0.0-darwin-macos
 dependencies.macos_x64-linux_x64 = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     libffi-3.2.1-3-darwin-macos \
     target-gcc-toolchain-3-linux-x86-64
 
@@ -305,20 +308,20 @@ abiSpecificLibraries.linux_x64 = ../lib64 lib64 usr/lib64
 
 # Raspberry Pi
 targetToolchain.linux_x64-linux_arm32_hfp = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu
-targetToolchain.mingw_x64-linux_arm32_hfp = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
-targetToolchain.macos_x64-linux_arm32_hfp = clang-llvm-6.0.1-darwin-macos
+targetToolchain.mingw_x64-linux_arm32_hfp = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
+targetToolchain.macos_x64-linux_arm32_hfp = clang-llvm-apple-8.0.0-darwin-macos
 dependencies.linux_x64-linux_arm32_hfp = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-2-raspberrypi \
     libffi-3.2.1-2-linux-x86-64
 dependencies.mingw_x64-linux_arm32_hfp = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     libffi-3.2.1-mingw-w64-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-2-raspberrypi
 dependencies.macos_x64-linux_arm32_hfp = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     libffi-3.2.1-3-darwin-macos \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-2-raspberrypi
@@ -347,20 +350,20 @@ abiSpecificLibraries.linux_arm32_hfp = \
 
 # Linux arm64
 targetToolchain.linux_x64-linux_arm64 = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu
-targetToolchain.mingw_x64-linux_arm64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
-targetToolchain.macos_x64-linux_arm64 = clang-llvm-6.0.1-darwin-macos
+targetToolchain.mingw_x64-linux_arm64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
+targetToolchain.macos_x64-linux_arm64 = clang-llvm-apple-8.0.0-darwin-macos
 dependencies.linux_x64-linux_arm64 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-1-linux-glibc-arm64 \
     libffi-3.2.1-2-linux-x86-64
 dependencies.mingw_x64-linux_arm64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     libffi-3.2.1-mingw-w64-x86-64 \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-1-linux-glibc-arm64
 dependencies.macos_x64-linux_arm64 = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     libffi-3.2.1-3-darwin-macos \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-1-linux-glibc-arm64
@@ -390,7 +393,7 @@ abiSpecificLibraries.linux_arm64 = \
 # MIPS
 targetToolchain.linux_x64-linux_mips32 = target-gcc-toolchain-2-linux-mips/x86_64-unknown-linux-gnu
 dependencies.linux_x64-linux_mips32 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-gcc-toolchain-2-linux-mips \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-2-mips \
@@ -417,7 +420,7 @@ abiSpecificLibraries.linux_mips32 =
 # MIPSel
 targetToolchain.linux_x64-linux_mipsel32 = target-gcc-toolchain-2-linux-mips/x86_64-unknown-linux-gnu
 dependencies.linux_x64-linux_mipsel32 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-gcc-toolchain-2-linux-mips \
     target-gcc-toolchain-3-linux-x86-64 \
     target-sysroot-2-mipsel \
@@ -441,23 +444,23 @@ dynamicLinker.linux_mipsel32 = /lib/ld.so.1
 abiSpecificLibraries.linux_mipsel32 =
 
 # Android ARM32, based on NDK for android-21.
-targetToolchain.macos_x64-android_arm32 = target-toolchain-1-osx-android_ndk
+targetToolchain.macos_x64-android_arm32 = target-toolchain-2-osx-android_ndk
 dependencies.macos_x64-android_arm32 = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-osx-android_ndk \
+    target-toolchain-2-osx-android_ndk \
     libffi-3.2.1-3-darwin-macos
-targetToolchain.linux_x64-android_arm32 = target-toolchain-1-linux-android_ndk
+targetToolchain.linux_x64-android_arm32 = target-toolchain-2-linux-android_ndk
 dependencies.linux_x64-android_arm32 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-linux-android_ndk \
+    target-toolchain-2-linux-android_ndk \
     libffi-3.2.1-2-linux-x86-64
-targetToolchain.mingw_x64-android_arm32 = target-toolchain-1-windows-android_ndk
+targetToolchain.mingw_x64-android_arm32 = target-toolchain-2-windows-android_ndk
 dependencies.mingw_x64-android_arm32 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-windows-android_ndk \
+    target-toolchain-2-windows-android_ndk \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_arm32 = arm-linux-androideabi
@@ -469,23 +472,23 @@ targetSysRoot.android_arm32 = target-sysroot-1-android_ndk
 linkerKonanFlags.android_arm32 = -lm -lstdc++ -landroid -llog -latomic
 
 # Android ARM64, based on NDK.
-targetToolchain.macos_x64-android_arm64 = target-toolchain-1-osx-android_ndk
+targetToolchain.macos_x64-android_arm64 = target-toolchain-2-osx-android_ndk
 dependencies.macos_x64-android_arm64 = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-osx-android_ndk \
+    target-toolchain-2-osx-android_ndk \
     libffi-3.2.1-3-darwin-macos
-targetToolchain.linux_x64-android_arm64 = target-toolchain-1-linux-android_ndk
+targetToolchain.linux_x64-android_arm64 = target-toolchain-2-linux-android_ndk
 dependencies.linux_x64-android_arm64 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-linux-android_ndk \
+    target-toolchain-2-linux-android_ndk \
     libffi-3.2.1-2-linux-x86-64
-targetToolchain.mingw_x64-android_arm64 = target-toolchain-1-windows-android_ndk
+targetToolchain.mingw_x64-android_arm64 = target-toolchain-2-windows-android_ndk
 dependencies.mingw_x64-android_arm64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-windows-android_ndk \
+    target-toolchain-2-windows-android_ndk \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_arm64 = aarch64-linux-android
@@ -497,23 +500,23 @@ linkerKonanFlags.android_arm64 = -lm -lstdc++ -landroid -llog -latomic
 linkerNoDebugFlags.android_arm64 = -Wl,-S
 
 # Android X86, based on NDK.
-targetToolchain.macos_x64-android_x86 = target-toolchain-1-osx-android_ndk
+targetToolchain.macos_x64-android_x86 = target-toolchain-2-osx-android_ndk
 dependencies.macos_x64-android_x86 = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-osx-android_ndk \
+    target-toolchain-2-osx-android_ndk \
     libffi-3.2.1-3-darwin-macos
-targetToolchain.linux_x64-android_x86 = target-toolchain-1-linux-android_ndk
+targetToolchain.linux_x64-android_x86 = target-toolchain-2-linux-android_ndk
 dependencies.linux_x64-android_x86 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-linux-android_ndk \
+    target-toolchain-2-linux-android_ndk \
     libffi-3.2.1-2-linux-x86-64
-targetToolchain.mingw_x64-android_x86 = target-toolchain-1-windows-android_ndk
+targetToolchain.mingw_x64-android_x86 = target-toolchain-2-windows-android_ndk
 dependencies.mingw_x64-android_x86 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-windows-android_ndk \
+    target-toolchain-2-windows-android_ndk \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_x86 = i686-linux-android
@@ -525,23 +528,23 @@ linkerKonanFlags.android_x86 = -lm -lstdc++ -landroid -llog -latomic
 linkerNoDebugFlags.android_x86 = -Wl,-S
 
 # Android X64, based on NDK.
-targetToolchain.macos_x64-android_x64 = target-toolchain-1-osx-android_ndk
+targetToolchain.macos_x64-android_x64 = target-toolchain-2-osx-android_ndk
 dependencies.macos_x64-android_x64 = \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-osx-android_ndk \
+    target-toolchain-2-osx-android_ndk \
     libffi-3.2.1-3-darwin-macos
-targetToolchain.linux_x64-android_x64 = target-toolchain-1-linux-android_ndk
+targetToolchain.linux_x64-android_x64 = target-toolchain-2-linux-android_ndk
 dependencies.linux_x64-android_x64 = \
-    clang-llvm-6.0.1-linux-x86-64 \
+    clang-llvm-8.0.0-linux-x86-64 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-linux-android_ndk \
+    target-toolchain-2-linux-android_ndk \
     libffi-3.2.1-2-linux-x86-64
-targetToolchain.mingw_x64-android_x64 = target-toolchain-1-windows-android_ndk
+targetToolchain.mingw_x64-android_x64 = target-toolchain-2-windows-android_ndk
 dependencies.mingw_x64-android_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     target-sysroot-1-android_ndk \
-    target-toolchain-1-windows-android_ndk \
+    target-toolchain-2-windows-android_ndk \
     libffi-3.2.1-mingw-w64-x86-64
 
 quadruple.android_x64 = x86_64-linux-android
@@ -554,27 +557,27 @@ linkerNoDebugFlags.android_x64 = -Wl,-S
 
 
 # Windows x86-64, based on mingw-w64.
-llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
-targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
+llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
+targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
 libffiDir.mingw_x64 = libffi-3.2.1-mingw-w64-x86-64
 
-targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
-targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
+targetToolchain.linux_x64-mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
+targetToolchain.macos_x64-mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
 dependencies.mingw_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     libffi-3.2.1-mingw-w64-x86-64 \
     lldb-1-windows
 dependencies.linux_x64-mingw_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
-    clang-llvm-6.0.1-linux-x86-64 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
+    clang-llvm-8.0.0-linux-x86-64 \
     libffi-3.2.1-2-linux-x86-64
 dependencies.macos_x64-mingw_x64 = \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
-    clang-llvm-6.0.1-darwin-macos \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
+    clang-llvm-apple-8.0.0-darwin-macos \
     libffi-3.2.1-3-darwin-macos
 
 quadruple.mingw_x64 = x86_64-w64-mingw32
-targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2
+targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1
 # For using with Universal Windows Platform (UWP) we need to use this slower option.
 # See https://youtrack.jetbrains.com/issue/KT-27654.
 # TODO: remove, once fixed in mingw, check with the bug testcase.
@@ -593,7 +596,7 @@ linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections
 targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
 dependencies.mingw_x64-mingw_x86 = \
     msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     libffi-3.2.1-mingw-w64-x86-64
 targetToolchain.linux_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
 targetToolchain.macos_x64-mingw_x86 = msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1
@@ -603,7 +606,7 @@ dependencies.linux_x64-mingw_x86 = \
     libffi-3.2.1-2-linux-x86-64
 dependencies.macos_x64-mingw_x86 = \
     msys2-mingw-w64-i686-gcc-7.4.0-clang-llvm-6.0.1 \
-    clang-llvm-6.0.1-darwin-macos \
+    clang-llvm-apple-8.0.0-darwin-macos \
     libffi-3.2.1-3-darwin-macos
 
 quadruple.mingw_x86 = i686-w64-mingw32
@@ -630,26 +633,26 @@ linkerOptimizationFlags.mingw_x86 = -Wl,--gc-sections
 targetToolchain.macos_x64-wasm32 = target-toolchain-3-macos-wasm
 dependencies.macos_x64-wasm32 = \
     libffi-3.2.1-3-darwin-macos \
-    clang-llvm-6.0.1-darwin-macos \
-    target-sysroot-2-wasm \
+    clang-llvm-apple-8.0.0-darwin-macos \
+    target-sysroot-3-wasm \
     target-toolchain-3-macos-wasm
 
 targetToolchain.linux_x64-wasm32 = target-toolchain-2-linux-wasm
 dependencies.linux_x64-wasm32 = \
     libffi-3.2.1-2-linux-x86-64 \
-    clang-llvm-6.0.1-linux-x86-64 \
-    target-sysroot-2-wasm \
+    clang-llvm-8.0.0-linux-x86-64 \
+    target-sysroot-3-wasm \
     target-toolchain-2-linux-wasm
 
 targetToolchain.mingw_x64-wasm32 = target-toolchain-2-mingw-wasm
 dependencies.mingw_x64-wasm32 = \
     libffi-3.2.1-mingw-w64-x86-64 \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
-    target-sysroot-2-wasm \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
+    target-sysroot-3-wasm \
     target-toolchain-2-mingw-wasm
 
 quadruple.wasm32 = wasm32-unknown-unknown
-targetSysRoot.wasm32 = target-sysroot-2-wasm
+targetSysRoot.wasm32 = target-sysroot-3-wasm
 optFlags.wasm32 = -internalize -globaldce -mtriple=wasm32-unknown-unknown-wasm
 optNooptFlags.wasm32 = -O1
 optOptFlags.wasm32 = -O3

konan/platforms/zephyr/stm32f4_disco

@@ -40,6 +40,6 @@ dependencies.macos_x64-zephyr_stm32f4_disco = \
 targetToolchain.mingw_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-win32/arm-none-eabi
 dependencies.mingw_x64-zephyr_stm32f4_disco = \
     libffi-3.2.1-mingw-w64-x86-64 \
-    msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1-2 \
+    msys2-mingw-w64-x86_64-clang-llvm-lld-compiler_rt-8.0.1 \
     gcc-arm-none-eabi-7-2017-q4-major-win32 \
     target-sysroot-2-wasm

libclangext/build.gradle

@@ -42,7 +42,7 @@ model {
             binaries.withType(StaticLibraryBinarySpec) { binary ->
                 if (!project.parent.convention.plugins.platformInfo.isWindows())
                     cppCompiler.args "-fPIC"
-                cppCompiler.args "--std=c++11", "-g", "-I${llvmDir}/include"
+                cppCompiler.args "--std=c++14", "-g", "-I${llvmDir}/include"
                 if (isEnabled) {
                     cppCompiler.args '-DLIBCLANGEXT_ENABLE=1'
                 }

libclangext/src/main/cpp/ClangExt.cpp

@@ -193,4 +193,28 @@ extern "C" {
     return 0;
   }
 
+  unsigned clang_Cursor_isObjCReturningRetainedMethod(CXCursor cursor) {
+#if LIBCLANGEXT_ENABLE
+    if (cursor.kind == CXCursor_ObjCInstanceMethodDecl) {
+      const Decl *decl = getCursorDecl(cursor);
+      if (const ObjCMethodDecl *methodDecl = dyn_cast_or_null<ObjCMethodDecl>(decl)) {
+        return methodDecl->hasAttr<NSReturnsRetainedAttr>();
+      }
+    }
+#endif
+    return 0;
+  }
+
+  unsigned clang_Cursor_isObjCConsumingSelfMethod(CXCursor cursor) {
+#if LIBCLANGEXT_ENABLE
+    if (cursor.kind == CXCursor_ObjCInstanceMethodDecl) {
+      const Decl *decl = getCursorDecl(cursor);
+      if (const ObjCMethodDecl *methodDecl = dyn_cast_or_null<ObjCMethodDecl>(decl)) {
+        return methodDecl->hasAttr<NSConsumesSelfAttr>();
+      }
+    }
+#endif
+    return 0;
+  }
+
 }

libclangext/src/main/include/clang-c/ext.h

@@ -51,6 +51,10 @@ CXCursor clang_Type_getProtocol(CXType type, unsigned index);
 
 unsigned clang_Cursor_isObjCInitMethod(CXCursor cursor);
 
+unsigned clang_Cursor_isObjCReturningRetainedMethod(CXCursor cursor);
+
+unsigned clang_Cursor_isObjCConsumingSelfMethod(CXCursor cursor);
+
 #ifdef __cplusplus
 }
 #endif

llvmCoverageMappingC/build.gradle

@@ -37,7 +37,7 @@ model {
         binaries.withType(StaticLibraryBinarySpec) { binary ->
           if (!project.parent.convention.plugins.platformInfo.isWindows())
              cppCompiler.args "-fPIC"
-          cppCompiler.args "--std=c++11", "-I${llvmDir}/include", "-I${projectDir}/src/main/include"
+          cppCompiler.args "--std=c++14", "-I${llvmDir}/include", "-I${projectDir}/src/main/include"
           if (isMac()) {
             cppCompiler.args "-DKONAN_MACOS=1"
           } else if (isWindows()) {

llvmDebugInfoC/build.gradle

@@ -37,7 +37,7 @@ model {
         binaries.withType(StaticLibraryBinarySpec) { binary ->
           if (!project.parent.convention.plugins.platformInfo.isWindows())
              cppCompiler.args "-fPIC"
-          cppCompiler.args "--std=c++11", "-I${llvmDir}/include", "-I${projectDir}/src/main/include"
+          cppCompiler.args "--std=c++14", "-I${llvmDir}/include", "-I${projectDir}/src/main/include"
           linker.args "-L${llvmDir}/lib", "-lLLVMCore", "-lLLVMSupport"
         }
         binaries.withType(SharedLibraryBinarySpec) { binary ->

llvmDebugInfoC/src/main/cpp/DebugInfoC.cpp

@@ -23,7 +23,7 @@
 #include <llvm/Support/Casting.h>
 #include "DebugInfoC.h"
 /**
- * c++ --std=c++11 llvmDebugInfoC/src/DebugInfoC.cpp -IllvmDebugInfoC/include/ -Idependencies/all/clang+llvm-3.9.0-darwin-macos/include -Ldependencies/all/clang+llvm-3.9.0-darwin-macos/lib  -lLLVMCore -lLLVMSupport -lncurses -shared -o libLLVMDebugInfoC.dylib
+ * c++ --std=c++14 llvmDebugInfoC/src/DebugInfoC.cpp -IllvmDebugInfoC/include/ -Idependencies/all/clang+llvm-3.9.0-darwin-macos/include -Ldependencies/all/clang+llvm-3.9.0-darwin-macos/lib  -lLLVMCore -lLLVMSupport -lncurses -shared -o libLLVMDebugInfoC.dylib
  */
 
 namespace llvm {
@@ -84,20 +84,25 @@ DIModuleRef DICreateModule(DIBuilderRef builder, DIScopeOpaqueRef scope,
   return llvm::wrap(llvm::unwrap(builder)->createModule(llvm::unwrap(scope), name, configurationMacro, includePath, iSysRoot));
 }
 
-DISubprogramRef DICreateFunction(DIBuilderRef builder, DIScopeOpaqueRef scope,
+DISubprogramRef DICreateFunction(DIBuilderRef builderRef, DIScopeOpaqueRef scope,
                                  const char* name, const char *linkageName,
                                  DIFileRef file, unsigned lineNo,
                                  DISubroutineTypeRef type, int isLocal,
                                  int isDefinition, unsigned scopeLine) {
-  return llvm::wrap(llvm::unwrap(builder)->createFunction(llvm::unwrap(scope),
-                                                          name,
-                                                          linkageName,
-                                                          llvm::unwrap(file),
-                                                          lineNo,
-                                                          llvm::unwrap(type),
-                                                          isLocal,
-                                                          isDefinition,
-                                                          scopeLine));
+  auto builder = llvm::unwrap(builderRef);
+  auto subprogram = builder->createFunction(llvm::unwrap(scope),
+                                            name,
+                                            linkageName,
+                                            llvm::unwrap(file),
+                                            lineNo,
+                                            llvm::unwrap(type),
+                                            scopeLine, llvm::DINode::DIFlags::FlagZero, llvm::DISubprogram::toSPFlags(false, true, false));
+  auto tmp = subprogram->getRetainedNodes().get();
+  if (!tmp && tmp->isTemporary())
+    llvm::MDTuple::deleteTemporary(tmp);
+
+  builder->finalizeSubprogram(subprogram);
+  return llvm::wrap(subprogram);
 }
 
 DIScopeOpaqueRef DICreateLexicalBlockFile(DIBuilderRef builderRef, DIScopeOpaqueRef scopeRef, DIFileRef fileRef) {

llvmDebugInfoC/src/main/include/DebugInfoC.h

@@ -33,7 +33,7 @@ typedef struct DISubprogram       *DISubprogramRef;
 typedef struct DIModule           *DIModuleRef;
 typedef struct DIScope            *DIScopeOpaqueRef;
 typedef struct DISubroutineType   *DISubroutineTypeRef;
-typedef struct DISubprogram       *DISubprogramRef;
+//typedef struct DISubprogram       *DISubprogramRef;
 typedef struct DILocation         *DILocationRef;
 typedef struct DILocalVariable    *DILocalVariableRef;
 typedef struct DIExpression       *DIExpressionRef;

platformLibs/src/platform/ios/ARKit.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore QuickLook SceneKit Security SpriteKit UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.ARKit
 modules = ARKit

platformLibs/src/platform/ios/AVFoundation.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
+depends = AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
 language = Objective-C
 package = platform.AVFoundation
 headers = AVFoundation/AVFoundation.h AVFoundation/AVFAudio.h AVFoundation/AVAudioBuffer.h

platformLibs/src/platform/ios/AVKit.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.AVKit
 modules = AVKit

platformLibs/src/platform/ios/AddressBookUI.def

@@ -1,4 +1,4 @@
-depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.AddressBookUI
 modules = AddressBookUI

platformLibs/src/platform/ios/AudioToolbox.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreAudio CoreFoundation CoreMIDI Foundation Security darwin posix
+depends = CFNetwork CoreAudioTypes CoreFoundation CoreMIDI Foundation Security darwin posix
 language = Objective-C
 package = platform.AudioToolbox
 modules = AudioToolbox AudioUnit

platformLibs/src/platform/ios/AuthenticationServices.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.AuthenticationServices
 modules = AuthenticationServices

platformLibs/src/platform/ios/BusinessChat.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.BusinessChat
 modules = BusinessChat

platformLibs/src/platform/ios/CarPlay.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MapKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MapKit Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.CarPlay
 modules = CarPlay

platformLibs/src/platform/ios/CloudKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork Contacts CoreFoundation CoreLocation Foundation Security darwin posix
+depends = CFNetwork CoreFoundation CoreLocation Foundation Security darwin posix
 language = Objective-C
 package = platform.CloudKit
 modules = CloudKit

platformLibs/src/platform/ios/ContactsUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.ContactsUI
 modules = ContactsUI

platformLibs/src/platform/ios/CoreAudio.def

@@ -1,4 +1,4 @@
-depends = CoreFoundation darwin posix
+depends = CoreAudioTypes CoreFoundation darwin posix
 language = Objective-C
 package = platform.CoreAudio
 modules = CoreAudio

platformLibs/src/platform/ios/CoreAudioKit.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AudioToolbox CFNetwork CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.CoreAudioKit
 modules = CoreAudioKit

platformLibs/src/platform/ios/CoreAudioTypes.def

@@ -0,0 +1,7 @@
+depends = CoreFoundation darwin posix
+language = Objective-C
+package = platform.CoreAudioTypes
+modules = CoreAudioTypes
+
+compilerOpts = -framework CoreAudioTypes
+linkerOpts = -framework CoreAudioTypes

platformLibs/src/platform/ios/CoreML.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Security darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreVideo Foundation IOSurface ImageIO Security darwin posix
 language = Objective-C
 package = platform.CoreML
 modules = CoreML

platformLibs/src/platform/ios/CoreMedia.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
+depends = CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
 language = Objective-C
 package = platform.CoreMedia
 modules = CoreMedia

platformLibs/src/platform/ios/EventKitUI.def

@@ -1,4 +1,4 @@
-depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL EventKit FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AddressBook CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL EventKit FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.EventKitUI
 modules = EventKitUI

platformLibs/src/platform/ios/FileProviderUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.FileProviderUI
 modules = FileProviderUI

platformLibs/src/platform/ios/GLKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal ModelIO OpenGLES2 OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal ModelIO OpenGLES2 OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.GLKit
 modules = GLKit

platformLibs/src/platform/ios/GameKit.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation GLKit GameController GameplayKit IOSurface ImageIO MediaToolbox Metal MetalKit ModelIO OpenGLESCommon QuartzCore ReplayKit SceneKit Security SpriteKit UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation GLKit GameController GameplayKit IOSurface ImageIO MediaToolbox Metal MetalKit ModelIO OpenGLESCommon QuartzCore ReplayKit SceneKit Security SpriteKit UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.GameKit
 modules = GameKit

platformLibs/src/platform/ios/GameplayKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.GameplayKit
 modules = GameplayKit

platformLibs/src/platform/ios/HealthKitUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation HealthKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation HealthKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.HealthKitUI
 modules = HealthKitUI

platformLibs/src/platform/ios/HomeKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.HomeKit
 modules = HomeKit

platformLibs/src/platform/ios/IdentityLookupUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface IdentityLookup ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface IdentityLookup ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.IdentityLookupUI
 modules = IdentityLookupUI

platformLibs/src/platform/ios/IntentsUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Intents Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Intents Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.IntentsUI
 modules = IntentsUI

platformLibs/src/platform/ios/MapKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MapKit
 modules = MapKit

platformLibs/src/platform/ios/MediaPlayer.def

@@ -1,4 +1,4 @@
-depends = AVFoundation CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AVFoundation CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MediaPlayer
 headers = MediaPlayer/MediaPlayer.h

platformLibs/src/platform/ios/MediaToolbox.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
+depends = AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
 language = Objective-C
 package = platform.MediaToolbox
 modules = MediaToolbox

platformLibs/src/platform/ios/MessageUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MessageUI
 modules = MessageUI

platformLibs/src/platform/ios/Messages.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.Messages
 modules = Messages

platformLibs/src/platform/ios/MetalKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MetalKit
 modules = MetalKit

platformLibs/src/platform/ios/MultipeerConnectivity.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MultipeerConnectivity
 modules = MultipeerConnectivity

platformLibs/src/platform/ios/NaturalLanguage.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreML CoreVideo Foundation IOSurface Security darwin posix
+depends = CFNetwork CoreFoundation Foundation Security darwin posix
 language = Objective-C
 package = platform.NaturalLanguage
 modules = NaturalLanguage

platformLibs/src/platform/ios/NetworkExtension.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation Foundation Security darwin posix
+depends = CFNetwork CoreFoundation Foundation Network Security darwin posix
 language = Objective-C
 package = platform.NetworkExtension
 modules = NetworkExtension

platformLibs/src/platform/ios/NotificationCenter.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.NotificationCenter
 modules = NotificationCenter

platformLibs/src/platform/ios/OpenAL.def

@@ -1,4 +1,4 @@
-depends = posix
+depends = darwin posix
 language = Objective-C
 package = platform.OpenAL
 modules = OpenAL

platformLibs/src/platform/ios/PDFKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.PDFKit
 modules = PDFKit

platformLibs/src/platform/ios/PassKit.def

@@ -1,4 +1,4 @@
-depends = AddressBook CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AddressBook CFNetwork Contacts CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.PassKit
 modules = PassKit

platformLibs/src/platform/ios/Photos.def

@@ -1,7 +1,8 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = UIKit AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
 language = Objective-C
 package = platform.Photos
-modules = Photos
+// TODO: ugly hack while forwarded enums are supported.
+modules = UIKit Photos
 
 compilerOpts = -framework Photos
 linkerOpts = -framework Photos

platformLibs/src/platform/ios/PhotosUI.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon Photos QuartzCore Security UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreLocation CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon Photos QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.PhotosUI
 modules = PhotosUI

platformLibs/src/platform/ios/QuickLook.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore QuickLookThumbnailing Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.QuickLook
 modules = QuickLook

platformLibs/src/platform/ios/QuickLookThumbnailing.def

@@ -0,0 +1,7 @@
+depends = CFNetwork CoreFoundation CoreGraphics Foundation Security darwin posix
+language = Objective-C
+package = platform.QuickLookThumbnailing
+modules = QuickLookThumbnailing
+
+compilerOpts = -framework QuickLookThumbnailing
+linkerOpts = -framework QuickLookThumbnailing

platformLibs/src/platform/ios/ReplayKit.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.ReplayKit
 modules = ReplayKit

platformLibs/src/platform/ios/SafariServices.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.SafariServices
 modules = SafariServices

platformLibs/src/platform/ios/SceneKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.SceneKit
 modules = SceneKit

platformLibs/src/platform/ios/Social.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.Social
 modules = Social

platformLibs/src/platform/ios/Speech.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreMIDI CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
 language = Objective-C
 package = platform.Speech
 modules = Speech

platformLibs/src/platform/ios/SpriteKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.SpriteKit
 modules = SpriteKit

platformLibs/src/platform/ios/StoreKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.StoreKit
 modules = StoreKit

platformLibs/src/platform/ios/Twitter.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security Social UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security Social UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.Twitter
 modules = Twitter

platformLibs/src/platform/ios/UIKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UserNotifications darwin posix
 language = Objective-C
 package = platform.UIKit
 modules = UIKit

platformLibs/src/platform/ios/UserNotificationsUI.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.UserNotificationsUI
 modules = UserNotificationsUI

platformLibs/src/platform/ios/VideoToolbox.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
+depends = CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
 language = Objective-C
 package = platform.VideoToolbox
 modules = VideoToolbox

platformLibs/src/platform/ios/Vision.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreML CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon Security darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreML CoreVideo Foundation IOSurface ImageIO Metal Security darwin posix
 language = Objective-C
 package = platform.Vision
 modules = Vision

platformLibs/src/platform/ios/WatchKit.def

@@ -1,7 +0,0 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MapKit Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
-language = Objective-C
-package = platform.WatchKit
-modules = WatchKit
-
-compilerOpts = -framework WatchKit
-linkerOpts = -framework WatchKit

platformLibs/src/platform/ios/WebKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.WebKit
 modules = WebKit

platformLibs/src/platform/ios/iAd.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AVKit AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AVFoundation AVKit AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMIDI CoreMedia CoreText CoreVideo EAGL FileProvider Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.iAd
 modules = iAd

platformLibs/src/platform/osx/DriverKit.def.disabled

@@ -0,0 +1,7 @@
+depends = 
+language = Objective-C
+package = platform.DriverKit
+modules = DriverKit
+
+compilerOpts = -framework DriverKit
+linkerOpts = -framework DriverKit

platformLibs/src/platform/osx/QTKit.def

@@ -1,7 +0,0 @@
-depends = ApplicationServices CFNetwork CoreFoundation CoreGraphics CoreServices CoreText DiskArbitration Foundation IOKit ImageIO Security darwin libkern osx posix
-language = Objective-C
-package = platform.QTKit
-modules = QTKit
-
-compilerOpts = -framework QTKit
-linkerOpts = -framework QTKit

platformLibs/src/platform/tvos/AVFoundation.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
+depends = AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
 language = Objective-C
 package = platform.AVFoundation
 headers = AVFoundation/AVFoundation.h AVFoundation/AVFAudio.h AVFoundation/AVAudioBuffer.h

platformLibs/src/platform/tvos/AVKit.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.AVKit
 modules = AVKit

platformLibs/src/platform/tvos/AudioToolbox.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreAudio CoreFoundation Foundation Security darwin posix
+depends = CFNetwork CoreAudioTypes CoreFoundation Foundation Security darwin posix
 language = Objective-C
 package = platform.AudioToolbox
 modules = AudioToolbox AudioUnit

platformLibs/src/platform/tvos/CoreAudio.def

@@ -1,4 +1,4 @@
-depends = CoreFoundation darwin posix
+depends = CoreAudioTypes CoreFoundation darwin posix
 language = Objective-C
 package = platform.CoreAudio
 modules = CoreAudio

platformLibs/src/platform/tvos/CoreAudioTypes.def

@@ -0,0 +1,7 @@
+depends = CoreFoundation darwin posix
+language = Objective-C
+package = platform.CoreAudioTypes
+modules = CoreAudioTypes
+
+compilerOpts = -framework CoreAudioTypes
+linkerOpts = -framework CoreAudioTypes

platformLibs/src/platform/tvos/CoreML.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Security darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreVideo Foundation IOSurface ImageIO Security darwin posix
 language = Objective-C
 package = platform.CoreML
 modules = CoreML

platformLibs/src/platform/tvos/CoreMedia.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
+depends = CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
 language = Objective-C
 package = platform.CoreMedia
 modules = CoreMedia

platformLibs/src/platform/tvos/GLKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal ModelIO OpenGLES2 OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal ModelIO OpenGLES2 OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.GLKit
 modules = GLKit

platformLibs/src/platform/tvos/GameKit.def

@@ -1,4 +1,4 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation GLKit GameController GameplayKit IOSurface ImageIO MediaToolbox Metal MetalKit ModelIO OpenGLESCommon QuartzCore ReplayKit SceneKit Security SpriteKit UIKit darwin posix
+depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation GLKit GameController GameplayKit IOSurface ImageIO MediaToolbox Metal MetalKit ModelIO OpenGLESCommon QuartzCore ReplayKit SceneKit Security SpriteKit UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.GameKit
 modules = GameKit

platformLibs/src/platform/tvos/GameplayKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation GLKit IOSurface ImageIO Metal OpenGLESCommon QuartzCore SceneKit Security SpriteKit UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.GameplayKit
 modules = GameplayKit

platformLibs/src/platform/tvos/HomeKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.HomeKit
 modules = HomeKit

platformLibs/src/platform/tvos/MapKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreLocation CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MapKit
 modules = MapKit

platformLibs/src/platform/tvos/MediaPlayer.def

@@ -1,4 +1,4 @@
-depends = AVFoundation CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = AVFoundation CFNetwork CoreFoundation CoreGraphics CoreImage CoreMedia CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MediaPlayer
 headers = MediaPlayer/MediaPlayer.h

platformLibs/src/platform/tvos/MediaToolbox.def

@@ -1,4 +1,4 @@
-depends = AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
+depends = AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreMedia CoreVideo Foundation IOSurface Metal OpenGLESCommon Security darwin posix
 language = Objective-C
 package = platform.MediaToolbox
 modules = MediaToolbox

platformLibs/src/platform/tvos/MetalKit.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal ModelIO OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MetalKit
 modules = MetalKit

platformLibs/src/platform/tvos/MultipeerConnectivity.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = CFNetwork CoreFoundation CoreGraphics CoreImage CoreText CoreVideo EAGL Foundation IOSurface ImageIO Metal OpenGLESCommon QuartzCore Security UIKit UserNotifications darwin posix
 language = Objective-C
 package = platform.MultipeerConnectivity
 modules = MultipeerConnectivity

platformLibs/src/platform/tvos/NaturalLanguage.def

@@ -1,4 +1,4 @@
-depends = CFNetwork CoreFoundation CoreGraphics CoreML CoreVideo Foundation IOSurface Security darwin posix
+depends = CFNetwork CoreFoundation Foundation Security darwin posix
 language = Objective-C
 package = platform.NaturalLanguage
 modules = NaturalLanguage

platformLibs/src/platform/tvos/OpenAL.def

@@ -1,4 +1,4 @@
-depends = posix
+depends = darwin posix
 language = Objective-C
 package = platform.OpenAL
 modules = OpenAL

platformLibs/src/platform/tvos/Photos.def

@@ -1,7 +1,7 @@
-depends = AVFoundation AudioToolbox CFNetwork CoreAudio CoreFoundation CoreGraphics CoreImage CoreLocation CoreMedia CoreText CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security UIKit darwin posix
+depends = UIKit AVFoundation AudioToolbox CFNetwork CoreAudio CoreAudioTypes CoreFoundation CoreGraphics CoreImage CoreLocation CoreMedia CoreVideo EAGL Foundation IOSurface ImageIO MediaToolbox Metal OpenGLESCommon QuartzCore Security darwin posix
 language = Objective-C
 package = platform.Photos
-modules = Photos
+modules = UIKit Photos
 
 compilerOpts = -framework Photos
 linkerOpts = -framework Photos