summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2011-06-18 15:06:26 +0000
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2011-06-18 15:06:26 +0000
commitca969b0595eb8fb77eef0c2ab7d78965b5da3257 (patch)
tree498a178bbecf1859133d3d2826807de9b1a24852 /libjava
parent36267cc4921b2be00e6af68695f11f60b39f4891 (diff)
downloadgcc-ca969b0595eb8fb77eef0c2ab7d78965b5da3257.tar.gz
PR target/49461
* libjava/configure.ac (SYSTEMSPEC): Pass -no_pie for darwin11. * libjava/configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@175182 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rwxr-xr-xlibjava/configure7
-rw-r--r--libjava/configure.ac7
3 files changed, 18 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b253d02a169..c800bf3aac0 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-17 Jack Howarth <howarth@bromo.med.uc.edu>
+
+ PR target/49461
+ * libjava/configure.ac (SYSTEMSPEC): Pass -no_pie for darwin11.
+ * libjava/configure: Regenerate.
+
2011-06-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR libgcj/49315
diff --git a/libjava/configure b/libjava/configure
index 01e5bf0dfc7..4c3ab55746b 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -19788,9 +19788,14 @@ case "${host}" in
SYSTEMSPEC="-lunicows $SYSTEMSPEC"
fi
;;
- *-*-darwin[912]*)
+ *-*-darwin9*)
SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
;;
+ *-*-darwin[12]*)
+ # Something is incompatible with pie, would be nice to fix it and
+ # remove -no_pie. PR49461
+ SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
+ ;;
*)
SYSTEMSPEC=
;;
diff --git a/libjava/configure.ac b/libjava/configure.ac
index 0e127fc818b..5f673ea7cfd 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -898,9 +898,14 @@ case "${host}" in
SYSTEMSPEC="-lunicows $SYSTEMSPEC"
fi
;;
- *-*-darwin[[912]]*)
+ *-*-darwin9*)
SYSTEMSPEC="%{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
;;
+ *-*-darwin[[12]]*)
+ # Something is incompatible with pie, would be nice to fix it and
+ # remove -no_pie. PR49461
+ SYSTEMSPEC="-no_pie %{!Zdynamiclib:%{!Zbundle:-allow_stack_execute}}"
+ ;;
*)
SYSTEMSPEC=
;;