diff options
| author | Carl Shapiro <cshapiro@google.com> | 2010-06-03 17:05:15 -0700 |
|---|---|---|
| committer | Carl Shapiro <cshapiro@google.com> | 2010-06-23 12:51:26 -0700 |
| commit | 93b0cb40c18cae594c931677be2b9214420610b7 (patch) | |
| tree | a9023901166a03f87b002e684367634fab9bfb81 /libcutils/Android.mk | |
| parent | 2124afeee1f19423e71c52ede6f4926f5389e917 (diff) | |
| download | system_core-93b0cb40c18cae594c931677be2b9214420610b7.tar.gz system_core-93b0cb40c18cae594c931677be2b9214420610b7.tar.bz2 system_core-93b0cb40c18cae594c931677be2b9214420610b7.zip | |
Define inline atomic operations for x86 and ARM.
This change moves the ARM definitions into GCC extended inline
assembler. In addition, the same set of x86 definitions are now
shared among all x86 targets.
Change-Id: I6e5aa3a413d0af2acbe5d32994983d35a01fdcb3
Diffstat (limited to 'libcutils/Android.mk')
| -rw-r--r-- | libcutils/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 5b05a1e5..778b5bd8 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -26,7 +26,7 @@ hostSmpFlag := -DANDROID_SMP=0 commonSources := \ array.c \ hashmap.c \ - atomic.c \ + atomic.c.arm \ native_handle.c \ buffer.c \ socket_inaddr_any_server.c \ @@ -112,7 +112,7 @@ LOCAL_MODULE := libcutils LOCAL_SRC_FILES := $(commonSources) ashmem-dev.c mq.c ifeq ($(TARGET_ARCH),arm) -LOCAL_SRC_FILES += memset32.S atomic-android-arm.S +LOCAL_SRC_FILES += memset32.S else # !arm ifeq ($(TARGET_ARCH),sh) LOCAL_SRC_FILES += memory.c atomic-android-sh.c |