diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fdce4c49228d..51992df1a01a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-01  Steve Ellcey  <sje@cup.hp.com>
+	
+	* lib/target-supports.exp (is-effective-target): Add cxa_atexit.
+	(is-effective-target-keyword): Ditto.
+
 2006-06-01  Thomas Koenig  <Thomas.Koenig@online.de>
 
 	PR fortran/27715
diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 31e3a4e1798c..cd00b14f31ff 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1749,6 +1749,7 @@ proc is-effective-target { arg } {
 	  "vmx_hw"         { set selected [check_vmx_hw_available] }
 	  "named_sections" { set selected [check_named_sections_available] }
 	  "gc_sections"    { set selected [check_gc_sections_available] }
+	  "cxa_atexit"     { set selected [check_cxa_atexit_available] }
 	  default          { error "unknown effective target keyword `$arg'" }
 	}
     }
@@ -1767,6 +1768,7 @@ proc is-effective-target-keyword { arg } {
 	  "vmx_hw"         { return 1 }
 	  "named_sections" { return 1 }
 	  "gc_sections"    { return 1 }
+	  "cxa_atexit"     { return 1 }
 	  default          { return 0 }
 	}
     }