From patchwork Thu Jun 30 16:25:23 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [Revised] Pass -no_pie on SYSTEMSPEC for darwin11
Date: Thu, 30 Jun 2011 06:25:23 -0000
From: Mike Stump <mikestump@comcast.net>
X-Patchwork-Id: 102780
Message-Id: <61DAD638-A211-4731-AB84-1537228AAD36@comcast.net>
To: Jack Howarth <howarth@bromo.med.uc.edu>
Cc: GCC Patches <gcc-patches@gcc.gnu.org>

On Jun 19, 2011, at 4:55 PM, Jack Howarth wrote:
>>> This is definitely a problem in current gcc-4_5-branch without the backport of the SYSTEMSPEC fix...
>> 
>> Excellent...  and does the patch fix it?
> 
> Yes...

Ok, applied to the 4.5 branch.  Scream loud and soon if for any reason you notice anything that isn't release quality.  I think we have enough bake time on 4.6 and mainline to avoid any downsides, but, also nice to be careful with the release branches.  Thanks for all your help.


Index: configure.ac
===================================================================
--- configure.ac	(revision 175709)
+++ configure.ac	(working copy)
@@ -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=
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 175709)
+++ ChangeLog	(working copy)
@@ -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.
Index: configure
===================================================================
--- configure	(revision 175709)
+++ configure	(working copy)
@@ -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=