* solib.c (info_sharedlibrary_command): Avoid internal_error.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e7f38a1865a68e81d1ee1e84878beb5d3b3d781..9d0d9b2e07787ca8f7affbf81e8538c225e801e9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-21  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * solib.c (info_sharedlibrary_command): Avoid internal_error.
+
 2006-01-21  Mark Kettenis  <kettenis@gnu.org>
 
        * i386-tdep.c (i386_mxcsr_type): New variable.

diff --git a/gdb/solib.c b/gdb/solib.c
index d21cf4611af0a8af9510af7e213ac67abe74edca..cd81274c9d8849e23bb6ccf3b08fe8819fada558 100644 (file)
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -698,16 +698,8 @@ info_sharedlibrary_command (char *ignore, int from_tty)
   int header_done = 0;
   int addr_width;
 
-  if (TARGET_PTR_BIT == 32)
-    addr_width = 8 + 4;
-  else if (TARGET_PTR_BIT == 64)
-    addr_width = 16 + 4;
-  else
-    {
-      internal_error (__FILE__, __LINE__,
-                     _("TARGET_PTR_BIT returned unknown size %d"),
-                     TARGET_PTR_BIT);
-    }
+  /* "0x", a little whitespace, and two hex digits per byte of pointers.  */
+  addr_width = 4 + (TARGET_PTR_BIT / 4);
 
   update_solib_list (from_tty, 0);