Index: gdb/ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.13748
retrieving revision 1.13749
diff -u -r1.13748 -r1.13749
--- gdb/ChangeLog	18 Jan 2012 18:58:42 -0000	1.13748
+++ gdb/ChangeLog	19 Jan 2012 12:51:04 -0000	1.13749
@@ -1,3 +1,8 @@
+2012-01-19  Gary Benson  <gbenson@redhat.com>
+
+	* mdebugread.c (sort_blocks): Replace integer constants with ones
+	derived from FIRST_LOCAL_BLOCK.
+
 2012-01-18  Paul Pluzhnikov  <ppluzhnikov@google.com>
 	    Jan Kratochvil  <jan.kratochvil@redhat.com>
 
Index: gdb/mdebugread.c
===================================================================
RCS file: /cvs/src/src/gdb/mdebugread.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- gdb/mdebugread.c	4 Jan 2012 08:17:06 -0000	1.127
+++ gdb/mdebugread.c	19 Jan 2012 12:51:04 -0000	1.128
@@ -4713,7 +4713,7 @@
 {
   struct blockvector *bv = BLOCKVECTOR (s);
 
-  if (BLOCKVECTOR_NBLOCKS (bv) <= 2)
+  if (BLOCKVECTOR_NBLOCKS (bv) <= FIRST_LOCAL_BLOCK)
     {
       /* Cosmetic */
       if (BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK)) == 0)
@@ -4728,7 +4728,7 @@
    * are very different.  It would be nice to find a reliable test
    * to detect -O3 images in advance.
    */
-  if (BLOCKVECTOR_NBLOCKS (bv) > 3)
+  if (BLOCKVECTOR_NBLOCKS (bv) > FIRST_LOCAL_BLOCK + 1)
     qsort (&BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK),
 	   BLOCKVECTOR_NBLOCKS (bv) - FIRST_LOCAL_BLOCK,
 	   sizeof (struct block *),