diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-19 15:21:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 15:21:57 -0700 |
| commit | d29b8a51a5f95a3f38e5fb812231e12e5a66a865 (patch) | |
| tree | 54313e535097d76ec6ae250646e29347e4809da0 /libc/arch-arm | |
| parent | 82775ae0acf7cac647c057c80fbcc7f13d0554d3 (diff) | |
| parent | 5109146f954d8cca39d34689bff2762e15bc6933 (diff) | |
| download | bionic-d29b8a51a5f95a3f38e5fb812231e12e5a66a865.zip bionic-d29b8a51a5f95a3f38e5fb812231e12e5a66a865.tar.gz bionic-d29b8a51a5f95a3f38e5fb812231e12e5a66a865.tar.bz2 | |
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>
Diffstat (limited to 'libc/arch-arm')
| -rw-r--r-- | libc/arch-arm/include/machine/cpu-features.h | 3 |
1 files changed, 3 insertions, 0 deletions
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 */ |