diff options
| author |  mtklein <mtklein@chromium.org> | 2014-07-02 12:38:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-02 12:38:38 -0700 |
| commit | 3fa56b322acd1fc722124f349d155fc29d8500cc (patch) | |
| tree | fba9261f146745de6a37bfde6ec876699f916834 /src/opts | |
| parent | f0480b1e697dcaee8b4004ca5b494917c939cde7 (diff) | |
Exclude Clang on Windows too. Comment this up a bit.
BUG=391016
R=tomhudson@chromium.org, mtklein@google.com, rnk@chromium.org, thakis@chromium.org
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/363983004
Diffstat (limited to 'src/opts')
| -rw-r--r-- | src/opts/SkBlitRow_opts_SSE4.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/opts/SkBlitRow_opts_SSE4.h b/src/opts/SkBlitRow_opts_SSE4.h index c49c392d0a..f202aa5139 100644 --- a/src/opts/SkBlitRow_opts_SSE4.h +++ b/src/opts/SkBlitRow_opts_SSE4.h @@ -10,12 +10,14 @@ #include "SkBlitRow.h" -/* Check if we are able to build assembly code, GCC/AT&T syntax. - * Had problems with LLVM-GCC 4.2. - * MemorySanitizer cannot handle assembly code. +/* Check if we are able to build assembly code, GCC/AT&T syntax: + * 1) Clang and GCC are generally OK. OS X's old LLVM-GCC 4.2 can't handle it; + * 2) We're intentionally not linking this in even when supported (Clang) on Windows; + * 3) MemorySanitizer cannot instrument assembly at all. */ -#if (defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC))) \ - && !defined(MEMORY_SANITIZER) +#if /* 1)*/ (defined(__clang__) || (defined(__GNUC__) && !defined(SK_BUILD_FOR_MAC))) \ + /* 2)*/ && !defined(SK_BUILD_FOR_WIN) \ + /* 3)*/ && !defined(MEMORY_SANITIZER) extern "C" void S32A_Opaque_BlitRow32_SSE4_asm(SkPMColor* SK_RESTRICT dst, const SkPMColor* SK_RESTRICT src, int count, U8CPU alpha); |