Forgot to commit these...

From-SVN: r17555

diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index 3354aa7ad3f16bb9d4a324c93071d0e0a66918e1..c3c721fd76720e94304024fcb690a444fc0f2ec7 100644 (file)
--- a/gcc/genattrtab.c
+++ b/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)    \

diff --git a/gcc/rtl.c b/gcc/rtl.c
index a6f53d4b719e3da7d37482c082c79d1ee1d209ba..acfe6c2f40668f7211cc9d58a39c9fc570b5cdd0 100644 (file)
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -768,8 +768,14 @@ 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;