ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* commit '373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7':
  There's no non-SMP LP64.
This commit is contained in:
Elliott Hughes 2014-08-20 20:22:23 +00:00 • committed by Android Git Automerger
commit f7e88e51b3
3 changed files with 0 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/cutils/atomic-arm64.h
View file

@ -46,18 +46,6 @@ void android_compiler_barrier(void)
__asm__ __volatile__ ("" : : : "memory"); __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 extern ANDROID_ATOMIC_INLINE
void android_memory_barrier(void) void android_memory_barrier(void)
{ {
@ -68,7 +56,6 @@ void android_memory_store_barrier(void)
{ {
__asm__ __volatile__ ("dmb ishst" : : : "memory"); __asm__ __volatile__ ("dmb ishst" : : : "memory");
} }
#endif
extern ANDROID_ATOMIC_INLINE extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_acquire_load(volatile const int32_t *ptr) int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

11
include/cutils/atomic-mips64.h
View file

@ -28,16 +28,6 @@ extern ANDROID_ATOMIC_INLINE void android_compiler_barrier(void)
__asm__ __volatile__ ("" : : : "memory"); __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) extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void)
{ {
__asm__ __volatile__ ("sync" : : : "memory"); __asm__ __volatile__ ("sync" : : : "memory");
@ -46,7 +36,6 @@ extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void)
{ {
__asm__ __volatile__ ("sync" : : : "memory"); __asm__ __volatile__ ("sync" : : : "memory");
} }
#endif
extern ANDROID_ATOMIC_INLINE extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_acquire_load(volatile const int32_t *ptr) int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

13
include/cutils/atomic-x86_64.h
View file

@ -41,18 +41,6 @@ void android_compiler_barrier(void)
__asm__ __volatile__ ("" : : : "memory"); __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 extern ANDROID_ATOMIC_INLINE
void android_memory_barrier(void) void android_memory_barrier(void)
{ {
@ -63,7 +51,6 @@ void android_memory_store_barrier(void)
{ {
android_compiler_barrier(); android_compiler_barrier();
} }
#endif
extern ANDROID_ATOMIC_INLINE extern ANDROID_ATOMIC_INLINE
int32_t android_atomic_acquire_load(volatile const int32_t *ptr) int32_t android_atomic_acquire_load(volatile const int32_t *ptr)