Commit 7bb289c4 authored by Rafaël Carré's avatar Rafaël Carré
Browse files

Revert ARM part of [806505a4]

parent ed371431
...@@ -257,6 +257,10 @@ out: ...@@ -257,6 +257,10 @@ out:
# if defined (__ARM_NEON__) # if defined (__ARM_NEON__)
i_capabilities |= CPU_CAPABILITY_NEON; i_capabilities |= CPU_CAPABILITY_NEON;
# elif defined (CAN_COMPILE_NEON) # elif defined (CAN_COMPILE_NEON)
# define NEED_RUNTIME_CPU_CHECK 1
# endif
# ifdef NEED_RUNTIME_CPU_CHECK
# if defined (__linux__) # if defined (__linux__)
FILE *info = fopen ("/proc/cpuinfo", "rt"); FILE *info = fopen ("/proc/cpuinfo", "rt");
if (info != NULL) if (info != NULL)
...@@ -266,16 +270,18 @@ out: ...@@ -266,16 +270,18 @@ out:
while (getline (&line, &linelen, info) != -1) while (getline (&line, &linelen, info) != -1)
{ {
const char *cap; const char *cap;
if (strncmp (line, "Features\t:", 10)) if (strncmp (line, "Features\t:", 10))
continue; continue;
cap = strstr (line + 10, " neon"); /* TODO: detect other CPU features when we use them */
if (cap != NULL && (cap[5] == '\0' || cap[5] == ' ')) # if defined (CAN_COMPILE_NEON) && !defined (__ARM_NEON__)
i_capabilities |= CPU_CAPABILITY_NEON; cap = strstr (line + 10, " neon");
if (cap != NULL && (cap[5] == '\0' || cap[5] == ' '))
break; i_capabilities |= CPU_CAPABILITY_NEON;
# endif
break;
} }
fclose (info); fclose (info);
free (line); free (line);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment