azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[K/N] Require small binaries for all watchos targets

Browse Source
This commit is contained in:
Pavel Kunyavskiy
2022-09-15 17:19:58 +02:00
committed by Space
parent 46afb46a6d
commit 7293dd6d65
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/runtime/src/main/cpp/Common.h
+1 -1
View File
@@ -25,7 +25,7 @@
#define RUNTIME_WEAK __attribute__((weak)) #define RUNTIME_WEAK __attribute__((weak))
#define RUNTIME_NODEBUG __attribute__((nodebug)) #define RUNTIME_NODEBUG __attribute__((nodebug))
#if KONAN_NEAD_SMALL_BINARY #if KONAN_NEED_SMALL_BINARY
// On the one hand, ALWAYS_INLINE forces many performance-critical function to be, well, // On the one hand, ALWAYS_INLINE forces many performance-critical function to be, well,
// inlined. Which is good for performance, of course. // inlined. Which is good for performance, of course.
// On the other hand, 32-bit Mach-O object files can't be really big. // On the other hand, 32-bit Mach-O object files can't be really big.
kotlin-native/runtime/src/main/cpp/Memory.h
+1 -1
View File
@@ -26,7 +26,7 @@
#include "PointerBits.h" #include "PointerBits.h"
#include "Utils.hpp" #include "Utils.hpp"
#if KONAN_NEAD_SMALL_BINARY #if KONAN_NEED_SMALL_BINARY
// Currently, codegen places a lot of unnecessary calls to MM functions. // Currently, codegen places a lot of unnecessary calls to MM functions.
// By forcing NO_INLINE on these functions we keep binaries from growing too big. // By forcing NO_INLINE on these functions we keep binaries from growing too big.
#define CODEGEN_INLINE_POLICY NO_INLINE #define CODEGEN_INLINE_POLICY NO_INLINE
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/ClangArgs.kt
+1 -1
View File
@@ -54,7 +54,7 @@ sealed class ClangArgs(
"HAS_FOUNDATION_FRAMEWORK".takeIf { target.hasFoundationFramework() }, "HAS_FOUNDATION_FRAMEWORK".takeIf { target.hasFoundationFramework() },
"HAS_UIKIT_FRAMEWORK".takeIf { target.hasUIKitFramework() }, "HAS_UIKIT_FRAMEWORK".takeIf { target.hasUIKitFramework() },
"REPORT_BACKTRACE_TO_IOS_CRASH_LOG".takeIf { target.supportsIosCrashLog() }, "REPORT_BACKTRACE_TO_IOS_CRASH_LOG".takeIf { target.supportsIosCrashLog() },
"NEAD_SMALL_BINARY".takeIf { target.needSmallBinary() }, "NEED_SMALL_BINARY".takeIf { target.needSmallBinary() },
"TARGET_HAS_ADDRESS_DEPENDENCY".takeIf { target.hasAddressDependencyInMemoryModel() }, "TARGET_HAS_ADDRESS_DEPENDENCY".takeIf { target.hasAddressDependencyInMemoryModel() },
).map { "KONAN_$it=1" } ).map { "KONAN_$it=1" }
val otherOptions = listOfNotNull( val otherOptions = listOfNotNull(
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanTargetExtenstions.kt
+5 -1
View File
@@ -143,7 +143,11 @@ fun KonanTarget.supportsUnalignedAccess(): Boolean = when (architecture) {
Architecture.X86, Architecture.ARM64, Architecture.X64 -> true Architecture.X86, Architecture.ARM64, Architecture.X64 -> true
} && this != KonanTarget.WATCHOS_ARM64 } && this != KonanTarget.WATCHOS_ARM64
fun KonanTarget.needSmallBinary() = (architecture == Architecture.ARM32 && family.isAppleFamily) fun KonanTarget.needSmallBinary() = when {
family == Family.WATCHOS -> true
family.isAppleFamily -> architecture == Architecture.ARM32
else -> false
}
fun KonanTarget.supportedSanitizers(): List<SanitizerKind> = fun KonanTarget.supportedSanitizers(): List<SanitizerKind> =
when(this) { when(this) {