From 33261c6e709ef6afae5825b9cf9f6808256739b0 Mon Sep 17 00:00:00 2001
From: Simon Maertens <simon@slmaertens.dev>
Date: Wed, 14 Oct 2026 16:53:08 +0100
Subject: [PATCH] Enable GEMM_GEMV_FORWARD by default on x86_64

---
 Makefile.system    | 3 +++
 cmake/system.cmake | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Makefile.system b/Makefile.system
index e8e732e9c8..4c962fd4d0 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -280,6 +280,9 @@ endif
 ifeq ($(ARCH), loongarch64)
 SMALL_MATRIX_OPT = 1
 endif
+ifeq ($(ARCH), x86_64)
+GEMM_GEMV_FORWARD = 1
+endif
 ifeq ($(ARCH), arm64)
 GEMM_GEMV_FORWARD = 1
 SBGEMM_GEMV_FORWARD = 1
diff --git a/cmake/system.cmake b/cmake/system.cmake
index 436f2109aa..dfe37cb411 100644
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -507,6 +507,9 @@ endif ()
 if (X86_64 OR ${CORE} STREQUAL POWER10 OR ARM64 OR LOONGARCH64)
   set(SMALL_MATRIX_OPT TRUE)
 endif ()
+if (X86_64)
+  set(GEMM_GEMV_FORWARD TRUE)
+endif ()
 if (ARM64)
   set(GEMM_GEMV_FORWARD TRUE)
   set(SBGEMM_GEMV_FORWARD TRUE)