Fix Win64 build

R=titzer@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22772 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/compiler/x64/code-generator-x64.cc b/src/compiler/x64/code-generator-x64.cc
index dd97bb3..a398c2d 100644 (file)
--- a/src/compiler/x64/code-generator-x64.cc
+++ b/src/compiler/x64/code-generator-x64.cc
@@ -16,6 +16,8 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
+#ifndef _WIN64
+
 #define __ masm()->
 
 
@@ -981,6 +983,8 @@ bool CodeGenerator::IsNopForSmiCodeInlining(Handle<Code> code, int start_pc,
 }
 
 #endif
+
+#endif
 }
 }
 }  // namespace v8::internal::compiler

diff --git a/src/compiler/x64/instruction-selector-x64.cc b/src/compiler/x64/instruction-selector-x64.cc
index d40bc67..c339781 100644 (file)
--- a/src/compiler/x64/instruction-selector-x64.cc
+++ b/src/compiler/x64/instruction-selector-x64.cc
@@ -9,6 +9,8 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
+#ifndef _WIN64
+
 // Adds X64-specific methods for generating operands.
 class X64OperandGenerator V8_FINAL : public OperandGenerator {
  public:
@@ -677,6 +679,8 @@ void InstructionSelector::VisitCall(Node* call, BasicBlock* continuation,
   }
 }
 
+#endif
+
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8

diff --git a/src/compiler/x64/linkage-x64.cc b/src/compiler/x64/linkage-x64.cc
index 7d34ef2..7b0436e 100644 (file)
--- a/src/compiler/x64/linkage-x64.cc
+++ b/src/compiler/x64/linkage-x64.cc
@@ -14,6 +14,8 @@ namespace v8 {
 namespace internal {
 namespace compiler {
 
+#ifndef _WIN64
+
 #ifdef _WIN64
 const bool kWin64 = true;
 #else
@@ -76,6 +78,8 @@ CallDescriptor* Linkage::GetSimplifiedCDescriptor(
   return LinkageHelper::GetSimplifiedCDescriptor<LinkageHelperTraits>(
       zone, num_params, return_type, param_types);
 }
+
+#endif
 }
 }
 }  // namespace v8::internal::compiler

diff --git a/test/cctest/compiler/test-node.cc b/test/cctest/compiler/test-node.cc
index 5411755..6fe8573 100644 (file)
--- a/test/cctest/compiler/test-node.cc
+++ b/test/cctest/compiler/test-node.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <functional>
+
 #include "src/v8.h"
 
 #include "graph-tester.h"