diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b9ac372b44..e3911e9e82 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-06  Yao Qi  <yao@codesourcery.com>
+
+	* target.h (struct target_ops) <to_traceframe_info>: Use
+	TARGET_DEFAULT_NORETURN (tcomplain ()).
+	* target-delegates.c: Regenerated.
+
 2014-03-05  Pedro Alves  <palves@redhat.com>
 
 	PR gdb/16575
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 5b27b59906..3ca24b7966 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -1297,7 +1297,7 @@ delegate_traceframe_info (struct target_ops *self)
 static struct traceframe_info *
 tdefault_traceframe_info (struct target_ops *self)
 {
-  return NULL;
+  tcomplain ();
 }
 
 static int
diff --git a/gdb/target.h b/gdb/target.h
index ab797b2ffa..91f0cc96a3 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -950,7 +950,7 @@ struct target_ops
        higher layers take care of caching, invalidating, and
        re-fetching when necessary.  */
     struct traceframe_info *(*to_traceframe_info) (struct target_ops *)
-       TARGET_DEFAULT_RETURN (NULL);
+	TARGET_DEFAULT_NORETURN (tcomplain ());
 
     /* Ask the target to use or not to use agent according to USE.  Return 1
        successful, 0 otherwise.  */