diff --git a/BUILD.bazel b/BUILD.bazel
index 712b9bcd96a..1cd67e8d7e0 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -4709,6 +4709,7 @@ xnnpack_cc_library(
         "@pthreadpool",
     ] + select({
         ":emscripten": [],
+        ":emscripten_tfjs_legacy": [],
         "//conditions:default": ["@cpuinfo"],
     }),
 )
@@ -4751,6 +4752,7 @@ xnnpack_cc_library(
         "@pthreadpool",
     ] + select({
         ":emscripten": [],
+        ":emscripten_tfjs_legacy": [],
         "//conditions:default": ["@cpuinfo"],
     }),
 )
@@ -4799,6 +4801,7 @@ xnnpack_cc_library(
         "@pthreadpool",
     ] + select({
         ":emscripten": [],
+        ":emscripten_tfjs_legacy": [],
         "//conditions:default": ["@cpuinfo"],
     }),
 )
@@ -4840,6 +4843,7 @@ xnnpack_cc_library(
         "@pthreadpool",
     ] + select({
         ":emscripten": [],
+        ":emscripten_tfjs_legacy": [],
         "//conditions:default": ["@cpuinfo"],
     }),
 )
@@ -7413,11 +7417,24 @@ config_setting(
 
 config_setting(
     name = "emscripten",
+    values = {"crosstool_top": "//emscripten_toolchain:everything"},
+)
+
+config_setting(
+    name = "emscripten_tfjs_legacy",
     values = {"crosstool_top": "//toolchain:emscripten"},
 )
 
 config_setting(
     name = "emscripten_wasm",
+    values = {
+        "crosstool_top": "//emscripten_toolchain:everything",
+        "cpu": "wasm",
+    },
+)
+
+config_setting(
+    name = "emscripten_wasm_tfjs_legacy",
     values = {
         "crosstool_top": "//toolchain:emscripten",
         "cpu": "wasm",
@@ -7426,6 +7443,15 @@ config_setting(
 
 config_setting(
     name = "emscripten_wasmsimd",
+    values = {
+        "crosstool_top": "//emscripten_toolchain:everything",
+        "cpu": "wasm",
+        "copt": "-msimd128",
+    },
+)
+
+config_setting(
+    name = "emscripten_wasmsimd_tfjs_legacy",
     values = {
         "crosstool_top": "//toolchain:emscripten",
         "cpu": "wasm",
diff --git a/build_defs.bzl b/build_defs.bzl
index 1ce94823c40..4389020064e 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -166,7 +166,9 @@ def xnnpack_cc_library(
             ":tvos_arm64": aarch64_srcs,
             ":tvos_x86_64": x86_srcs,
             ":emscripten_wasm": wasm_srcs,
+            ":emscripten_wasm_tfjs_legacy": wasm_srcs,
             ":emscripten_wasmsimd": wasmsimd_srcs,
+            ":emscripten_wasmsimd_tfjs_legacy": wasmsimd_srcs,
             "//conditions:default": [],
         }),
         copts = [
@@ -200,7 +202,9 @@ def xnnpack_cc_library(
             ":tvos_arm64": aarch64_copts,
             ":tvos_x86_64": gcc_x86_copts,
             ":emscripten_wasm": wasm_copts,
+            ":emscripten_wasm_tfjs_legacy": wasm_copts,
             ":emscripten_wasmsimd": wasmsimd_copts,
+            ":emscripten_wasmsimd_tfjs_legacy": wasmsimd_copts,
             "//conditions:default": [],
         }) + select({
             ":windows_x86_64_clang": ["/clang:" + opt for opt in gcc_copts],
@@ -281,7 +285,9 @@ def xnnpack_aggregate_library(
             ":tvos_arm64": aarch64_deps,
             ":tvos_x86_64": x86_deps,
             ":emscripten_wasm": wasm_deps,
+            ":emscripten_wasm_tfjs_legacy": wasm_deps,
             ":emscripten_wasmsimd": wasmsimd_deps,
+            ":emscripten_wasmsimd_tfjs_legacy": wasmsimd_deps,
         }),
     )
 
@@ -324,6 +330,7 @@ def xnnpack_unit_test(name, srcs, copts = [], mingw_copts = [], msys_copts = [],
             }) + copts,
             linkopts = select({
                 ":emscripten": xnnpack_emscripten_test_linkopts(),
+                ":emscripten_tfjs_legacy": xnnpack_emscripten_test_linkopts(),
                 "//conditions:default": [],
             }),
             linkstatic = True,
@@ -331,6 +338,7 @@ def xnnpack_unit_test(name, srcs, copts = [], mingw_copts = [], msys_copts = [],
                 "@com_google_googletest//:gtest_main",
             ] + deps + select({
                 ":emscripten": xnnpack_emscripten_deps(),
+                ":emscripten_tfjs_legacy": xnnpack_emscripten_deps(),
                 "//conditions:default": [],
             }),
             tags = tags,
@@ -356,6 +364,7 @@ def xnnpack_unit_test(name, srcs, copts = [], mingw_copts = [], msys_copts = [],
             }) + copts,
             linkopts = select({
                 ":emscripten": xnnpack_emscripten_test_linkopts(),
+                ":emscripten_tfjs_legacy": xnnpack_emscripten_test_linkopts(),
                 "//conditions:default": [],
             }),
             linkstatic = True,
@@ -363,6 +372,7 @@ def xnnpack_unit_test(name, srcs, copts = [], mingw_copts = [], msys_copts = [],
                 "@com_google_googletest//:gtest_main",
             ] + deps + select({
                 ":emscripten": xnnpack_emscripten_deps(),
+                ":emscripten_tfjs_legacy": xnnpack_emscripten_deps(),
                 "//conditions:default": [],
             }),
             testonly = True,
@@ -389,6 +399,7 @@ def xnnpack_binary(name, srcs, copts = [], deps = []):
         ] + copts,
         linkopts = select({
             ":emscripten": xnnpack_emscripten_minimal_linkopts(),
+            ":emscripten_tfjs_legacy": xnnpack_emscripten_minimal_linkopts(),
             "//conditions:default": [],
         }),
         linkstatic = True,
@@ -423,6 +434,7 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
         }) + copts,
         linkopts = select({
             ":emscripten": xnnpack_emscripten_benchmark_linkopts(),
+            ":emscripten_tfjs_legacy": xnnpack_emscripten_benchmark_linkopts(),
             ":windows_x86_64_mingw": ["-lshlwapi"],
             ":windows_x86_64_msys": ["-lshlwapi"],
             "//conditions:default": [],
@@ -432,6 +444,7 @@ def xnnpack_benchmark(name, srcs, copts = [], deps = [], tags = []):
             "@com_google_benchmark//:benchmark",
         ] + deps + select({
             ":emscripten": xnnpack_emscripten_deps(),
+            ":emscripten_tfjs_legacy": xnnpack_emscripten_deps(),
             "//conditions:default": [],
         }),
 	tags = tags,
diff --git a/third_party/cpuinfo.BUILD b/third_party/cpuinfo.BUILD
index f5fd5e1a46a..a3a599c0843 100644
--- a/third_party/cpuinfo.BUILD
+++ b/third_party/cpuinfo.BUILD
@@ -120,6 +120,7 @@ cc_library(
         ":tvos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS,
         ":tvos_arm64": COMMON_SRCS + MACH_SRCS + MACH_ARM_SRCS,
         ":emscripten": COMMON_SRCS + EMSCRIPTEN_SRCS,
+        ":emscripten_tfjs_legacy": COMMON_SRCS + EMSCRIPTEN_SRCS,
     }),
     copts = select({
         ":windows_x86_64": [],
@@ -334,5 +335,10 @@ config_setting(
 
 config_setting(
     name = "emscripten",
+    values = {"crosstool_top": "//emscripten_toolchain:everything"},
+)
+
+config_setting(
+    name = "emscripten_tfjs_legacy",
     values = {"crosstool_top": "//toolchain:emscripten"},
 )