diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index f86730e2090d9d268c79c9d30295aeb0e1528103..d70c6771f0798cb6beb37760bc75f5c9acea0f76 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,3 +1,11 @@
+2012-07-13  Richard Guenther  <rguenther@suse.de>
+
+	* testsuite/libmudflap.c++/ctors.exp: Explicitely specify -O0.
+	* testsuite/libmudflap.c++/c++frags.exp: Likewise.
+	* testsuite/libmudflap.cth/cthfrags.exp: Likewise.
+	* testsuite/libmudflap.c/cfrags.exp: Likewise.
+	* testsuite/libmudflap.c/externs.exp: Likewise.
+
 2012-07-13  Richard Guenther  <rguenther@suse.de>
 
 	* testsuite/libmudflap.c/fail11-frag.c: Adjust to not look like memset.
diff --git a/libmudflap/testsuite/libmudflap.c++/c++frags.exp b/libmudflap/testsuite/libmudflap.c++/c++frags.exp
index eb900d7991133b1aea1fe7502e27fcaa8054db2b..4e3d244fd1a5922a5355ce687feb463721a59e4a 100644
--- a/libmudflap/testsuite/libmudflap.c++/c++frags.exp
+++ b/libmudflap/testsuite/libmudflap.c++/c++frags.exp
@@ -1,5 +1,5 @@
 global MUDFLAP_FLAGS
-set MUDFLAP_FLAGS [list {} {-static} { -O} {-O2} {-O3}]
+set MUDFLAP_FLAGS [list {-O0} {-static} { -O} {-O2} {-O3}]
 
 libmudflap-init c++
 if {$cxx == "g++"} then {
diff --git a/libmudflap/testsuite/libmudflap.c++/ctors.exp b/libmudflap/testsuite/libmudflap.c++/ctors.exp
index b3dda8fd6ec94f745456e19e20cd3db33e1817c8..df7293dc91c5765af7f8d93eb4ac648b183a1f08 100644
--- a/libmudflap/testsuite/libmudflap.c++/ctors.exp
+++ b/libmudflap/testsuite/libmudflap.c++/ctors.exp
@@ -1,5 +1,5 @@
 global MUDFLAP_FLAGS
-set MUDFLAP_FLAGS [list {} {-static} {-O2} {-O3}]
+set MUDFLAP_FLAGS [list {-O0} {-static} {-O2} {-O3}]
 
 libmudflap-init c++
 if {$cxx == "g++"} then {
diff --git a/libmudflap/testsuite/libmudflap.c/cfrags.exp b/libmudflap/testsuite/libmudflap.c/cfrags.exp
index bdaf2196cb7fa7971cb620480d73942b5e47a85f..ebd67c4ff72d17fa5b1539bd41a0428118f8867b 100644
--- a/libmudflap/testsuite/libmudflap.c/cfrags.exp
+++ b/libmudflap/testsuite/libmudflap.c/cfrags.exp
@@ -1,5 +1,5 @@
 global MUDFLAP_FLAGS
-set MUDFLAP_FLAGS [list {} {-static} {-O2} {-O3}]
+set MUDFLAP_FLAGS [list {-O0} {-static} {-O2} {-O3}]
 
 libmudflap-init c
 
diff --git a/libmudflap/testsuite/libmudflap.c/externs.exp b/libmudflap/testsuite/libmudflap.c/externs.exp
index 773f80cc12a5ed92bf21b0fb89ba2cb77c7b3525..5a0297f2ed44614fef08fd7f0bda704f3f784f63 100644
--- a/libmudflap/testsuite/libmudflap.c/externs.exp
+++ b/libmudflap/testsuite/libmudflap.c/externs.exp
@@ -1,5 +1,5 @@
 global MUDFLAP_FLAGS
-set MUDFLAP_FLAGS [list {} {-static} {-O2} {-O3}]
+set MUDFLAP_FLAGS [list {-O0} {-static} {-O2} {-O3}]
 
 libmudflap-init c
 dg-init
diff --git a/libmudflap/testsuite/libmudflap.cth/cthfrags.exp b/libmudflap/testsuite/libmudflap.cth/cthfrags.exp
index a025b03805f6a2d4cfbbf7888f48418abcc0e4b3..75d444768384d65fad230070e1952713a85cb978 100644
--- a/libmudflap/testsuite/libmudflap.cth/cthfrags.exp
+++ b/libmudflap/testsuite/libmudflap.cth/cthfrags.exp
@@ -1,5 +1,5 @@
 global MUDFLAP_FLAGS
-set MUDFLAP_FLAGS [list {} {-static -DSTATIC} {-O2} {-O3}]
+set MUDFLAP_FLAGS [list {-O0} {-static -DSTATIC} {-O2} {-O3}]
 
 libmudflap-init c