diff --git a/ChangeLog b/ChangeLog
index 85aeab17d6..f968a3fc6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May  1 05:02:30 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (optflags): disable unsafe optimizations.
+	  [ruby-core:44679][Bug #6370]
+
 Mon Apr 30 23:36:49 2012  Tanaka Akira  <akr@fsij.org>
 
 	* lib/fileutils.rb (copy_metadata): use File.lchown and File.lchmod to
@@ -8,11 +13,6 @@ Mon Apr 30 23:05:53 2012  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 	* test/ruby/test_continuation.rb (tracing_with_set_trace_func): don't
 	  call Continuation from other threads. [ruby-dev:45596] [Bug #6382]
 
-Mon Apr 30 21:09:06 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (optflags): disable unsafe optimizations.
-	  [ruby-core:44679][Bug #6370]
-
 Mon Apr 30 20:10:04 2012  Tanaka Akira  <akr@fsij.org>
 
 	* ext/zlib/extconf.rb: detect z_crc_t type which will be defined
diff --git a/configure.in b/configure.in
index e71aeb3c03..1e1b2ac9fc 100644
--- a/configure.in
+++ b/configure.in
@@ -549,7 +549,9 @@ if test "$GCC" = yes; then
     ])
 
     # disable fast-math
-    RUBY_TRY_CFLAGS(-fno-fast-math, [RUBY_APPEND_OPTION(optflags, $oflag)])
+    for oflag in -fno-fast-math; do
+	RUBY_TRY_CFLAGS(oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
+    done
 fi
 
 test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""