diff --git a/ChangeLog b/ChangeLog
index ba2cedf89c..b80b4856fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,14 +64,6 @@
 	* math/libm-test.inc (check_float_internal): Correct ulp
 	calculation for subnormal expected results.
 
-2012-05-06  Andreas Jaeger  <aj@suse.de>
-
-	* Makeconfig (+math-flags): New, set to -frounding-math.
-	(+cflags): Add +math-flags so that all of glibc gets compiled with
-	it.
-
-	* sysdeps/x86_64/fpu/libm-test-ulps: Updated.
-
 2012-05-05  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/libm-test.inc (hypot_test) [TEST_DOUBLE && TEST_INLINE]:
diff --git a/Makeconfig b/Makeconfig
index f68a752766..5c78ee497b 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -574,11 +574,6 @@ endif
 # actually different, so allow the compiler to merge them all.
 +merge-constants = -fmerge-all-constants
 
-# We have to assume that glibc functions are called in any rounding
-# mode and also change the rounding mode in a few functions. So,
-# disable any optimization that assume default rounding mode.
-+math-flags = -frounding-math
-
 # This is the program that generates makefile dependencies from C source files.
 # The -MP flag tells GCC >= 3.2 (which we now require) to produce dummy
 # targets for headers so that removed headers don't break the build.
@@ -638,7 +633,7 @@ ifeq	"$(strip $(+cflags))" ""
 +cflags	:= $(default_cflags)
 endif	# $(+cflags) == ""
 
-+cflags += $(cflags-cpu) $(+gccwarn) $(+merge-constants) $(+math-flags)
++cflags += $(cflags-cpu) $(+gccwarn) $(+merge-constants)
 +gcc-nowarn := -w
 
 # Don't duplicate options if we inherited variables from the parent.