From a7b3cdfc2840455c194e8a23d0db613c3a6b7707 Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Mon, 17 Sep 2012 15:34:47 +0000
Subject: [PATCH] avr.c (CONST_FIXED_P): Remove define.

	* config/avr/avr.c (CONST_FIXED_P): Remove define.
	* config/avr/avr.md (add<mode>3): Use CONST_FIXED_P.

From-SVN: r191393
---
 gcc/ChangeLog         | 5 +++++
 gcc/config/avr/avr.c  | 4 ----
 gcc/config/avr/avr.md | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c7a92fcd5c4..c1ba2e5b743 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-17  Georg-Johann Lay  <avr@gjlay.de>
+
+	* config/avr/avr.c (CONST_FIXED_P): Remove define.
+	* config/avr/avr.md (add<mode>3): Use CONST_FIXED_P.
+
 2012-09-17  Georg-Johann Lay  <avr@gjlay.de>
 
 	PR target/54607
diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index b1bd6d6d751..42c722ec97a 100644
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -49,10 +49,6 @@
 #include "params.h"
 #include "df.h"
 
-#ifndef CONST_FIXED_P
-#define CONST_FIXED_P(X) (CONST_FIXED == GET_CODE (X))
-#endif
-
 /* Maximal allowed offset for an address in the LD command */
 #define MAX_LD_OFFSET(MODE) (64 - (signed)GET_MODE_SIZE (MODE))
 
diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md
index 8b13010e700..270eacd2929 100644
--- a/gcc/config/avr/avr.md
+++ b/gcc/config/avr/avr.md
@@ -1132,7 +1132,7 @@
           }
       }
 
-    if (CONST_FIXED == GET_CODE (operands[2]))
+    if (CONST_FIXED_P (operands[2]))
       {
         emit_insn (gen_add<mode>3_clobber (operands[0], operands[1], operands[2]));
         DONE;