diff --git a/ChangeLog b/ChangeLog
index e89b69a2f3..cac1a7ede8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/Makefile ($(objpfx)tst-xmmymm.out): Moved to ...
+	* sysdeps/x86/Makefile: Here.
+	* sysdeps/x86_64/tst-xmmymm.sh: Renamed to ...
+	* sysdeps/x86/tst-xmmymm.sh: This.
+
 2012-11-07  Joseph Myers  <joseph@codesourcery.com>
 
 	* conform/data/pthread.h-data [XPG3 || XPG4]: Disable all
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index f25d1e2415..086054ff09 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -1,4 +1,9 @@
 ifeq ($(subdir),elf)
 CFLAGS-.os += $(if $(filter $(@F),$(patsubst %,%.os,$(all-rtld-routines))),\
 		   -mno-sse -mno-mmx)
+
+tests: $(objpfx)tst-xmmymm.out
+$(objpfx)tst-xmmymm.out: ../sysdeps/x86/tst-xmmymm.sh $(objpfx)ld.so
+	@echo "Checking ld.so for SSE register use.  This will take a few seconds..."
+	$(SHELL) $< $(objpfx) > $@
 endif
diff --git a/sysdeps/x86_64/tst-xmmymm.sh b/sysdeps/x86/tst-xmmymm.sh
similarity index 100%
rename from sysdeps/x86_64/tst-xmmymm.sh
rename to sysdeps/x86/tst-xmmymm.sh
diff --git a/sysdeps/x86_64/Makefile b/sysdeps/x86_64/Makefile
index 0acb69a17f..78c98e7c5e 100644
--- a/sysdeps/x86_64/Makefile
+++ b/sysdeps/x86_64/Makefile
@@ -37,11 +37,6 @@ tests-pie += $(quad-pie-test)
 
 $(objpfx)tst-quad1pie: $(objpfx)tst-quadmod1pie.o
 $(objpfx)tst-quad2pie: $(objpfx)tst-quadmod2pie.o
-
-tests: $(objpfx)tst-xmmymm.out
-$(objpfx)tst-xmmymm.out: ../sysdeps/x86_64/tst-xmmymm.sh $(objpfx)ld.so
-	@echo "Checking ld.so for SSE register use.  This will take a few seconds..."
-	$(SHELL) $< $(objpfx) > $@
 endif
 
 ifeq ($(subdir),csu)