diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 57f844968f..2f007912f4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-20  Martin M. Hunt  <hunt@redhat.com>
 
+	* solib.c (info_sharedlibrary_command): Don't assume pointers
+	are the same size of long, call	longest_local_hex_string_custom().
+
 	* solib-svr4.c (LM_ADDR): LM_ADDR is a signed offset, so
 	extract_signed_integer() should be called instead of
 	extract_address().
diff --git a/gdb/solib.c b/gdb/solib.c
index 5fdb9a1d14..07d72ec121 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -638,14 +638,14 @@ info_sharedlibrary_command (char *ignore, int from_tty)
 
 	  printf_unfiltered ("%-*s", addr_width,
 			     so->textsection != NULL 
-			       ? local_hex_string_custom (
-			           (unsigned long) so->textsection->addr,
+			       ? longest_local_hex_string_custom (
+			           (LONGEST) so->textsection->addr,
 	                           addr_fmt)
 			       : "");
 	  printf_unfiltered ("%-*s", addr_width,
 			     so->textsection != NULL 
-			       ? local_hex_string_custom (
-			           (unsigned long) so->textsection->endaddr,
+			       ? longest_local_hex_string_custom (
+			           (LONGEST) so->textsection->endaddr,
 	                           addr_fmt)
 			       : "");
 	  printf_unfiltered ("%-12s", so->symbols_loaded ? "Yes" : "No");