7 files changed, 12 insertions, 8 deletions
diff --git a/src/base64/bun-base64.c b/src/base64/bun-base64.c
index e11f88da5..6cf11bbe7 100644
--- a/src/base64/bun-base64.c
+++ b/src/base64/bun-base64.c
@@ -22,7 +22,7 @@ size_t bun_base64_encode(char *dest, const char *src, size_t len) {
   return chromium_base64_encode(dest, src, len);
 }
 
-#elif defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+#elif defined(__GNUC__) && (defined(__x86_64__) && defined(__AVX2__))
 
 size_t bun_base64_decode(char *dest, const char *src, size_t len,
                          size_t *outlen) {
diff --git a/src/base64/fastavxbase64.c b/src/base64/fastavxbase64.c
index 47be824b4..305288fde 100644
--- a/src/base64/fastavxbase64.c
+++ b/src/base64/fastavxbase64.c
@@ -1,4 +1,4 @@
-#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+#if defined(__GNUC__) && defined(__x86_64__) && defined(__AVX2__)
 #include "fastavxbase64.h"
 
 #include <stdbool.h>
diff --git a/src/base64/fastavxbase64.h b/src/base64/fastavxbase64.h
index d1064a5d1..80f097ae8 100644
--- a/src/base64/fastavxbase64.h
+++ b/src/base64/fastavxbase64.h
@@ -1,4 +1,5 @@
-#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__))
+
+#if defined(__GNUC__) && defined(__x86_64__) && defined(__AVX2__)
 
 #ifndef EXPAVX_B64
 #define EXPAVX_B64
diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit
-Subproject 7e7774dabf1c2d94fe3604defb3c54a4c989c3b
+Subproject 786404fdda33adfee9b484702fa0101fdffbb26
diff --git a/src/bun.js/node/syscall.zig b/src/bun.js/node/syscall.zig
index b931e9c0e..4378a4762 100644
--- a/src/bun.js/node/syscall.zig
+++ b/src/bun.js/node/syscall.zig
@@ -16,27 +16,29 @@ const C = @import("../../global.zig").C;
 const linux = os.linux;
 const Maybe = JSC.Maybe;
 
+// On Linux AARCh64, zig is missing stat & lstat syscalls
+const use_libc = (Environment.isLinux and Environment.isAarch64) or Environment.isMac;
 pub const system = if (Environment.isLinux) linux else @import("io").darwin;
 pub const S = struct {
     pub usingnamespace if (Environment.isLinux) linux.S else std.os.S;
 };
 const sys = std.os.system;
 
-const statSym = if (Environment.isMac)
+const statSym = if (use_libc)
     C.stat
 else if (Environment.isLinux)
     linux.stat
 else
     @compileError("STAT");
 
-const fstatSym = if (Environment.isMac)
+const fstatSym = if (use_libc)
     C.fstat
 else if (Environment.isLinux)
     linux.fstat
 else
     @compileError("STAT");
 
-const lstat64 = if (Environment.isMac)
+const lstat64 = if (use_libc)
     C.lstat
 else if (Environment.isLinux)
     linux.lstat
diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig
index a64985bbb..a28749849 100644
--- a/src/cli/upgrade_command.zig
+++ b/src/cli/upgrade_command.zig
@@ -66,7 +66,8 @@ pub const Version = struct {
     pub const platform_label = if (Environment.isMac) "darwin" else "linux";
     pub const arch_label = if (Environment.isAarch64) "aarch64" else "x64";
     pub const triplet = platform_label ++ "-" ++ arch_label;
-    pub const folder_name = "bun-" ++ triplet;
+    const suffix = if (Environment.baseline) "-baseline" else "";
+    pub const folder_name = "bun-" ++ triplet ++ suffix;
     pub const zip_filename = folder_name ++ ".zip";
 
     const current_version: string = "bun-v" ++ Global.package_json_version;
diff --git a/src/env.zig b/src/env.zig
index 0e4cbc414..aa0a6de86 100644
--- a/src/env.zig
+++ b/src/env.zig
@@ -25,4 +25,4 @@ pub const isX86 = @import("builtin").target.cpu.arch.isX86();
 pub const isX64 = @import("builtin").target.cpu.arch == .x86_64;
 pub const allow_assert = isDebug or isTest;
 pub const analytics_url = if (isDebug) "http://localhost:4000/events" else "http://i.bun.sh/events";
-pub const simd = isX86 or isAarch64;
+pub const baseline = @import("build_options").baseline;