diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2b53eed1955..2a47ca2cecf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-23  David Malcolm  <dmalcolm@redhat.com>
+
+	PR jit/64722
+	* emit-rtl.c (init_emit_regs): Set pic_offset_table_rtx to
+	NULL_RTX before testing PIC_OFFSET_TABLE_REGNUM, since the
+	latter may be affected by the former (e.g. on i686).
+
 2015-01-23  Martin Liska  <mliska@suse.cz>
 
 	* tree.h (tree_vec_elt_check): Workaround -Wstrict-overflow
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index df85366c5d6..483eacb2d6c 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -5872,10 +5872,9 @@ init_emit_regs (void)
     = gen_raw_REG (Pmode, RETURN_ADDRESS_POINTER_REGNUM);
 #endif
 
+  pic_offset_table_rtx = NULL_RTX;
   if ((unsigned) PIC_OFFSET_TABLE_REGNUM != INVALID_REGNUM)
     pic_offset_table_rtx = gen_raw_REG (Pmode, PIC_OFFSET_TABLE_REGNUM);
-  else
-    pic_offset_table_rtx = NULL_RTX;
 
   for (i = 0; i < (int) MAX_MACHINE_MODE; i++)
     {