~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '2.4.x' into 2.5.x
[catacomb]
/
base
/
dispatch.c
diff --git
a/base/dispatch.c
b/base/dispatch.c
index
abd019f
..
131e3fd
100644
(file)
--- a/
base/dispatch.c
+++ b/
base/dispatch.c
@@
-344,6
+344,7
@@
static unsigned hwcaps = 0;
# define WANTAUX(_) \
WANT_AT_HWCAP(_)
# define CAPMAP(_) \
# define WANTAUX(_) \
WANT_AT_HWCAP(_)
# define CAPMAP(_) \
+ _(ARM_NEON, "arm:neon") \
_(ARM_AES, "arm:aes") \
_(ARM_PMULL, "arm:pmull")
#endif
_(ARM_AES, "arm:aes") \
_(ARM_PMULL, "arm:pmull")
#endif
@@
-464,6
+465,7
@@
static void probe_hwcaps(void)
# endif
#endif
#if CPUFAM_ARM64
# endif
#endif
#if CPUFAM_ARM64
+ if (probed.hwcap & HWCAP_ASIMD) hw |= HF_ARM_NEON;
if (probed.hwcap & HWCAP_AES) hw |= HF_ARM_AES;
if (probed.hwcap & HWCAP_PMULL) hw |= HF_ARM_PMULL;
#endif
if (probed.hwcap & HWCAP_AES) hw |= HF_ARM_AES;
if (probed.hwcap & HWCAP_PMULL) hw |= HF_ARM_PMULL;
#endif