--- a/src/bridges/bridge_argon2id_reference.c	2025-08-23 16:43:56.000000000 +0800
+++ b/src/bridges/bridge_argon2id_reference.c	2026-04-25 20:08:27.000000000 +0800
@@ -18,11 +18,8 @@
 #include "core.c"
 #include "blake2/blake2b.c"
 
-#if defined(__riscv)
-#include "ref.c"
-#else
-#include "opt.c"
-#endif
+// Use portable reference implementation (no SIMD)
+#include "ref.c"
 
 // good: we can use this multiplier do reduce copy overhead to increase the guessing speed,
 // bad: but we also increase the password candidate batch size.

--- a/src/bridges/bridge_argon2id_reference.mk	2025-08-23 16:43:56.000000000 +0800
+++ b/src/bridges/bridge_argon2id_reference.mk	2026-04-25 20:08:27.000000000 +0800
@@ -3,17 +3,6 @@
 ARGON2_REFERENCE_CFLAGS := -I$(ARGON2_REFERENCE)/_hashcat/
 
 ifeq ($(MAINTAINER_MODE),0)
-ifeq ($(BUILD_MODE),cross)
-ARGON2_REFERENCE_CFLAGS += -mavx2
-else
-ifeq ($(UNAME),Darwin)
-ifeq ($(IS_APPLE_SILICON),0)
-ARGON2_REFERENCE_CFLAGS += -mavx2
-endif
-else
-ARGON2_REFERENCE_CFLAGS += -march=native
-endif
-endif
 endif
 
 ifeq ($(BUILD_MODE),cross)

--- a/src/bridges/bridge_scrypt_jane.mk	2025-08-23 16:43:56.000000000 +0800
+++ b/src/bridges/bridge_scrypt_jane.mk	2026-04-25 20:13:40.000000000 +0800
@@ -3,17 +3,6 @@
 SCRYPT_JANE_CFLAGS := -I$(SCRYPT_JANE)/ -DSCRYPT_SHA256 -DSCRYPT_SALSA -DSCRYPT_CHOOSE_COMPILETIME -Wno-unused-function -Wno-unused-but-set-variable
 
 ifeq ($(MAINTAINER_MODE),0)
-ifeq ($(BUILD_MODE),cross)
-SCRYPT_JANE_CFLAGS += -mavx2
-else
-ifeq ($(UNAME),Darwin)
-ifeq ($(IS_APPLE_SILICON),0)
-SCRYPT_JANE_CFLAGS += -mavx2
-endif
-else
-SCRYPT_JANE_CFLAGS += -march=native
-endif
-endif
 endif
 
 ifeq ($(BUILD_MODE),cross)

--- a/src/bridges/bridge_scrypt_yescrypt.mk	2025-08-23 16:43:56.000000000 +0800
+++ b/src/bridges/bridge_scrypt_yescrypt.mk	2026-04-25 19:54:06.000000000 +0800
@@ -3,17 +3,6 @@
 SCRYPT_YESCRYPT_CFLAGS := -I$(SCRYPT_YESCRYPT)/ -DSKIP_MEMZERO -Wno-cpp -Wno-type-limits
 
 ifeq ($(MAINTAINER_MODE),0)
-ifeq ($(BUILD_MODE),cross)
-SCRYPT_YESCRYPT_CFLAGS += -mavx2
-else
-ifeq ($(UNAME),Darwin)
-ifeq ($(IS_APPLE_SILICON),0)
-SCRYPT_YESCRYPT_CFLAGS += -mavx2
-endif
-else
-SCRYPT_YESCRYPT_CFLAGS += -march=native
-endif
-endif
 endif
 
 ifeq ($(BUILD_MODE),cross)