Revision: 15391
Author:   [email protected]
Date:     Fri Jun 28 08:34:48 2013
Log: Clean up the usage of V8_TARGET_ARCH_${arch} and V8_HOST_ARCH_${arch}

[email protected]

Review URL: https://codereview.chromium.org/18037002

Patch from Haitao Feng <[email protected]>.
http://code.google.com/p/v8/source/detail?r=15391

Modified:
 /branches/bleeding_edge/src/arm/assembler-arm.cc
 /branches/bleeding_edge/src/arm/builtins-arm.cc
 /branches/bleeding_edge/src/arm/code-stubs-arm.cc
 /branches/bleeding_edge/src/arm/codegen-arm.cc
 /branches/bleeding_edge/src/arm/constants-arm.cc
 /branches/bleeding_edge/src/arm/cpu-arm.cc
 /branches/bleeding_edge/src/arm/debug-arm.cc
 /branches/bleeding_edge/src/arm/disasm-arm.cc
 /branches/bleeding_edge/src/arm/frames-arm.cc
 /branches/bleeding_edge/src/arm/full-codegen-arm.cc
 /branches/bleeding_edge/src/arm/ic-arm.cc
 /branches/bleeding_edge/src/arm/macro-assembler-arm.cc
 /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc
 /branches/bleeding_edge/src/arm/simulator-arm.cc
 /branches/bleeding_edge/src/arm/stub-cache-arm.cc
 /branches/bleeding_edge/src/assembler.cc
 /branches/bleeding_edge/src/atomicops.h
 /branches/bleeding_edge/src/code-stubs.h
 /branches/bleeding_edge/src/execution.h
 /branches/bleeding_edge/src/flags.cc
 /branches/bleeding_edge/src/frames.cc
 /branches/bleeding_edge/src/full-codegen.h
 /branches/bleeding_edge/src/gdb-jit.cc
 /branches/bleeding_edge/src/globals.h
 /branches/bleeding_edge/src/heap.cc
 /branches/bleeding_edge/src/heap.h
 /branches/bleeding_edge/src/hydrogen-instructions.cc
 /branches/bleeding_edge/src/hydrogen.cc
 /branches/bleeding_edge/src/ia32/assembler-ia32.cc
 /branches/bleeding_edge/src/ia32/builtins-ia32.cc
 /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc
 /branches/bleeding_edge/src/ia32/codegen-ia32.cc
 /branches/bleeding_edge/src/ia32/cpu-ia32.cc
 /branches/bleeding_edge/src/ia32/debug-ia32.cc
 /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc
 /branches/bleeding_edge/src/ia32/disasm-ia32.cc
 /branches/bleeding_edge/src/ia32/frames-ia32.cc
 /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc
 /branches/bleeding_edge/src/ia32/ic-ia32.cc
 /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc
 /branches/bleeding_edge/src/ia32/lithium-gap-resolver-ia32.cc
 /branches/bleeding_edge/src/ia32/lithium-ia32.cc
 /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc
 /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc
 /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc
 /branches/bleeding_edge/src/isolate.cc
 /branches/bleeding_edge/src/isolate.h
 /branches/bleeding_edge/src/mips/assembler-mips.cc
 /branches/bleeding_edge/src/mips/builtins-mips.cc
 /branches/bleeding_edge/src/mips/code-stubs-mips.cc
 /branches/bleeding_edge/src/mips/codegen-mips.cc
 /branches/bleeding_edge/src/mips/constants-mips.cc
 /branches/bleeding_edge/src/mips/cpu-mips.cc
 /branches/bleeding_edge/src/mips/debug-mips.cc
 /branches/bleeding_edge/src/mips/disasm-mips.cc
 /branches/bleeding_edge/src/mips/frames-mips.cc
 /branches/bleeding_edge/src/mips/full-codegen-mips.cc
 /branches/bleeding_edge/src/mips/ic-mips.cc
 /branches/bleeding_edge/src/mips/macro-assembler-mips.cc
 /branches/bleeding_edge/src/mips/regexp-macro-assembler-mips.cc
 /branches/bleeding_edge/src/mips/simulator-mips.cc
 /branches/bleeding_edge/src/mips/stub-cache-mips.cc
 /branches/bleeding_edge/src/platform-linux.cc
 /branches/bleeding_edge/src/platform-macos.cc
 /branches/bleeding_edge/src/platform-openbsd.cc
 /branches/bleeding_edge/src/platform-posix.cc
 /branches/bleeding_edge/src/platform-tls-mac.h
 /branches/bleeding_edge/src/platform-win32.cc
 /branches/bleeding_edge/src/strtod.cc
 /branches/bleeding_edge/src/v8utils.h
 /branches/bleeding_edge/src/x64/assembler-x64.cc
 /branches/bleeding_edge/src/x64/builtins-x64.cc
 /branches/bleeding_edge/src/x64/code-stubs-x64.cc
 /branches/bleeding_edge/src/x64/codegen-x64.cc
 /branches/bleeding_edge/src/x64/cpu-x64.cc
 /branches/bleeding_edge/src/x64/debug-x64.cc
 /branches/bleeding_edge/src/x64/deoptimizer-x64.cc
 /branches/bleeding_edge/src/x64/disasm-x64.cc
 /branches/bleeding_edge/src/x64/frames-x64.cc
 /branches/bleeding_edge/src/x64/full-codegen-x64.cc
 /branches/bleeding_edge/src/x64/ic-x64.cc
 /branches/bleeding_edge/src/x64/lithium-codegen-x64.cc
 /branches/bleeding_edge/src/x64/lithium-gap-resolver-x64.cc
 /branches/bleeding_edge/src/x64/lithium-x64.cc
 /branches/bleeding_edge/src/x64/macro-assembler-x64.cc
 /branches/bleeding_edge/src/x64/regexp-macro-assembler-x64.cc
 /branches/bleeding_edge/src/x64/stub-cache-x64.cc
 /branches/bleeding_edge/test/cctest/test-hashing.cc
 /branches/bleeding_edge/test/cctest/test-lockers.cc
 /branches/bleeding_edge/test/cctest/test-macro-assembler-x64.cc
 /branches/bleeding_edge/test/cctest/test-regexp.cc

=======================================
--- /branches/bleeding_edge/src/arm/assembler-arm.cc Tue Jun 11 03:47:44 2013 +++ /branches/bleeding_edge/src/arm/assembler-arm.cc Fri Jun 28 08:34:48 2013
@@ -36,7 +36,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "arm/assembler-arm-inl.h"
 #include "serialize.h"
=======================================
--- /branches/bleeding_edge/src/arm/builtins-arm.cc     Fri Jun 28 06:40:41 2013
+++ /branches/bleeding_edge/src/arm/builtins-arm.cc     Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "codegen.h"
 #include "debug.h"
=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Fri Jun 28 06:40:41 2013 +++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "bootstrapper.h"
 #include "code-stubs.h"
@@ -3077,7 +3077,7 @@
   __ mov(r0, Operand(r4));
   __ mov(r1, Operand(r6));

-#if defined(V8_HOST_ARCH_ARM)
+#if V8_HOST_ARCH_ARM
   int frame_alignment = MacroAssembler::ActivationFrameAlignment();
   int frame_alignment_mask = frame_alignment - 1;
   if (FLAG_debug_code) {
@@ -7125,7 +7125,7 @@
     __ and_(sp, sp, Operand(-frame_alignment));
   }

-#if defined(V8_HOST_ARCH_ARM)
+#if V8_HOST_ARCH_ARM
   int32_t entry_hook =
       reinterpret_cast<int32_t>(masm->isolate()->function_entry_hook());
   __ mov(ip, Operand(entry_hook));
=======================================
--- /branches/bleeding_edge/src/arm/codegen-arm.cc      Thu May 23 02:51:06 2013
+++ /branches/bleeding_edge/src/arm/codegen-arm.cc      Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "codegen.h"
 #include "macro-assembler.h"
=======================================
--- /branches/bleeding_edge/src/arm/constants-arm.cc Tue Apr 16 05:30:51 2013 +++ /branches/bleeding_edge/src/arm/constants-arm.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "constants-arm.h"

=======================================
--- /branches/bleeding_edge/src/arm/cpu-arm.cc  Thu Apr 18 03:32:18 2013
+++ /branches/bleeding_edge/src/arm/cpu-arm.cc  Fri Jun 28 08:34:48 2013
@@ -32,7 +32,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "cpu.h"
 #include "macro-assembler.h"
=======================================
--- /branches/bleeding_edge/src/arm/debug-arm.cc        Fri May 17 08:38:14 2013
+++ /branches/bleeding_edge/src/arm/debug-arm.cc        Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "codegen.h"
 #include "debug.h"
=======================================
--- /branches/bleeding_edge/src/arm/disasm-arm.cc       Fri May 17 08:38:14 2013
+++ /branches/bleeding_edge/src/arm/disasm-arm.cc       Fri Jun 28 08:34:48 2013
@@ -56,7 +56,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "constants-arm.h"
 #include "disasm.h"
=======================================
--- /branches/bleeding_edge/src/arm/frames-arm.cc       Mon Jun 24 06:27:48 2013
+++ /branches/bleeding_edge/src/arm/frames-arm.cc       Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "assembler.h"
 #include "assembler-arm.h"
=======================================
--- /branches/bleeding_edge/src/arm/full-codegen-arm.cc Mon Jun 24 07:26:32 2013 +++ /branches/bleeding_edge/src/arm/full-codegen-arm.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "code-stubs.h"
 #include "codegen.h"
=======================================
--- /branches/bleeding_edge/src/arm/ic-arm.cc   Thu Jun 27 06:39:44 2013
+++ /branches/bleeding_edge/src/arm/ic-arm.cc   Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "assembler-arm.h"
 #include "code-stubs.h"
=======================================
--- /branches/bleeding_edge/src/arm/macro-assembler-arm.cc Thu Jun 27 06:39:44 2013 +++ /branches/bleeding_edge/src/arm/macro-assembler-arm.cc Fri Jun 28 08:34:48 2013
@@ -29,7 +29,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "bootstrapper.h"
 #include "codegen.h"
@@ -985,19 +985,19 @@


 int MacroAssembler::ActivationFrameAlignment() {
-#if defined(V8_HOST_ARCH_ARM)
+#if V8_HOST_ARCH_ARM
// Running on the real platform. Use the alignment as mandated by the local
   // environment.
   // Note: This will break if we ever start generating snapshots on one ARM
   // platform for another ARM platform with a different alignment.
   return OS::ActivationFrameAlignment();
-#else  // defined(V8_HOST_ARCH_ARM)
+#else  // V8_HOST_ARCH_ARM
// If we are using the simulator then we should always align to the expected // alignment. As the simulator is used to generate snapshots we do not know // if the target platform will need alignment, so this is controlled from a
   // flag.
   return FLAG_sim_stack_alignment;
-#endif  // defined(V8_HOST_ARCH_ARM)
+#endif  // V8_HOST_ARCH_ARM
 }


@@ -3403,7 +3403,7 @@
   // Make sure that the stack is aligned before calling a C function unless
// running in the simulator. The simulator has its own alignment check which
   // provides more information.
-#if defined(V8_HOST_ARCH_ARM)
+#if V8_HOST_ARCH_ARM
   if (emit_debug_code()) {
     int frame_alignment = OS::ActivationFrameAlignment();
     int frame_alignment_mask = frame_alignment - 1;
=======================================
--- /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc Fri Jun 7 01:38:05 2013 +++ /branches/bleeding_edge/src/arm/regexp-macro-assembler-arm.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "unicode.h"
 #include "log.h"
=======================================
--- /branches/bleeding_edge/src/arm/simulator-arm.cc Thu Jun 13 12:16:35 2013 +++ /branches/bleeding_edge/src/arm/simulator-arm.cc Fri Jun 28 08:34:48 2013
@@ -30,7 +30,7 @@
 #include <cstdarg>
 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "disasm.h"
 #include "assembler.h"
=======================================
--- /branches/bleeding_edge/src/arm/stub-cache-arm.cc Wed Jun 19 02:25:24 2013 +++ /branches/bleeding_edge/src/arm/stub-cache-arm.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_ARM

 #include "ic-inl.h"
 #include "codegen.h"
=======================================
--- /branches/bleeding_edge/src/assembler.cc    Wed Jun 12 08:03:44 2013
+++ /branches/bleeding_edge/src/assembler.cc    Fri Jun 28 08:34:48 2013
@@ -1308,7 +1308,7 @@
 ExternalReference ExternalReference::re_check_stack_guard_state(
     Isolate* isolate) {
   Address function;
-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   function = FUNCTION_ADDR(RegExpMacroAssemblerX64::CheckStackGuardState);
 #elif V8_TARGET_ARCH_IA32
   function = FUNCTION_ADDR(RegExpMacroAssemblerIA32::CheckStackGuardState);
=======================================
--- /branches/bleeding_edge/src/atomicops.h     Tue Mar  5 05:54:03 2013
+++ /branches/bleeding_edge/src/atomicops.h     Fri Jun 28 08:34:48 2013
@@ -154,17 +154,17 @@
 #if defined(THREAD_SANITIZER)
 #include "atomicops_internals_tsan.h"
 #elif defined(_MSC_VER) && \
-  (defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_X64))
+  (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64)
 #include "atomicops_internals_x86_msvc.h"
 #elif defined(__APPLE__) && \
-  (defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_X64))
+  (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64)
 #include "atomicops_internals_x86_macosx.h"
 #elif defined(__GNUC__) && \
-  (defined(V8_HOST_ARCH_IA32) || defined(V8_HOST_ARCH_X64))
+  (V8_HOST_ARCH_IA32 || V8_HOST_ARCH_X64)
 #include "atomicops_internals_x86_gcc.h"
-#elif defined(__GNUC__) && defined(V8_HOST_ARCH_ARM)
+#elif defined(__GNUC__) && V8_HOST_ARCH_ARM
 #include "atomicops_internals_arm_gcc.h"
-#elif defined(__GNUC__) && defined(V8_HOST_ARCH_MIPS)
+#elif defined(__GNUC__) && V8_HOST_ARCH_MIPS
 #include "atomicops_internals_mips_gcc.h"
 #else
 #error "Atomic operations are not supported on your platform"
=======================================
--- /branches/bleeding_edge/src/code-stubs.h    Fri Jun 28 06:40:41 2013
+++ /branches/bleeding_edge/src/code-stubs.h    Fri Jun 28 08:34:48 2013
@@ -95,7 +95,7 @@
   V(KeyedLoadField)

 // List of code stubs only used on ARM platforms.
-#ifdef V8_TARGET_ARCH_ARM
+#if V8_TARGET_ARCH_ARM
 #define CODE_STUB_LIST_ARM(V)  \
   V(GetProperty)               \
   V(SetProperty)               \
@@ -107,7 +107,7 @@
 #endif

 // List of code stubs only used on MIPS platforms.
-#ifdef V8_TARGET_ARCH_MIPS
+#if V8_TARGET_ARCH_MIPS
 #define CODE_STUB_LIST_MIPS(V)  \
   V(RegExpCEntry)               \
   V(DirectCEntry)
=======================================
--- /branches/bleeding_edge/src/execution.h     Mon Apr 22 08:01:45 2013
+++ /branches/bleeding_edge/src/execution.h     Fri Jun 28 08:34:48 2013
@@ -253,7 +253,7 @@
   void EnableInterrupts();
   void DisableInterrupts();

-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   static const uintptr_t kInterruptLimit = V8_UINT64_C(0xfffffffffffffffe);
   static const uintptr_t kIllegalLimit = V8_UINT64_C(0xfffffffffffffff8);
 #else
=======================================
--- /branches/bleeding_edge/src/flags.cc        Tue Apr 16 07:39:48 2013
+++ /branches/bleeding_edge/src/flags.cc        Fri Jun 28 08:34:48 2013
@@ -34,7 +34,7 @@
 #include "smart-pointers.h"
 #include "string-stream.h"

-#ifdef V8_TARGET_ARCH_ARM
+#if V8_TARGET_ARCH_ARM
 #include "arm/assembler-arm-inl.h"
 #endif

@@ -520,7 +520,7 @@

 // static
 void FlagList::PrintHelp() {
-#ifdef V8_TARGET_ARCH_ARM
+#if V8_TARGET_ARCH_ARM
   CpuFeatures::PrintTarget();
   CpuFeatures::Probe();
   CpuFeatures::PrintFeatures();
=======================================
--- /branches/bleeding_edge/src/frames.cc       Fri Jun 28 06:40:41 2013
+++ /branches/bleeding_edge/src/frames.cc       Fri Jun 28 08:34:48 2013
@@ -423,7 +423,7 @@


 Address StackFrame::UnpaddedFP() const {
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
   if (!is_optimized()) return fp();
   int32_t alignment_state = Memory::int32_at(
     fp() + JavaScriptFrameConstants::kDynamicAlignmentStateOffset);
=======================================
--- /branches/bleeding_edge/src/full-codegen.h  Fri Jun 14 04:35:00 2013
+++ /branches/bleeding_edge/src/full-codegen.h  Fri Jun 28 08:34:48 2013
@@ -332,7 +332,7 @@

   // Helper function to split control flow and avoid a branch to the
   // fall-through label if it is set up.
-#ifdef V8_TARGET_ARCH_MIPS
+#if V8_TARGET_ARCH_MIPS
   void Split(Condition cc,
              Register lhs,
              const Operand&  rhs,
=======================================
--- /branches/bleeding_edge/src/gdb-jit.cc      Thu Jun 27 04:38:37 2013
+++ /branches/bleeding_edge/src/gdb-jit.cc      Fri Jun 28 08:34:48 2013
@@ -217,7 +217,7 @@
 struct MachOSectionHeader {
   char sectname[16];
   char segname[16];
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
   uint32_t addr;
   uint32_t size;
 #else
@@ -525,7 +525,7 @@
     uint32_t ncmds;
     uint32_t sizeofcmds;
     uint32_t flags;
-#if defined(V8_TARGET_ARCH_X64)
+#if V8_TARGET_ARCH_X64
     uint32_t reserved;
 #endif
   };
@@ -534,7 +534,7 @@
     uint32_t cmd;
     uint32_t cmdsize;
     char segname[16];
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
     uint32_t vmaddr;
     uint32_t vmsize;
     uint32_t fileoff;
@@ -560,11 +560,11 @@
   Writer::Slot<MachOHeader> WriteHeader(Writer* w) {
     ASSERT(w->position() == 0);
     Writer::Slot<MachOHeader> header = w->CreateSlotHere<MachOHeader>();
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
     header->magic = 0xFEEDFACEu;
     header->cputype = 7;  // i386
     header->cpusubtype = 3;  // CPU_SUBTYPE_I386_ALL
-#elif defined(V8_TARGET_ARCH_X64)
+#elif V8_TARGET_ARCH_X64
     header->magic = 0xFEEDFACFu;
     header->cputype = 7 | 0x01000000;  // i386 | 64-bit ABI
     header->cpusubtype = 3;  // CPU_SUBTYPE_I386_ALL
@@ -585,7 +585,7 @@
uintptr_t code_size) {
     Writer::Slot<MachOSegmentCommand> cmd =
         w->CreateSlotHere<MachOSegmentCommand>();
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
     cmd->cmd = LC_SEGMENT_32;
 #else
     cmd->cmd = LC_SEGMENT_64;
@@ -672,10 +672,10 @@
   void WriteHeader(Writer* w) {
     ASSERT(w->position() == 0);
     Writer::Slot<ELFHeader> header = w->CreateSlotHere<ELFHeader>();
-#if defined(V8_TARGET_ARCH_IA32) || defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM
     const uint8_t ident[16] =
         { 0x7f, 'E', 'L', 'F', 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-#elif defined(V8_TARGET_ARCH_X64)
+#elif V8_TARGET_ARCH_X64
     const uint8_t ident[16] =
         { 0x7f, 'E', 'L', 'F', 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 #else
@@ -683,14 +683,14 @@
 #endif
     OS::MemCopy(header->ident, ident, 16);
     header->type = 1;
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
     header->machine = 3;
-#elif defined(V8_TARGET_ARCH_X64)
+#elif V8_TARGET_ARCH_X64
     // Processor identification value for x64 is 62 as defined in
     //    System V ABI, AMD64 Supplement
     //    http://www.x86-64.org/documentation/abi.pdf
     header->machine = 62;
-#elif defined(V8_TARGET_ARCH_ARM)
+#elif V8_TARGET_ARCH_ARM
     // Set to EM_ARM, defined as 40, in "ARM ELF File Format" at
     // infocenter.arm.com/help/topic/com.arm.doc.dui0101a/DUI0101A_Elf.pdf
     header->machine = 40;
@@ -784,7 +784,7 @@
   Binding binding() const {
     return static_cast<Binding>(info >> 4);
   }
-#if defined(V8_TARGET_ARCH_IA32) || defined(V8_TARGET_ARCH_ARM)
+#if V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_ARM
   struct SerializedLayout {
     SerializedLayout(uint32_t name,
                      uintptr_t value,
@@ -807,7 +807,7 @@
     uint8_t other;
     uint16_t section;
   };
-#elif defined(V8_TARGET_ARCH_X64)
+#elif V8_TARGET_ARCH_X64
   struct SerializedLayout {
     SerializedLayout(uint32_t name,
                      uintptr_t value,
@@ -921,7 +921,7 @@

 class CodeDescription BASE_EMBEDDED {
  public:
-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   enum StackState {
     POST_RBP_PUSH,
     POST_RBP_SET,
@@ -984,7 +984,7 @@
         lineinfo_ != NULL;
   }

-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   uintptr_t GetStackStateStartAddress(StackState state) const {
     ASSERT(state < STACK_STATE_MAX);
     return stack_state_start_addresses_[state];
@@ -1012,7 +1012,7 @@
   GDBJITLineInfo* lineinfo_;
   GDBJITInterface::CodeTag tag_;
   CompilationInfo* info_;
-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   uintptr_t stack_state_start_addresses_[STACK_STATE_MAX];
 #endif
 };
@@ -1106,13 +1106,13 @@
       w->Write<intptr_t>(desc_->CodeStart() + desc_->CodeSize());
       Writer::Slot<uint32_t> fb_block_size = w->CreateSlotHere<uint32_t>();
       uintptr_t fb_block_start = w->position();
-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32
       w->Write<uint8_t>(DW_OP_reg5);  // The frame pointer's here on ia32
-#elif defined(V8_TARGET_ARCH_X64)
+#elif V8_TARGET_ARCH_X64
       w->Write<uint8_t>(DW_OP_reg6);  // and here on x64.
-#elif defined(V8_TARGET_ARCH_ARM)
+#elif V8_TARGET_ARCH_ARM
       UNIMPLEMENTED();
-#elif defined(V8_TARGET_ARCH_MIPS)
+#elif V8_TARGET_ARCH_MIPS
       UNIMPLEMENTED();
 #else
 #error Unsupported target architecture.
@@ -1563,7 +1563,7 @@
 };


-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64

 class UnwindInfoSection : public DebugSection {
  public:
@@ -1797,7 +1797,7 @@
     obj->AddSection(new(zone) DebugAbbrevSection(desc), zone);
     obj->AddSection(new(zone) DebugLineSection(desc), zone);
   }
-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   obj->AddSection(new(zone) UnwindInfoSection(desc), zone);
 #endif
 }
@@ -2015,7 +2015,7 @@
 }

 static void AddUnwindInfo(CodeDescription* desc) {
-#ifdef V8_TARGET_ARCH_X64
+#if V8_TARGET_ARCH_X64
   if (desc->tag() == GDBJITInterface::FUNCTION) {
     // To avoid propagating unwinding information through
     // compilation pipeline we use an approximation.
=======================================
--- /branches/bleeding_edge/src/globals.h       Fri Jun 21 06:02:38 2013
+++ /branches/bleeding_edge/src/globals.h       Fri Jun 28 08:34:48 2013
@@ -105,8 +105,8 @@
// 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_ARM) && !defined(V8_TARGET_ARCH_MIPS)
+#if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \
+    !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS
 #if defined(_M_X64) || defined(__x86_64__)
 #define V8_TARGET_ARCH_X64 1
 #elif defined(_M_IX86) || defined(__i386__)
@@ -121,18 +121,16 @@
 #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_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

@@ -140,22 +138,22 @@
 // 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_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_MIPS)
+#elif V8_TARGET_ARCH_MIPS
 #define V8_TARGET_LITTLE_ENDIAN 1
 #else
 #error Unknown target architecture endiannes
=======================================
--- /branches/bleeding_edge/src/heap.cc Wed Jun 26 09:17:12 2013
+++ /branches/bleeding_edge/src/heap.cc Fri Jun 28 08:34:48 2013
@@ -66,7 +66,7 @@
     : isolate_(NULL),
// semispace_size_ should be a power of 2 and old_generation_size_ should be
 // a multiple of Page::kPageSize.
-#if defined(V8_TARGET_ARCH_X64)
+#if V8_TARGET_ARCH_X64
 #define LUMP_OF_MEMORY (2 * MB)
       code_range_size_(512*MB),
 #else
=======================================
--- /branches/bleeding_edge/src/heap.h  Tue Jun 25 07:57:47 2013
+++ /branches/bleeding_edge/src/heap.h  Fri Jun 28 08:34:48 2013
@@ -1955,7 +1955,7 @@

   int scan_on_scavenge_pages_;

-#if defined(V8_TARGET_ARCH_X64)
+#if V8_TARGET_ARCH_X64
   static const int kMaxObjectSizeInNewSpace = 1024*KB;
 #else
   static const int kMaxObjectSizeInNewSpace = 512*KB;
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.cc Fri Jun 28 06:16:14 2013 +++ /branches/bleeding_edge/src/hydrogen-instructions.cc Fri Jun 28 08:34:48 2013
@@ -1566,7 +1566,7 @@
       HValue* new_right =
           LChunkBuilder::SimplifiedDivisorForMathFloorOfDiv(right);
       if (new_right == NULL &&
-#ifdef V8_TARGET_ARCH_ARM
+#if V8_TARGET_ARCH_ARM
           CpuFeatures::IsSupported(SUDIV) &&
 #endif
           hdiv->observed_input_representation(2).IsSmiOrInteger32()) {
=======================================
--- /branches/bleeding_edge/src/hydrogen.cc     Fri Jun 28 06:16:14 2013
+++ /branches/bleeding_edge/src/hydrogen.cc     Fri Jun 28 08:34:48 2013
@@ -7632,7 +7632,7 @@
     return false;
   }

-#if !defined(V8_TARGET_ARCH_IA32)
+#if !V8_TARGET_ARCH_IA32
   // Target must be able to use caller's context.
   CompilationInfo* outer_info = current_info();
   if (target->context() != outer_info->closure()->context() ||
@@ -7781,7 +7781,7 @@
                                      undefined,
                                      function_state()->inlining_kind(),
                                      undefined_receiver);
-#ifdef V8_TARGET_ARCH_IA32
+#if V8_TARGET_ARCH_IA32
   // IA32 only, overwrite the caller's context in the deoptimization
   // environment with the correct one.
   //
=======================================
--- /branches/bleeding_edge/src/ia32/assembler-ia32.cc Tue Jun 11 03:47:44 2013 +++ /branches/bleeding_edge/src/ia32/assembler-ia32.cc Fri Jun 28 08:34:48 2013
@@ -36,7 +36,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "disassembler.h"
 #include "macro-assembler.h"
=======================================
--- /branches/bleeding_edge/src/ia32/builtins-ia32.cc Fri Jun 28 06:40:41 2013 +++ /branches/bleeding_edge/src/ia32/builtins-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "codegen.h"
 #include "deoptimizer.h"
=======================================
--- /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Fri Jun 28 06:40:41 2013 +++ /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "bootstrapper.h"
 #include "code-stubs.h"
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Thu May 23 02:51:06 2013 +++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "codegen.h"
 #include "heap.h"
=======================================
--- /branches/bleeding_edge/src/ia32/cpu-ia32.cc        Tue Apr  9 08:11:45 2013
+++ /branches/bleeding_edge/src/ia32/cpu-ia32.cc        Fri Jun 28 08:34:48 2013
@@ -33,7 +33,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "cpu.h"
 #include "macro-assembler.h"
=======================================
--- /branches/bleeding_edge/src/ia32/debug-ia32.cc      Tue Apr 30 00:56:09 2013
+++ /branches/bleeding_edge/src/ia32/debug-ia32.cc      Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "codegen.h"
 #include "debug.h"
=======================================
--- /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Mon Jun 3 08:32:22 2013 +++ /branches/bleeding_edge/src/ia32/deoptimizer-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "codegen.h"
 #include "deoptimizer.h"
=======================================
--- /branches/bleeding_edge/src/ia32/disasm-ia32.cc     Fri Dec 21 05:47:08 2012
+++ /branches/bleeding_edge/src/ia32/disasm-ia32.cc     Fri Jun 28 08:34:48 2013
@@ -31,7 +31,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "disasm.h"

=======================================
--- /branches/bleeding_edge/src/ia32/frames-ia32.cc     Mon Jun 24 06:27:48 2013
+++ /branches/bleeding_edge/src/ia32/frames-ia32.cc     Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "assembler.h"
 #include "assembler-ia32.h"
=======================================
--- /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Mon Jun 24 07:26:32 2013 +++ /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "code-stubs.h"
 #include "codegen.h"
=======================================
--- /branches/bleeding_edge/src/ia32/ic-ia32.cc Thu Jun 27 06:39:44 2013
+++ /branches/bleeding_edge/src/ia32/ic-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "codegen.h"
 #include "ic-inl.h"
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Fri Jun 28 06:16:14 2013 +++ /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "ia32/lithium-codegen-ia32.h"
 #include "ic.h"
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-gap-resolver-ia32.cc Tue May 28 05:37:29 2013 +++ /branches/bleeding_edge/src/ia32/lithium-gap-resolver-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "ia32/lithium-gap-resolver-ia32.h"
 #include "ia32/lithium-codegen-ia32.h"
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-ia32.cc Fri Jun 28 06:16:14 2013 +++ /branches/bleeding_edge/src/ia32/lithium-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "lithium-allocator-inl.h"
 #include "ia32/lithium-ia32.h"
=======================================
--- /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc Thu Jun 27 06:39:44 2013 +++ /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "bootstrapper.h"
 #include "codegen.h"
=======================================
--- /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc Fri Jun 7 01:38:05 2013 +++ /branches/bleeding_edge/src/ia32/regexp-macro-assembler-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "unicode.h"
 #include "log.h"
=======================================
--- /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Wed Jun 19 02:25:24 2013 +++ /branches/bleeding_edge/src/ia32/stub-cache-ia32.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_IA32)
+#if V8_TARGET_ARCH_IA32

 #include "ic-inl.h"
 #include "codegen.h"
=======================================
--- /branches/bleeding_edge/src/isolate.cc      Fri Jun 28 06:40:41 2013
+++ /branches/bleeding_edge/src/isolate.cc      Fri Jun 28 08:34:48 2013
@@ -116,7 +116,7 @@
 void ThreadLocalTop::Initialize() {
   InitializeInternal();
 #ifdef USE_SIMULATOR
-#ifdef V8_TARGET_ARCH_ARM
+#if V8_TARGET_ARCH_ARM
   simulator_ = Simulator::current(isolate_);
 #elif V8_TARGET_ARCH_MIPS
   simulator_ = Simulator::current(isolate_);
@@ -1625,7 +1625,7 @@
   // This might be just paranoia, but it seems to be needed in case a
   // thread_local_top_ is restored on a separate OS thread.
 #ifdef USE_SIMULATOR
-#ifdef V8_TARGET_ARCH_ARM
+#if V8_TARGET_ARCH_ARM
   thread_local_top()->simulator_ = Simulator::current(this);
 #elif V8_TARGET_ARCH_MIPS
   thread_local_top()->simulator_ = Simulator::current(this);
@@ -1776,8 +1776,8 @@
   thread_manager_ = new ThreadManager();
   thread_manager_->isolate_ = this;

-#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
-    defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__)
+#if V8_TARGET_ARCH_ARM && !defined(__arm__) || \
+    V8_TARGET_ARCH_MIPS && !defined(__mips__)
   simulator_initialized_ = false;
   simulator_i_cache_ = NULL;
   simulator_redirection_ = NULL;
@@ -2134,7 +2134,7 @@

   // Initialize other runtime facilities
 #if defined(USE_SIMULATOR)
-#if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS)
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS
   Simulator::Initialize(this);
 #endif
 #endif
=======================================
--- /branches/bleeding_edge/src/isolate.h       Fri Jun 28 06:40:41 2013
+++ /branches/bleeding_edge/src/isolate.h       Fri Jun 28 08:34:48 2013
@@ -101,8 +101,8 @@
 class DebuggerAgent;
 #endif

-#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
-    !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
+#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \
+    !defined(__mips__) && V8_TARGET_ARCH_MIPS
 class Redirection;
 class Simulator;
 #endif
@@ -263,7 +263,7 @@
   Address handler_;   // try-blocks are chained through the stack

 #ifdef USE_SIMULATOR
-#if defined(V8_TARGET_ARCH_ARM) || defined(V8_TARGET_ARCH_MIPS)
+#if V8_TARGET_ARCH_ARM || V8_TARGET_ARCH_MIPS
   Simulator* simulator_;
 #endif
 #endif  // USE_SIMULATOR
@@ -391,8 +391,8 @@
           thread_id_(thread_id),
           stack_limit_(0),
           thread_state_(NULL),
-#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
-    !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
+#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \
+    !defined(__mips__) && V8_TARGET_ARCH_MIPS
           simulator_(NULL),
 #endif
           next_(NULL),
@@ -404,8 +404,8 @@
     ThreadState* thread_state() const { return thread_state_; }
     void set_thread_state(ThreadState* value) { thread_state_ = value; }

-#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
-    !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
+#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \
+    !defined(__mips__) && V8_TARGET_ARCH_MIPS
     Simulator* simulator() const { return simulator_; }
     void set_simulator(Simulator* simulator) {
       simulator_ = simulator;
@@ -422,8 +422,8 @@
     uintptr_t stack_limit_;
     ThreadState* thread_state_;

-#if !defined(__arm__) && defined(V8_TARGET_ARCH_ARM) || \
-    !defined(__mips__) && defined(V8_TARGET_ARCH_MIPS)
+#if !defined(__arm__) && V8_TARGET_ARCH_ARM || \
+    !defined(__mips__) && V8_TARGET_ARCH_MIPS
     Simulator* simulator_;
 #endif

@@ -994,8 +994,8 @@
   int* code_kind_statistics() { return code_kind_statistics_; }
 #endif

-#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
-    defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__)
+#if V8_TARGET_ARCH_ARM && !defined(__arm__) || \
+    V8_TARGET_ARCH_MIPS && !defined(__mips__)
   bool simulator_initialized() { return simulator_initialized_; }
   void set_simulator_initialized(bool initialized) {
     simulator_initialized_ = initialized;
@@ -1301,8 +1301,8 @@
   // Time stamp at initialization.
   double time_millis_at_init_;

-#if defined(V8_TARGET_ARCH_ARM) && !defined(__arm__) || \
-    defined(V8_TARGET_ARCH_MIPS) && !defined(__mips__)
+#if V8_TARGET_ARCH_ARM && !defined(__arm__) || \
+    V8_TARGET_ARCH_MIPS && !defined(__mips__)
   bool simulator_initialized_;
   HashMap* simulator_i_cache_;
   Redirection* simulator_redirection_;
=======================================
--- /branches/bleeding_edge/src/mips/assembler-mips.cc Mon Jun 10 09:31:55 2013 +++ /branches/bleeding_edge/src/mips/assembler-mips.cc Fri Jun 28 08:34:48 2013
@@ -35,7 +35,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_MIPS)
+#if V8_TARGET_ARCH_MIPS

 #include "mips/assembler-mips-inl.h"
 #include "serialize.h"
@@ -1475,7 +1475,7 @@
 void Assembler::stop(const char* msg, uint32_t code) {
   ASSERT(code > kMaxWatchpointCode);
   ASSERT(code <= kMaxStopCode);
-#if defined(V8_HOST_ARCH_MIPS)
+#if V8_HOST_ARCH_MIPS
   break_(0x54321);
 #else  // V8_HOST_ARCH_MIPS
   BlockTrampolinePoolFor(2);
=======================================
--- /branches/bleeding_edge/src/mips/builtins-mips.cc Tue Jun 25 09:31:07 2013 +++ /branches/bleeding_edge/src/mips/builtins-mips.cc Fri Jun 28 08:34:48 2013
@@ -29,7 +29,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_MIPS)
+#if V8_TARGET_ARCH_MIPS

 #include "codegen.h"
 #include "debug.h"
=======================================
--- /branches/bleeding_edge/src/mips/code-stubs-mips.cc Thu Jun 27 12:19:48 2013 +++ /branches/bleeding_edge/src/mips/code-stubs-mips.cc Fri Jun 28 08:34:48 2013
@@ -27,7 +27,7 @@

 #include "v8.h"

-#if defined(V8_TARGET_ARCH_MIPS)
+#if V8_TARGET_ARCH_MIPS

 #include "bootstrapper.h"
 #include "code-stubs.h"
@@ -7540,7 +7540,7 @@
     __ And(sp, sp, Operand(-frame_alignment));
   }

-#if defined(V8_HOST_ARCH_MIPS)
+#if V8_HOST_ARCH_MIPS
   __ li(at, Operand(reinterpret_cast<int32_t>(&entry_hook_)));
   __ lw(at, MemOperand(at));
 #else
=======================================
***Additional files exist in this changeset.***

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to