am 3601abb8: am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."

* commit '3601abb810e7e33902e461ed0386673d3be11af9':
  There's no non-SMP LP64.
This commit is contained in:
Elliott Hughes 2014-08-20 21:01:56 +00:00 committed by Android Git Automerger
commit 811849979d
3 changed files with 0 additions and 37 deletions

View File

@ -46,18 +46,6 @@ void android_compiler_barrier(void)
__asm__ __volatile__ ("" : : : "memory");
}
#if ANDROID_SMP == 0
extern ANDROID_ATOMIC_INLINE
void android_memory_barrier(void)
{
android_compiler_barrier();
}
extern ANDROID_ATOMIC_INLINE
void android_memory_store_barrier(void)
{
android_compiler_barrier();
}
#else
extern ANDROID_ATOMIC_INLINE
void android_memory_barrier(void)
{
@ -68,7 +56,6 @@ void android_memory_store_barrier(void)
{
__asm__ __volatile__ ("dmb ishst" : : : "memory");
}
#endif
extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

View File

@ -28,16 +28,6 @@ extern ANDROID_ATOMIC_INLINE void android_compiler_barrier(void)
__asm__ __volatile__ ("" : : : "memory");
}
#if ANDROID_SMP == 0
extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void)
{
android_compiler_barrier();
}
extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void)
{
android_compiler_barrier();
}
#else
extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void)
{
__asm__ __volatile__ ("sync" : : : "memory");
@ -46,7 +36,6 @@ extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void)
{
__asm__ __volatile__ ("sync" : : : "memory");
}
#endif
extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

View File

@ -41,18 +41,6 @@ void android_compiler_barrier(void)
__asm__ __volatile__ ("" : : : "memory");
}
#if ANDROID_SMP == 0
extern ANDROID_ATOMIC_INLINE
void android_memory_barrier(void)
{
android_compiler_barrier();
}
extern ANDROID_ATOMIC_INLINE
void android_memory_store_barrier(void)
{
android_compiler_barrier();
}
#else
extern ANDROID_ATOMIC_INLINE
void android_memory_barrier(void)
{
@ -63,7 +51,6 @@ void android_memory_store_barrier(void)
{
android_compiler_barrier();
}
#endif
extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_acquire_load(volatile const int32_t *ptr)