From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-return-57089-listarch-gcc=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 29946 invoked by alias); 24 Jul 2002 20:14:40 -0000
Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Archive: <http://gcc.gnu.org/ml/gcc/>
List-Post: <mailto:gcc@gcc.gnu.org>
List-Help: <http://gcc.gnu.org/ml/>
Sender: gcc-owner@gcc.gnu.org
Received: (qmail 29932 invoked from network); 24 Jul 2002 20:14:39 -0000
Received: from unknown (HELO Cantor.suse.de) (213.95.15.193)
  by sources.redhat.com with SMTP; 24 Jul 2002 20:14:39 -0000
Received: from Hermes.suse.de (Charybdis.suse.de [213.95.15.201])
	by Cantor.suse.de (Postfix) with ESMTP
	id 51515149E6; Wed, 24 Jul 2002 22:14:39 +0200 (MEST)
Date: Wed, 24 Jul 2002 20:27:00 -0000
From: Michael Matz <matz@suse.de>
To: John David Anglin <dave@hiauly1.hia.nrc.ca>
Cc: <gcc@gcc.gnu.org>, <gcc-patches@gcc.gnu.org>
Subject: [fix] for: ra-colorize.c:1068: `inv_reg_alloc_order' undeclared
In-Reply-To: <200207241916.g6OJGF5F016657@hiauly1.hia.nrc.ca>
Message-ID: <Pine.LNX.4.33.0207242211180.22087-100000@wotan.suse.de>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-SW-Source: 2002-07/txt/msg01178.txt.bz2

Hi,

On Wed, 24 Jul 2002, John David Anglin wrote:

> The error occurs because inv_reg_alloc_order is only defined when
> REG_ALLOC_ORDER is defined.  None of the vax ports define this macro.

Fixed thusly (will checkin after bootstrap/regtest):


Ciao,
Michael.
-- 
        * ra-colorize.c (inv_reg_alloc_order): New macro.
        (free_reg): Use it.

Index: ra-colorize.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ra-colorize.c,v
retrieving revision 1.2
diff -u -p -r1.2 ra-colorize.c
--- ra-colorize.c	15 Jul 2002 14:07:05 -0000	1.2
+++ ra-colorize.c	24 Jul 2002 20:09:14 -0000
@@ -1031,6 +1031,13 @@ color_usable_p (c, dont_begin_colors, fr
   return 0;
 }

+/* I don't want to clutter up the actual code with ifdef's.  */
+#ifdef REG_ALLOC_ORDER
+#define inv_reg_alloc_order(c) inv_reg_alloc_order[c]
+#else
+#define inv_reg_alloc_order(c) c
+#endif
+
 /* Searches in FREE_COLORS for a block of hardregs of the right length
    for MODE, which doesn't begin at a hardreg mentioned in DONT_BEGIN_COLORS.
    If it needs more than one hardreg it prefers blocks beginning
@@ -1065,16 +1072,16 @@ get_free_reg (dont_begin_colors, free_co
 	  {
 	    if (size < 2 || (c & 1) == 0)
 	      {
-		if (inv_reg_alloc_order[c] < pref_reg_order)
+		if (inv_reg_alloc_order (c) < pref_reg_order)
 		  {
 		    pref_reg = c;
-		    pref_reg_order = inv_reg_alloc_order[c];
+		    pref_reg_order = inv_reg_alloc_order (c);
 		  }
 	      }
-	    else if (inv_reg_alloc_order[c] < last_resort_reg_order)
+	    else if (inv_reg_alloc_order (c) < last_resort_reg_order)
 	      {
 		last_resort_reg = c;
-		last_resort_reg_order = inv_reg_alloc_order[c];
+		last_resort_reg_order = inv_reg_alloc_order (c);
 	      }
 	  }
 	else