Forgot to commit these...

From-SVN: r17555

gcc/genattrtab.c

@@ -353,6 +353,9 @@ static char *alternative_name;
 
 int reload_completed = 0;
 
+/* Similarly since PRESERVE_DEATH_INFO_REGNO_P might reference "optimize".  */
+int optimize = 0;
+
 /* Simplify an expression.  Only call the routine if there is something to
    simplify.  */
 #define SIMPLIFY_TEST_EXP(EXP,INSN_CODE,INSN_INDEX)	\

gcc/rtl.c

@@ -768,9 +768,15 @@ read_rtx (infile)
 #if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG
 	tmp_wide = atol (tmp_char);
 #else
+#ifdef HAVE_ATOLL
+	tmp_wide = atoll (tmp_char);
+#else
+#ifdef HAVE_ATOQ
 	tmp_wide = atoq (tmp_char);
 #endif
 #endif
+#endif
+#endif
 	XWINT (return_rtx, i) = tmp_wide;
 	break;