* read.c (read_a_source_file): Rearrange evaluation order when

[deliverable/binutils-gdb.git] / gdb / findcmd.c

diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index ad8edc8a896d278154d3e2d50cb9d4eb0d1d257e..2996fb02bfa773206d2f2ae5e8c1400daf2001a1 100644 (file)
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -23,7 +23,6 @@
 #include "gdbcmd.h"
 #include "value.h"
 #include "target.h"
-#include "gdb_stdint.h"
 
 /* Copied from bfd_put_bits.  */
 
@@ -293,13 +292,14 @@ find_command (char *args, int from_tty)
   /* Record and print the results.  */
 
   set_internalvar (lookup_internalvar ("numfound"),
-                  value_from_longest (builtin_type_int,
+                  value_from_longest (builtin_type_int32,
                                       (LONGEST) found_count));
   if (found_count > 0)
     {
+      struct gdbarch *gdbarch = current_gdbarch;
+      struct type *ptr_type = builtin_type (gdbarch)->builtin_data_ptr;
       set_internalvar (lookup_internalvar ("_"),
-                      value_from_pointer (builtin_type_void_data_ptr,
-                                          last_found_addr));
+                      value_from_pointer (ptr_type, last_found_addr));
     }
 
   if (found_count == 0)