From: Jack Howarth <howarth@bromo.med.uc.edu>
Date: Thu, 30 Jun 2011 16:14:30 +0000 (+0000)
Subject: re PR target/49461 (boehm-gc and gcj incompatible with pie)
X-Git-Tag: releases/gcc-4.5.4~565
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=789f17f6449d18214ffdb9d792dbdcb737e57c8d;p=thirdparty%2Fgcc.git

re PR target/49461 (boehm-gc and gcj incompatible with pie)

2011-06-30  Jack Howarth <howarth@bromo.med.uc.edu>

	    PR target/49461
	    * libjava/configure.ac (SYSTEMSPEC): Pass -no_pie for darwin11.
	    * libjava/configure: Regenerate.

From-SVN: r175710
---

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 <howarth@bromo.med.uc.edu>
+
+	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=