Index: src/globals.h |
diff --git a/src/globals.h b/src/globals.h |
index c7f359874b4f857b11296dd8779d2deaf87d6aeb..438484d9200c476b6f75dcb6156e541bfe406537 100644 |
--- a/src/globals.h |
+++ b/src/globals.h |
@@ -109,9 +109,8 @@ namespace internal { |
// Target architecture detection. This may be set externally. If not, detect |
// in the same way as the host architecture, that is, target the native |
// environment as presented by the compiler. |
-#if !defined(V8_TARGET_ARCH_X64) && !defined(V8_TARGET_ARCH_IA32) && \ |
- !defined(V8_TARGET_ARCH_A64) && !defined(V8_TARGET_ARCH_ARM) && \ |
- !defined(V8_TARGET_ARCH_MIPS) |
+#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \ |
+ !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_A64 && !V8_TARGET_ARCH_MIPS |
#if defined(_M_X64) || defined(__x86_64__) |
#define V8_TARGET_ARCH_X64 1 |
#elif defined(_M_IX86) || defined(__i386__) |
@@ -128,22 +127,19 @@ namespace internal { |
#endif |
// Check for supported combinations of host and target architectures. |
-#if defined(V8_TARGET_ARCH_IA32) && !defined(V8_HOST_ARCH_IA32) |
+#if V8_TARGET_ARCH_IA32 && !V8_HOST_ARCH_IA32 |
#error Target architecture ia32 is only supported on ia32 host |
#endif |
-#if defined(V8_TARGET_ARCH_X64) && !defined(V8_HOST_ARCH_X64) |
+#if V8_TARGET_ARCH_X64 && !V8_HOST_ARCH_X64 |
#error Target architecture x64 is only supported on x64 host |
#endif |
-#if (defined(V8_TARGET_ARCH_ARM) && \ |
- !(defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_ARM))) |
+#if (V8_TARGET_ARCH_ARM && !(V8_HOST_ARCH_IA32 || V8_HOST_ARCH_ARM)) |
#error Target architecture arm is only supported on arm and ia32 host |
#endif |
-#if (defined(V8_TARGET_ARCH_A64) && \ |
- !(defined(V8_HOST_ARCH_X64) || defined(V8_HOST_ARCH_A64))) |
+#if (V8_TARGET_ARCH_A64 && !(V8_HOST_ARCH_X64 || V8_HOST_ARCH_A64)) |
#error Target architecture a64 is only supported on a64 and x64 host |
#endif |
-#if (defined(V8_TARGET_ARCH_MIPS) && \ |
- !(defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_MIPS))) |
+#if (V8_TARGET_ARCH_MIPS && !(V8_HOST_ARCH_IA32 || V8_HOST_ARCH_MIPS)) |
#error Target architecture mips is only supported on mips and ia32 host |
#endif |
@@ -151,27 +147,27 @@ namespace internal { |
// Setting USE_SIMULATOR explicitly from the build script will force |
// the use of a simulated environment. |
#if !defined(USE_SIMULATOR) |
-#if (defined(V8_TARGET_ARCH_A64) && !defined(V8_HOST_ARCH_A64)) |
+#if (V8_TARGET_ARCH_A64 && !V8_HOST_ARCH_A64) |
#define USE_SIMULATOR 1 |
#endif |
-#if (defined(V8_TARGET_ARCH_ARM) && !defined(V8_HOST_ARCH_ARM)) |
+#if (V8_TARGET_ARCH_ARM && !V8_HOST_ARCH_ARM) |
#define USE_SIMULATOR 1 |
#endif |
-#if (defined(V8_TARGET_ARCH_MIPS) && !defined(V8_HOST_ARCH_MIPS)) |
+#if (V8_TARGET_ARCH_MIPS && !V8_HOST_ARCH_MIPS) |
#define USE_SIMULATOR 1 |
#endif |
#endif |
// Determine architecture endiannes (we only support little-endian). |
-#if defined(V8_TARGET_ARCH_IA32) |
+#if V8_TARGET_ARCH_IA32 |
#define V8_TARGET_LITTLE_ENDIAN 1 |
-#elif defined(V8_TARGET_ARCH_X64) |
+#elif V8_TARGET_ARCH_X64 |
#define V8_TARGET_LITTLE_ENDIAN 1 |
-#elif defined(V8_TARGET_ARCH_ARM) |
+#elif V8_TARGET_ARCH_ARM |
#define V8_TARGET_LITTLE_ENDIAN 1 |
-#elif defined(V8_TARGET_ARCH_A64) |
+#elif V8_TARGET_ARCH_A64 |
#define V8_TARGET_LITTLE_ENDIAN 1 |
-#elif defined(V8_TARGET_ARCH_MIPS) |
+#elif V8_TARGET_ARCH_MIPS |
#define V8_TARGET_LITTLE_ENDIAN 1 |
#else |
#error Unknown target architecture endiannes |