diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 16a6c45328d..c55d81bc3f9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -3,7 +3,7 @@ Fri Mar 17 05:43:28 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 	* gdb.base/nodebug.exp: Comment out redundant test.  Make name of
 	tests unique.
 
-	* lib/gdb.exp: Skip CHILL for AIX.
+	* lib/gdb.exp: Skip CHILL for AIX and Solaris.
 
 Thu Mar 16 16:27:07 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 189f83bbf58..b010303194b 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -559,5 +559,6 @@ proc skip_chill_tests {} {
     # For AIX (as of 16 Mar 95), (a) there is no language code for
     # CHILL in output_epilog in gcc/config/rs6000/rs6000.c, (b) collect2
     # does not get along with AIX's too-clever linker.
-    return ![isnative] || [istarget "*-*-aix*"]
+    # On Solaris, static constructors are broken.
+    return {![isnative] || [istarget "*-*-aix*"] || [istarget "*-*-solaris2*"]}
 }