From 103427718a0a928d1e95e4b6aaf03c81c8061e00 Mon Sep 17 00:00:00 2001
From: "kjellander@google.com"
 <kjellander@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Thu, 3 Jul 2014 18:39:32 +0000
Subject: [PATCH] Disable assembly optimizations in MemorySanitizer builds.

BUG=chromium:344505, chromium:373739
R=kjellander@google.com, mflodman@chromium.org

Review URL: https://webrtc-codereview.appspot.com/14849004

Patch from Sergey Matveev <earthdok@chromium.org>.

git-svn-id: http://libyuv.googlecode.com/svn/trunk@1028 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 BUILD.gn   | 6 ++++++
 libyuv.gyp | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/BUILD.gn b/BUILD.gn
index b9a3f3ab9..e41b9937d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -77,6 +77,12 @@ source_set("libyuv") {
     defines += [ "HAVE_JPEG" ]
   }
 
+  if (is_msan) {
+    # MemorySanitizer does not support assembly code yet.
+    # http://crbug.com/344505
+    defines += [ "LIBYUV_DISABLE_X86" ]
+  }
+
   deps = [
     "//third_party:jpeg",
   ]
diff --git a/libyuv.gyp b/libyuv.gyp
index d067a05dd..cc4b0f88f 100644
--- a/libyuv.gyp
+++ b/libyuv.gyp
@@ -104,6 +104,13 @@
             'LIBYUV_NEON',
           ]
         }],
+        # MemorySanitizer does not support assembly code yet.
+        # http://crbug.com/344505
+        [ 'msan == 1', {
+          'defines': [
+            'LIBYUV_DISABLE_X86',
+          ],
+        }],
       ],
       'defines': [
         # Enable the following 3 macros to turn off assembly for specified CPU.