pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jean-Baptiste Queru 2010-10-19 15:21:57 -07:00 committed by Android Git Automerger
parent 82775ae0ac 5109146f95
commit d29b8a51a5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libc/arch-arm/include/machine/cpu-features.h
View File

@ -185,6 +185,7 @@
#endif #endif
/* Assembly-only macros */ /* Assembly-only macros */
#ifdef __ASSEMBLY__
/* define a handy PLD(address) macro since the cache preload /* define a handy PLD(address) macro since the cache preload
* is an optional opcode * is an optional opcode
@ -195,4 +196,6 @@
# define PLD(reg,offset) /* nothing */ # define PLD(reg,offset) /* nothing */
#endif #endif
#endif /* ! __ASSEMBLY__ */
#endif /* _ARM_MACHINE_CPU_FEATURES_H */ #endif /* _ARM_MACHINE_CPU_FEATURES_H */