am 5109146f: Merge "Reconcile assembly-only macros in <machine/cpu-features.h>"
Merge commit '5109146f954d8cca39d34689bff2762e15bc6933' into gingerbread-plus-aosp
* commit '5109146f954d8cca39d34689bff2762e15bc6933':
Reconcile assembly-only macros in <machine/cpu-features.h>
diff --git a/libc/arch-arm/include/machine/cpu-features.h b/libc/arch-arm/include/machine/cpu-features.h
index 39c1db3..80d3fda 100644
--- a/libc/arch-arm/include/machine/cpu-features.h
+++ b/libc/arch-arm/include/machine/cpu-features.h
@@ -185,6 +185,7 @@
#endif
/* Assembly-only macros */
+#ifdef __ASSEMBLY__
/* define a handy PLD(address) macro since the cache preload
* is an optional opcode
@@ -195,4 +196,6 @@
# define PLD(reg,offset) /* nothing */
#endif
+#endif /* ! __ASSEMBLY__ */
+
#endif /* _ARM_MACHINE_CPU_FEATURES_H */