diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59226336d68..23de85f78e2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-25  Richard Guenther  <rguenther@suse.de>
+
+	PR middle-end/39497
+	* Makefile.in (dfp.o-warn): Use -fno-strict-aliasing instead
+	of -Wno-error.
+
 2009-03-25  Andrey Belevantsev  <abel@ispras.ru>
 
 	* config/ia64/ia64.c (ia64_set_sched_flags): Zero spec_info->mask when
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index d4d6683b32f..8850231bb89 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -177,8 +177,8 @@ GCC_WARN_CFLAGS = $(LOOSE_WARN) $($(@D)-warn) $(NOCOMMON_FLAG) $($@-warn)
 build/gengtype-lex.o-warn = -Wno-error
 # SYSCALLS.c misses prototypes
 SYSCALLS.c.X-warn = -Wno-strict-prototypes -Wno-error
-# dfp.c contains alias violations
-dfp.o-warn = -Wno-error
+# dfp.c contains many alias violations
+dfp.o-warn = -fno-strict-aliasing
 # mips-tfile.c contains -Wcast-qual warnings.
 mips-tfile.o-warn = -Wno-error