diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f1152836304..e25f025eebe 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-12  Yao Qi  <yao.qi@linaro.org>
+
+	PR tdep/20955
+	* cris-tdep.c (cris_delayed_get_disassembler): Remove the
+	assert.
+
 2016-12-09  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (ALL_TARGET_OBS): Remove vax-obsd-tdep.o.
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 084ff49b799..f2d9eeddec8 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -3792,10 +3792,7 @@ static int
 cris_delayed_get_disassembler (bfd_vma addr, struct disassemble_info *info)
 {
   int (*print_insn) (bfd_vma addr, struct disassemble_info *info);
-  /* FIXME: cagney/2003-08-27: It should be possible to select a CRIS
-     disassembler, even when there is no BFD.  Does something like
-     "gdb; target remote; disassmeble *0x123" work?  */
-  gdb_assert (exec_bfd != NULL);
+
   print_insn = cris_get_disassembler (exec_bfd);
   gdb_assert (print_insn != NULL);
   return print_insn (addr, info);