From 74364c97740eb48c86d6e7b42520c77130eb1486 Mon Sep 17 00:00:00 2001
From: djsollen <djsollen@google.com>
Date: Wed, 3 Sep 2014 10:44:00 -0700
Subject: [PATCH] Disable -fexpensive-optimizations on 64-bit ARM.

BUG=skia:2908
R=mtklein@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/535113004
---
 gyp/common_conditions.gypi | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 9a436f3130..0075b250ea 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -240,6 +240,13 @@
               '-fno-omit-frame-pointer',
             ],
           }],
+          [ 'skia_arch_type == "arm64"', {
+            # this flag causes tiling errors with GCC 4.9 (pre-release) toolchain
+            # see skbug.com/ 
+            'cflags': [
+              '-fno-expensive-optimizations'
+            ],
+          }],
           [ 'skia_arch_type == "arm" and arm_thumb == 1', {
             'cflags': [
               '-mthumb',
@@ -578,7 +585,6 @@
           },
           'Release': {
             'cflags': ['-O2'],
-            'defines': [ 'NDEBUG' ],
           },
         },
         'libraries': [