Reviewers: titzer,
Message:
PTAL
Description:
Fix Win64 build
[email protected]
Please review this at https://codereview.chromium.org/434623003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+14, -0 lines):
M src/compiler/x64/code-generator-x64.cc
M src/compiler/x64/instruction-selector-x64.cc
M src/compiler/x64/linkage-x64.cc
M test/cctest/compiler/test-node.cc
Index: src/compiler/x64/code-generator-x64.cc
diff --git a/src/compiler/x64/code-generator-x64.cc
b/src/compiler/x64/code-generator-x64.cc
index
dd97bb338ffbfb1cb91713c6f9a7eba27888763c..a398c2dd10a736532db9fb096b4f13ea51f6ab23
100644
--- 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
Index: src/compiler/x64/instruction-selector-x64.cc
diff --git a/src/compiler/x64/instruction-selector-x64.cc
b/src/compiler/x64/instruction-selector-x64.cc
index
d40bc6750bdc29970a88222f620d9be3bdd18056..c339781d26597ff5ec2270b229ba1601dfe0c90b
100644
--- 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
Index: src/compiler/x64/linkage-x64.cc
diff --git a/src/compiler/x64/linkage-x64.cc
b/src/compiler/x64/linkage-x64.cc
index
7d34ef2cfae42b602fe2ce5105f790897c52cc92..7b0436ebf3442bc78d0995b756dfd999f22c3b0a
100644
--- 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
Index: test/cctest/compiler/test-node.cc
diff --git a/test/cctest/compiler/test-node.cc
b/test/cctest/compiler/test-node.cc
index
541175506b42b1b3daba20071e7952107f3ed03a..6fe8573a2f78b3218ab51bc0b3cfcd47f9dd3e1a
100644
--- 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"
--
--
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/d/optout.
