From bcb339946495233334317afdd24f151f2848b6f7 Mon Sep 17 00:00:00 2001
From: Bernd Schmidt <bernds@cygnus.co.uk>
Date: Tue, 14 Sep 1999 14:37:12 +0000
Subject: Undo bogus changes from gcc2 merge

From-SVN: r29407
---
 gcc/rtl.def | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gcc/rtl.def')

diff --git a/gcc/rtl.def b/gcc/rtl.def
index 257ab07faf8..cf2edac7c69 100644
--- a/gcc/rtl.def
+++ b/gcc/rtl.def
@@ -530,13 +530,8 @@ DEF_RTL_EXPR(CONST_STRING, "const_string", "s", 'o')
 /* This is used to encapsulate an expression whose value is constant
    (such as the sum of a SYMBOL_REF and a CONST_INT) so that it will be
    recognized as a constant operand rather than by arithmetic instructions.  */
-DEF_RTL_EXPR(CONST, "const", "e", 'o')
 
-/* A unary `__builtin_constant_p' expression.  This RTL code may only be used
-   as an operand of a CONST.  This pattern is only emitted during RTL
-   generation and then only if optimize > 0.  It is converted by the first
-   CSE pass into the appropriate CONST_INT.  */
-DEF_RTL_EXPR(CONSTANT_P_RTX, "constant_p_rtx", "e", 'x')
+DEF_RTL_EXPR(CONST, "const", "e", 'o')
 
 /* program counter.  Ordinary jumps are represented
    by a SET whose first operand is (PC).  */
@@ -855,6 +850,11 @@ DEF_RTL_EXPR(RANGE_VAR, "range_var", "eti", 'x')
    0 is the live bitmap.  Operand 1 is the original block number.  */
 DEF_RTL_EXPR(RANGE_LIVE, "range_live", "bi", 'x')
 
+/* A unary `__builtin_constant_p' expression.  These are only emitted
+   during RTL generation, and then only if optimize > 0.  They are
+   eliminated by the first CSE pass. */
+DEF_RTL_EXPR(CONSTANT_P_RTX, "constant_p_rtx", "e", 'x')
+
 /* A placeholder for a CALL_INSN which may be turned into a normal call,
    a sibling (tail) call or tail recursion.
 
-- 
cgit v1.2.1

