From 12d0d1b74f956e6a6ac3a944f1c1a3c306b84237 Mon Sep 17 00:00:00 2001
From: "yangguo@chromium.org"
 <yangguo@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Tue, 1 Jul 2014 13:51:27 +0000
Subject: [PATCH] Revert "Add msan build option." (r22109)

Building d8 with msan requires instrumented libc++. Currently the
advised way to do this is from a chromium checkout with d8 as target.

R=jarin@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@22124 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 Makefile              |  8 +-------
 build/standalone.gypi | 17 -----------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index bcb3922..3ac994a 100644
--- a/Makefile
+++ b/Makefile
@@ -145,13 +145,7 @@ ifneq ($(strip $(asan)),)
   export LINK=$(asan)
   export ASAN_SYMBOLIZER_PATH="$(dir $(asan))llvm-symbolizer"
 endif
-# msan=/path/to/clang++
-ifneq ($(strip $(msan)),)
-  GYPFLAGS += -Dmsan=1 -Dmsan_track_origins=2
-  export CXX=$(msan)
-  export CXX_host=$(msan)
-  export LINK=$(msan)
-endif
+
 # arm specific flags.
 # arm_version=<number | "default">
 ifneq ($(strip $(arm_version)),)
diff --git a/build/standalone.gypi b/build/standalone.gypi
index 92b5ff8..cf448f3 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -35,7 +35,6 @@
     'component%': 'static_library',
     'clang%': 0,
     'asan%': 0,
-    'msan%': 0,
     'visibility%': 'hidden',
     'v8_enable_backtrace%': 0,
     'v8_enable_i18n_support%': 1,
@@ -186,22 +185,6 @@
         ],
       },
     }],
-    ['msan==1', {
-      'target_defaults': {
-        'cflags_cc+': [
-          '-fno-omit-frame-pointer',
-          '-fsanitize-memory-track-origins=2',
-          '-fsanitize=memory',
-          '-w',  # http://crbug.com/162783
-        ],
-        'cflags_cc!': [
-          '-fomit-frame-pointer',
-        ],
-        'ldflags': [
-          '-fsanitize=memory',
-        ],
-      },
-    }],
     ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
        or OS=="netbsd"', {
       'target_defaults': {
-- 
2.7.4