diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e8580dbf0f..60d4a84dfd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/bigcore.exp: Correct checks for systems which can
+	not dump a large core file.
+
 2005-06-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/relocate.c: Add a copyright notice.
diff --git a/gdb/testsuite/gdb.base/bigcore.exp b/gdb/testsuite/gdb.base/bigcore.exp
index af3098c5f9..d972e46f0a 100644
--- a/gdb/testsuite/gdb.base/bigcore.exp
+++ b/gdb/testsuite/gdb.base/bigcore.exp
@@ -1,4 +1,4 @@
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004
+# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2004, 2005
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -118,6 +118,10 @@ proc extract_heap { dir } {
 set next_heap [extract_heap next]
 set prev_heap [extract_heap prev]
 
+# Save the total allocated size within GDB so that we can check
+# the core size later.
+gdb_test "set \$bytes_allocated = bytes_allocated" "" "save heap size"
+
 # Now create a core dump
 
 # Rename the core file to "TESTFILE.corefile" rather than just "core",
@@ -171,11 +175,15 @@ if { $file == "" } {
 
 if {[catch {file size $corefile} core_size] == 0} {
     set core_ok 0
-    gdb_test_multiple "print bytes_allocated < $core_size" "check core size" {
+    gdb_test_multiple "print \$bytes_allocated < $core_size" "check core size" {
 	-re " = 1\r\n$gdb_prompt $" {
 	    pass "check core size"
 	    set core_ok 1
 	}
+	-re " = 0\r\n$gdb_prompt $" {
+	    pass "check core size"
+	    set core_ok 0
+	}
     }
 } { 
     # Probably failed due to the TCL build having problems with very