diff --git a/core/config.h b/core/config.h
index 8304c5b9f..3b2e62b32 100644
--- a/core/config.h
+++ b/core/config.h
@@ -136,6 +136,10 @@
 #define WASM_ENABLE_UVWASI 0
 #endif
 
+#ifndef WASM_ENABLE_WASI_NN
+#define WASM_ENABLE_WASI_NN 0
+#endif
+
 /* Default disable libc emcc */
 #ifndef WASM_ENABLE_LIBC_EMCC
 #define WASM_ENABLE_LIBC_EMCC 0
diff --git a/core/iwasm/aot/aot_intrinsic.c b/core/iwasm/aot/aot_intrinsic.c
index eed327485..b98960808 100644
--- a/core/iwasm/aot/aot_intrinsic.c
+++ b/core/iwasm/aot/aot_intrinsic.c
@@ -657,9 +657,9 @@ aot_intrinsic_fill_capability_flags(AOTCompContext *comp_ctx)
         add_f32_common_intrinsics(comp_ctx);
         add_f64_common_intrinsics(comp_ctx);
         add_common_float_integer_convertion(comp_ctx);
-    }
-    else if (!strncmp(comp_ctx->target_arch, "riscv32", 7)) {
-        add_i64_common_intrinsics(comp_ctx);
+        if (!strncmp(comp_ctx->target_arch, "riscv32", 7)) {
+            add_i64_common_intrinsics(comp_ctx);
+        }
     }
     else if (!strncmp(comp_ctx->target_arch, "xtensa", 6)) {
         /*
diff --git a/core/iwasm/compilation/aot_emit_numberic.c b/core/iwasm/compilation/aot_emit_numberic.c
index 09ad1c50c..be3ae7b0d 100644
--- a/core/iwasm/compilation/aot_emit_numberic.c
+++ b/core/iwasm/compilation/aot_emit_numberic.c
@@ -331,6 +331,9 @@ compile_rems(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
 {
     LLVMValueRef phi, no_overflow_value, zero = is_i32 ? I32_ZERO : I64_ZERO;
     LLVMBasicBlockRef block_curr, no_overflow_block, rems_end_block;
+    LLVMTypeRef param_types[2];
+
+    param_types[1] = param_types[0] = is_i32 ? I32_TYPE : I64_TYPE;
 
     block_curr = LLVMGetInsertBlock(comp_ctx->builder);
 
@@ -349,7 +352,15 @@ compile_rems(AOTCompContext *comp_ctx, AOTFuncContext *func_ctx,
     LLVMPositionBuilderAtEnd(comp_ctx->builder, no_overflow_block);
 
     /* Calculate the rem value */
-    LLVM_BUILD_OP(SRem, left, right, no_overflow_value, "rem_s", false);
+    if (comp_ctx->disable_llvm_intrinsics && !is_i32
+        && aot_intrinsic_check_capability(comp_ctx, "i64.rem_s")) {
+        no_overflow_value =
+            aot_call_llvm_intrinsic(comp_ctx, func_ctx, "rem_s", param_types[0],
+                                    param_types, 2, left, right);
+    }
+    else {
+        LLVM_BUILD_OP(SRem, left, right, no_overflow_value, "rem_s", false);
+    }
 
     /* Jump to rems_end block */
     if (!LLVMBuildBr(comp_ctx->builder, rems_end_block)) {