diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 64073f2c5d..7f29257e25 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-23  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* lib/gdb.exp: Don't execute C++ tests on m6811/m6812 targets.
+
 2003-02-13  Michael Chastain  <mec@shout.net>
 
 	* gdb.base/exprs.exp: Remove i960 remnants.
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index dca41dc913..d2b6fbdb8c 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1004,6 +1004,15 @@ proc skip_cplus_tests {} {
     if { [istarget "h8300-*-*"] } {
 	return 1
     }
+
+    # The C++ IO streams are too large for HC11/HC12 and are thus not
+    # available.  The gdb C++ tests use them and don't compile.
+    if { [istarget "m6811-*-*"] } {
+	return 1
+    }
+    if { [istarget "m6812-*-*"] } {
+	return 1
+    }
     return 0
 }