upgpkg(emscripten): update to 3.1.12
This is squash of following commit:
commit e43b2cdb13e8cb29433bb12f73ddb15766093429
Author: Jia Yuan Lo <jylo06g@gmail.com>
Date: Mon Jun 6 00:45:23 2022 +0800
emscripten: sync libllvm patches
commit c3d32f0a2d2a46bbab79e186e33b2f928b90b1b2
Author: Jia Yuan Lo <jylo06g@gmail.com>
Date: Sun Jun 5 23:57:40 2022 +0800
emscripten: add cmake to test notes
commit 407d1ef2e144450522b8e5437bc1b0271290e153
Author: Jia Yuan Lo <jylo06g@gmail.com>
Date: Sun Jun 5 11:25:38 2022 +0000
emscripten: update to 3.1.12
Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Jia Yuan Lo
Aditya Alok
parent
82a407d2f1
commit
50a1abe51c
|
|
@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=https://emscripten.org
|
|||
TERMUX_PKG_DESCRIPTION="Emscripten: An LLVM-to-WebAssembly Compiler"
|
||||
TERMUX_PKG_LICENSE="MIT"
|
||||
TERMUX_PKG_MAINTAINER="@truboxl"
|
||||
TERMUX_PKG_VERSION=3.1.11
|
||||
TERMUX_PKG_VERSION=3.1.12
|
||||
TERMUX_PKG_SRCURL=https://github.com/emscripten-core/emscripten.git
|
||||
TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
|
||||
TERMUX_PKG_PLATFORM_INDEPENDENT=true
|
||||
|
|
@ -62,13 +62,13 @@ opt/emscripten/LICENSE
|
|||
|
||||
# https://github.com/emscripten-core/emscripten/issues/11362
|
||||
# can switch to stable LLVM to save space once above is fixed
|
||||
LLVM_COMMIT=295d032762ad284068c72cc1904680a4db5e80d3
|
||||
LLVM_TGZ_SHA256=580fa4760b38a89cc6c4ad3aa1e187ce087c8aef98dc9384ff12b897f79e249f
|
||||
LLVM_COMMIT=d58cc0839ee5935e649dbbc18c898a8e4bcd6724
|
||||
LLVM_TGZ_SHA256=31d2a5beaa3703305d4c389bfb87d624f5ef2954420a6ab51394f4dec2e67f96
|
||||
|
||||
# https://github.com/emscripten-core/emscripten/issues/12252
|
||||
# upstream says better bundle the right binaryen revision for now
|
||||
BINARYEN_COMMIT=fa3ffd0c2697fde7705495b52b139f7939f97925
|
||||
BINARYEN_TGZ_SHA256=f9e6c25f0e642bb3b3a0aabe8dcea380ceeac9f2b1f4f2a00b09d53154a1a810
|
||||
BINARYEN_COMMIT=7476d64271354d42d864e1ed21f87f514949bc64
|
||||
BINARYEN_TGZ_SHA256=f01e5d575c757c130d5270fce9f6113d10d43d002524f0919a3802cde0169e26
|
||||
|
||||
# https://github.com/emscripten-core/emsdk/blob/main/emsdk.py
|
||||
# https://chromium.googlesource.com/emscripten-releases/+/refs/heads/main/src/build.py
|
||||
|
|
@ -309,7 +309,7 @@ termux_step_create_debscripts() {
|
|||
# https://github.com/emscripten-core/emscripten/issues/9098
|
||||
#
|
||||
# Steps:
|
||||
# - pkg install emscripten-tests-third-party ndk-sysroot openjdk-17
|
||||
# - apt install cmake emscripten-tests-third-party ndk-sysroot openjdk-17
|
||||
# - cd $PREFIX/opt/emscripten
|
||||
# - npm install --no-optional
|
||||
# - export EMTEST_SKIP_V8=1
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -uNr llvm-project/clang/lib/Driver/ToolChain.cpp llvm-project.mod/clang/lib/Driver/ToolChain.cpp
|
||||
--- llvm-project/clang/lib/Driver/ToolChain.cpp 2022-05-03 21:10:32.000000000 +0800
|
||||
+++ llvm-project.mod/clang/lib/Driver/ToolChain.cpp 2022-05-08 23:47:42.482356300 +0800
|
||||
@@ -967,7 +967,7 @@
|
||||
--- llvm-project/clang/lib/Driver/ToolChain.cpp 2022-05-27 00:44:58.000000000 +0800
|
||||
+++ llvm-project.mod/clang/lib/Driver/ToolChain.cpp 2022-06-06 00:15:23.523958529 +0800
|
||||
@@ -1004,7 +1004,7 @@
|
||||
|
||||
switch (Type) {
|
||||
case ToolChain::CST_Libcxx:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -uNr llvm-project/clang/lib/Driver/ToolChains/Linux.cpp llvm-project.mod/clang/lib/Driver/ToolChains/Linux.cpp
|
||||
--- llvm-project/clang/lib/Driver/ToolChains/Linux.cpp 2022-05-03 21:10:32.000000000 +0800
|
||||
+++ llvm-project.mod/clang/lib/Driver/ToolChains/Linux.cpp 2022-05-08 23:49:55.901100813 +0800
|
||||
--- llvm-project/clang/lib/Driver/ToolChains/Linux.cpp 2022-05-27 00:44:58.000000000 +0800
|
||||
+++ llvm-project.mod/clang/lib/Driver/ToolChains/Linux.cpp 2022-06-06 00:18:38.107958390 +0800
|
||||
@@ -162,8 +162,8 @@
|
||||
// FIXME: This is a bit of a hack. We should really unify this code for
|
||||
// reasoning about oslibdir spellings with the lib dir spellings in the
|
||||
|
|
@ -21,13 +21,7 @@ diff -uNr llvm-project/clang/lib/Driver/ToolChains/Linux.cpp llvm-project.mod/cl
|
|||
addPathIfExists(D, SysRoot + "/usr/lib/../" + OSLibDir, Paths);
|
||||
if (IsRISCV) {
|
||||
StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
|
||||
@@ -308,12 +308,20 @@
|
||||
// The deprecated -DLLVM_ENABLE_PROJECTS=libcxx configuration installs
|
||||
// libc++.so in D.Dir+"/../lib/". Detect this path.
|
||||
// TODO Remove once LLVM_ENABLE_PROJECTS=libcxx is unsupported.
|
||||
- if (StringRef(D.Dir).startswith(SysRoot) &&
|
||||
+ if (StringRef(D.Dir).startswith(SysRoot) && !IsAndroid &&
|
||||
D.getVFS().exists(D.Dir + "/../lib/libc++.so"))
|
||||
@@ -313,7 +313,15 @@
|
||||
addPathIfExists(D, D.Dir + "/../lib", Paths);
|
||||
|
||||
addPathIfExists(D, SysRoot + "/lib", Paths);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -uNr llvm-project/compiler-rt/CMakeLists.txt llvm-project.mod/compiler-rt/CMakeLists.txt
|
||||
--- llvm-project/compiler-rt/CMakeLists.txt 2022-05-03 21:10:32.000000000 +0800
|
||||
+++ llvm-project.mod/compiler-rt/CMakeLists.txt 2022-05-08 23:47:42.498356922 +0800
|
||||
--- llvm-project/compiler-rt/CMakeLists.txt 2022-05-27 00:44:58.000000000 +0800
|
||||
+++ llvm-project.mod/compiler-rt/CMakeLists.txt 2022-06-06 00:15:23.591958529 +0800
|
||||
@@ -186,6 +186,9 @@
|
||||
elseif (FUCHSIA)
|
||||
set(${var}_LIBNAME "libc++")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -uNr llvm-project/compiler-rt/lib/builtins/CMakeLists.txt llvm-project.mod/compiler-rt/lib/builtins/CMakeLists.txt
|
||||
--- llvm-project/compiler-rt/lib/builtins/CMakeLists.txt 2022-05-03 21:10:32.000000000 +0800
|
||||
+++ llvm-project.mod/compiler-rt/lib/builtins/CMakeLists.txt 2022-05-08 23:47:42.503357117 +0800
|
||||
@@ -745,6 +745,8 @@
|
||||
--- llvm-project/compiler-rt/lib/builtins/CMakeLists.txt 2022-05-27 00:44:58.000000000 +0800
|
||||
+++ llvm-project.mod/compiler-rt/lib/builtins/CMakeLists.txt 2022-06-06 00:15:23.627958529 +0800
|
||||
@@ -750,6 +750,8 @@
|
||||
# Release mode already sets it via -O2/3, Debug mode doesn't.
|
||||
if (${arch} STREQUAL "armhf")
|
||||
list(APPEND BUILTIN_CFLAGS_${arch} -fomit-frame-pointer -DCOMPILER_RT_ARMHF_TARGET)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff -uNr llvm-project/libunwind/CMakeLists.txt llvm-project.mod/libunwind/CMakeLists.txt
|
||||
--- llvm-project/libunwind/CMakeLists.txt 2022-05-03 21:10:32.000000000 +0800
|
||||
+++ llvm-project.mod/libunwind/CMakeLists.txt 2022-05-08 23:47:42.507357273 +0800
|
||||
@@ -190,6 +190,10 @@
|
||||
--- llvm-project/libunwind/CMakeLists.txt 2022-05-27 00:44:58.000000000 +0800
|
||||
+++ llvm-project.mod/libunwind/CMakeLists.txt 2022-06-06 00:15:23.703958529 +0800
|
||||
@@ -159,6 +159,10 @@
|
||||
add_compile_flags_if_supported(-Werror=return-type)
|
||||
|
||||
if (LIBUNWIND_ENABLE_CET)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
diff -uNr llvm-project/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp llvm-project.mod/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp
|
||||
--- llvm-project/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp 2022-05-03 21:10:32.000000000 +0800
|
||||
+++ llvm-project.mod/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp 2022-05-08 23:47:42.511357428 +0800
|
||||
--- llvm-project/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp 2022-05-27 00:44:58.000000000 +0800
|
||||
+++ llvm-project.mod/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp 2022-06-06 00:15:23.759958529 +0800
|
||||
@@ -286,7 +286,7 @@
|
||||
uintptr_t SlabSize = 0;
|
||||
uintptr_t CurrentSlabOffset = 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue