diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6227a8e244..4fa2d4952d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-29  Tom Tromey  <tom@tromey.com>
+
+	* main.c (captured_main_1): Remove unused declaration.
+	* spu-multiarch.c (parse_spufs_run): Remove unused declaration.
+
 2017-09-29  Tom Tromey  <tom@tromey.com>
 
 	* symtab.c (search_symbols): Remove unused outer cleanup.
diff --git a/gdb/main.c b/gdb/main.c
index 66ba75ba21..f174a24ed5 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -498,8 +498,6 @@ captured_main_1 (struct captured_main_args *context)
   int save_auto_load;
   struct objfile *objfile;
 
-  struct cleanup *chain;
-
 #ifdef HAVE_SBRK
   /* Set this before constructing scoped_command_stats.  */
   lim_at_start = (char *) sbrk (0);
diff --git a/gdb/spu-multiarch.c b/gdb/spu-multiarch.c
index ebca082d2e..a935a72c30 100644
--- a/gdb/spu-multiarch.c
+++ b/gdb/spu-multiarch.c
@@ -56,7 +56,6 @@ static int
 parse_spufs_run (ptid_t ptid, int *fd, CORE_ADDR *addr)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ());
-  struct cleanup *old_chain;
   struct gdbarch_tdep *tdep;
   struct regcache *regcache;
   gdb_byte buf[4];