Reviewers: Jakob,

Description:
Merged r15071 into trunk branch.

Use -O2 instead -O3 for Android build.

[email protected]

Please review this at https://chromiumcodereview.appspot.com/15821014/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
  M build/android.gypi
  M build/common.gypi
  M src/version.cc


Index: build/android.gypi
diff --git a/build/android.gypi b/build/android.gypi
index 8400ab113ab3c72cd7a3059577040526dfef5458..ca097255bbb5ce4deb018d5d95743af22af67b7c 100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -75,15 +75,8 @@
     ],
     'configurations': {
       'Release': {
-        'cflags!': [
-          '-O2',
-          '-Os',
-        ],
         'cflags': [
-          '-fdata-sections',
-          '-ffunction-sections',
           '-fomit-frame-pointer',
-          '-O3',
         ],
       },  # Release
     },  # configurations
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 127749a47380591ff3e0d9cc96a0f06034068a68..09abe2978ed9ab7bf92814088e06e00540365253 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -528,8 +528,7 @@
           ['v8_enable_extra_checks==1', {
             'defines': ['ENABLE_EXTRA_CHECKS',],
           }],
-          ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
-            or OS=="android"', {
+ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
             'cflags!': [
               '-O2',
               '-Os',
@@ -548,6 +547,25 @@
               }],
             ],
           }],
+          ['OS=="android"', {
+            'cflags!': [
+              '-O3',
+              '-Os',
+            ],
+            'cflags': [
+              '-fdata-sections',
+              '-ffunction-sections',
+              '-O2',
+            ],
+            'conditions': [
+              [ 'gcc_version==44 and clang==0', {
+                'cflags': [
+                  # Avoid crashes with gcc 4.4 in the v8 test suite.
+                  '-fno-tree-vrp',
+                ],
+              }],
+            ],
+          }],
           ['OS=="mac"', {
             'xcode_settings': {
               'GCC_OPTIMIZATION_LEVEL': '3',  # -O3
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index bad15cf2e0a7ee11fe3e14f6ffa78b4d634d99e3..c07f9be313e0a7d9685d3672976098cd54370f63 100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     3
 #define MINOR_VERSION     19
 #define BUILD_NUMBER      13
-#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.


Reply via email to