From 185970c705159d5a8d120d3d71dc946ae33a5ce9 Mon Sep 17 00:00:00 2001
From: Jia Yuan Lo <jylo06g@gmail.com>
Date: Sat, 20 Nov 2021 17:40:12 +0800
Subject: [PATCH] emscripten: update to 2.0.34 (#8009)

* emscripten: update to 2.0.34

* emscripten: update patches & fix i686 native build
---
 packages/emscripten/build.sh                  | 10 ++++-----
 ...-clang-lib-Driver-ToolChain.cpp.patch.diff |  8 +++----
 ...lib-Driver-ToolChains-Linux.cpp.patch.diff | 21 ++++++++++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/packages/emscripten/build.sh b/packages/emscripten/build.sh
index 778cb2e59..df7100ce7 100644
--- a/packages/emscripten/build.sh
+++ b/packages/emscripten/build.sh
@@ -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=2.0.32
+TERMUX_PKG_VERSION=2.0.34
 TERMUX_PKG_SRCURL=https://github.com/emscripten-core/emscripten.git
 TERMUX_PKG_GIT_BRANCH=$TERMUX_PKG_VERSION
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
@@ -50,13 +50,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=9403514e764950a0dfcd627fc90c73432314bced
-LLVM_TGZ_SHA256=fb355b3cd159e0e699a32f7fb1e2612322b019ed73b4aa37b493fc7f9fe03f31
+LLVM_COMMIT=3d39612b3dd3f6b67ee63da305d30606abbe7287
+LLVM_TGZ_SHA256=f522d3dcd3c448cef661f8f7a4d2da2296f9634eee63f203b04ae5a8147b5e0e
 
 # https://github.com/emscripten-core/emscripten/issues/12252
 # upstream says better bundle the right binaryen revision for now
-BINARYEN_COMMIT=c19ff59c71824b34fa312aac9ad979e2198d7d36
-BINARYEN_TGZ_SHA256=cfd4d53d22c868587ffa8020f32e41fa9bb847b368d1c29dc82da2ce35e5d816
+BINARYEN_COMMIT=ab66e9ab1210a87d1db8ebe93cf8463eafe34e33
+BINARYEN_TGZ_SHA256=23a8429c91be77892b54d368b3eb8d19d82cfd537067f0bde42da03268eb9a2b
 
 # https://github.com/emscripten-core/emsdk/blob/main/emsdk.py
 # https://chromium.googlesource.com/emscripten-releases/+/refs/heads/main/src/build.py
diff --git a/packages/emscripten/llvm-project-clang-lib-Driver-ToolChain.cpp.patch.diff b/packages/emscripten/llvm-project-clang-lib-Driver-ToolChain.cpp.patch.diff
index 9a63efc9f..2053bb2df 100644
--- a/packages/emscripten/llvm-project-clang-lib-Driver-ToolChain.cpp.patch.diff
+++ b/packages/emscripten/llvm-project-clang-lib-Driver-ToolChain.cpp.patch.diff
@@ -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	2021-10-20 02:24:04.000000000 +0800
-+++ llvm-project.mod/clang/lib/Driver/ToolChain.cpp	2021-10-29 10:06:11.727942353 +0800
-@@ -405,7 +405,7 @@
+--- llvm-project/clang/lib/Driver/ToolChain.cpp	2021-11-04 18:24:28.000000000 +0800
++++ llvm-project.mod/clang/lib/Driver/ToolChain.cpp	2021-11-14 21:15:21.092854100 +0800
+@@ -406,7 +406,7 @@
    case llvm::Triple::AIX:
      return "aix";
    default:
@@ -10,7 +10,7 @@ diff -uNr llvm-project/clang/lib/Driver/ToolChain.cpp llvm-project.mod/clang/lib
    }
  }
  
-@@ -943,7 +943,7 @@
+@@ -944,7 +944,7 @@
  
    switch (Type) {
    case ToolChain::CST_Libcxx:
diff --git a/packages/emscripten/llvm-project-clang-lib-Driver-ToolChains-Linux.cpp.patch.diff b/packages/emscripten/llvm-project-clang-lib-Driver-ToolChains-Linux.cpp.patch.diff
index 6e27a5bde..d4734a8ff 100644
--- a/packages/emscripten/llvm-project-clang-lib-Driver-ToolChains-Linux.cpp.patch.diff
+++ b/packages/emscripten/llvm-project-clang-lib-Driver-ToolChains-Linux.cpp.patch.diff
@@ -1,7 +1,18 @@
 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	2021-10-20 02:24:04.000000000 +0800
-+++ llvm-project.mod/clang/lib/Driver/ToolChains/Linux.cpp	2021-10-29 14:39:16.043930634 +0800
-@@ -287,7 +287,7 @@
+--- llvm-project/clang/lib/Driver/ToolChains/Linux.cpp	2021-11-04 18:24:28.000000000 +0800
++++ llvm-project.mod/clang/lib/Driver/ToolChains/Linux.cpp	2021-11-20 09:32:21.097136800 +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
+   // GCCInstallationDetector, but that is a more significant refactoring.
+-  if (Triple.getArch() == llvm::Triple::x86 || Triple.isPPC32() ||
+-      Triple.getArch() == llvm::Triple::sparc)
++  if (!Triple.isAndroid() && (Triple.getArch() == llvm::Triple::x86 || Triple.isPPC32() ||
++      Triple.getArch() == llvm::Triple::sparc))
+     return "lib32";
+ 
+   if (Triple.getArch() == llvm::Triple::x86_64 && Triple.isX32())
+@@ -294,7 +294,7 @@
    if (Triple.getVendor() == llvm::Triple::OpenEmbedded &&
        Triple.isArch64Bit())
      addPathIfExists(D, SysRoot + "/usr/" + OSLibDir, Paths);
@@ -10,7 +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);
-@@ -302,7 +302,7 @@
+@@ -309,7 +309,7 @@
    // searched.
    // FIXME: It's not clear whether we should use the driver's installed
    // directory ('Dir' below) or the ResourceDir.
@@ -19,7 +30,7 @@ diff -uNr llvm-project/clang/lib/Driver/ToolChains/Linux.cpp llvm-project.mod/cl
      // Even if OSLibDir != "lib", this is needed for Clang in the build
      // directory (not installed) to find libc++.
      addPathIfExists(D, D.Dir + "/../lib", Paths);
-@@ -311,7 +311,15 @@
+@@ -318,7 +318,15 @@
    }
  
    addPathIfExists(D, SysRoot + "/lib", Paths);