From: isaacs <i@izs.me>
Date: Tue, 23 Oct 2012 18:59:19 +0000 (-0700)
Subject: Merge remote-tracking branch 'ry/v0.8'
X-Git-Tag: v0.9.3~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3ca783525c3de368572a12e627e56090e49f594;p=platform%2Fupstream%2Fnodejs.git

Merge remote-tracking branch 'ry/v0.8'

Conflicts:
	deps/v8/src/arm/code-stubs-arm.cc
	deps/v8/src/version.cc
---

c3ca783525c3de368572a12e627e56090e49f594
diff --cc deps/v8/build/common.gypi
index 78017dd,5d6132c..f4e63ea
--- a/deps/v8/build/common.gypi
+++ b/deps/v8/build/common.gypi
@@@ -343,23 -330,9 +344,23 @@@
          },
          'conditions': [
            ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
-             'cflags': [ '-Wno-unused-parameter',
+             'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
                          '-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
            }],
 +          ['OS=="android"', {
 +            'variables': {
 +              'android_full_debug%': 1,
 +            },
 +            'conditions': [
 +              ['android_full_debug==0', {
 +                # Disable full debug if we want a faster v8 in a debug build.
 +                # TODO(2304): pass DISABLE_DEBUG_ASSERT instead of hiding DEBUG.
 +                'defines!': [
 +                  'DEBUG',
 +                ],
 +              }],
 +            ],
 +          }],
          ],
        },  # Debug
        'Release': {