Update LLVM to 6.0.1 and WebAssembly target refactoring (#1788)
* wasm updates: removed binaryen, simplified morecore and launcher.js * Updated LLVM toolchain to 6.0.1
This commit is contained in:
Sergey Bogolepov
+34
-33
@@ -31,10 +31,10 @@ downloadingAttemptIntervalMs = 3000
|
||||
homeDependencyCache = .konan/cache
|
||||
|
||||
llvmDebugOptFlags = -O1
|
||||
llvmVersion = 5.0.0
|
||||
llvmVersion = 6.0.1
|
||||
|
||||
# Mac OS X.
|
||||
llvmHome.macos_x64 = clang-llvm-5.0.0-darwin-macos
|
||||
llvmHome.macos_x64 = clang-llvm-6.0.1-darwin-macos
|
||||
targetToolchain.macos_x64 = target-toolchain-6-macos_x64
|
||||
|
||||
arch.macos_x64 = x86_64
|
||||
@@ -54,7 +54,7 @@ osVersionMin.macos_x64 = 10.11
|
||||
entrySelector.macos_x64 = -alias _Konan_main _main
|
||||
dependencies.macos_x64 = \
|
||||
libffi-3.2.1-2-darwin-macos \
|
||||
clang-llvm-5.0.0-darwin-macos
|
||||
clang-llvm-6.0.1-darwin-macos
|
||||
|
||||
target-sysroot-6-macos_x64.default = \
|
||||
remote:internal
|
||||
@@ -66,7 +66,7 @@ target-toolchain-6-macos_x64.default = \
|
||||
targetToolchain.macos_x64-ios_arm32 = target-toolchain-6-macos_x64
|
||||
dependencies.macos_x64-ios_arm32 = \
|
||||
libffi-3.2.1-2-darwin-ios \
|
||||
clang-llvm-5.0.0-darwin-macos
|
||||
clang-llvm-6.0.1-darwin-macos
|
||||
|
||||
target-sysroot-6-ios_arm32.default = \
|
||||
remote:internal
|
||||
@@ -92,7 +92,7 @@ osVersionMin.ios_arm32 = 9.0
|
||||
targetToolchain.macos_x64-ios_arm64 = target-toolchain-6-macos_x64
|
||||
dependencies.macos_x64-ios_arm64 = \
|
||||
libffi-3.2.1-2-darwin-ios \
|
||||
clang-llvm-5.0.0-darwin-macos
|
||||
clang-llvm-6.0.1-darwin-macos
|
||||
|
||||
target-sysroot-6-ios_arm64.default = \
|
||||
remote:internal
|
||||
@@ -117,7 +117,7 @@ osVersionMin.ios_arm64 = 8.0
|
||||
targetToolchain.macos_x64-ios_x64 = target-toolchain-6-macos_x64
|
||||
dependencies.macos_x64-ios_x64 = \
|
||||
libffi-3.2.1-1-darwin-ios_sim \
|
||||
clang-llvm-5.0.0-darwin-macos
|
||||
clang-llvm-6.0.1-darwin-macos
|
||||
|
||||
target-sysroot-6-ios_x64.default = \
|
||||
remote:internal
|
||||
@@ -139,7 +139,7 @@ osVersionMinFlagClang.ios_x64 = -mios-simulator-version-min
|
||||
osVersionMin.ios_x64 = 8.0
|
||||
|
||||
# Linux x86-64.
|
||||
llvmHome.linux_x64 = clang-llvm-5.0.0-linux-x86-64
|
||||
llvmHome.linux_x64 = clang-llvm-6.0.1-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
|
||||
|
||||
@@ -164,14 +164,14 @@ entrySelector.linux_x64 = --defsym main=Konan_main
|
||||
# targetSysRoot relative
|
||||
abiSpecificLibraries.linux_x64 = ../lib64 lib64 usr/lib64
|
||||
dependencies.linux_x64 = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-gcc-toolchain-3-linux-x86-64 \
|
||||
libffi-3.2.1-2-linux-x86-64
|
||||
|
||||
# Raspberry Pi
|
||||
targetToolchain.linux_x64-linux_arm32_hfp = target-gcc-toolchain-3-linux-x86-64/x86_64-unknown-linux-gnu
|
||||
dependencies.linux_x64-linux_arm32_hfp = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-gcc-toolchain-3-linux-x86-64 \
|
||||
target-sysroot-1-raspberrypi \
|
||||
libffi-3.2.1-2-linux-x86-64 \
|
||||
@@ -203,7 +203,7 @@ abiSpecificLibraries.linux_arm32_hfp = \
|
||||
# MIPS
|
||||
targetToolchain.linux_x64-linux_mips32 = target-gcc-toolchain-2-linux-mips/x86_64-unknown-linux-gnu
|
||||
dependencies.linux_x64-linux_mips32 = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-gcc-toolchain-2-linux-mips \
|
||||
target-gcc-toolchain-3-linux-x86-64 \
|
||||
target-sysroot-2-mips \
|
||||
@@ -232,7 +232,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-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-gcc-toolchain-2-linux-mips \
|
||||
target-gcc-toolchain-3-linux-x86-64 \
|
||||
target-sysroot-2-mipsel \
|
||||
@@ -261,13 +261,13 @@ abiSpecificLibraries.linux_mipsel32 =
|
||||
targetToolchain.macos_x64-android_arm32 = target-toolchain-21-osx-android_arm32
|
||||
# TODO: split dependencies to host-dependent and host-independent parts.
|
||||
dependencies.macos_x64-android_arm32 = \
|
||||
clang-llvm-5.0.0-darwin-macos \
|
||||
clang-llvm-6.0.1-darwin-macos \
|
||||
target-sysroot-21-android_arm32 \
|
||||
target-toolchain-21-osx-android_arm32 \
|
||||
libffi-3.2.1-2-android_arm32
|
||||
targetToolchain.linux_x64-android_arm32 = target-toolchain-21-linux-android_arm32
|
||||
dependencies.linux_x64-android_arm32 = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-sysroot-21-android_arm32 \
|
||||
target-toolchain-21-linux-android_arm32 \
|
||||
libffi-3.2.1-2-android_arm32
|
||||
@@ -286,13 +286,13 @@ linkerKonanFlags.android_arm32 = -lm -latomic -lstdc++ -landroid
|
||||
targetToolchain.macos_x64-android_arm64 = target-toolchain-21-osx-android_arm64
|
||||
# TODO: split dependencies to host-dependent and host-independent parts.
|
||||
dependencies.macos_x64-android_arm64 = \
|
||||
clang-llvm-5.0.0-darwin-macos \
|
||||
clang-llvm-6.0.1-darwin-macos \
|
||||
target-sysroot-21-android_arm64 \
|
||||
target-toolchain-21-osx-android_arm64 \
|
||||
libffi-3.2.1-2-android_arm64
|
||||
targetToolchain.linux_x64-android_arm64 = target-toolchain-21-linux-android_arm64
|
||||
dependencies.linux_x64-android_arm64 = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-sysroot-21-android_arm64 \
|
||||
target-toolchain-21-linux-android_arm64 \
|
||||
libffi-3.2.1-2-android_arm64
|
||||
@@ -306,11 +306,11 @@ linkerKonanFlags.android_arm64 = -lm -latomic -lstdc++ -landroid
|
||||
linkerNoDebugFlags.android_arm64 = -Wl,-S
|
||||
|
||||
# Windows x86-64, based on mingw-w64.
|
||||
llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64
|
||||
targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64
|
||||
llvmHome.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
|
||||
targetToolchain.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
|
||||
|
||||
quadruple.mingw_x64 = x86_64-w64-mingw32
|
||||
targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64
|
||||
targetSysRoot.mingw_x64 = msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1
|
||||
libffiDir.mingw_x64 = libffi-3.2.1-mingw-w64-x86-64
|
||||
llvmLtoFlags.mingw_x64 =
|
||||
llvmLtoOptFlags.mingw_x64 = -O3 -function-sections
|
||||
@@ -324,38 +324,39 @@ linkerKonanFlags.mingw_x64 =-static-libgcc -static-libstdc++ \
|
||||
linkerOptimizationFlags.mingw_x64 = -Wl,--gc-sections
|
||||
entrySelector.mingw_x64 = -Wl,--defsym,main=Konan_main
|
||||
dependencies.mingw_x64 = \
|
||||
msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64 \
|
||||
msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
|
||||
libffi-3.2.1-mingw-w64-x86-64
|
||||
|
||||
# WebAssembly 32-bit.
|
||||
targetToolchain.macos_x64-wasm32 = target-toolchain-2-osx-wasm
|
||||
targetToolchain.macos_x64-wasm32 = target-toolchain-3-macos-wasm
|
||||
dependencies.macos_x64-wasm32 = \
|
||||
clang-llvm-5.0.0-darwin-macos \
|
||||
clang-llvm-6.0.1-darwin-macos \
|
||||
target-sysroot-2-wasm \
|
||||
target-toolchain-2-osx-wasm
|
||||
target-toolchain-3-macos-wasm
|
||||
|
||||
targetToolchain.linux_x64-wasm32 = target-toolchain-1-linux-wasm
|
||||
targetToolchain.linux_x64-wasm32 = target-toolchain-2-linux-wasm
|
||||
dependencies.linux_x64-wasm32 = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
target-sysroot-2-wasm \
|
||||
target-toolchain-1-linux-wasm
|
||||
target-toolchain-2-linux-wasm
|
||||
|
||||
targetToolchain.mingw_x64-wasm32 = target-toolchain-1-mingw-wasm
|
||||
targetToolchain.mingw_x64-wasm32 = target-toolchain-2-mingw-wasm
|
||||
dependencies.mingw_x64-wasm32 = \
|
||||
msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64 \
|
||||
msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
|
||||
target-sysroot-2-wasm \
|
||||
target-toolchain-1-mingw-wasm
|
||||
target-toolchain-2-mingw-wasm
|
||||
|
||||
quadruple.wasm32 = wasm32
|
||||
quadruple.wasm32 = wasm32-unknown-unknown
|
||||
llvmLtoFlags.wasm32 =
|
||||
targetSysRoot.wasm32 = target-sysroot-2-wasm
|
||||
optFlags.wasm32 = -internalize -globaldce
|
||||
optFlags.wasm32 = -internalize -globaldce -mtriple=wasm32-unknown-unknown-wasm
|
||||
optNooptFlags.wasm32 = -O1
|
||||
optOptFlags.wasm32 = -O3
|
||||
optDebugFlags.wasm32 = -O0
|
||||
llcFlags.wasm32 =
|
||||
llcFlags.wasm32 = -mtriple=wasm32-unknown-unknown-wasm
|
||||
llcNooptFlags.wasm32 = -O1
|
||||
llcOptFlags.wasm32 = -O3
|
||||
llcDebugFlags.wasm32 = -O0
|
||||
# The stack size is in bytes.
|
||||
s2wasmFlags.wasm32 = --allocate-stack 1048576 --import-memory
|
||||
# TODO: make explicit list of external symbols
|
||||
lld.wasm32 = --allow-undefined --no-entry --global-base=0 --no-threads
|
||||
|
||||
|
||||
@@ -25,18 +25,18 @@ boardSpecificClangFlags.zephyr_stm32f4_disco = -mabi=aapcs -mthumb -mcpu=cortex-
|
||||
|
||||
targetToolchain.linux_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-linux/arm-none-eabi
|
||||
dependencies.linux_x64-zephyr_stm32f4_disco = \
|
||||
clang-llvm-5.0.0-linux-x86-64 \
|
||||
clang-llvm-6.0.1-linux-x86-64 \
|
||||
gcc-arm-none-eabi-7-2017-q4-major-linux \
|
||||
target-sysroot-2-wasm
|
||||
|
||||
targetToolchain.macos_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-mac/arm-none-eabi
|
||||
dependencies.macos_x64-zephyr_stm32f4_disco = \
|
||||
gcc-arm-none-eabi-7-2017-q4-major-mac \
|
||||
clang-llvm-5.0.0-darwin-macos \
|
||||
clang-llvm-6.0.1-darwin-macos \
|
||||
target-sysroot-2-wasm
|
||||
|
||||
targetToolchain.mingw_x64-zephyr_stm32f4_disco = gcc-arm-none-eabi-7-2017-q4-major-win32/arm-none-eabi
|
||||
dependencies.mingw_x64-zephyr_stm32f4_disco = \
|
||||
msys2-mingw-w64-x86_64-gcc-7.2.0-clang-llvm-5.0.0-windows-x86-64 \
|
||||
msys2-mingw-w64-x86_64-gcc-7.3.0-clang-llvm-lld-6.0.1 \
|
||||
gcc-arm-none-eabi-7-2017-q4-major-win32 \
|
||||
target-sysroot-2-wasm
|
||||
|
||||
Reference in New Issue
Block a user