diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 55d384b146c..f90cd353ea0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-10  Peter O'Gorman  <peter@pogma.com>
+
+	* configure.ac: Set SYSTEMSPEC so that -allow_stack_execute is not
+	passed to the linker for -dynamiclib or -bundle on darwin.
+	* configure: Regenerate. 
+
 2010-06-09  Iain Sandoe  <iains@gcc.gnu.org>
 
 	PR bootstrap/43170
diff --git a/libjava/configure b/libjava/configure
index c20480912da..7ca3dcfb5b3 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -19761,7 +19761,7 @@ case "${host}" in
       fi
     ;;
     *-*-darwin[912]*)
-      SYSTEMSPEC="-allow_stack_execute"
+      SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
     ;;
     *)
       SYSTEMSPEC=
diff --git a/libjava/configure.ac b/libjava/configure.ac
index a359afed7bd..f21ae91d18a 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -883,7 +883,7 @@ case "${host}" in
       fi
     ;;
     *-*-darwin[[912]]*)
-      SYSTEMSPEC="-allow_stack_execute"
+      SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
     ;;
     *)
       SYSTEMSPEC=