diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 77b5fb20c1f..8a7710991a0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-11  Martin M. Hunt  <hunt@redhat.com>
+
+	* utils.c (string_to_core_addr): After turning string into
+	a number, convert to a CORE_ADDR using INTEGER_TO_ADDRESS
+	which will do necessary sign-extension, etc.
+
 2002-10-11  Daniel Jacobowitz  <drow@mvista.com>
 
 	* c-exp.y (THIS): Delete token and grammar rule.
diff --git a/gdb/utils.c b/gdb/utils.c
index 9aab625f63c..d1b4c994570 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -2649,6 +2649,8 @@ string_to_core_addr (const char *my_string)
 	    internal_error (__FILE__, __LINE__, "invalid decimal");
 	}
     }
+  if (INTEGER_TO_ADDRESS_P ())
+    addr = INTEGER_TO_ADDRESS (builtin_type_void_data_ptr, &addr); 
   return addr;
 }