summaryrefslogtreecommitdiffstats
path: root/libcutils/atomic.c
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2014-10-05 16:04:54 +0000
committerHans Boehm <hboehm@google.com>2014-11-13 15:59:10 -0800
commitc56648948c93ba6223770755609fafeab2c23cb5 (patch)
treebc17a0217cbc9a3dd0815f25159afcfe909a636f /libcutils/atomic.c
parent06279285ae38b58988a9431c89b8689d8e16904e (diff)
downloadsystem_core-c56648948c93ba6223770755609fafeab2c23cb5.zip
system_core-c56648948c93ba6223770755609fafeab2c23cb5.tar.gz
system_core-c56648948c93ba6223770755609fafeab2c23cb5.tar.bz2
Second attempt to "Rewrite atomic.h to use stdatomic.h."
This should not be committed until win_sdk and aarch64 builds are fixed in the presence of this CL. This reverts commit 2789faabfa9cdf16902a52a1de3fc4a7ae98efed. We additionally remove uniprocessor support from the earlier CL, thus avoiding a potential compiler code reordering issue. Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
Diffstat (limited to 'libcutils/atomic.c')
-rw-r--r--libcutils/atomic.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/libcutils/atomic.c b/libcutils/atomic.c
index 1484ef8..d34aa00 100644
--- a/libcutils/atomic.c
+++ b/libcutils/atomic.c
@@ -14,6 +14,13 @@
* limitations under the License.
*/
+/*
+ * Generate non-inlined versions of android_atomic functions.
+ * Nobody should be using these, but some binary blobs currently (late 2014)
+ * are.
+ * If you read this in 2015 or later, please try to delete this file.
+ */
+
#define ANDROID_ATOMIC_INLINE
-#include <cutils/atomic-inline.h>
+#include <cutils/atomic.h>