| Index: third_party/WebKit/Source/wtf/CPU.h
|
| diff --git a/third_party/WebKit/Source/wtf/CPU.h b/third_party/WebKit/Source/wtf/CPU.h
|
| index dc80f303f6e057b3ba52aba4e8fd82c6d542878f..a2d70a210b6e161a80ff10380fa8efe1bc5eecc2 100644
|
| --- a/third_party/WebKit/Source/wtf/CPU.h
|
| +++ b/third_party/WebKit/Source/wtf/CPU.h
|
| @@ -32,7 +32,8 @@
|
| #include "wtf/Compiler.h"
|
|
|
| /* CPU() - the target CPU architecture */
|
| -#define CPU(WTF_FEATURE) (defined WTF_CPU_##WTF_FEATURE && WTF_CPU_##WTF_FEATURE)
|
| +#define CPU(WTF_FEATURE) \
|
| + (defined WTF_CPU_##WTF_FEATURE && WTF_CPU_##WTF_FEATURE)
|
|
|
| /* ==== CPU() - the target CPU architecture ==== */
|
|
|
| @@ -40,70 +41,54 @@
|
| /* This defines CPU(32BIT) or CPU(64BIT), as appropriate. */
|
|
|
| /* CPU(X86) - i386 / x86 32-bit */
|
| -#if defined(__i386__) \
|
| - || defined(i386) \
|
| - || defined(_M_IX86) \
|
| - || defined(_X86_) \
|
| - || defined(__THW_INTEL)
|
| +#if defined(__i386__) || defined(i386) || defined(_M_IX86) || \
|
| + defined(_X86_) || defined(__THW_INTEL)
|
| #define WTF_CPU_X86 1
|
| #endif
|
|
|
| /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
|
| -#if defined(__x86_64__) \
|
| - || defined(_M_X64)
|
| +#if defined(__x86_64__) || defined(_M_X64)
|
| #define WTF_CPU_X86_64 1
|
| #define WTF_CPU_64BIT 1
|
| #endif
|
|
|
| /* CPU(ARM) - ARM, any version*/
|
| -#define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && defined(WTF_ARM_ARCH_VERSION) && WTF_ARM_ARCH_VERSION >= N)
|
| +#define WTF_ARM_ARCH_AT_LEAST(N) \
|
| + (CPU(ARM) && defined(WTF_ARM_ARCH_VERSION) && WTF_ARM_ARCH_VERSION >= N)
|
|
|
| -#if defined(arm) \
|
| - || defined(__arm__) \
|
| - || defined(ARM) \
|
| - || defined(_ARM_)
|
| +#if defined(arm) || defined(__arm__) || defined(ARM) || defined(_ARM_)
|
| #define WTF_CPU_ARM 1
|
|
|
| #if defined(__ARMEB__)
|
| #define WTF_CPU_BIG_ENDIAN 1
|
|
|
| -#elif !defined(__ARM_EABI__) \
|
| - && !defined(__EABI__) \
|
| - && !defined(__VFP_FP__) \
|
| - && !defined(_WIN32_WCE) \
|
| - && !defined(ANDROID)
|
| +#elif !defined(__ARM_EABI__) && !defined(__EABI__) && !defined(__VFP_FP__) && \
|
| + !defined(_WIN32_WCE) && !defined(ANDROID)
|
| #define WTF_CPU_MIDDLE_ENDIAN 1
|
|
|
| #endif
|
|
|
| /* Set WTF_ARM_ARCH_VERSION */
|
| -#if defined(__ARM_ARCH_4__) \
|
| - || defined(__ARM_ARCH_4T__) \
|
| - || defined(__MARM_ARMV4__)
|
| +#if defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) || \
|
| + defined(__MARM_ARMV4__)
|
| #define WTF_ARM_ARCH_VERSION 4
|
|
|
| -#elif defined(__ARM_ARCH_5__) \
|
| - || defined(__ARM_ARCH_5T__) \
|
| - || defined(__MARM_ARMV5__)
|
| +#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \
|
| + defined(__MARM_ARMV5__)
|
| #define WTF_ARM_ARCH_VERSION 5
|
|
|
| -#elif defined(__ARM_ARCH_5E__) \
|
| - || defined(__ARM_ARCH_5TE__) \
|
| - || defined(__ARM_ARCH_5TEJ__)
|
| +#elif defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || \
|
| + defined(__ARM_ARCH_5TEJ__)
|
| #define WTF_ARM_ARCH_VERSION 5
|
|
|
| -#elif defined(__ARM_ARCH_6__) \
|
| - || defined(__ARM_ARCH_6J__) \
|
| - || defined(__ARM_ARCH_6K__) \
|
| - || defined(__ARM_ARCH_6Z__) \
|
| - || defined(__ARM_ARCH_6ZK__) \
|
| - || defined(__ARM_ARCH_6T2__) \
|
| - || defined(__ARMV6__)
|
| +#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
|
| + defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
|
| + defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) || \
|
| + defined(__ARMV6__)
|
| #define WTF_ARM_ARCH_VERSION 6
|
|
|
| -#elif defined(__ARM_ARCH_7A__) \
|
| - || defined(__ARM_ARCH_7R__) \
|
| - || defined(__ARM_ARCH_7S__)
|
| +#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || \
|
| + defined(__ARM_ARCH_7S__)
|
| #define WTF_ARM_ARCH_VERSION 7
|
|
|
| /* MSVC sets _M_ARM */
|
| @@ -115,44 +100,37 @@
|
| #endif
|
|
|
| /* Set WTF_THUMB_ARCH_VERSION */
|
| -#if defined(__ARM_ARCH_4T__)
|
| +#if defined(__ARM_ARCH_4T__)
|
| #define WTF_THUMB_ARCH_VERSION 1
|
|
|
| -#elif defined(__ARM_ARCH_5T__) \
|
| - || defined(__ARM_ARCH_5TE__) \
|
| - || defined(__ARM_ARCH_5TEJ__)
|
| +#elif defined(__ARM_ARCH_5T__) || defined(__ARM_ARCH_5TE__) || \
|
| + defined(__ARM_ARCH_5TEJ__)
|
| #define WTF_THUMB_ARCH_VERSION 2
|
|
|
| -#elif defined(__ARM_ARCH_6J__) \
|
| - || defined(__ARM_ARCH_6K__) \
|
| - || defined(__ARM_ARCH_6Z__) \
|
| - || defined(__ARM_ARCH_6ZK__) \
|
| - || defined(__ARM_ARCH_6M__)
|
| +#elif defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || \
|
| + defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \
|
| + defined(__ARM_ARCH_6M__)
|
| #define WTF_THUMB_ARCH_VERSION 3
|
|
|
| -#elif defined(__ARM_ARCH_6T2__) \
|
| - || defined(__ARM_ARCH_7__) \
|
| - || defined(__ARM_ARCH_7A__) \
|
| - || defined(__ARM_ARCH_7M__) \
|
| - || defined(__ARM_ARCH_7R__) \
|
| - || defined(__ARM_ARCH_7S__)
|
| +#elif defined(__ARM_ARCH_6T2__) || defined(__ARM_ARCH_7__) || \
|
| + defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7M__) || \
|
| + defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7S__)
|
| #define WTF_THUMB_ARCH_VERSION 4
|
|
|
| #else
|
| #define WTF_THUMB_ARCH_VERSION 0
|
| #endif
|
|
|
| -
|
| /* CPU(ARM_THUMB2) - Thumb2 instruction set is available */
|
| #if !defined(WTF_CPU_ARM_THUMB2)
|
| -# if defined(thumb2) || defined(__thumb2__) \
|
| - || ((defined(__thumb) || defined(__thumb__)) && WTF_THUMB_ARCH_VERSION == 4)
|
| -# define WTF_CPU_ARM_THUMB2 1
|
| -# elif WTF_ARM_ARCH_AT_LEAST(4)
|
| -# define WTF_CPU_ARM_THUMB2 0
|
| -# else
|
| -# error "Unsupported ARM architecture"
|
| -# endif
|
| +#if defined(thumb2) || defined(__thumb2__) || \
|
| + ((defined(__thumb) || defined(__thumb__)) && WTF_THUMB_ARCH_VERSION == 4)
|
| +#define WTF_CPU_ARM_THUMB2 1
|
| +#elif WTF_ARM_ARCH_AT_LEAST(4)
|
| +#define WTF_CPU_ARM_THUMB2 0
|
| +#else
|
| +#error "Unsupported ARM architecture"
|
| +#endif
|
| #endif /* !defined(WTF_CPU_ARM_THUMB2) */
|
|
|
| #if defined(__ARM_NEON__) && !defined(WTF_CPU_ARM_NEON)
|
|
|