diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rwxr-xr-x | libjava/configure | 7 | ||||
| -rw-r--r-- | libjava/configure.ac | 7 |
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= ;; |
