Create build structure for X64.

Possible to attempt to build for X64.
Build will be unsuccessful, since all x64 source files are
missing and pointers are reinterpreted as integers everywhere.

Review URL: http://codereview.chromium.org/99186

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

diff --git a/SConstruct b/SConstruct
index c107ab694f5cadccd5b45eeea3ff03f10384c712..d8ef914ca6dcafe663bae5ef7a7e90f9f56164b1 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -131,10 +131,25 @@ LIBRARY_FLAGS = {
                        '-Wstrict-aliasing=2'],
       'CPPPATH':      ANDROID_INCLUDES,
     },
-    'wordsize:64': {
+    'wordsize:32': {
       'CCFLAGS':      ['-m32'],
+      'CPPDEFINES':   ['ILP32'],
       'LINKFLAGS':    ['-m32']
     },
+    'wordsize:64': {
+      'CCFLAGS':      ['-m64'],
+      'CPPDEFINES':   ['LP64'],
+      'LINKFLAGS':    ['-m64']
+    },
+    'arch:ia32': {
+      'CPPDEFINES':   ['V8_ARCH_IA32']
+    },
+    'arch:arm': {
+      'CPPDEFINES':   ['V8_ARCH_ARM']
+    },
+    'arch:x64': {
+      'CPPDEFINES':   ['V8_ARCH_X64']
+    },
     'prof:oprofile': {
       'CPPDEFINES':   ['ENABLE_OPROFILE_AGENT']
     }
@@ -175,7 +190,7 @@ LIBRARY_FLAGS = {
         'LINKFLAGS':    ['/LTCG'],
         'ARFLAGS':      ['/LTCG'],
       }
-    },
+    }
   }
 }
 
@@ -190,9 +205,6 @@ V8_EXTRA_FLAGS = {
     'arch:arm': {
       'CPPDEFINES':   ['ARM']
     },
-    'arch:android': {
-      'CPPDEFINES':   ['ARM']
-    },
     'os:win32': {
       'WARNINGFLAGS': ['-pedantic', '-Wno-long-long']
     },
@@ -298,10 +310,16 @@ CCTEST_EXTRA_FLAGS = {
         'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
       }
     },
-    'wordsize:64': {
+    'wordsize:32': {
       'CCFLAGS':      ['-m32'],
+      'CPPDEFINES':   ['ILP32'],
       'LINKFLAGS':    ['-m32']
     },
+    'wordsize:64': {
+      'CCFLAGS':      ['-m64'],
+      'CPPDEFINES':   ['LP64'],
+      'LINKFLAGS':    ['-m64']
+    },
   },
   'msvc': {
     'all': {
@@ -349,10 +367,16 @@ SAMPLE_FLAGS = {
         'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
       }
     },
-    'wordsize:64': {
+    'wordsize:32': {
       'CCFLAGS':      ['-m32'],
+      'CPPDEFINES':   ['ILP32'],
       'LINKFLAGS':    ['-m32']
     },
+    'wordsize:64': {
+      'CCFLAGS':      ['-m64'],
+      'CPPDEFINES':   ['LP64'],
+      'LINKFLAGS':    ['-m64']
+    },
     'mode:release': {
       'CCFLAGS':      ['-O2']
     },
@@ -466,17 +490,17 @@ SIMPLE_OPTIONS = {
   'toolchain': {
     'values': ['gcc', 'msvc'],
     'default': TOOLCHAIN_GUESS,
-    'help': 'the toolchain to use'
+    'help': 'the toolchain to use (' + TOOLCHAIN_GUESS + ')'
   },
   'os': {
     'values': ['freebsd', 'linux', 'macos', 'win32', 'android'],
     'default': OS_GUESS,
-    'help': 'the os to build for'
+    'help': 'the os to build for (' + OS_GUESS + ')'
   },
   'arch': {
-    'values':['arm', 'ia32'],
+    'values':['arm', 'ia32', 'x64'],
     'default': ARCH_GUESS,
-    'help': 'the architecture to build for'
+    'help': 'the architecture to build for (' + ARCH_GUESS + ')'
   },
   'snapshot': {
     'values': ['on', 'off', 'nobuild'],
@@ -505,7 +529,7 @@ SIMPLE_OPTIONS = {
   },
   'wordsize': {
     'values': ['64', '32'],
-    'default': WORDSIZE_GUESS,
+    'default': '32',   # WORDSIZE_GUESS,
     'help': 'the word size'
   },
   'simulator': {
@@ -565,6 +589,8 @@ def VerifyOptions(env):
     Abort("Profiling on windows only supported for static library.")
   if env['prof'] == 'oprofile' and env['os'] != 'linux':
     Abort("OProfile is only supported on Linux.")
+  if env['wordsize'] == '64' and (env['os'] != 'linux' or env['arch'] != 'x64'):
+    Abort("64 bit compilation only allowed on Linux OS and x64 architecture.")
   for (name, option) in SIMPLE_OPTIONS.iteritems():
     if (not option.get('default')) and (name not in ARGUMENTS):
       message = ("A value for option %s must be specified (%s)." %

diff --git a/src/SConscript b/src/SConscript
old mode 100644 (file)
new mode 100755 (executable)
index b0a2933..bf9e173
--- a/src/SConscript
+++ b/src/SConscript
@@ -57,16 +57,26 @@ SOURCES = {
     'arm/codegen-arm.cc', 'arm/cpu-arm.cc', 'arm/disasm-arm.cc',
     'arm/debug-arm.cc', 'arm/frames-arm.cc', 'arm/ic-arm.cc',
     'arm/jump-target-arm.cc', 'arm/macro-assembler-arm.cc',
+    'arm/regexp-macro-assembler-arm.cc',
     'arm/register-allocator-arm.cc', 'arm/stub-cache-arm.cc',
-    'arm/regexp-macro-assembler-arm.cc', 'arm/virtual-frame-arm.cc'
+    'arm/virtual-frame-arm.cc'
   ],
   'arch:ia32': [
     'ia32/assembler-ia32.cc', 'ia32/builtins-ia32.cc',
     'ia32/codegen-ia32.cc', 'ia32/cpu-ia32.cc', 'ia32/disasm-ia32.cc',
     'ia32/debug-ia32.cc', 'ia32/frames-ia32.cc', 'ia32/ic-ia32.cc',
     'ia32/jump-target-ia32.cc', 'ia32/macro-assembler-ia32.cc',
+    'ia32/regexp-macro-assembler-ia32.cc',
     'ia32/register-allocator-ia32.cc', 'ia32/stub-cache-ia32.cc',
-    'ia32/regexp-macro-assembler-ia32.cc', 'ia32/virtual-frame-ia32.cc'
+    'ia32/virtual-frame-ia32.cc'
+  ],
+  'arch:x64': [
+    'x64/assembler-x64.cc', 'x64/builtins-x64.cc',
+    'x64/codegen-x64.cc', 'x64/cpu-x64.cc', 'x64/disasm-x64.cc',
+    'x64/debug-x64.cc', 'x64/frames-x64.cc', 'x64/ic-x64.cc',
+    'x64/jump-target-x64.cc', 'x64/macro-assembler-x64.cc',
+    # 'x64/regexp-macro-assembler-x64.cc',
+    'x64/stub-cache-x64.cc'
   ],
   'simulator:arm': ['arm/simulator-arm.cc'],
   'os:freebsd': ['platform-freebsd.cc', 'platform-posix.cc'],

diff --git a/src/codegen.h b/src/codegen.h
index 0f60463dee6c3ff8218c76ae938052ab39b0fb75..3d4599523257e7f4ca32f7163c13d9e0f15163cb 100644 (file)
--- a/src/codegen.h
+++ b/src/codegen.h
@@ -76,9 +76,15 @@
 enum OverwriteMode { NO_OVERWRITE, OVERWRITE_LEFT, OVERWRITE_RIGHT };
 
 
-#ifdef ARM
+#ifdef V8_ARCH_ARM
 #include "arm/codegen-arm.h"
-#else
+#endif
+
+#ifdef V8_ARCH_X64
+#include "x64/codegen-x64.h"
+#endif
+
+#ifdef V8_ARCH_IA32
 #include "ia32/codegen-ia32.h"
 #endif
 

diff --git a/src/execution.cc b/src/execution.cc
index 8fa059abf8562ea7373b27b7b51609fe5e8e8db4..eb39d640fa7533abb5b8a2b18719df9124cc3cf4 100644 (file)
--- a/src/execution.cc
+++ b/src/execution.cc
@@ -32,9 +32,15 @@
 #include "api.h"
 #include "codegen-inl.h"
 
-#ifdef ARM
+#ifdef V8_ARCH_ARM
 #include "arm/simulator-arm.h"
-#else  // ia32
+#endif
+
+#ifdef V8_ARCH_X64
+#include "x64/simulator-x64.h"
+#endif
+
+#ifdef V8_ARCH_IA32
 #include "ia32/simulator-ia32.h"
 #endif
 

diff --git a/src/frames-inl.h b/src/frames-inl.h
index 481b83bf5a06879fd1fc78dd90864d22e5a1fccd..8244c672497eccaf62bd6bd94bef18db723ef146 100644 (file)
--- a/src/frames-inl.h
+++ b/src/frames-inl.h
@@ -29,9 +29,15 @@
 #define V8_FRAMES_INL_H_
 
 #include "frames.h"
-#ifdef ARM
+#ifdef V8_ARCH_ARM
 #include "arm/frames-arm.h"
-#else
+#endif
+
+#ifdef V8_ARCH_X64
+#include "x64/frames-x64.h"
+#endif
+
+#ifdef V8_ARCH_IA32
 #include "ia32/frames-ia32.h"
 #endif
 

diff --git a/src/globals.h b/src/globals.h
index d11ea67739bbfccd64002bc882fa3e82f09f48e8..5d2ac048cf222ff257dc149b2a6dd385d65bf689 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -73,7 +73,7 @@ typedef byte* Address;
 typedef uint16_t uc16;
 typedef signed int uc32;
 
-#ifndef ARM
+#if defined(V8_ARCH_IA32) || defined(V8_ARCH_X64)
 #define CAN_READ_UNALIGNED 1
 #endif
 

diff --git a/src/jsregexp.cc b/src/jsregexp.cc
index 89d11eb4e25e38abd56142125806a1ccfe1882f2..58d556eb5d1e69c4d098d71eff1bc59aeda69d76 100644 (file)
--- a/src/jsregexp.cc
+++ b/src/jsregexp.cc
@@ -42,9 +42,16 @@
 #include "regexp-macro-assembler-irregexp.h"
 #include "regexp-stack.h"
 
-#ifdef ARM
+#ifdef V8_ARCH_ARM
 #include "arm/regexp-macro-assembler-arm.h"
-#else  // IA32
+#endif
+
+#ifdef V8_ARCH_X64
+#include "x64/macro-assembler-x64.h"
+#include "x64/regexp-macro-assembler-x64.h"
+#endif
+
+#ifdef V8_ARCH_IA32
 #include "ia32/macro-assembler-ia32.h"
 #include "ia32/regexp-macro-assembler-ia32.h"
 #endif
@@ -424,9 +431,13 @@ Handle<Object> RegExpImpl::IrregexpExec(Handle<JSRegExp> jsregexp,
   Handle<String> original_subject = subject;
   Handle<FixedArray> regexp(FixedArray::cast(jsregexp->data()));
   if (UseNativeRegexp()) {
-#ifdef ARM
+#ifdef V8_ARCH_ARM
     UNREACHABLE();
-#else
+#endif
+#ifdef V8_ARCH_X64
+    UNIMPLEMENTED();
+#endif
+#ifdef V8_ARCH_IA32
     RegExpMacroAssemblerIA32::Result res;
     do {
       bool is_ascii = StringShape(*subject).IsAsciiRepresentation();
@@ -4434,9 +4445,13 @@ RegExpEngine::CompilationResult RegExpEngine::Compile(RegExpCompileData* data,
   NodeInfo info = *node->info();
 
   if (RegExpImpl::UseNativeRegexp()) {
-#ifdef ARM
+#ifdef V8_ARCH_ARM
     UNREACHABLE();
-#else  // IA32
+#endif
+#ifdef V8_ARCH_X64
+    UNREACHABLE();
+#endif
+#ifdef V8_ARCH_IA32
     RegExpMacroAssemblerIA32::Mode mode;
     if (is_ascii) {
       mode = RegExpMacroAssemblerIA32::ASCII;

diff --git a/src/jsregexp.h b/src/jsregexp.h
index 74e01aa61a2571a55b39ddb0ded81a5443ed4f4a..c0d50a3088da11b439f83797fbf3b76f199cf100 100644 (file)
--- a/src/jsregexp.h
+++ b/src/jsregexp.h
@@ -37,9 +37,13 @@ class RegExpMacroAssembler;
 class RegExpImpl {
  public:
   static inline bool UseNativeRegexp() {
-#ifdef ARM
+#ifdef V8_ARCH_ARM
     return false;
-#else
+#endif
+#ifdef V8_ARCH_X64
+    return false;
+#endif
+#ifdef V8_ARCH_IA32
     return FLAG_regexp_native;
 #endif
   }

diff --git a/src/macro-assembler.h b/src/macro-assembler.h
index d21f4796026c778057a34f629c4ea6d373b42770..2d93dac841225ddce816afed6d53d48399f8f4d1 100644 (file)
--- a/src/macro-assembler.h
+++ b/src/macro-assembler.h
@@ -28,23 +28,29 @@
 #ifndef V8_MACRO_ASSEMBLER_H_
 #define V8_MACRO_ASSEMBLER_H_
 
-#ifdef ARM
-
+#ifdef V8_ARCH_ARM
 #include "arm/constants-arm.h"
 #include "assembler.h"
 #include "arm/assembler-arm.h"
 #include "arm/assembler-arm-inl.h"
 #include "code.h"  // must be after assembler_*.h
 #include "arm/macro-assembler-arm.h"
+#endif
 
-#else  // ia32
+#ifdef V8_ARCH_X64
+#include "assembler.h"
+#include "x64/assembler-x64.h"
+#include "x64/assembler-x64-inl.h"
+#include "code.h"  // must be after assembler_*.h
+#include "x64/macro-assembler-x64.h"
+#endif
 
+#ifdef V8_ARCH_IA32
 #include "assembler.h"
 #include "ia32/assembler-ia32.h"
 #include "ia32/assembler-ia32-inl.h"
 #include "code.h"  // must be after assembler_*.h
 #include "ia32/macro-assembler-ia32.h"
-
 #endif
 
 #endif  // V8_MACRO_ASSEMBLER_H_

diff --git a/src/platform-freebsd.cc b/src/platform-freebsd.cc
index 1e717044729ed25143354e29f1a5b91e0b415544..82208f1a3deac69142d0b489a957a187ff0572c7 100644 (file)
--- a/src/platform-freebsd.cc
+++ b/src/platform-freebsd.cc
@@ -171,7 +171,7 @@ void OS::Abort() {
 
 
 void OS::DebugBreak() {
-#if defined (__arm__) || defined(__thumb__)
+#if defined(__arm__) || defined(__thumb__)
   asm("bkpt 0");
 #else
   asm("int $3");

diff --git a/src/platform-linux.cc b/src/platform-linux.cc
index 9f5b9ac26fad1161d6b981f9770941c2358ca643..c735cebfcf593acce35b2427008063241be0fd1b 100644 (file)
--- a/src/platform-linux.cc
+++ b/src/platform-linux.cc
@@ -171,6 +171,8 @@ void OS::Abort() {
 
 
 void OS::DebugBreak() {
+// TODO(lrn): Introduce processor define for runtime system (!= V8_ARCH_x,
+//  which is the architecture of generated code).
 #if defined(__arm__) || defined(__thumb__)
   asm("bkpt 0");
 #else
@@ -598,7 +600,7 @@ static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
     // Extracting the sample from the context is extremely machine dependent.
     ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
     mcontext_t& mcontext = ucontext->uc_mcontext;
-#if defined (__arm__) || defined(__thumb__)
+#if defined(__arm__) || defined(__thumb__)
     sample.pc = mcontext.gregs[R15];
     sample.sp = mcontext.gregs[R13];
     sample.fp = mcontext.gregs[R11];

diff --git a/src/virtual-frame.h b/src/virtual-frame.h
index ef9ab720b7e690ae5a60ecfd5d676b5f7b70e7e8..8c76f8a16b5f2ed5538fc7366de394ee07eaaea6 100644 (file)
--- a/src/virtual-frame.h
+++ b/src/virtual-frame.h
@@ -202,9 +202,15 @@ class FrameElement BASE_EMBEDDED {
 
 } }  // namespace v8::internal
 
-#ifdef ARM
+#ifdef V8_ARCH_ARM
 #include "arm/virtual-frame-arm.h"
-#else  // ia32
+#endif
+
+#ifdef V8_ARCH_X64
+#include "x64/virtual-frame-x64.h"
+#endif
+
+#ifdef V8_ARCH_IA32
 #include "ia32/virtual-frame-ia32.h"
 #endif
 

diff --git a/tools/v8.xcodeproj/project.pbxproj b/tools/v8.xcodeproj/project.pbxproj
index 7a1a7f69e9a3a8eacb2f62247b25ef1d9ed549dd..843486bcca713ab76314143130408569d3c353a6 100755 (executable)
--- a/tools/v8.xcodeproj/project.pbxproj
+++ b/tools/v8.xcodeproj/project.pbxproj
@@ -1369,6 +1369,7 @@
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(GCC_PREPROCESSOR_DEFINITIONS)",
+                                        V8_ARCH_IA32,
                                        DEBUG,
                                );
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -1408,6 +1409,7 @@
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(GCC_PREPROCESSOR_DEFINITIONS)",
+                                        V8_ARCH_IA32,
                                        NDEBUG,
                                );
                                GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@@ -1447,6 +1449,7 @@
                                DEPLOYMENT_POSTPROCESSING = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(GCC_PREPROCESSOR_DEFINITIONS)",
+                                        V8_ARCH_IA32,
                                        ENABLE_DISASSEMBLER,
                                        ENABLE_LOGGING_AND_PROFILING,
                                );
@@ -1488,7 +1491,7 @@
                                DEPLOYMENT_POSTPROCESSING = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                                       ARM,
+                                       V8_ARCH_ARM,
                                        ENABLE_DISASSEMBLER,
                                        ENABLE_LOGGING_AND_PROFILING,
                                );
@@ -1504,7 +1507,7 @@
                                DEPLOYMENT_POSTPROCESSING = NO;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "$(GCC_PREPROCESSOR_DEFINITIONS)",
-                                       ARM,
+                                       V8_ARCH_ARM,
                                );
                                HEADER_SEARCH_PATHS = ../src;
                                PRODUCT_NAME = "v8-arm";

diff --git a/tools/visual_studio/arm.vsprops b/tools/visual_studio/arm.vsprops
index 0e37d41793c8ad16306325687691488214951cf7..4f0f4e343672f1d3db668727abf95b67161bcee2 100644 (file)
--- a/tools/visual_studio/arm.vsprops
+++ b/tools/visual_studio/arm.vsprops
@@ -6,7 +6,7 @@
        >
        <Tool
                Name="VCCLCompilerTool"
-               PreprocessorDefinitions="ARM"
+               PreprocessorDefinitions="V8_ARCH_ARM"
                DisableSpecificWarnings="4996"
        />
 </VisualStudioPropertySheet>

diff --git a/tools/visual_studio/d8.vcproj b/tools/visual_studio/d8.vcproj
index a05a3f39e64a066239ea4d3e58cd7ca4914ae56b..21636ba35bb5dc10e4edc754967802462df45fda 100644 (file)
--- a/tools/visual_studio/d8.vcproj
+++ b/tools/visual_studio/d8.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -79,7 +79,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/ia32.vsprops b/tools/visual_studio/ia32.vsprops
new file mode 100644 (file)
index 0000000..c77d3b9
--- /dev/null
+++ b/tools/visual_studio/ia32.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+       ProjectType="Visual C++"
+       Version="8.00"
+       Name="arm"
+       >
+       <Tool
+               Name="VCCLCompilerTool"
+               PreprocessorDefinitions="V8_ARCH_IA32"
+       />
+</VisualStudioPropertySheet>

diff --git a/tools/visual_studio/v8.vcproj b/tools/visual_studio/v8.vcproj
index c2f336e6abc3c19ee7550e6ea3a862940f4b4a1e..47ba8c1f441aa7d14eb6d3cd179a31541dc94212 100644 (file)
--- a/tools/visual_studio/v8.vcproj
+++ b/tools/visual_studio/v8.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -70,7 +70,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_base.vcproj b/tools/visual_studio/v8_base.vcproj
index 43c970d305bc2428d02529096a96bad8b7115941..ba685b6c7db72f36e45be821c0f1075d22ad17e5 100644 (file)
--- a/tools/visual_studio/v8_base.vcproj
+++ b/tools/visual_studio/v8_base.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_cctest.vcproj b/tools/visual_studio/v8_cctest.vcproj
index 5d49d2487dbd17379496bcce57ec01e5bdf9f27a..921b2177afe5ba32ae8b7d7f818641e878c4fd85 100644 (file)
--- a/tools/visual_studio/v8_cctest.vcproj
+++ b/tools/visual_studio/v8_cctest.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -79,7 +79,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_mksnapshot.vcproj b/tools/visual_studio/v8_mksnapshot.vcproj
index 4d5d84f7549faf5a102e11874b5c21022823cfc3..00950b06954313a518c786a0a61b803d71856bc3 100644 (file)
--- a/tools/visual_studio/v8_mksnapshot.vcproj
+++ b/tools/visual_studio/v8_mksnapshot.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -79,7 +79,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_process_sample.vcproj b/tools/visual_studio/v8_process_sample.vcproj
index ea8c97d4e1aeaae8db3f1967b957c1eaf61d2ce3..d94966b3376e8a12ad3be06f1c22af522e092f63 100644 (file)
--- a/tools/visual_studio/v8_process_sample.vcproj
+++ b/tools/visual_studio/v8_process_sample.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -79,7 +79,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_shell_sample.vcproj b/tools/visual_studio/v8_shell_sample.vcproj
index b5d9c612aac123a8b0ad9c7f0968125dabd7e374..2cbd22df6ea5b2dbdaeca07a21b56e1d5690653d 100644 (file)
--- a/tools/visual_studio/v8_shell_sample.vcproj
+++ b/tools/visual_studio/v8_shell_sample.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -79,7 +79,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="1"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_snapshot.vcproj b/tools/visual_studio/v8_snapshot.vcproj
index 25d922f15216aad55e4cba766ddf0f627afd2f48..29db4f8d0e34fa58e6996b93e2da632ad163e5da 100644 (file)
--- a/tools/visual_studio/v8_snapshot.vcproj
+++ b/tools/visual_studio/v8_snapshot.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -70,7 +70,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="4"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"

diff --git a/tools/visual_studio/v8_snapshot_cc.vcproj b/tools/visual_studio/v8_snapshot_cc.vcproj
index 1cfac247cc0907ee8eb19d6e77b75b753939b686..7c4799afd6436d7a2e14210c072a4a219ff8c08e 100644 (file)
--- a/tools/visual_studio/v8_snapshot_cc.vcproj
+++ b/tools/visual_studio/v8_snapshot_cc.vcproj
@@ -18,7 +18,7 @@
                <Configuration
                        Name="Debug|Win32"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\common.vsprops;.\debug.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\debug.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
@@ -36,7 +36,7 @@
                <Configuration
                        Name="Release|Win32"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\common.vsprops;.\release.vsprops"
+                       InheritedPropertySheets=".\common.vsprops;.\ia32.vsprops;.\release.vsprops"
                        >
                        <Tool
                                Name="VCPreBuildEventTool"