read-rtl.c: Disable RTL checking.

	* read-rtl.c: Disable RTL checking.
	(apply_macro_to_rtx): Use XTMPL to access 'T' fields.

From-SVN: r86822

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99dbaf7fc4279af856764ebc5be3e3bb4afaa743..11d9a3de7bc749b5fbd85dc4e2f89c16b4fa6eec 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-31  Richard Sandiford  <rsandifo@redhat.com>
+
+       * read-rtl.c: Disable RTL checking.
+       (apply_macro_to_rtx): Use XTMPL to access 'T' fields.
+
 2004-08-31  Richard Sandiford  <rsandifo@redhat.com>
 
        * config/mips/mips.md (fcond): New code macro and attribute.

diff --git a/gcc/read-rtl.c b/gcc/read-rtl.c
index db0b3d7d3fb66ebdf4bfee03dac5111bff3928fe..2cd4e22a4c1d9b17d3c1c9028a8415f08d3adea5 100644 (file)
--- a/gcc/read-rtl.c
+++ b/gcc/read-rtl.c
@@ -21,6 +21,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
 #include "bconfig.h"
+
+/* Disable rtl checking; it conflicts with the macro handling.  */
+#undef ENABLE_RTL_CHECKING
+
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
@@ -316,8 +320,11 @@ apply_macro_to_rtx (rtx original, struct mapping *macro, int value)
   for (i = 0; format_ptr[i] != 0; i++)
     switch (format_ptr[i])
       {
-      case 'S':
       case 'T':
+       XTMPL (x, i) = apply_macro_to_string (XTMPL (x, i), macro, value);
+       break;
+
+      case 'S':
       case 's':
        XSTR (x, i) = apply_macro_to_string (XSTR (x, i), macro, value);
        break;