diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 74377ffe49d..7662eacdc11 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-01  Joel Brobecker  <brobecker@adacore.com>
+
+	* solib-svr4.c (svr4_solib_create_inferior_hook): Remove warning.
+
 2007-06-01  Ulrich Weigand  <uweigand@de.ibm.com>
 
 	* irix5-nat.c (JB_ELEMENT_SIZE, get_longjmp_target): Remove.
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 7867d452d3b..e2026388860 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1348,11 +1348,7 @@ svr4_solib_create_inferior_hook (void)
   svr4_relocate_main_executable ();
 
   if (!svr4_have_link_map_offsets ())
-    {
-      warning (_("no shared library support for this OS / ABI"));
-      return;
-
-    }
+    return;
 
   if (!enable_break ())
     return;