Revision: 22772
Author: [email protected]
Date: Thu Jul 31 16:22:27 2014 UTC
Log: Fix Win64 build
[email protected]
Review URL: https://codereview.chromium.org/434623003
http://code.google.com/p/v8/source/detail?r=22772
Modified:
/branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc
/branches/bleeding_edge/src/compiler/x64/instruction-selector-x64.cc
/branches/bleeding_edge/src/compiler/x64/linkage-x64.cc
/branches/bleeding_edge/test/cctest/compiler/test-node.cc
=======================================
--- /branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc Thu Jul
31 15:06:54 2014 UTC
+++ /branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc Thu Jul
31 16:22:27 2014 UTC
@@ -16,6 +16,8 @@
namespace internal {
namespace compiler {
+#ifndef _WIN64
+
#define __ masm()->
@@ -979,6 +981,8 @@
return *(code->instruction_start() + start_pc) ==
v8::internal::Assembler::kNopByte;
}
+
+#endif
#endif
}
=======================================
--- /branches/bleeding_edge/src/compiler/x64/instruction-selector-x64.cc
Thu Jul 31 11:45:22 2014 UTC
+++ /branches/bleeding_edge/src/compiler/x64/instruction-selector-x64.cc
Thu Jul 31 16:22:27 2014 UTC
@@ -9,6 +9,8 @@
namespace internal {
namespace compiler {
+#ifndef _WIN64
+
// Adds X64-specific methods for generating operands.
class X64OperandGenerator V8_FINAL : public OperandGenerator {
public:
@@ -676,6 +678,8 @@
Emit(kPopStack | MiscField::encode(buffer.pushed_count), NULL);
}
}
+
+#endif
} // namespace compiler
} // namespace internal
=======================================
--- /branches/bleeding_edge/src/compiler/x64/linkage-x64.cc Thu Jul 31
15:06:54 2014 UTC
+++ /branches/bleeding_edge/src/compiler/x64/linkage-x64.cc Thu Jul 31
16:22:27 2014 UTC
@@ -14,6 +14,8 @@
namespace internal {
namespace compiler {
+#ifndef _WIN64
+
#ifdef _WIN64
const bool kWin64 = true;
#else
@@ -76,6 +78,8 @@
return LinkageHelper::GetSimplifiedCDescriptor<LinkageHelperTraits>(
zone, num_params, return_type, param_types);
}
+
+#endif
}
}
} // namespace v8::internal::compiler
=======================================
--- /branches/bleeding_edge/test/cctest/compiler/test-node.cc Wed Jul 30
13:54:45 2014 UTC
+++ /branches/bleeding_edge/test/cctest/compiler/test-node.cc Thu Jul 31
16:22:27 2014 UTC
@@ -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.
