diff options
| author | Ryan Dahl <ry@tinyclouds.org> | 2010-04-27 00:31:47 -0700 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2010-04-27 00:31:47 -0700 |
| commit | 24931f840544c9970203660121a1ec4606bdd4f1 (patch) | |
| tree | f22539325eb06fc50879d9d4f327cf6c83645891 /deps/v8/tools | |
| parent | 2374e557e30fab5c357d3f03716ca3b83131c3c0 (diff) | |
| download | node-new-24931f840544c9970203660121a1ec4606bdd4f1.tar.gz | |
Upgrade V8 to 2.2.5
Diffstat (limited to 'deps/v8/tools')
| -rw-r--r-- | deps/v8/tools/gyp/v8.gyp | 26 | ||||
| -rw-r--r-- | deps/v8/tools/v8.xcodeproj/project.pbxproj | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp index 383564e21a..bfdc1cd3d2 100644 --- a/deps/v8/tools/gyp/v8.gyp +++ b/deps/v8/tools/gyp/v8.gyp @@ -29,7 +29,7 @@ 'variables': { 'msvs_use_common_release': 0, 'gcc_version%': 'unknown', - 'target_arch%': 'ia32', + 'v8_target_arch%': '<(target_arch)', 'v8_use_snapshot%': 'true', }, 'target_defaults': { @@ -39,17 +39,17 @@ 'ENABLE_VMSTATE_TRACKING', ], 'conditions': [ - ['target_arch=="arm"', { + ['v8_target_arch=="arm"', { 'defines': [ 'V8_TARGET_ARCH_ARM', ], }], - ['target_arch=="ia32"', { + ['v8_target_arch=="ia32"', { 'defines': [ 'V8_TARGET_ARCH_IA32', ], }], - ['target_arch=="x64"', { + ['v8_target_arch=="x64"', { 'defines': [ 'V8_TARGET_ARCH_X64', ], @@ -204,7 +204,7 @@ 'conditions': [ # The ARM assembler assumes the host is 32 bits, so force building # 32-bit host tools. - ['target_arch=="arm" and host_arch=="x64" and _toolset=="host"', { + ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', { 'cflags': ['-m32'], 'ldflags': ['-m32'], }] @@ -264,8 +264,8 @@ '../../src/cpu-profiler-inl.h', '../../src/cpu-profiler.cc', '../../src/cpu-profiler.h', - '../../src/data-flow.cc', - '../../src/data-flow.h', + '../../src/data-flow.cc', + '../../src/data-flow.h', '../../src/dateparser.cc', '../../src/dateparser.h', '../../src/dateparser-inl.h', @@ -396,8 +396,8 @@ '../../src/token.h', '../../src/top.cc', '../../src/top.h', - '../../src/type-info.cc', - '../../src/type-info.h', + '../../src/type-info.cc', + '../../src/type-info.h', '../../src/unicode-inl.h', '../../src/unicode.cc', '../../src/unicode.h', @@ -424,7 +424,7 @@ '../../src/zone.h', ], 'conditions': [ - ['target_arch=="arm"', { + ['v8_target_arch=="arm"', { 'include_dirs+': [ '../../src/arm', ], @@ -470,7 +470,7 @@ }] ] }], - ['target_arch=="ia32"', { + ['v8_target_arch=="ia32"', { 'include_dirs+': [ '../../src/ia32', ], @@ -505,7 +505,7 @@ '../../src/ia32/virtual-frame-ia32.h', ], }], - ['target_arch=="x64"', { + ['v8_target_arch=="x64"', { 'include_dirs+': [ '../../src/x64', ], @@ -656,7 +656,7 @@ 'conditions': [ # The ARM assembler assumes the host is 32 bits, so force building # 32-bit host tools. - ['target_arch=="arm" and host_arch=="x64" and _toolset=="host"', { + ['v8_target_arch=="arm" and host_arch=="x64" and _toolset=="host"', { 'cflags': ['-m32'], 'ldflags': ['-m32'], }] diff --git a/deps/v8/tools/v8.xcodeproj/project.pbxproj b/deps/v8/tools/v8.xcodeproj/project.pbxproj index bdd12d5a2c..1e9d1e74cd 100644 --- a/deps/v8/tools/v8.xcodeproj/project.pbxproj +++ b/deps/v8/tools/v8.xcodeproj/project.pbxproj @@ -1588,7 +1588,9 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS)", DEBUG, + ENABLE_LOGGING_AND_PROFILING, V8_ENABLE_CHECKS, + ENABLE_VMSTATE_TRACKING, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; |