Merge pull request #1327 from Sonicadvance1/less_native

Arm64: Don't fall back to native
FEX-Emu · Oct 22, 2021 · a3b39af · a3b39af
2 parents e9937d9 + 0bfc1bb
commit a3b39af
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -300,11 +300,6 @@ if(ENUM_ENUM_WARNING)
   add_compile_options(-Wno-deprecated-enum-enum-conversion)
 endif()
 
-check_cxx_compiler_flag("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
-if(COMPILER_SUPPORTS_MARCH_NATIVE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-endif()
-
 if(ENABLE_WERROR OR ENABLE_STRICT_WERROR)
   add_compile_options(-Werror)
   if (NOT ENABLE_STRICT_WERROR)
@@ -336,6 +331,11 @@ if(_M_ARM_64)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=${AARCH64_CPU}")
     endif()
   endif()
+else()
+  check_cxx_compiler_flag("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE)
+  if(COMPILER_SUPPORTS_MARCH_NATIVE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+  endif()
 endif()
 
 if (ENABLE_IWYU)

diff --git a/Scripts/aarch64_fit_native.py b/Scripts/aarch64_fit_native.py
@@ -60,8 +60,8 @@
             current_part = int(re.findall(r'0x[0-9A-F]+', line, re.I)[0], 16)
             cpuinfo += {tuple([current_implementer, current_part])}
 
-largest_big = "native"
-largest_little = "native"
+largest_big = "cortex-a57"
+largest_little = "cortex-a53"
 
 for core in cpuinfo:
     if BigCoreIDs.get(core):