cherrypick the fix for cpu detect on m1 arm64 from av1 repo
diff --git a/aom_ports/arm_cpudetect.c b/aom_ports/arm_cpudetect.c
index c32a730..c5c9f48 100644
--- a/aom_ports/arm_cpudetect.c
+++ b/aom_ports/arm_cpudetect.c
@@ -39,7 +39,7 @@
return env && *env ? (int)strtol(env, NULL, 0) : ~0;
}
-#if !CONFIG_RUNTIME_CPU_DETECT
+#if !CONFIG_RUNTIME_CPU_DETECT || defined(__APPLE__)
int aom_arm_cpu_caps(void) {
/* This function should actually be a no-op. There is no way to adjust any of
@@ -57,7 +57,7 @@
return flags & mask;
}
-#elif defined(_MSC_VER) /* end !CONFIG_RUNTIME_CPU_DETECT */
+#elif defined(_MSC_VER) /* end !CONFIG_RUNTIME_CPU_DETECT || __APPLE__ */
/*For GetExceptionCode() and EXCEPTION_ILLEGAL_INSTRUCTION.*/
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
