482358fda7
Merge commit 'd29b8a51a5f95a3f38e5fb812231e12e5a66a865' * commit 'd29b8a51a5f95a3f38e5fb812231e12e5a66a865': Reconcile assembly-only macros in <machine/cpu-features.h>