diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 519c6d1d7c49de77c9d1fe51d0c9215e6bf84b31..9d652d7f6c5e860cc536b4f2262e2c7886727912 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-05-10  Trevor Saunders  <tbsaunde+binutils@tbsaunde.org>
+
+	* iq2000-tdep.c (iq2000_scan_prologue): Remove if that shouldn't guard
+	anything.
+	* linespec.c (add_sal_to_sals): Restore call to symtab_to_fullname.
+
 2016-05-10  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	* arm-tdep.c (arm_elf_make_msymbol_special): Use
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index 14d2afe2ab9e7150ed60efa123db1042442dbec3..600d70a15f87317e71ce10089e561af8aa047043 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -248,7 +248,6 @@ iq2000_scan_prologue (struct gdbarch *gdbarch,
 	  if (tgtreg >= 0 && tgtreg < E_NUM_REGS)
 	    cache->saved_regs[tgtreg] = -((signed short) (insn & 0xffff));
 
-	  if (tgtreg == E_LR_REGNUM)
 	  continue;
 	}
 
diff --git a/gdb/linespec.c b/gdb/linespec.c
index c0c3b3b39c33614f5659538d8c50207fd1a340c6..71621630b04a7bd833117e2027004aa4d831c459 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -845,6 +845,8 @@ add_sal_to_sals (struct linespec_state *self,
       canonical = &self->canonical_names[sals->nelts - 1];
       if (!literal_canonical && sal->symtab)
 	{
+	  symtab_to_fullname (sal->symtab);
+
 	  /* Note that the filter doesn't have to be a valid linespec
 	     input.  We only apply the ":LINE" treatment to Ada for
 	     the time being.  */