Reviewers: machenbach,
Description:
Merged r16018, r16026 into trunk branch.
Revert windows-specific part of r15937 for debug level 1.
Make optimized debug builds link against debug CRT.
[email protected]
BUG=
Please review this at https://chromiumcodereview.appspot.com/22192002/
SVN Base: https://v8.googlecode.com/svn/trunk
Affected files:
M build/toolchain.gypi
M src/version.cc
Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index
36d60c28ab98d03e79d9ba9688b8afd344cacd3f..ddb8aafad0c58bfe882ee1ad33a0153d713109bb
100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -61,11 +61,10 @@
'v8_enable_backtrace%': 0,
# Speeds up Debug builds:
- # 0 - compiler optimizations off (debuggable) (default). This may
+ # 0 - Compiler optimizations off (debuggable) (default). This may
# be 5x slower than Release (or worse).
- # 1 - turn on compiler optimizations. and #undef DEBUG/#define NDEBUG.
- # This may be hard or impossible to debug. This may still be
- # 2x slower than Release (or worse).
+ # 1 - Turn on compiler optimizations. This may be hard or impossible to
+ # debug. This may still be 2x slower than Release (or worse).
# 2 - Turn on optimizations, and also #undef DEBUG / #define NDEBUG
# (but leave V8_ENABLE_CHECKS and most other assertions enabled.
# This may cause some v8 tests to fail in the Debug configuration.
@@ -455,14 +454,32 @@
'msvs_settings': {
'VCCLCompilerTool': {
'conditions': [
- ['component=="shared_library"', {
- 'RuntimeLibrary': '3', # /MDd
- }, {
- 'RuntimeLibrary': '1', # /MTd
- }],
['v8_optimized_debug==0', {
'Optimization': '0',
- }, {
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'RuntimeLibrary': '3', # /MDd
+ }, {
+ 'RuntimeLibrary': '1', # /MTd
+ }],
+ ],
+ }],
+ ['v8_optimized_debug==1', {
+ 'Optimization': '1',
+ 'InlineFunctionExpansion': '2',
+ 'EnableIntrinsicFunctions': 'true',
+ 'FavorSizeOrSpeed': '0',
+ 'StringPooling': 'true',
+ 'BasicRuntimeChecks': '0',
+ 'conditions': [
+ ['component=="shared_library"', {
+ 'RuntimeLibrary': '3', # /MDd
+ }, {
+ 'RuntimeLibrary': '1', # /MTd
+ }],
+ ],
+ }],
+ ['v8_optimized_debug==2', {
'Optimization': '2',
'InlineFunctionExpansion': '2',
'EnableIntrinsicFunctions': 'true',
@@ -471,9 +488,9 @@
'BasicRuntimeChecks': '0',
'conditions': [
['component=="shared_library"', {
- 'RuntimeLibrary': '2', #/MD
+ 'RuntimeLibrary': '3', #/MDd
}, {
- 'RuntimeLibrary': '0', #/MT
+ 'RuntimeLibrary': '1', #/MTd
}],
['v8_target_arch=="x64"', {
# TODO(2207): remove this option once the bug is fixed.
@@ -487,7 +504,11 @@
'conditions': [
['v8_optimized_debug==0', {
'LinkIncremental': '2',
- }, {
+ }],
+ ['v8_optimized_debug==1', {
+ 'LinkIncremental': '2',
+ }],
+ ['v8_optimized_debug==2', {
'LinkIncremental': '1',
'OptimizeReferences': '2',
'EnableCOMDATFolding': '2',
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
be0a4b5a67baa20c09f835e5466808d7c4972acc..9771bd6504fca23010b61d14c01adc9d4ed378e1
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 20
#define BUILD_NUMBER 12
-#define PATCH_LEVEL 0
+#define PATCH_LEVEL 1
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
