diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fe3340969a..ee8385ee1c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* solib-svr4.c (svr4_exec_displacement): New comment for entry_point.
+	Replace exec_entry_point call by bfd_get_start_address.
+
 2010-01-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Support Valgrind attachments broken by the PIE support.
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 6daf0dcca6..826f8bf0da 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1620,13 +1620,15 @@ static CORE_ADDR
 svr4_exec_displacement (void)
 {
   int found;
+  /* ENTRY_POINT is a possible function descriptor - before
+     a call to gdbarch_convert_from_func_ptr_addr.  */
   CORE_ADDR entry_point;
 
   if (exec_bfd == NULL)
     return 0;
 
   if (target_auxv_search (&current_target, AT_ENTRY, &entry_point) == 1)
-    return entry_point - exec_entry_point (exec_bfd, &current_target);
+    return entry_point - bfd_get_start_address (exec_bfd);
 
   return svr4_static_exec_displacement ();
 }