diff options
| author | Henrik Gramner <gramner@twoorioles.com> | 2020-05-10 16:48:57 +0300 |
|---|---|---|
| committer | Henrik Gramner <henrik@gramner.com> | 2020-05-10 16:48:57 +0300 |
| commit | 28d333577ee8ecf5b77fda2794625bd6adbfd9ee (patch) | |
| tree | 9251358a3fb924a9adf6592cfa42b4ec8b95ecde | |
| parent | 6a6c3528925e623891c8404afdf43c0d63815709 (diff) | |
x86: Unconditionally compile msac_init.c
Eliminates the x86-64 check from the meson configuration file to be
consistent with how other x86-64-exclusive code is handled.
| -rw-r--r-- | src/meson.build | 7 | ||||
| -rw-r--r-- | src/x86/msac_init.c | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/meson.build b/src/meson.build index 11626fc..7ecb685 100644 --- a/src/meson.build +++ b/src/meson.build @@ -151,14 +151,9 @@ if is_asm_enabled libdav1d_sources += files( 'x86/cpu.c', + 'x86/msac_init.c', ) - if host_machine.cpu_family() == 'x86_64' - libdav1d_sources += files( - 'x86/msac_init.c', - ) - endif - libdav1d_tmpl_sources += files( 'x86/cdef_init_tmpl.c', 'x86/film_grain_init_tmpl.c', diff --git a/src/x86/msac_init.c b/src/x86/msac_init.c index a9dafc7..a634da2 100644 --- a/src/x86/msac_init.c +++ b/src/x86/msac_init.c @@ -28,6 +28,7 @@ #include "src/msac.h" #include "src/x86/msac.h" +#if ARCH_X86_64 void dav1d_msac_init_x86(MsacContext *const s) { const unsigned flags = dav1d_get_cpu_flags(); @@ -39,4 +40,4 @@ void dav1d_msac_init_x86(MsacContext *const s) { s->symbol_adapt16 = dav1d_msac_decode_symbol_adapt16_avx2; } } - +#endif |