Remove accidental addition of CLEAR_CONFLICT.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30421 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/global.c b/gcc/global.c
index 3cb6b34..5d92ba1 100644 (file)
--- a/gcc/global.c
+++ b/gcc/global.c
@@ -133,12 +133,6 @@ static int allocno_row_words;
  (conflicts[(I) * allocno_row_words + (unsigned)(J) / INT_BITS]        \
   |= ((INT_TYPE) 1 << ((unsigned)(J) % INT_BITS)))
 
-/* CYGNUS LOCAL LRS */
-#define CLEAR_CONFLICT(I, J) \
- (conflicts[(I) * allocno_row_words + (J) / INT_BITS]   \
-  &= ~ ((INT_TYPE) 1 << ((J) % INT_BITS)))
-/* END CYGNUS LOCAL */
-
 /* Set of hard regs currently live (during scan of all insns).  */
 
 static HARD_REG_SET hard_regs_live;