From: Stuart Henderson <shenders@gcc.gnu.org>
Date: Tue, 3 May 2011 13:47:07 +0000 (+0000)
Subject: Originally From Bernd Schmidt
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1a3a9152b23751bf38d2c4874614fbad252f09f7;p=gcc.git

Originally From Bernd Schmidt

2011-05-03  Stuart Henderson  <shenders@gcc.gnu.org>

        Originally From Bernd Schmidt
        * config/bfin/bfin.c (override_options): Disable -fstack-limit for
        FD-PIC.

From-SVN: r173306
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5db305fa730..444b6b15c35 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-03  Stuart Henderson  <shenders@gcc.gnu.org>
+
+	Originally From Bernd Schmidt
+	* config/bfin/bfin.c (override_options): Disable -fstack-limit for
+	FD-PIC.
+
 2011-05-03  Jeff Law  <law@redhat.com>
 
 	* tree-ssa-threadupdate.c (THREAD_TARGET): define.
diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index 9369d1d0d67..fc97805d659 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -2676,6 +2676,12 @@ bfin_option_override (void)
   if (global_options_set.x_bfin_library_id && ! TARGET_ID_SHARED_LIBRARY)
     error ("-mshared-library-id= specified without -mid-shared-library");
 
+  if (stack_limit_rtx && TARGET_FDPIC)
+    {
+      warning (0, "-fstack-limit- options are ignored with -mfdpic; use -mstack-check-l1");
+      stack_limit_rtx = NULL_RTX;
+    }
+
   if (stack_limit_rtx && TARGET_STACK_CHECK_L1)
     error ("can%'t use multiple stack checking methods together");