From 3517bd1411cf581477712cc0a2fedd5b3d4b702f Mon Sep 17 00:00:00 2001
From: Yang Liu <numbksco@gmail.com>
Date: Wed, 4 Feb 2026 15:08:30 +0800
Subject: [PATCH] [CORE][LA64] Fixed non-lasx resolving order

---
 src/core.c      | 9 ++++++++-
 src/tools/env.c | 6 ------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/core.c b/src/core.c
index 7d2cc24644..2f87638b41 100644
--- a/src/core.c
+++ b/src/core.c
@@ -201,7 +201,7 @@ void computeRDTSC()
     printf_log_prefix(0, LOG_INFO, "\n");
 }
 
-static void displayMiscInfo()
+static void displayMiscInfo(void)
 {
     openFTrace();
 
@@ -221,6 +221,13 @@ static void displayMiscInfo()
         printf_log(LOG_INFO, "Minimum CPU requirements not met, disabling DynaRec\n");
         SET_BOX64ENV(dynarec, 0);
     }
+
+#if defined(LA64)
+    if (box64env.avx && !cpuext.lasx) {
+        box64env.avx = 0;
+        box64env.avx2 = 0;
+    }
+#endif
 #endif
 
     printf_log(LOG_INFO, "Running on %s with %d core%s, pagesize: %zd", box64_sysinfo.cpuname, box64_sysinfo.ncpu, box64_sysinfo.ncpu > 1 ? "s" : "", box64_pagesize);
diff --git a/src/tools/env.c b/src/tools/env.c
index d8a4ce0c17..4113473806 100644
--- a/src/tools/env.c
+++ b/src/tools/env.c
@@ -276,12 +276,6 @@ static void applyCustomRules()
         box64env.avx = 1;
         box64env.avx2 = 1;
     }
-#if defined(LA64) && defined(DYNAREC)
-    if (box64env.avx && !cpuext.lasx) {
-        box64env.avx = 0;
-        box64env.avx2 = 0;
-    }
-#endif
 
 #ifndef _WIN32
     if (box64env.exit) exit(0);