From eace2ba7e028182b3d4ece6b8f12dd08f0501ebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20A=C4=9Facan?= Date: Thu, 8 Aug 2024 08:56:38 +0000 Subject: [PATCH] Revert "[deps] Update binaryen" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a6e8b4eebfed9ead2abe13d464ac97a9bfbd3c3c. Reason for revert: Broke Windows SDK targets, binaryen does not seem to build with the C++ compiler used on Windows. Original change's description: > [deps] Update binaryen > > Update to the latest g3 version. > > This version includes https://github.com/WebAssembly/binaryen/pull/6794 > which unblocks https://dart-review.googlesource.com/c/sdk/+/378421. > > Change-Id: I9f4e41df9eb9b49d1048e45d4a12f019412e9887 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/379580 > Commit-Queue: Ömer Ağacan > Reviewed-by: Martin Kustermann Change-Id: Icb4d51283cff077e40ca0312e51527480a71c3a5 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/379600 Reviewed-by: Martin Kustermann Commit-Queue: Martin Kustermann Bot-Commit: Rubber Stamper --- DEPS | 2 +- third_party/binaryen/BUILD.gn | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/DEPS b/DEPS index 0ddfb9e03d5..8f798613ae9 100644 --- a/DEPS +++ b/DEPS @@ -97,7 +97,7 @@ vars = { ### /third_party/ dependencies # Prefer to use hashes of binaryen that have been reviewed & rolled into g3. - "binaryen_rev" : "23a1a1aacc0dd14767ca8c53a034b7c6bb4acf52", + "binaryen_rev" : "654ee6e2504f11fb0e982a2cf276bafa750f694b", "boringssl_gen_rev": "fef055e8d2749b82c79c8f043be1cbe5e8e4b40c", "boringssl_rev": "2db0eb3f96a5756298dcd7f9319e56a98585bd10", "browser-compat-data_tag": "ac8cae697014da1ff7124fba33b0b4245cc6cd1b", # v1.0.22 diff --git a/third_party/binaryen/BUILD.gn b/third_party/binaryen/BUILD.gn index 470cc9a7f67..c77db555272 100644 --- a/third_party/binaryen/BUILD.gn +++ b/third_party/binaryen/BUILD.gn @@ -83,7 +83,6 @@ source_set("binaryen_sources") { "src/src/tools/fuzzing", "src/src/wasm", "src/third_party/llvm-project", - "src/third_party/FP16", ] # We avoid listing all sources manually, this means when updating @@ -104,7 +103,6 @@ source_set("binaryen_sources") { include_dirs = [ "src/src", "src/third_party/llvm-project/include", - "src/third_party/FP16/include", ] # Ensure WasmIntrinsics.cpp/config.h files are generated. @@ -130,10 +128,7 @@ template("wasm_tool") { target_name, ".cpp", ]) ] - include_dirs = [ - "src/src", - "src/third_party/FP16/include", - ] + include_dirs = [ "src/src" ] deps = [ ":binaryen_sources" ] forward_variables_from(invoker, "*")