Remove remaining bionic support for TARGET_CPU_SMP being false.

[android-sdk/platform-bionic.git] / libc / private / bionic_atomic_inline.h

diff --git a/libc/private/bionic_atomic_inline.h b/libc/private/bionic_atomic_inline.h
index 6819af6b382134f8d3f9edbc29cd7bba5f029040..f8032c34a65e931020da91d6aaaf4fba3ede735a 100644 (file)
--- a/libc/private/bionic_atomic_inline.h
+++ b/libc/private/bionic_atomic_inline.h
@@ -23,22 +23,13 @@
  * memory barrier needs to be issued inline rather than as a function
  * call.
  *
- * Most code should not use these.
- *
- * Anything that does include this file must set ANDROID_SMP to either
- * 0 or 1, indicating compilation for UP or SMP, respectively.
- *
  * Macros defined in this header:
  *
- * void ANDROID_MEMBAR_FULL(void)
+ * void ANDROID_MEMBAR_FULL()
  *   Full memory barrier.  Provides a compiler reordering barrier, and
  *   on SMP systems emits an appropriate instruction.
  */
 
-#if !defined(ANDROID_SMP)
-# error "Must define ANDROID_SMP before including atomic-inline.h"
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -49,8 +40,10 @@ extern "C" {
  */
 #define  __ATOMIC_INLINE__  static __inline__ __attribute__((always_inline))
 
-#ifdef __arm__
+#if defined(__arm__)
 #  include "bionic_atomic_arm.h"
+#elif defined(__aarch64__)
+#  include "bionic_atomic_arm64.h"
 #elif defined(__i386__)
 #  include "bionic_atomic_x86.h"
 #elif defined(__mips__)