diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c9cf31c629..108c750ca6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+	* windows-nat.c (windows_get_tib_address): Add 'self' argument.
+	* target.h (struct target_ops) <to_get_tib_address>: Add argument.
+	(target_get_tib_address): Add argument.
+	* target.c (update_current_target): Update.
+	* remote.c (remote_get_tib_address): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
 	* target.h (struct target_ops) <to_set_trace_notes>: Add argument.
diff --git a/gdb/remote.c b/gdb/remote.c
index 1e33ed7e66..bd420aa169 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -9320,7 +9320,7 @@ remote_get_thread_local_address (struct target_ops *ops,
    Returns 1 if ptid is found and thread_local_base is non zero.  */
 
 static int
-remote_get_tib_address (ptid_t ptid, CORE_ADDR *addr)
+remote_get_tib_address (struct target_ops *self, ptid_t ptid, CORE_ADDR *addr)
 {
   if (remote_protocol_packets[PACKET_qGetTIBAddr].support != PACKET_DISABLE)
     {
diff --git a/gdb/target.c b/gdb/target.c
index d61d10091b..e020add615 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -918,7 +918,7 @@ update_current_target (void)
 		      const char *, const char *, const char *))
 	    return_zero);
   de_fault (to_get_tib_address,
-	    (int (*) (ptid_t, CORE_ADDR *))
+	    (int (*) (struct target_ops *, ptid_t, CORE_ADDR *))
 	    tcomplain);
   de_fault (to_set_permissions,
 	    (void (*) (void))
diff --git a/gdb/target.h b/gdb/target.h
index 1acd7196dd..d4620f358c 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -859,7 +859,8 @@ struct target_ops
 
     /* Return the address of the start of the Thread Information Block
        a Windows OS specific feature.  */
-    int (*to_get_tib_address) (ptid_t ptid, CORE_ADDR *addr);
+    int (*to_get_tib_address) (struct target_ops *,
+			       ptid_t ptid, CORE_ADDR *addr);
 
     /* Send the new settings of write permission variables.  */
     void (*to_set_permissions) (void);
@@ -1861,7 +1862,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
 					(user), (notes), (stopnotes))
 
 #define target_get_tib_address(ptid, addr) \
-  (*current_target.to_get_tib_address) ((ptid), (addr))
+  (*current_target.to_get_tib_address) (&current_target, (ptid), (addr))
 
 #define target_set_permissions() \
   (*current_target.to_set_permissions) ()
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 164b53f6fe..e0dac7ba7f 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2570,7 +2570,8 @@ windows_xfer_partial (struct target_ops *ops, enum target_object object,
    Returns 1 if ptid is found and sets *ADDR to thread_local_base.  */
 
 static int
-windows_get_tib_address (ptid_t ptid, CORE_ADDR *addr)
+windows_get_tib_address (struct target_ops *self,
+			 ptid_t ptid, CORE_ADDR *addr)
 {
   thread_info *th;