From 789f17f6449d18214ffdb9d792dbdcb737e57c8d Mon Sep 17 00:00:00 2001 From: Jack Howarth Date: Thu, 30 Jun 2011 16:14:30 +0000 Subject: [PATCH] re PR target/49461 (boehm-gc and gcj incompatible with pie) 2011-06-30 Jack Howarth PR target/49461 * libjava/configure.ac (SYSTEMSPEC): Pass -no_pie for darwin11. * libjava/configure: Regenerate. From-SVN: r175710 --- libjava/ChangeLog | 6 ++++++ libjava/configure | 9 +++++++-- libjava/configure.ac | 9 +++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aa86795f35a8..eb8c977fe7d2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2011-06-30 Jack Howarth + + PR target/49461 + * libjava/configure.ac (SYSTEMSPEC): Pass -no_pie for darwin11. + * libjava/configure: Regenerate. + 2011-04-28 Release Manager * GCC 4.5.3 released. diff --git a/libjava/configure b/libjava/configure index 54541109a120..29f92526a389 100755 --- a/libjava/configure +++ b/libjava/configure @@ -19754,8 +19754,13 @@ case "${host}" in SYSTEMSPEC="-lunicows $SYSTEMSPEC" fi ;; - *-*-darwin[912]*) - SYSTEMSPEC="-allow_stack_execute" + *-*-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 9b551db97244..902467a25238 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -882,8 +882,13 @@ case "${host}" in SYSTEMSPEC="-lunicows $SYSTEMSPEC" fi ;; - *-*-darwin[[912]]*) - SYSTEMSPEC="-allow_stack_execute" + *-*-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= -- 2.47.2