diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures
index 099714e..12377ad 100644
--- a/Makefile.cpufeatures
+++ b/Makefile.cpufeatures
@@ -17,7 +17,11 @@ ifeq ($(CPUFEATURES_UNAME),Darwin)
   CPUFEATURES_CFLAGS += -DHAVE_SYSCTLBYNAME
 endif
 
-ifeq ($(CPUFEATURES_ARCH), x86_64)
+ifeq ($(CPUFEATURES_ARCH),x86_64)
+  CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
+endif
+
+ifneq ($(filter-out $(CPUFEATURES_ARCH),i%86),)
   CPUFEATURES_OBJS += cpu_features/src/cpuinfo_x86.o
 endif