diff --git a/libavutil/aes.c b/libavutil/aes.c
index 80f8a2253d..de7144fab8 100644
--- a/libavutil/aes.c
+++ b/libavutil/aes.c
@@ -237,7 +237,7 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt)
 
     a->rounds = rounds;
     a->crypt = decrypt ? aes_decrypt : aes_encrypt;
-#if ARCH_X86
+#if ARCH_X86 && HAVE_X86ASM
     ff_init_aes_x86(a, decrypt);
 #endif
 
diff --git a/libavutil/fixed_dsp.c b/libavutil/fixed_dsp.c
index 95f0eb2595..74cefdb145 100644
--- a/libavutil/fixed_dsp.c
+++ b/libavutil/fixed_dsp.c
@@ -165,7 +165,7 @@ AVFixedDSPContext * avpriv_alloc_fixed_dsp(int bit_exact)
 
 #if ARCH_RISCV
     ff_fixed_dsp_init_riscv(fdsp);
-#elif ARCH_X86
+#elif ARCH_X86 && HAVE_X86ASM
     ff_fixed_dsp_init_x86(fdsp);
 #endif
 
diff --git a/libavutil/float_dsp.c b/libavutil/float_dsp.c
index f38ad565cf..5bfa1008d1 100644
--- a/libavutil/float_dsp.c
+++ b/libavutil/float_dsp.c
@@ -159,7 +159,7 @@ av_cold AVFloatDSPContext *avpriv_float_dsp_alloc(int bit_exact)
     ff_float_dsp_init_ppc(fdsp, bit_exact);
 #elif ARCH_RISCV
     ff_float_dsp_init_riscv(fdsp);
-#elif ARCH_X86
+#elif ARCH_X86 && HAVE_X86ASM
     ff_float_dsp_init_x86(fdsp);
 #elif ARCH_MIPS
     ff_float_dsp_init_mips(fdsp);
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 7b88738e2d..681482dc08 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -362,7 +362,7 @@ void av_image_copy_plane_uc_from(uint8_t *dst, ptrdiff_t dst_linesize,
 {
     int ret = -1;
 
-#if ARCH_X86
+#if ARCH_X86 && HAVE_X86ASM
     ret = ff_image_copy_plane_uc_from_x86(dst, dst_linesize, src, src_linesize,
                                           bytewidth, height);
 #endif
diff --git a/libavutil/lls.c b/libavutil/lls.c
index fe8f55976d..27168009c5 100644
--- a/libavutil/lls.c
+++ b/libavutil/lls.c
@@ -114,7 +114,7 @@ av_cold void avpriv_init_lls(LLSModel *m, int indep_count)
     m->evaluate_lls = evaluate_lls;
 #if ARCH_RISCV
     ff_init_lls_riscv(m);
-#elif ARCH_X86
+#elif ARCH_X86 && HAVE_X86ASM
     ff_init_lls_x86(m);
 #endif
 }
diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c
index 820889a143..8e91f0a2cc 100644
--- a/libavutil/pixelutils.c
+++ b/libavutil/pixelutils.c
@@ -86,7 +86,7 @@ av_pixelutils_sad_fn av_pixelutils_get_sad_fn(int w_bits, int h_bits, int aligne
     if (w_bits != h_bits) // only squared sad for now
         return NULL;
 
-#if ARCH_X86
+#if ARCH_X86 && HAVE_X86ASM
     ff_pixelutils_sad_init_x86(sad, aligned);
 #endif
 
diff --git a/libavutil/x86/Makefile b/libavutil/x86/Makefile
index 8cfd646108..4e1b4b1176 100644
--- a/libavutil/x86/Makefile
+++ b/libavutil/x86/Makefile
@@ -1,23 +1,14 @@
-OBJS += x86/aes_init.o                                                  \
-        x86/cpu.o                                                       \
-        x86/fixed_dsp_init.o                                            \
-        x86/float_dsp_init.o                                            \
-        x86/imgutils_init.o                                             \
-        x86/lls_init.o                                                  \
-
-OBJS-$(HAVE_X86ASM) += x86/tx_float_init.o                              \
-
-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils_init.o                      \
+OBJS += x86/cpu.o                                                       \
 
 EMMS_OBJS_$(HAVE_MMX_INLINE)_$(HAVE_MMX_EXTERNAL)_$(HAVE_MM_EMPTY) = x86/emms.o
 
-X86ASM-OBJS += x86/aes.o                                                \
-             x86/cpuid.o                                                \
-             $(EMMS_OBJS__yes_)                                      \
-             x86/fixed_dsp.o                                            \
-             x86/float_dsp.o                                            \
-             x86/imgutils.o                                             \
-             x86/lls.o                                                  \
-             x86/tx_float.o                                             \
+X86ASM-OBJS += x86/aes.o x86/aes_init.o                                 \
+               x86/cpuid.o                                              \
+               $(EMMS_OBJS__yes_)                                       \
+               x86/fixed_dsp.o x86/fixed_dsp_init.o                     \
+               x86/float_dsp.o x86/float_dsp_init.o                     \
+               x86/imgutils.o x86/imgutils_init.o                       \
+               x86/lls.o x86/lls_init.o                                 \
+               x86/tx_float.o x86/tx_float_init.o                       \
 
-X86ASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o                    \
+X86ASM-OBJS-$(CONFIG_PIXELUTILS) += x86/pixelutils.o x86/pixelutils_init.o