diff --git a/Makefile b/Makefile
index 68f65392d..486e4d011 100644
--- a/Makefile
+++ b/Makefile
@@ -337,7 +337,9 @@ ZSTD_OBJS += $(ZSTD)/common/entropy_common.o $(ZSTD)/common/error_private.o
 ZSTD_OBJS += $(ZSTD)/common/fse_decompress.o $(ZSTD)/common/xxhash.o
 ZSTD_OBJS += $(ZSTD)/common/zstd_common.o
 ZSTD_OBJS += $(ZSTD)/decompress/huf_decompress.o
+ifneq (,$(filter x86%, $(ARCH)))
 ZSTD_OBJS += $(ZSTD)/decompress/huf_decompress_amd64.o
+endif
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_ddict.o
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress_block.o
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress.o
diff --git a/Makefile.libretro b/Makefile.libretro
index 9a2e2ebb3..578b10e8f 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -64,7 +64,7 @@ endif
 # x86/x86_64 generic
 else ifneq (,$(findstring x86,$(platform)))
 	TARGET := $(TARGET_NAME)_libretro.so
-	ARCH := 86
+	ARCH := x86
         fpic := -fPIC
 	SHARED := -shared
 	CFLAGS += -DFAMEC_NO_GOTOS