--- a/gcc/genattrtab.c	Sun Feb 07 18:28:00 2010 +0900
+++ b/gcc/genattrtab.c	Fri Feb 12 23:39:51 2010 +0900
@@ -1,6 +1,7 @@
 /* Generate code from machine description to compute values of attributes.
    Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2002, 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+   Free Software Foundation, Inc.
    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
 
 This file is part of GCC.
@@ -318,7 +319,7 @@
 
 /* Here is how primitive or already-shared RTL's hash
    codes are made.  */
-#define RTL_HASH(RTL) ((long) (RTL) & 0777777)
+#define RTL_HASH(RTL) ((intptr_t) (RTL) & 0777777)
 
 /* Add an entry to the hash table for RTL with hash code HASHCODE.  */
 
@@ -1637,7 +1638,7 @@
       for (length_unit_log = 0; length_or & 1; length_or >>= 1)
 	length_unit_log++;
     }
-  printf ("const int length_unit_log = %u;\n", length_unit_log);
+  printf ("EXPORTED_CONST int length_unit_log = %u;\n", length_unit_log);
 }
 
 /* Take a COND expression and see if any of the conditions in it can be
@@ -1940,22 +1941,22 @@
       else
 	newexp = false_rtx;
       break;
-      
+
     case SYMBOL_REF:
       {
 	char *p;
 	char string[256];
-	
+
 	gcc_assert (GET_CODE (exp) == EQ_ATTR);
 	gcc_assert (strlen (XSTR (exp, 0)) + strlen (XSTR (exp, 1)) + 2
 		    <= 256);
-	
+
 	strcpy (string, XSTR (exp, 0));
 	strcat (string, "_");
 	strcat (string, XSTR (exp, 1));
 	for (p = string; *p; p++)
 	  *p = TOUPPER (*p);
-	
+
 	newexp = attr_rtx (EQ, value,
 			   attr_rtx (SYMBOL_REF,
 				     DEF_ATTR_STRING (string)));
@@ -1966,12 +1967,12 @@
       /* We construct an IOR of all the cases for which the
 	 requested attribute value is present.  Since we start with
 	 FALSE, if it is not present, FALSE will be returned.
-	  
+
 	 Each case is the AND of the NOT's of the previous conditions with the
 	 current condition; in the default case the current condition is TRUE.
-	  
+
 	 For each possible COND value, call ourselves recursively.
-	  
+
 	 The extra TRUE and FALSE expressions will be eliminated by another
 	 call to the simplification routine.  */
 
@@ -2107,7 +2108,7 @@
 
       if (attr_alt_subset_p (exp, *pterm))
 	*pterm = true_rtx;
-	
+
       return exp;
     }
 
@@ -4306,7 +4307,7 @@
   decl->insn_num        = n_insn_reservs;
   decl->bypassed	= false;
   decl->next            = 0;
-  
+
   *last_insn_reserv_p = decl;
   last_insn_reserv_p  = &decl->next;
   n_insn_reservs++;
@@ -4391,7 +4392,7 @@
 
   code_exp = rtx_alloc (COND);
   lats_exp = rtx_alloc (COND);
-  
+
   XVEC (code_exp, 0) = rtvec_alloc (n_insn_reservs * 2);
   XVEC (lats_exp, 0) = rtvec_alloc (n_insn_reservs * 2);
 
@@ -4404,7 +4405,7 @@
     {
       XVECEXP (code_exp, 0, i)   = decl->condexp;
       XVECEXP (lats_exp, 0, i)   = decl->condexp;
-      
+
       XVECEXP (code_exp, 0, i+1) = make_numeric_value (decl->insn_num);
       XVECEXP (lats_exp, 0, i+1) = make_numeric_value (decl->default_latency);
     }