From 532dd622148046028462b0e933912f1781fec06b Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c>
Date: Tue, 27 Nov 2012 21:04:56 +0000
Subject: [PATCH] Another shot at using the new asan flag

BUG=159580, 162783
TBR=glider

Review URL: https://codereview.chromium.org/11428031

git-svn-id: http://src.chromium.org/svn/trunk/src/build@169750 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
---
 common.gypi | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/common.gypi b/common.gypi
index 9d89186b5..0daf4440f 100644
--- a/common.gypi
+++ b/common.gypi
@@ -2700,13 +2700,12 @@
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': [
-                  '-faddress-sanitizer',
+                  '-fsanitize=address',
                   '-fno-omit-frame-pointer',
-                  # See http://crbug.com/159580
-                  '-w',
+                  '-w',  # http://crbug.com/162783
                 ],
                 'ldflags': [
-                  '-faddress-sanitizer',
+                  '-fsanitize=address',
                 ],
                 'defines': [
                   'ADDRESS_SANITIZER',
@@ -3164,9 +3163,8 @@
               # Due to issues in Clang build system, using ASan on 32-bit
               # binaries on x86_64 host is problematic.
               # TODO(eugenis): re-enable.
-              '-faddress-sanitizer',
-              # See http://crbug.com/159580
-              '-w',
+              '-fsanitize=address',
+              '-w',  # http://crbug.com/162783
             ],
             'ldflags!': [
               '-faddress-sanitizer',
@@ -3287,9 +3285,8 @@
           ['asan==1', {
             'xcode_settings': {
               'OTHER_CFLAGS': [
-                '-faddress-sanitizer',
-                # See http://crbug.com/159580
-                '-w',
+                '-fsanitize=address',
+                '-w',  # http://crbug.com/162783
               ],
             },
             'defines': [