m68k.c (m68k_tls_reference_p_1): Delete.

gcc/
	* config/m68k/m68k.c (m68k_tls_reference_p_1): Delete.
	(m68k_tls_reference_p): Use FOR_EACH_SUBRTX_VAR.

From-SVN: r216700

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ddd1991d81761735905467222c979713a2b53ae3..cf177bdc2b4b5d0992722bd097ae51f0b87c7b01 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-26  Richard Sandiford  <richard.sandiford@arm.com>
+
+       * config/m68k/m68k.c (m68k_tls_reference_p_1): Delete.
+       (m68k_tls_reference_p): Use FOR_EACH_SUBRTX_VAR.
+
 2014-10-26  Richard Sandiford  <richard.sandiford@arm.com>
 
        * config/m68k/m68k.c: Include rtl-iter.h.

diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index b01110db5c3ad99e54dc2db33aeb77c58f3d6e6e..717c50e1463f472e4932af1b2530b06747b998f3 100644 (file)
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -2671,22 +2671,6 @@ m68k_tls_symbol_p (rtx x)
   return SYMBOL_REF_TLS_MODEL (x) != 0;
 }
 
-/* Helper for m68k_tls_referenced_p.  */
-
-static int
-m68k_tls_reference_p_1 (rtx *x_ptr, void *data ATTRIBUTE_UNUSED)
-{
-  /* Note: this is not the same as m68k_tls_symbol_p.  */
-  if (GET_CODE (*x_ptr) == SYMBOL_REF)
-    return SYMBOL_REF_TLS_MODEL (*x_ptr) != 0 ? 1 : 0;
-
-  /* Don't recurse into legitimate TLS references.  */
-  if (m68k_tls_reference_p (*x_ptr, true))
-    return -1;
-
-  return 0;
-}
-
 /* If !LEGITIMATE_P, return true if X is a TLS symbol reference,
    though illegitimate one.
    If LEGITIMATE_P, return true if X is a legitimate TLS symbol reference.  */
@@ -2698,7 +2682,22 @@ m68k_tls_reference_p (rtx x, bool legitimate_p)
     return false;
 
   if (!legitimate_p)
-    return for_each_rtx (&x, m68k_tls_reference_p_1, NULL) == 1 ? true : false;
+    {
+      subrtx_var_iterator::array_type array;
+      FOR_EACH_SUBRTX_VAR (iter, array, x, ALL)
+       {
+         rtx x = *iter;
+
+         /* Note: this is not the same as m68k_tls_symbol_p.  */
+         if (GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_TLS_MODEL (x) != 0)
+           return true;
+
+         /* Don't recurse into legitimate TLS references.  */
+         if (m68k_tls_reference_p (x, true))
+           iter.skip_subrtxes ();
+       }
+      return false;
+    }
   else
     {
       enum m68k_reloc reloc = RELOC_GOT;