X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Fx86%2Flib%2FMakefile;h=85f5db95c60f03718f292080587f7faa337ef570;hb=cc2cef505ccd434acd7fb3cee2b9cbf2a5294369;hp=3e549b8ec8c9da4ebf3c02db2289196abc0a5b1b;hpb=6effe5f5773a12f0b1f2c1e1aea9dcf0ee96e7e6;p=~andy%2Flinux

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 3e549b8ec8c..85f5db95c60 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -15,8 +15,10 @@ ifeq ($(CONFIG_X86_32),y)
         obj-y += atomic64_32.o
         lib-y += checksum_32.o
         lib-y += strstr_32.o
-        lib-y += semaphore_32.o string_32.o cmpxchg8b_emu.o
-
+        lib-y += semaphore_32.o string_32.o
+ifneq ($(CONFIG_X86_CMPXCHG64),y)
+        lib-y += cmpxchg8b_emu.o
+endif
         lib-$(CONFIG_X86_USE_3DNOW) += mmx_32.o
 else
         obj-y += io_64.o iomap_copy_64.o