diff --git a/ggml/src/CMakeLists.txt b/ggml/src/CMakeLists.txt
index e5f6aad03..9cb2c228d 100644
--- a/ggml/src/CMakeLists.txt
+++ b/ggml/src/CMakeLists.txt
@@ -290,10 +290,6 @@ function(ggml_add_cpu_backend_variant tag_name)
         foreach (feat ${ARGN})
             set(GGML_INTERNAL_${feat} ON)
         endforeach()
-    elseif (GGML_SYSTEM_ARCH STREQUAL "s390x")
-        foreach (feat ${ARGN})
-            set(GGML_${feat} ON)
-        endforeach()
     endif()
 
     ggml_add_cpu_backend_variant_impl(${tag_name})
@@ -358,14 +354,6 @@ if (GGML_CPU_ALL_VARIANTS)
         else()
             message(FATAL_ERROR "Unsupported PowerPC target OS: ${CMAKE_SYSTEM_NAME}")
         endif()
-    elseif (GGML_SYSTEM_ARCH STREQUAL "s390x")
-        if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-            ggml_add_cpu_backend_variant(s390x_z15  VX VXE VXE2)
-            ggml_add_cpu_backend_variant(s390x_z16  VX VXE VXE2 NNPA)
-            ggml_add_cpu_backend_variant(s390x_z17  VX VXE VXE2 NNPA)
-        else()
-            message(FATAL_ERROR "Unsupported s390x target OS: ${CMAKE_SYSTEM_NAME}")
-        endif()
     else()
         message(FATAL_ERROR "GGML_CPU_ALL_VARIANTS not yet supported with ${GGML_SYSTEM_ARCH} on ${CMAKE_SYSTEM_NAME}")
     endif()
@@ -414,17 +402,3 @@ if (BUILD_SHARED_LIBS)
         target_compile_definitions(${target} PUBLIC  GGML_SHARED)
     endforeach()
 endif()
-
-if (GGML_VXE)
-    message(STATUS "GGML_VXE triggered")
-    add_compile_definitions(GGML_VXE)
-    target_compile_definitions(ggml PRIVATE GGML_VXE)
-    target_compile_definitions(ggml-base PRIVATE GGML_VXE)
-endif()
-
-if (GGML_NNPA)
-    message(STATUS "GGML_NNPA triggered")
-    add_compile_definitions(GGML_NNPA)
-    target_compile_definitions(ggml PRIVATE GGML_NNPA)
-    target_compile_definitions(ggml-base PRIVATE GGML_NNPA)
-endif()
diff --git a/ggml/src/ggml-cpu/CMakeLists.txt b/ggml/src/ggml-cpu/CMakeLists.txt
index babcfaf6a..b599df624 100644
--- a/ggml/src/ggml-cpu/CMakeLists.txt
+++ b/ggml/src/ggml-cpu/CMakeLists.txt
@@ -469,12 +469,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name)
             message(STATUS "VX/VXE/VXE2 enabled")
             list(APPEND ARCH_FLAGS -mvx -mzvector)
             list(APPEND ARCH_DEFINITIONS GGML_VXE)
+            target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_VXE)
         endif()
 
         if (GGML_NNPA)
-            target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_NNPA)
             message(STATUS "NNPA enabled")
             list(APPEND ARCH_DEFINITIONS GGML_NNPA)
+            target_compile_definitions(${GGML_CPU_NAME} PRIVATE GGML_NNPA)
         endif()
     elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "wasm")
         message(STATUS "Wasm detected")