From: sgjesse@chromium.org Date: Wed, 27 Jan 2010 16:18:58 +0000 (+0000) Subject: Fix 64-bit build on Windows and Visual Studio project files X-Git-Tag: upstream/4.7.83~22597 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fe8bd99198e48ecbae59ae58e29ae3a4bcec5d2;p=platform%2Fupstream%2Fv8.git 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 --- diff --git a/SConstruct b/SConstruct index 2967d92..c9c5a55 100644 --- a/SConstruct +++ b/SConstruct @@ -281,18 +281,12 @@ V8_EXTRA_FLAGS = { }, '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 diff --git a/src/spaces.h b/src/spaces.h index f7a0439..37117f9 100644 --- a/src/spaces.h +++ b/src/spaces.h @@ -1837,7 +1837,7 @@ class MapSpace : public FixedSpace { #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()); diff --git a/test/cctest/test-serialize.cc b/test/cctest/test-serialize.cc index 81b6b71..c34840a 100644 --- a/test/cctest/test-serialize.cc +++ b/test/cctest/test-serialize.cc @@ -217,7 +217,7 @@ void FileByteSink::WriteSpaceUsed( 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 name = Vector::New(file_name_length + 1); OS::SNPrintF(name, "%s.size", file_name_); FILE* fp = OS::FOpen(name.start(), "w"); @@ -368,7 +368,7 @@ TEST(PartialSerialization) { 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 startup_name = Vector::New(file_name_length + 1); OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file); @@ -394,7 +394,7 @@ TEST(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 startup_name = Vector::New(file_name_length + 1); OS::SNPrintF(startup_name, "%s.startup", FLAG_testing_serialization_file); diff --git a/tools/visual_studio/common.vsprops b/tools/visual_studio/common.vsprops index 213a081..e4f75a5 100644 --- a/tools/visual_studio/common.vsprops +++ b/tools/visual_studio/common.vsprops @@ -28,7 +28,6 @@ GenerateDebugInformation="true" MapFileName="$(OutDir)\$(TargetName).map" ImportLibrary="$(OutDir)\lib\$(TargetName).lib" - TargetMachine="1" FixedBaseAddress="1" AdditionalOptions="/IGNORE:4221 /NXCOMPAT" /> diff --git a/tools/visual_studio/d8.vcproj b/tools/visual_studio/d8.vcproj index 21636ba..8372c67 100644 --- a/tools/visual_studio/d8.vcproj +++ b/tools/visual_studio/d8.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/d8_arm.vcproj b/tools/visual_studio/d8_arm.vcproj index fbebdb3..66adcec 100644 --- a/tools/visual_studio/d8_arm.vcproj +++ b/tools/visual_studio/d8_arm.vcproj @@ -1,199 +1,193 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/visual_studio/d8_x64.vcproj b/tools/visual_studio/d8_x64.vcproj index 5c47a8a..b534a92 100644 --- a/tools/visual_studio/d8_x64.vcproj +++ b/tools/visual_studio/d8_x64.vcproj @@ -50,7 +50,6 @@ - @@ -112,7 +108,6 @@ - @@ -146,6 +138,22 @@ + + + + + + + diff --git a/tools/visual_studio/v8_arm.vcproj b/tools/visual_studio/v8_arm.vcproj index f8cbcc4..d21affe 100644 --- a/tools/visual_studio/v8_arm.vcproj +++ b/tools/visual_studio/v8_arm.vcproj @@ -1,223 +1,223 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/visual_studio/v8_base_x64.vcproj b/tools/visual_studio/v8_base_x64.vcproj index a8c8b55..2c22280 100644 --- a/tools/visual_studio/v8_base_x64.vcproj +++ b/tools/visual_studio/v8_base_x64.vcproj @@ -425,6 +425,19 @@ > + + + + + + diff --git a/tools/visual_studio/v8_cctest.vcproj b/tools/visual_studio/v8_cctest.vcproj index d1cf2e8..9acb835 100644 --- a/tools/visual_studio/v8_cctest.vcproj +++ b/tools/visual_studio/v8_cctest.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/v8_cctest_arm.vcproj b/tools/visual_studio/v8_cctest_arm.vcproj index 968d134..7ff953e 100644 --- a/tools/visual_studio/v8_cctest_arm.vcproj +++ b/tools/visual_studio/v8_cctest_arm.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/v8_cctest_x64.vcproj b/tools/visual_studio/v8_cctest_x64.vcproj index 78db1a4..1e9044b 100644 --- a/tools/visual_studio/v8_cctest_x64.vcproj +++ b/tools/visual_studio/v8_cctest_x64.vcproj @@ -50,7 +50,6 @@ - @@ -112,7 +108,6 @@ - @@ -180,10 +172,6 @@ > - - diff --git a/tools/visual_studio/v8_mksnapshot.vcproj b/tools/visual_studio/v8_mksnapshot.vcproj index 00950b0..cb9e048 100644 --- a/tools/visual_studio/v8_mksnapshot.vcproj +++ b/tools/visual_studio/v8_mksnapshot.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/v8_mksnapshot_x64.vcproj b/tools/visual_studio/v8_mksnapshot_x64.vcproj index 1c460e4..e684af0 100644 --- a/tools/visual_studio/v8_mksnapshot_x64.vcproj +++ b/tools/visual_studio/v8_mksnapshot_x64.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/v8_process_sample.vcproj b/tools/visual_studio/v8_process_sample.vcproj index d94966b..dc3fb3a 100644 --- a/tools/visual_studio/v8_process_sample.vcproj +++ b/tools/visual_studio/v8_process_sample.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/v8_process_sample_arm.vcproj b/tools/visual_studio/v8_process_sample_arm.vcproj index 7320231..2d63f69 100644 --- a/tools/visual_studio/v8_process_sample_arm.vcproj +++ b/tools/visual_studio/v8_process_sample_arm.vcproj @@ -1,151 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/visual_studio/v8_process_sample_x64.vcproj b/tools/visual_studio/v8_process_sample_x64.vcproj index 81adbe0..1d7f01a 100644 --- a/tools/visual_studio/v8_process_sample_x64.vcproj +++ b/tools/visual_studio/v8_process_sample_x64.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - @@ -144,6 +138,22 @@ + + + + + + diff --git a/tools/visual_studio/v8_shell_sample.vcproj b/tools/visual_studio/v8_shell_sample.vcproj index 2cbd22d..b1e5f01 100644 --- a/tools/visual_studio/v8_shell_sample.vcproj +++ b/tools/visual_studio/v8_shell_sample.vcproj @@ -70,9 +70,6 @@ Name="VCAppVerifierTool" /> - @@ -131,9 +128,6 @@ Name="VCAppVerifierTool" /> - diff --git a/tools/visual_studio/v8_shell_sample_arm.vcproj b/tools/visual_studio/v8_shell_sample_arm.vcproj index ba7e0e0..a14c91a 100644 --- a/tools/visual_studio/v8_shell_sample_arm.vcproj +++ b/tools/visual_studio/v8_shell_sample_arm.vcproj @@ -1,151 +1,145 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/visual_studio/v8_shell_sample_x64.vcproj b/tools/visual_studio/v8_shell_sample_x64.vcproj index e1d5164..44d7b12 100644 --- a/tools/visual_studio/v8_shell_sample_x64.vcproj +++ b/tools/visual_studio/v8_shell_sample_x64.vcproj @@ -50,7 +50,6 @@ - @@ -112,7 +108,6 @@ - @@ -146,6 +138,22 @@ + + + + + + diff --git a/tools/visual_studio/x64.vsprops b/tools/visual_studio/x64.vsprops index 7587acf..3371d54 100644 --- a/tools/visual_studio/x64.vsprops +++ b/tools/visual_studio/x64.vsprops @@ -10,4 +10,8 @@ Name="VCCLCompilerTool" PreprocessorDefinitions="V8_TARGET_ARCH_X64;V8_NATIVE_REGEXP" /> +