Changeset 94235 in webkit for trunk/Source/JavaScriptCore/wtf

Timestamp:

Aug 31, 2011, 2:48:15 PM (14 years ago)

Author:

[email protected]

Message:

Add Android's platform specification and the right atomic functions.
​https://bugs.webkit.org/show_bug.cgi?id=66687

Patch by Peter Beverloo <​[email protected]> on 2011-08-31
Reviewed by Adam Barth.

• wtf/Atomics.h:

(WTF::atomicIncrement):
(WTF::atomicDecrement):

• wtf/Platform.h:

Location:

trunk/Source/JavaScriptCore/wtf

Files:

• Atomics.h (modified) (2 diffs)
• Platform.h (modified) (5 diffs)

trunk/Source/JavaScriptCore/wtf/Atomics.h

@@ -68 +68 @@
 #elif OS(QNX)
 #include <atomic.h>
+#elif OS(ANDROID)
+#include <sys/atomics.h>
 #elif COMPILER(GCC) && !OS(SYMBIAN)
 #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
@@ -102 +104 @@
 inline int atomicDecrement(int volatile* addend) { return static_cast<int>(atomic_sub_value(reinterpret_cast<unsigned volatile*>(addend), 1)) - 1; }
 
+#elif OS(ANDROID)
+
+inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend); }
+inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend); }
+
 #elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -177 +177 @@
     && !defined(__EABI__) \
     && !defined(__VFP_FP__) \
-    && !defined(_WIN32_WCE)
+    && !defined(_WIN32_WCE) \
+    && !defined(ANDROID)
 #define WTF_CPU_MIDDLE_ENDIAN 1
 
@@ -303 +304 @@
    virtual memory, not to choose a GUI toolkit ==== */
 
+/* OS(ANDROID) - Android */
+#ifdef ANDROID
+#define WTF_OS_ANDROID 1
+#endif
+
 /* OS(AIX) - AIX */
 #ifdef _AIX
@@ -390 +396 @@
 /* OS(UNIX) - Any Unix-like system */
 #if   OS(AIX)              \
+    || OS(ANDROID)          \
     || OS(DARWIN)           \
     || OS(FREEBSD)          \
@@ -689 +696 @@
 #if !OS(WINDOWS) && !OS(SOLARIS) && !OS(QNX) \
     && !OS(SYMBIAN) && !OS(HAIKU) && !OS(RVCT) \
-    && !PLATFORM(BREWMP)
+    && !OS(ANDROID) && !PLATFORM(BREWMP)
 #define HAVE_TM_GMTOFF 1
 #define HAVE_TM_ZONE 1
@@ -762 +769 @@
 #define HAVE_SYS_TIME_H 1
 
+#elif OS(ANDROID)
+
+#define HAVE_ERRNO_H 1
+#define HAVE_LANGINFO_H 0
+#define HAVE_NMAP 1
+#define HAVE_SBRK 1
+#define HAVE_STRINGS_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_TIME_H 1
+
 #else