summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorpogma <pogma@138bc75d-0d04-0410-961f-82ee72b054a4>2010-06-10 23:35:31 +0000
committerpogma <pogma@138bc75d-0d04-0410-961f-82ee72b054a4>2010-06-10 23:35:31 +0000
commit9f635d9918d822c45652b2b79ca1a2d4567e1691 (patch)
tree6e147403ceb44901f5051030f773fd47e911b4e5 /libjava
parent15f255bdf8785cef57a8dc99a4b51db8c8f27cce (diff)
downloadgcc-9f635d9918d822c45652b2b79ca1a2d4567e1691.tar.gz
* configure.ac: Set SYSTEMSPEC so that -allow_stack_execute is not
passed to the linker for -dynamiclib or -bundle on darwin. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@160583 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rwxr-xr-xlibjava/configure2
-rw-r--r--libjava/configure.ac2
3 files changed, 8 insertions, 2 deletions
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=