aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/bfin/bfin.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5db305f..444b6b1 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 9369d1d..fc97805 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");