From: Daniel Jacobowitz <drow@false.org>
Date: Sat, 21 Jan 2006 22:23:27 +0000 (+0000)
Subject: 	* solib.c (info_sharedlibrary_command): Avoid internal_error.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84eb3c4faebe0d2443ef27e5f20b6464b9441ca5;p=binutils-gdb.git

	* solib.c (info_sharedlibrary_command): Avoid internal_error.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e7f38a1865..9d0d9b2e077 100644
--- 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 d21cf4611af..cd81274c9d8 100644
--- 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);