diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49150fdc6a..ba0b361f48 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,7 +1,11 @@
+Mon Aug 31 15:42:10 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* top.c (context_hook): Define.
+
 Tue Aug 25 13:21:58 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
 	* ax-gdb.c (gen_var_ref): Allow for typedef types.
-	(gen_cast, gen_bitfield_ref, gen_expr): ditto.
+	(gen_cast, gen_bitfield_ref, gen_expr, gen_deref): ditto.
 
 Mon Aug 24 18:29:03 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
 
diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index 2beed22f14..d4baa251a6 100644
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,3 +1,7 @@
+Mon Aug 31 15:42:10 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gdbtk-hooks.c (context_hook): Don't define.
+
 1998-08-31  Keith Seitz  <keiths@cygnus.com>
 
 	* gdbtk-cmds.c (gdb_listfuncs): When stripping out "global destructors"
diff --git a/gdb/gdbtk-hooks.c b/gdb/gdbtk-hooks.c
index d4a9fa1bbc..8f6f19c3e5 100644
--- a/gdb/gdbtk-hooks.c
+++ b/gdb/gdbtk-hooks.c
@@ -111,7 +111,6 @@ static void pc_changed PARAMS ((void));
 static void tracepoint_notify PARAMS ((struct tracepoint *, const char *));
 static void gdbtk_selected_frame_changed PARAMS ((int));
 static void gdbtk_context_change PARAMS ((int));
-void (*context_hook) PARAMS ((int));
 
 /*
  * gdbtk_fputs can't be static, because we need to call it in gdbtk.c.
diff --git a/gdb/top.c b/gdb/top.c
index b9d759b3e0..d666f43d94 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -460,6 +460,9 @@ int (*target_wait_hook) PARAMS ((int pid, struct target_waitstatus *status));
 void (*call_command_hook) PARAMS ((struct cmd_list_element *c, char *cmd,
 				   int from_tty));
 
+/* Called when the current thread changes.  Argument is thread id.  */
+
+void (*context_hook) PARAMS ((int id));
 
 /* Takes control from error ().  Typically used to prevent longjmps out of the
    middle of the GUI.  Usually used in conjunction with a catch routine.  */