m68k.c (m68k_option_override): Check opt_fstack_limit_symbol_arg and opt_fstack_limit...

gcc/
	* config/m68k/m68k.c (m68k_option_override): Check
	opt_fstack_limit_symbol_arg and opt_fstack_limit_register_no
	instead of stack_limit_rtx.

gcc/testsuite/
	* gcc.target/m68k/stack-limit-1.c: Expect warning on line 0.

From-SVN: r241140

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae5a7109a81dc2339406d7058014f8d76444276c..ae99273eb3ab58065b20d33090a7e8854b8e669f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * config/m68k/m68k.c (m68k_option_override): Check
+       opt_fstack_limit_symbol_arg and opt_fstack_limit_register_no
+       instead of stack_limit_rtx.
+
 2016-10-13  Jakub Jelinek  <jakub@redhat.com>
 
        * dwarf2out.c (gen_member_die): Handle inline static data member

diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 8e7dbf38fa3f90ab8c43f5180c6aa7042e7c2b0d..b152ca80bad80c1f3647ae3f07e04b4305bf300c 100644 (file)
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -638,10 +638,12 @@ m68k_option_override (void)
     }
 #endif
 
-  if (stack_limit_rtx != NULL_RTX && !TARGET_68020)
+  if ((opt_fstack_limit_symbol_arg != NULL || opt_fstack_limit_register_no >= 0)
+      && !TARGET_68020)
     {
       warning (0, "-fstack-limit- options are not supported on this cpu");
-      stack_limit_rtx = NULL_RTX;
+      opt_fstack_limit_symbol_arg = NULL;
+      opt_fstack_limit_register_no = -1;
     }
 
   SUBTARGET_OVERRIDE_OPTIONS;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0960e08ce6d7946d0ce269623d9d6c37e28b44ce..93bb49e5bb2fcab67a0462a9d617ed178059e63c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-10-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * gcc.target/m68k/stack-limit-1.c: Expect warning on line 0.
+
 2016-10-13  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        PR tree-optimization/77937

diff --git a/gcc/testsuite/gcc.target/m68k/stack-limit-1.c b/gcc/testsuite/gcc.target/m68k/stack-limit-1.c
index b1e9b99b26c7379a32937dac1cc8301d9fce9389..5086edd77f7f0f5e75fb6564798260686fed5225 100644 (file)
--- a/gcc/testsuite/gcc.target/m68k/stack-limit-1.c
+++ b/gcc/testsuite/gcc.target/m68k/stack-limit-1.c
@@ -1,6 +1,6 @@
 /* -fstack-limit- should be ignored without an ICE if not supported.  */
 /* { dg-do compile } */
 /* { dg-options "-fstack-limit-symbol=_stack_limit -m68000" } */
-/* { dg-warning "not supported" "" { target *-*-* } 1 } */
+/* { dg-warning "not supported" "" { target *-*-* } 0 } */
 
 void dummy (void) { }