diff --git a/ChangeLog b/ChangeLog
index 248b7f417c..8f9936e2da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 15 06:15:14 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* configure.in (HAVE_GCC_ATOMIC_BUILTINS):  Set -march=i486 to enable
+	  __sync_val_compare_and_swap.  Patch by KOSAKI Motohiro.
+	  [ruby-trunk - Bug #7485]
+
 Sat Dec 15 04:25:11 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* include/ruby/intern.h: remove rb_thread_polling() declaration.
diff --git a/configure.in b/configure.in
index b38869c9fb..eda9de8641 100644
--- a/configure.in
+++ b/configure.in
@@ -1536,7 +1536,7 @@ AS_CASE(["$target_os"],
 [])
 
 
-AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86-linux*]], [
+AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
 	 AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
 			 AC_TRY_LINK([unsigned long atomic_var;],
 				     [