diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties index b1818abc91d..9a395021071 100644 --- a/kotlin-native/konan/konan.properties +++ b/kotlin-native/konan/konan.properties @@ -539,9 +539,9 @@ linkerHostSpecificFlags.linux_x64-linux_x64 = linker.mingw_x64-linux_x64 = $targetToolchain.mingw_x64-linux_x64/bin/ld.gold linkerHostSpecificFlags.mingw_x64-linux_x64 = linker.macos_x64-linux_x64 = $targetToolchain.macos_x64-linux_x64/bin/ld.lld -linkerHostSpecificFlags.macos_x64-linux_x64 = --no-threads +linkerHostSpecificFlags.macos_x64-linux_x64 = linker.macos_arm64-linux_x64 = $targetToolchain.macos_arm64-linux_x64/bin/ld.lld -linkerHostSpecificFlags.macos_arm64-linux_x64 = --no-threads +linkerHostSpecificFlags.macos_arm64-linux_x64 = dynamicLinker.linux_x64 = /lib64/ld-linux-x86-64.so.2 # targetSysRoot relative @@ -596,9 +596,9 @@ linkerHostSpecificFlags.linux_x64-linux_arm32_hfp = linker.mingw_x64-linux_arm32_hfp = $targetToolchain.mingw_x64-linux_arm32_hfp/bin/ld.gold linkerHostSpecificFlags.mingw_x64-linux_arm32_hfp = linker.macos_x64-linux_arm32_hfp = $targetToolchain.macos_x64-linux_arm32_hfp/bin/ld.lld -linkerHostSpecificFlags.macos_x64-linux_arm32_hfp = --no-threads +linkerHostSpecificFlags.macos_x64-linux_arm32_hfp = linker.macos_arm64-linux_arm32_hfp = $targetToolchain.macos_arm64-linux_arm32_hfp/bin/ld.lld -linkerHostSpecificFlags.macos_arm64-linux_arm32_hfp = --no-threads +linkerHostSpecificFlags.macos_arm64-linux_arm32_hfp = dynamicLinker.linux_arm32_hfp = /lib/ld-linux-armhf.so.3 # targetSysRoot relative abiSpecificLibraries.linux_arm32_hfp = lib usr/lib @@ -650,9 +650,9 @@ linkerHostSpecificFlags.linux_x64-linux_arm64 = linker.mingw_x64-linux_arm64 = $targetToolchain.mingw_x64-linux_arm64/bin/ld.gold linkerHostSpecificFlags.mingw_x64-linux_arm64 = linker.macos_x64-linux_arm64 = $targetToolchain.macos_x64-linux_arm64/bin/ld.lld -linkerHostSpecificFlags.macos_x64-linux_arm64 = --no-threads +linkerHostSpecificFlags.macos_x64-linux_arm64 = linker.macos_arm64-linux_arm64 = $targetToolchain.macos_arm64-linux_arm64/bin/ld.lld -linkerHostSpecificFlags.macos_arm64-linux_arm64 = --no-threads +linkerHostSpecificFlags.macos_arm64-linux_arm64 = dynamicLinker.linux_arm64 = /lib/ld-linux-aarch64.so.1 # targetSysRoot relative abiSpecificLibraries.linux_arm64 = lib usr/lib @@ -961,7 +961,7 @@ clangNooptFlags.wasm32 = -O1 clangOptFlags.wasm32 = -O3 clangDebugFlags.wasm32 = -O0 # TODO: make explicit list of external symbols -lld.wasm32 = --allow-undefined --no-entry --global-base=0 --no-threads --export-dynamic +lld.wasm32 = --allow-undefined --no-entry --global-base=0 --export-dynamic runtimeDefinitions.wasm32 = KONAN_WASM=1 KONAN_NO_FFI=1 KONAN_NO_THREADS=1 \ KONAN_NO_EXCEPTIONS=1 KONAN_INTERNAL_DLMALLOC=1 KONAN_INTERNAL_SNPRINTF=1 \ KONAN_INTERNAL_NOW=1 KONAN_NO_MEMMEM KONAN_NO_CTORS_SECTION=1 KONAN_NO_BACKTRACE=1 \