diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ac10311a92..4605fc1b7ff 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR shlibs/11293
+	* solib-svr4.c (enable_break): Check size of CORE_ADDR instead
+	of ULONGEST for address size.
+
 2010-02-17  Tom Tromey  <tromey@redhat.com>
 
 	* NEWS: Add C++ improvements section.
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index b3b9e00bde1..8edc8891ac1 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -1459,9 +1459,9 @@ enable_break (struct svr4_info *info, int from_tty)
 	       invalid addresses like 0x101234567 for 32bit inferiors on 64bit
 	       GDB.  */
 
-	    if (addr_bit < (sizeof (ULONGEST) * HOST_CHAR_BIT))
+	    if (addr_bit < (sizeof (CORE_ADDR) * HOST_CHAR_BIT))
 	      {
-		CORE_ADDR space_size = (ULONGEST) 1 << addr_bit;
+		CORE_ADDR space_size = (CORE_ADDR) 1 << addr_bit;
 		CORE_ADDR tmp_entry_point = exec_entry_point (tmp_bfd,
 							      tmp_bfd_target);