2012-01-19 Gary Benson <gbenson@redhat.com>

	* mdebugread.c (sort_blocks): Replace integer constants with ones
	derived from FIRST_LOCAL_BLOCK.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 120bcbc134784cd61a248839be65e48a73cb5e63..dfce58b66d2447242d53378ef3eecdd37eeb9cee 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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>
 

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index c95c09b62eddbb3cce54ccfb9d534e15c6ab5f64..e6d3b8c739fd5893ffb2b3b3f8e81a09ba5da5ac 100644 (file)
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -4713,7 +4713,7 @@ sort_blocks (struct symtab *s)
 {
   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 @@ sort_blocks (struct symtab *s)
    * 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 *),