Skip to content

V
V8
Commit 5fe8bd99 authored by sgjesse@chromium.org's avatar sgjesse@chromium.org
Browse files
Options

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.

TBR=lrn@chromium.org
Review URL: http://codereview.chromium.org/549174

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3722 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 2b62886d
Show whitespace changes
Inline Side-by-side
Showing with 780 additions and 812 deletions
SConstruct
View file @ 5fe8bd99
...@@ -281,18 +281,12 @@ V8_EXTRA_FLAGS = { ...@@ -281,18 +281,12 @@ V8_EXTRA_FLAGS = {
}, },
'msvc': { 'msvc': {
'all': { 'all': {
'WARNINGFLAGS': ['/WX', '/wd4355', '/wd4800'] 'WARNINGFLAGS': ['/W3', '/WX', '/wd4355', '/wd4800']
}, },
'library:shared': { 'library:shared': {
'CPPDEFINES': ['BUILDING_V8_SHARED'], 'CPPDEFINES': ['BUILDING_V8_SHARED'],
'LIBS': ['winmm', 'ws2_32'] 'LIBS': ['winmm', 'ws2_32']
}, },
'arch:ia32': {
'WARNINGFLAGS': ['/W3']
},
'arch:x64': {
'WARNINGFLAGS': ['/W3']
},
'arch:arm': { 'arch:arm': {
'CPPDEFINES': ['V8_TARGET_ARCH_ARM'], 'CPPDEFINES': ['V8_TARGET_ARCH_ARM'],
# /wd4996 is to silence the warning about sscanf # /wd4996 is to silence the warning about sscanf
......
src/spaces.h
View file @ 5fe8bd99
...@@ -1837,7 +1837,7 @@ class MapSpace : public FixedSpace { ...@@ -1837,7 +1837,7 @@ class MapSpace : public FixedSpace {
#ifdef DEBUG #ifdef DEBUG
if (FLAG_enable_slow_asserts) { 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()) for (Page* p = first_page_; p != top_page; p = p->next_page())
actual_size += kMapsPerPage * Map::kSize; actual_size += kMapsPerPage * Map::kSize;
actual_size += (new_top - top_page->ObjectAreaStart()); actual_size += (new_top - top_page->ObjectAreaStart());
......
test/cctest/test-serialize.cc
View file @ 5fe8bd99
...@@ -217,7 +217,7 @@ void FileByteSink::WriteSpaceUsed( ...@@ -217,7 +217,7 @@ void FileByteSink::WriteSpaceUsed(
int map_space_used, int map_space_used,
int cell_space_used, int cell_space_used,
int large_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); Vector<char> name = Vector<char>::New(file_name_length + 1);
OS::SNPrintF(name, "%s.size", file_name_); OS::SNPrintF(name, "%s.size", file_name_);
FILE* fp = OS::FOpen(name.start(), "w"); FILE* fp = OS::FOpen(name.start(), "w");
...@@ -368,7 +368,7 @@ TEST(PartialSerialization) { ...@@ -368,7 +368,7 @@ TEST(PartialSerialization) {
raw_foo = *(v8::Utils::OpenHandle(*foo)); 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); Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file); OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file);
...@@ -394,7 +394,7 @@ TEST(PartialSerialization) { ...@@ -394,7 +394,7 @@ TEST(PartialSerialization) {
DEPENDENT_TEST(PartialDeserialization, PartialSerialization) { 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); Vector<char> startup_name = Vector<char>::New(file_name_length + 1);
OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file); OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file);
......
tools/visual_studio/common.vsprops
View file @ 5fe8bd99
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
GenerateDebugInformation="true" GenerateDebugInformation="true"
MapFileName="$(OutDir)\$(TargetName).map" MapFileName="$(OutDir)\$(TargetName).map"
ImportLibrary="$(OutDir)\lib\$(TargetName).lib" ImportLibrary="$(OutDir)\lib\$(TargetName).lib"
TargetMachine="1"
FixedBaseAddress="1" FixedBaseAddress="1"
AdditionalOptions="/IGNORE:4221 /NXCOMPAT" AdditionalOptions="/IGNORE:4221 /NXCOMPAT"
/> />
......
tools/visual_studio/d8.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/d8_arm.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/d8_x64.vcproj
View file @ 5fe8bd99
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib" AdditionalDependencies="winmm.lib Ws2_32.lib"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -70,9 +69,6 @@ ...@@ -70,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -112,7 +108,6 @@ ...@@ -112,7 +108,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib" AdditionalDependencies="winmm.lib Ws2_32.lib"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -132,9 +127,6 @@ ...@@ -132,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -146,6 +138,22 @@ ...@@ -146,6 +138,22 @@
<File <File
RelativePath="..\..\src\d8.cc" 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>
<File <File
RelativePath="..\..\src\d8.h" RelativePath="..\..\src\d8.h"
......
tools/visual_studio/ia32.vsprops
View file @ 5fe8bd99
...@@ -10,4 +10,8 @@ ...@@ -10,4 +10,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="_USE_32BIT_TIME_T;V8_TARGET_ARCH_IA32;V8_NATIVE_REGEXP" PreprocessorDefinitions="_USE_32BIT_TIME_T;V8_TARGET_ARCH_IA32;V8_NATIVE_REGEXP"
/> />
<Tool
Name="VCLinkerTool"
TargetMachine="1"
/>
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
tools/visual_studio/v8_base_x64.vcproj
View file @ 5fe8bd99
...@@ -425,6 +425,19 @@ ...@@ -425,6 +425,19 @@
> >
</File> </File>
<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" RelativePath="..\..\src\func-name-inferrer.cc"
> >
</File> </File>
......
tools/visual_studio/v8_cctest.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_cctest_arm.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_cctest_x64.vcproj
View file @ 5fe8bd99
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib" AdditionalDependencies="winmm.lib Ws2_32.lib"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -70,9 +69,6 @@ ...@@ -70,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -112,7 +108,6 @@ ...@@ -112,7 +108,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib" AdditionalDependencies="winmm.lib Ws2_32.lib"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -132,9 +127,6 @@ ...@@ -132,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -179,10 +171,6 @@ ...@@ -179,10 +171,6 @@
RelativePath="..\..\test\cctest\test-decls.cc" RelativePath="..\..\test\cctest\test-decls.cc"
> >
</File> </File>
<File
RelativePath="..\..\test\cctest\test-disasm-x64.cc"
>
</File>
<File <File
RelativePath="..\..\test\cctest\test-flags.cc" RelativePath="..\..\test\cctest\test-flags.cc"
> >
......
tools/visual_studio/v8_mksnapshot.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_mksnapshot_x64.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_process_sample.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_process_sample_arm.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_process_sample_x64.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -144,6 +138,22 @@ ...@@ -144,6 +138,22 @@
<File <File
RelativePath="..\..\samples\process.cc" 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> </File>
</Files> </Files>
<Globals> <Globals>
......
tools/visual_studio/v8_shell_sample.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_shell_sample_arm.vcproj
View file @ 5fe8bd99
...@@ -69,9 +69,6 @@ ...@@ -69,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -130,9 +127,6 @@ ...@@ -130,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
......
tools/visual_studio/v8_shell_sample_x64.vcproj
View file @ 5fe8bd99
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib" AdditionalDependencies="winmm.lib Ws2_32.lib"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -70,9 +69,6 @@ ...@@ -70,9 +69,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -112,7 +108,6 @@ ...@@ -112,7 +108,6 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="winmm.lib Ws2_32.lib" AdditionalDependencies="winmm.lib Ws2_32.lib"
TargetMachine="17"
/> />
<Tool <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -132,9 +127,6 @@ ...@@ -132,9 +127,6 @@
<Tool <Tool
Name="VCAppVerifierTool" Name="VCAppVerifierTool"
/> />
<Tool
Name="VCWebDeploymentTool"
/>
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
...@@ -146,6 +138,22 @@ ...@@ -146,6 +138,22 @@
<File <File
RelativePath="..\..\samples\shell.cc" 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> </File>
</Files> </Files>
<Globals> <Globals>
......
tools/visual_studio/x64.vsprops
View file @ 5fe8bd99
...@@ -10,4 +10,8 @@ ...@@ -10,4 +10,8 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
PreprocessorDefinitions="V8_TARGET_ARCH_X64;V8_NATIVE_REGEXP" PreprocessorDefinitions="V8_TARGET_ARCH_X64;V8_NATIVE_REGEXP"
/> />
<Tool
Name="VCLinkerTool"
TargetMachine="17"
/>
</VisualStudioPropertySheet> </VisualStudioPropertySheet>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment