From 4ea3e060bba13531dcd80e7673b5ec0ec8da44b8 Mon Sep 17 00:00:00 2001 From: "ricow@chromium.org" Date: Thu, 13 Jan 2011 14:10:26 +0000 Subject: [PATCH] Fix the xcode build by not including x64 specific code when generating 32 bit code. Review URL: http://codereview.chromium.org/6249002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@6299 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/ia32/deoptimizer-ia32.cc | 4 ++++ src/ia32/lithium-codegen-ia32.cc | 6 ++++++ src/ia32/lithium-ia32.cc | 6 ++++++ src/x64/deoptimizer-x64.cc | 4 ++++ src/x64/lithium-codegen-x64.cc | 6 ++++++ src/x64/lithium-x64.cc | 6 ++++++ 6 files changed, 32 insertions(+) diff --git a/src/ia32/deoptimizer-ia32.cc b/src/ia32/deoptimizer-ia32.cc index d1c0f2b031..3050c5674f 100644 --- a/src/ia32/deoptimizer-ia32.cc +++ b/src/ia32/deoptimizer-ia32.cc @@ -27,6 +27,8 @@ #include "v8.h" +#if defined(V8_TARGET_ARCH_IA32) + #include "codegen.h" #include "deoptimizer.h" #include "full-codegen.h" @@ -618,3 +620,5 @@ void Deoptimizer::TableEntryGenerator::GeneratePrologue() { } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_IA32 diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc index 775e3a9396..033667b1c7 100644 --- a/src/ia32/lithium-codegen-ia32.cc +++ b/src/ia32/lithium-codegen-ia32.cc @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_IA32) + #include "ia32/lithium-codegen-ia32.h" #include "code-stubs.h" #include "stub-cache.h" @@ -3482,3 +3486,5 @@ void LCodeGen::DoOsrEntry(LOsrEntry* instr) { #undef __ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_IA32 diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc index 4b187c4d90..82903108ec 100644 --- a/src/ia32/lithium-ia32.cc +++ b/src/ia32/lithium-ia32.cc @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_IA32) + #include "ia32/lithium-ia32.h" #include "ia32/lithium-codegen-ia32.h" @@ -1874,3 +1878,5 @@ LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_IA32 diff --git a/src/x64/deoptimizer-x64.cc b/src/x64/deoptimizer-x64.cc index 4e890cd4c0..8bb3ac09fd 100644 --- a/src/x64/deoptimizer-x64.cc +++ b/src/x64/deoptimizer-x64.cc @@ -27,6 +27,8 @@ #include "v8.h" +#if defined(V8_TARGET_ARCH_X64) + #include "codegen.h" #include "deoptimizer.h" #include "full-codegen.h" @@ -75,3 +77,5 @@ void Deoptimizer::TableEntryGenerator::GeneratePrologue() { } } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_X64 diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc index 066fdd215a..bca6cb1cf6 100644 --- a/src/x64/lithium-codegen-x64.cc +++ b/src/x64/lithium-codegen-x64.cc @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_X64) + #include "x64/lithium-codegen-x64.h" #include "code-stubs.h" #include "stub-cache.h" @@ -1125,3 +1129,5 @@ void LCodeGen::DoOsrEntry(LOsrEntry* instr) { #undef __ } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_X64 diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc index 0c2c570636..c8418bf3ce 100644 --- a/src/x64/lithium-x64.cc +++ b/src/x64/lithium-x64.cc @@ -25,6 +25,10 @@ // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#include "v8.h" + +#if defined(V8_TARGET_ARCH_X64) + #include "x64/lithium-x64.h" #include "x64/lithium-codegen-x64.h" @@ -1314,3 +1318,5 @@ LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { } } } // namespace v8::internal + +#endif // V8_TARGET_ARCH_X64