diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6b8d590f0c..781377e9d7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-05  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* linux-thread-db.c (check_for_thread_db): Return early if we have
+	no libthread_db support.
+
 2007-02-05  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* mi/mi-parse.h: Include <sys/time.h>.
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 3a18c9e0a7..7e5e4eb4fd 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -581,6 +581,10 @@ check_for_thread_db (void)
   td_err_e err;
   static int already_loaded;
 
+  /* Do nothing if we couldn't load libthread_db.so.1.  */
+  if (td_ta_new_p == NULL)
+    return;
+
   /* First time through, report that libthread_db was successfuly
      loaded.  Can't print this in in thread_db_load as, at that stage,
      the interpreter and it's console haven't started.  */