Revision: 3722
Author: [email protected]
Date: Wed Jan 27 08:18:58 2010
Log: Fix 64-bit build on Windows and Visual Studio project files
64-bit version now builds on Windows again in both release and debug mode.
The Visual Studio project files have been updated so that all three
configurations work (32-bit, 64-bit and 32-bit with ARM simulator). They
all convert from Visual Studio 2005 to Visual Studio 2008.
[email protected]
Review URL: http://codereview.chromium.org/549174
http://code.google.com/p/v8/source/detail?r=3722
Modified:
/branches/bleeding_edge/SConstruct
/branches/bleeding_edge/src/spaces.h
/branches/bleeding_edge/test/cctest/test-serialize.cc
/branches/bleeding_edge/tools/visual_studio/common.vsprops
/branches/bleeding_edge/tools/visual_studio/d8.vcproj
/branches/bleeding_edge/tools/visual_studio/d8_arm.vcproj
/branches/bleeding_edge/tools/visual_studio/d8_x64.vcproj
/branches/bleeding_edge/tools/visual_studio/ia32.vsprops
/branches/bleeding_edge/tools/visual_studio/v8_arm.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_base_x64.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_cctest.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_cctest_arm.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_cctest_x64.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_mksnapshot.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_mksnapshot_x64.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_process_sample.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_process_sample_arm.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_process_sample_x64.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_shell_sample.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_shell_sample_arm.vcproj
/branches/bleeding_edge/tools/visual_studio/v8_shell_sample_x64.vcproj
/branches/bleeding_edge/tools/visual_studio/x64.vsprops
=======================================
--- /branches/bleeding_edge/SConstruct Mon Jan 25 04:37:31 2010
+++ /branches/bleeding_edge/SConstruct Wed Jan 27 08:18:58 2010
@@ -281,18 +281,12 @@
},
'msvc': {
'all': {
- 'WARNINGFLAGS': ['/WX', '/wd4355', '/wd4800']
+ 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800']
},
'library:shared': {
'CPPDEFINES': ['BUILDING_V8_SHARED'],
'LIBS': ['winmm', 'ws2_32']
},
- 'arch:ia32': {
- 'WARNINGFLAGS': ['/W3']
- },
- 'arch:x64': {
- 'WARNINGFLAGS': ['/W3']
- },
'arch:arm': {
'CPPDEFINES': ['V8_TARGET_ARCH_ARM'],
# /wd4996 is to silence the warning about sscanf
=======================================
--- /branches/bleeding_edge/src/spaces.h Mon Jan 25 14:53:18 2010
+++ /branches/bleeding_edge/src/spaces.h Wed Jan 27 08:18:58 2010
@@ -1837,7 +1837,7 @@
#ifdef DEBUG
if (FLAG_enable_slow_asserts) {
- int actual_size = 0;
+ intptr_t actual_size = 0;
for (Page* p = first_page_; p != top_page; p = p->next_page())
actual_size += kMapsPerPage * Map::kSize;
actual_size += (new_top - top_page->ObjectAreaStart());
=======================================
--- /branches/bleeding_edge/test/cctest/test-serialize.cc Wed Jan 27
00:25:48 2010
+++ /branches/bleeding_edge/test/cctest/test-serialize.cc Wed Jan 27
08:18:58 2010
@@ -217,7 +217,7 @@
int map_space_used,
int cell_space_used,
int large_space_used) {
- int file_name_length = strlen(file_name_) + 10;
+ int file_name_length = StrLength(file_name_) + 10;
Vector<char> name = Vector<char>::New(file_name_length + 1);
OS::SNPrintF(name, "%s.size", file_name_);
FILE* fp = OS::FOpen(name.start(), "w");
@@ -368,7 +368,7 @@
raw_foo = *(v8::Utils::OpenHandle(*foo));
}
- int file_name_length = strlen(FLAG_testing_serialization_file) + 10;
+ int file_name_length = StrLength(FLAG_testing_serialization_file) + 10;
Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
OS::SNPrintF(startup_name, "%s.startup",
FLAG_testing_serialization_file);
@@ -394,7 +394,7 @@
DEPENDENT_TEST(PartialDeserialization, PartialSerialization) {
- int file_name_length = strlen(FLAG_testing_serialization_file) + 10;
+ int file_name_length = StrLength(FLAG_testing_serialization_file) + 10;
Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
OS::SNPrintF(startup_name, "%s.startup",
FLAG_testing_serialization_file);
=======================================
--- /branches/bleeding_edge/tools/visual_studio/common.vsprops Fri Sep 11
05:26:15 2009
+++ /branches/bleeding_edge/tools/visual_studio/common.vsprops Wed Jan 27
08:18:58 2010
@@ -28,7 +28,6 @@
GenerateDebugInformation="true"
MapFileName="$(OutDir)\$(TargetName).map"
ImportLibrary="$(OutDir)\lib\$(TargetName).lib"
- TargetMachine="1"
FixedBaseAddress="1"
AdditionalOptions="/IGNORE:4221 /NXCOMPAT"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/d8.vcproj Wed Apr 29
06:11:48 2009
+++ /branches/bleeding_edge/tools/visual_studio/d8.vcproj Wed Jan 27
08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/d8_arm.vcproj Mon Sep 7
03:47:31 2009
+++ /branches/bleeding_edge/tools/visual_studio/d8_arm.vcproj Wed Jan 27
08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/d8_x64.vcproj Mon Aug 24
02:12:07 2009
+++ /branches/bleeding_edge/tools/visual_studio/d8_x64.vcproj Wed Jan 27
08:18:58 2010
@@ -50,7 +50,6 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -70,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -112,7 +108,6 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -132,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -146,6 +138,22 @@
<File
RelativePath="..\..\src\d8.cc"
>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ DisableSpecificWarnings="4267"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ DisableSpecificWarnings="4267"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\src\d8.h"
=======================================
--- /branches/bleeding_edge/tools/visual_studio/ia32.vsprops Mon Sep 7
03:47:31 2009
+++ /branches/bleeding_edge/tools/visual_studio/ia32.vsprops Wed Jan 27
08:18:58 2010
@@ -10,4 +10,8 @@
Name="VCCLCompilerTool"
PreprocessorDefinitions="_USE_32BIT_TIME_T;V8_TARGET_ARCH_IA32;V8_NATIVE_REGEXP"
/>
+ <Tool
+ Name="VCLinkerTool"
+ TargetMachine="1"
+ />
</VisualStudioPropertySheet>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_base_x64.vcproj Thu Oct
8 00:10:10 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_base_x64.vcproj Wed Jan
27 08:18:58 2010
@@ -425,6 +425,19 @@
>
</File>
<File
+ RelativePath="..\..\src\full-codegen.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\full-codegen.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\src\x64\full-codegen-x64.cc"
+ >
+ </File>
+ <File
+
RelativePath="..\..\src\func-name-inferrer.cc"
>
</File>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_cctest.vcproj Wed Sep 16
06:41:24 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_cctest.vcproj Wed Jan 27
08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_cctest_arm.vcproj Wed
Sep 16 06:41:24 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_cctest_arm.vcproj Wed
Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_cctest_x64.vcproj Wed
Sep 16 06:41:24 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_cctest_x64.vcproj Wed
Jan 27 08:18:58 2010
@@ -50,7 +50,6 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -70,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -112,7 +108,6 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -132,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -178,10 +170,6 @@
<File
RelativePath="..\..\test\cctest\test-decls.cc"
>
- </File>
- <File
- RelativePath="..\..\test\cctest\test-disasm-x64.cc"
- >
</File>
<File
RelativePath="..\..\test\cctest\test-flags.cc"
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_mksnapshot.vcproj Wed
Apr 29 06:11:48 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_mksnapshot.vcproj Wed
Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_mksnapshot_x64.vcproj
Wed Aug 19 00:32:48 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_mksnapshot_x64.vcproj
Wed Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_process_sample.vcproj
Wed Apr 29 06:11:48 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_process_sample.vcproj
Wed Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
---
/branches/bleeding_edge/tools/visual_studio/v8_process_sample_arm.vcproj
Mon Sep 7 03:47:31 2009
+++
/branches/bleeding_edge/tools/visual_studio/v8_process_sample_arm.vcproj
Wed Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
---
/branches/bleeding_edge/tools/visual_studio/v8_process_sample_x64.vcproj
Wed Aug 19 00:32:48 2009
+++
/branches/bleeding_edge/tools/visual_studio/v8_process_sample_x64.vcproj
Wed Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -144,6 +138,22 @@
<File
RelativePath="..\..\samples\process.cc"
>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ DisableSpecificWarnings="4267"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ DisableSpecificWarnings="4267"
+ />
+ </FileConfiguration>
</File>
</Files>
<Globals>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_shell_sample.vcproj Wed
Apr 29 06:11:48 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_shell_sample.vcproj Wed
Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_shell_sample_arm.vcproj
Mon Sep 7 03:47:31 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_shell_sample_arm.vcproj
Wed Jan 27 08:18:58 2010
@@ -69,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -130,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/v8_shell_sample_x64.vcproj
Mon Aug 24 02:12:07 2009
+++ /branches/bleeding_edge/tools/visual_studio/v8_shell_sample_x64.vcproj
Wed Jan 27 08:18:58 2010
@@ -50,7 +50,6 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -70,9 +69,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -112,7 +108,6 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib"
- TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -132,9 +127,6 @@
<Tool
Name="VCAppVerifierTool"
/>
- <Tool
- Name="VCWebDeploymentTool"
- />
<Tool
Name="VCPostBuildEventTool"
/>
@@ -146,6 +138,22 @@
<File
RelativePath="..\..\samples\shell.cc"
>
+ <FileConfiguration
+ Name="Debug|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ DisableSpecificWarnings="4267"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|x64"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ DisableSpecificWarnings="4267"
+ />
+ </FileConfiguration>
</File>
</Files>
<Globals>
=======================================
--- /branches/bleeding_edge/tools/visual_studio/x64.vsprops Mon Sep 7
03:47:31 2009
+++ /branches/bleeding_edge/tools/visual_studio/x64.vsprops Wed Jan 27
08:18:58 2010
@@ -10,4 +10,8 @@
Name="VCCLCompilerTool"
PreprocessorDefinitions="V8_TARGET_ARCH_X64;V8_NATIVE_REGEXP"
/>
+ <Tool
+ Name="VCLinkerTool"
+ TargetMachine="17"
+ />
</VisualStudioPropertySheet>
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
