From 0675a9eb482d96d3556b1aebd7125c748ef225f0 Mon Sep 17 00:00:00 2001 From: Alexey Gladkov Date: Mon, 7 Sep 2020 13:08:29 +0300 Subject: [PATCH] ALT: disable asm on x86 in dav1d Signed-off-by: Alexey Gladkov --- third_party/dav1d/BUILD.gn | 2 +- third_party/dav1d/config/linux/x86/config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn index 20e45374b4e..f9ec9c61c13 100644 --- a/third_party/dav1d/BUILD.gn +++ b/third_party/dav1d/BUILD.gn @@ -2,21 +2,21 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. import("dav1d_generated.gni") import("//build/config/compiler/compiler.gni") import("//build/config/sanitizers/sanitizers.gni") import("//third_party/nasm/nasm_assemble.gni") # MemorySanitizer can't handle assembly, https://crbug.com/928357. -enable_nasm = (current_cpu == "x86" || current_cpu == "x64") && !is_msan +enable_nasm = (current_cpu == "x64") && !is_msan if (is_win) { platform_config_root = "config/win/$current_cpu" } else if (is_msan) { assert(current_cpu == "x64" && (is_linux || is_chromeos), "Only Linux X64 MSAN is supported") platform_config_root = "config/linux-noasm/$current_cpu" } else { # Linux configuration files seem to work on Mac, so just reuse them. platform_config_root = "config/linux/$current_cpu" diff --git a/third_party/dav1d/config/linux/x86/config.h b/third_party/dav1d/config/linux/x86/config.h index 9869da9c6bd..b0fcfe6a40e 100644 --- a/third_party/dav1d/config/linux/x86/config.h +++ b/third_party/dav1d/config/linux/x86/config.h @@ -18,23 +18,23 @@ #define ARCH_X86_64 0 #define CONFIG_16BPC 1 #define CONFIG_8BPC 1 // #define CONFIG_LOG 1 -- Logging is controlled by Chromium #define ENDIANNESS_BIG 0 -#define HAVE_ASM 1 +#define HAVE_ASM 0 -#define HAVE_AVX512ICL 1 +#define HAVE_AVX512ICL 0 #define HAVE_CLOCK_GETTIME 1 #define HAVE_DLSYM 1 #define HAVE_POSIX_MEMALIGN 1 #define HAVE_UNISTD_H 1 // #define STACK_ALIGNMENT 16 -- Stack alignment is controlled by Chromium -- 2.25.4