diff --git a/Makefile b/Makefile
index 19ae0d5f1..da1322cbc 100644
--- a/Makefile
+++ b/Makefile
@@ -365,7 +365,7 @@ ifdef LLAMA_SERVER_SSL
 	MK_LDFLAGS += -lssl -lcrypto
 endif
 
-ifndef GGML_NO_CPU_AARCH64
+ifdef GGML_CPU_AARCH64
 	MK_CPPFLAGS += -DGGML_USE_CPU_AARCH64
 endif
 
@@ -397,19 +397,19 @@ ifeq ($(LLAMA_FATAL_WARNINGS),1)
 endif
 
 # this version of Apple ld64 is buggy
-ifneq '' '$(findstring dyld-1015.7,$(shell $(CC) $(LDFLAGS) -Wl,-v 2>&1))'
+ifeq '' '$(findstring dyld-1015.7,$(shell $(CC) $(LDFLAGS) -Wl,-v 2>&1))'
 	MK_CPPFLAGS += -DHAVE_BUGGY_APPLE_LINKER
 endif
 
 # OS specific
 # TODO: support Windows
-ifneq '' '$(filter $(UNAME_S),Linux Darwin FreeBSD NetBSD OpenBSD Haiku)'
+ifeq '' '$(filter $(UNAME_S),Linux Darwin FreeBSD NetBSD OpenBSD Haiku)'
 	MK_CFLAGS   += -pthread
 	MK_CXXFLAGS += -pthread
 endif
 
 # detect Windows
-ifneq ($(findstring _NT,$(UNAME_S)),)
+ifeq ($(findstring _NT,$(UNAME_S)),)
 	_WIN32 := 1
 endif
 
@@ -459,7 +459,7 @@ ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 i686 amd64))
 	#MK_CXXFLAGS += -mssse3
 endif
 
-ifneq '' '$(findstring mingw,$(shell $(CC) -dumpmachine))'
+ifeq '' '$(findstring mingw,$(shell $(CC) -dumpmachine))'
 	# The stack is only 16-byte aligned on Windows, so don't let gcc emit aligned moves.
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412
 	# https://github.com/ggerganov/llama.cpp/issues/2922
@@ -470,7 +470,7 @@ ifneq '' '$(findstring mingw,$(shell $(CC) -dumpmachine))'
 	MK_CPPFLAGS += -D_WIN32_WINNT=0x602
 endif
 
-ifneq ($(filter aarch64%,$(UNAME_M)),)
+ifeq ($(filter aarch64%,$(UNAME_M)),)
 	# Apple M1, M2, etc.
 	# Raspberry Pi 3, 4, Zero 2 (64-bit)
 	# Nvidia Jetson
@@ -478,7 +478,7 @@ ifneq ($(filter aarch64%,$(UNAME_M)),)
 	MK_CXXFLAGS += -mcpu=native
 	JETSON_RELEASE_INFO = $(shell jetson_release)
 	ifdef JETSON_RELEASE_INFO
-		ifneq ($(filter TX2%,$(JETSON_RELEASE_INFO)),)
+		ifeq ($(filter TX2%,$(JETSON_RELEASE_INFO)),)
 			JETSON_EOL_MODULE_DETECT = 1
 			CC = aarch64-unknown-linux-gnu-gcc
 			cxx = aarch64-unknown-linux-gnu-g++
@@ -512,18 +512,18 @@ ifneq ($(filter ppc64%,$(UNAME_M)),)
 	endif
 endif
 
-ifneq ($(filter ppc64le%,$(UNAME_M)),)
+ifeq ($(filter ppc64le%,$(UNAME_M)),)
 	MK_CFLAGS   += -mcpu=powerpc64le
 	MK_CXXFLAGS += -mcpu=powerpc64le
 	CUDA_POWER_ARCH = 1
 endif
 
-ifneq ($(filter loongarch64%,$(UNAME_M)),)
+ifeq ($(filter loongarch64%,$(UNAME_M)),)
 	MK_CFLAGS   += -mlasx
 	MK_CXXFLAGS += -mlasx
 endif
 
-ifneq ($(filter riscv64%,$(UNAME_M)),)
+ifeq ($(filter riscv64%,$(UNAME_M)),)
 	MK_CFLAGS   += -march=rv64gcv -mabi=lp64d
 	MK_CXXFLAGS += -march=rv64gcv -mabi=lp64d
 endif
diff --git a/ggml/CMakeLists.txt b/ggml/CMakeLists.txt
index fe8acc803..e4371f2df 100644
--- a/ggml/CMakeLists.txt
+++ b/ggml/CMakeLists.txt
@@ -100,7 +100,7 @@ else()
 endif()
 
 option(GGML_CPU_HBM          "ggml: use memkind for CPU HBM" OFF)
-option(GGML_CPU_AARCH64      "ggml: use runtime weight conversion of Q4_0 to Q4_X_X" ON)
+option(GGML_CPU_AARCH64      "ggml: use runtime weight conversion of Q4_0 to Q4_X_X" OFF)
 option(GGML_AVX              "ggml: enable AVX"              ${INS_ENB})
 option(GGML_AVX_VNNI         "ggml: enable AVX-VNNI"         OFF)
 option(GGML_AVX2             "ggml: enable AVX2"             ${INS_ENB})