deps, src: simplifying base64 encoding

codebytere · web-flow · commit fdd11bc95d62 · 2025-03-27T10:13:56.000Z
nodejs/node#52714
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
@@ -14,7 +14,7 @@ diff --git a/BUILD.gn b/BUILD.gn
 index 1ed186b597eece7c34cb69c8e1e20870555a040d..2ce1e8a7dcca2ba153d387d11970c72b5f43c167 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -1,14 +1,406 @@
+@@ -1,14 +1,405 @@
 -##############################################################################
 -#                                                                            #
 -#                       DO NOT EDIT THIS FILE!                               #
@@ -284,7 +284,6 @@ index 1ed186b597eece7c34cb69c8e1e20870555a040d..2ce1e8a7dcca2ba153d387d11970c72b
 +    ":node_js2c_exec",
 +    "deps/googletest:gtest",
 +    "deps/ada",
-+    "deps/base64",
 +    "deps/simdutf",
 +    "deps/uvwasi",
 +    "//third_party/zlib",
@@ -458,84 +457,6 @@ index e92ac3a3beac143dced2efb05304ed8ba832b067..1ce69e9deba1a9b191e8d95f4c82e0ec
 -ada_gn_build("ada") {
 +  public_configs = [ ":ada_config" ]
  }
-diff --git a/deps/base64/unofficial.gni b/deps/base64/unofficial.gni
-index 0e69d7383762f6b81c5b57698aa9d121d5a9c401..35bbeb37acc7ccb14b4b8a644ec3d4c76ca5c61c 100644
---- a/deps/base64/unofficial.gni
-+++ b/deps/base64/unofficial.gni
-@@ -12,6 +12,10 @@ template("base64_gn_build") {
-     }
-   }
- 
-+  # FIXME(zcbenz): ASM on win/x86 compiles perfectly in upstream Node, figure
-+  # out why it does not work in Electron's build configs.
-+  support_x86_asm = current_cpu == "x64" || (current_cpu == "x86" && !is_win)
-+
-   config("base64_internal_config") {
-     include_dirs = [ "base64/lib" ]
-     if (is_component_build) {
-@@ -19,7 +23,7 @@ template("base64_gn_build") {
-     } else {
-       defines = []
-     }
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       defines += [
-         "HAVE_SSSE3=1",
-         "HAVE_SSE41=1",
-@@ -69,7 +73,7 @@ template("base64_gn_build") {
-   source_set("base64_ssse3") {
-     configs += [ ":base64_internal_config" ]
-     sources = [ "base64/lib/arch/ssse3/codec.c" ]
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       if (is_clang || !is_win) {
-         cflags_c = [ "-mssse3" ]
-       }
-@@ -79,7 +83,7 @@ template("base64_gn_build") {
-   source_set("base64_sse41") {
-     configs += [ ":base64_internal_config" ]
-     sources = [ "base64/lib/arch/sse41/codec.c" ]
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       if (is_clang || !is_win) {
-         cflags_c = [ "-msse4.1" ]
-       }
-@@ -89,7 +93,7 @@ template("base64_gn_build") {
-   source_set("base64_sse42") {
-     configs += [ ":base64_internal_config" ]
-     sources = [ "base64/lib/arch/sse42/codec.c" ]
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       if (is_clang || !is_win) {
-         cflags_c = [ "-msse4.2" ]
-       }
-@@ -99,7 +103,7 @@ template("base64_gn_build") {
-   source_set("base64_avx") {
-     configs += [ ":base64_internal_config" ]
-     sources = [ "base64/lib/arch/avx/codec.c" ]
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       if (is_clang || !is_win) {
-         cflags_c = [ "-mavx" ]
-       } else if (is_win) {
-@@ -111,7 +115,7 @@ template("base64_gn_build") {
-   source_set("base64_avx2") {
-     configs += [ ":base64_internal_config" ]
-     sources = [ "base64/lib/arch/avx2/codec.c" ]
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       if (is_clang || !is_win) {
-         cflags_c = [ "-mavx2" ]
-       } else if (is_win) {
-@@ -123,7 +127,7 @@ template("base64_gn_build") {
-   source_set("base64_avx512") {
-     configs += [ ":base64_internal_config" ]
-     sources = [ "base64/lib/arch/avx512/codec.c" ]
--    if (current_cpu == "x86" || current_cpu == "x64") {
-+    if (support_x86_asm) {
-       if (is_clang || !is_win) {
-         cflags_c = [
-           "-mavx512vl",
 diff --git a/deps/cares/BUILD.gn b/deps/cares/BUILD.gn
 index ac19ac73ed1e24c61cb679f3851685b79cfc8b39..ef745c19f2b1cd433cc43c834a18db7eaa8e5162 100644
 --- a/deps/cares/BUILD.gn
