From 42b9149fbc6c127bada977e31e598b0c1f898cf1 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 8 Sep 2022 16:52:26 +0000 Subject: [PATCH] No Issue - prevent build issue in MSVC due to libaom SIMD inlining. --- media/libaom/moz.build | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/media/libaom/moz.build b/media/libaom/moz.build index 72d55cffe1..f493af1640 100644 --- a/media/libaom/moz.build +++ b/media/libaom/moz.build @@ -117,7 +117,18 @@ if CONFIG['CLANG_CL'] or not CONFIG['_MSC_VER']: SOURCES[f].flags += ['-mavx'] elif f.endswith('avx2.c'): SOURCES[f].flags += ['-mavx2'] - +if CONFIG['_MSC_VER']: + for f in SOURCES: + # MSVC massively chokes on inlining these SIMD sources, so disable inlining for them. + if f.endswith('cdef_block_sse2.c'): + SOURCES[f].flags += ['-Ob0'] + elif f.endswith('cdef_block_ssse3.c'): + SOURCES[f].flags += ['-Ob0'] + elif f.endswith('cdef_block_sse4.c'): + SOURCES[f].flags += ['-Ob0'] + elif f.endswith('cdef_block_avx2.c'): + SOURCES[f].flags += ['-Ob0'] + # Suppress warnings in third-party code. if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: CFLAGS += [