diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/base/cpu_unittest.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/base/cpu_unittest.cc')
| -rw-r--r-- | chromium/base/cpu_unittest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/base/cpu_unittest.cc b/chromium/base/cpu_unittest.cc index 931509738fe..ec14620f98c 100644 --- a/chromium/base/cpu_unittest.cc +++ b/chromium/base/cpu_unittest.cc @@ -26,7 +26,7 @@ TEST(CPU, RunExtendedInstructions) { ASSERT_TRUE(cpu.has_sse()); ASSERT_TRUE(cpu.has_sse2()); -// TODO(fbarchard): consider enabling for clangcl. +// GCC and clang instruction test. #if defined(COMPILER_GCC) // Execute an MMX instruction. __asm__ __volatile__("emms\n" : : : "mm0"); @@ -67,8 +67,9 @@ TEST(CPU, RunExtendedInstructions) { __asm__ __volatile__("vpunpcklbw %%ymm0, %%ymm0, %%ymm0\n" : : : "xmm0"); } -// TODO(jschuh): crbug.com/168866 Find a way to enable this on Win64. -#elif defined(COMPILER_MSVC) && defined(ARCH_CPU_32_BITS) +// Visual C 32 bit and ClangCL 32/64 bit test. +#elif defined(COMPILER_MSVC) && (defined(ARCH_CPU_32_BITS) || \ + (defined(ARCH_CPU_64_BITS) && defined(__clang__))) // Execute an MMX instruction. __asm emms; |