diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e6ec30e843e3..9cc0907b1b76 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-02  Jack Howarth  <howarth@bromo.med.uc.edu>
+
+	* configure.ac: Expand to darwin10 and later.
+	* configure: Regenerate.
+	* testsuite/lib/libjava.exp: Expand to darwin10 and later.
+
 2008-11-12  Steve Ellcey  <sje@cup.hp.com>
 
 	* configure: Regenerate to get new GCC_CHECK_UNWIND_GETIPINFO.
diff --git a/libjava/configure b/libjava/configure
index ecaa36ce0468..428038330832 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -20608,7 +20608,7 @@ case "${host}" in
     # on Darwin -single_module speeds up loading of the dynamic libraries.
     extra_ldflags_libjava=-Wl,-single_module
     ;;
-*-*-darwin[9]*)
+*-*-darwin912*)
     extra_gij_ldflags=-Wl,-allow_stack_execute
     ;;
 arm*linux*eabi)
diff --git a/libjava/configure.ac b/libjava/configure.ac
index ade98b9c9763..6c7abb40666a 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -867,7 +867,7 @@ case "${host}" in
     # on Darwin -single_module speeds up loading of the dynamic libraries.
     extra_ldflags_libjava=-Wl,-single_module
     ;;
-*-*-darwin[[9]]*)
+*-*-darwin[912]*)
     extra_gij_ldflags=-Wl,-allow_stack_execute
     ;;
 arm*linux*eabi)
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 332c07270c88..a31c2bc63d3d 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -430,7 +430,7 @@ proc libjava_arguments {{mode compile}} {
 	    lappend args "additional_flags=-bind_at_load"
 	    lappend args "additional_flags=-multiply_defined suppress"
 	}
-	if { [istarget "*-*-darwin9*"] } {
+	if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"] || [istarget "*-*-darwin2*"] } {
 	    lappend args "additional_flags=-Wl,-allow_stack_execute"
 	}