Re: [RFC][patch] Work around for gold/10400 bug.

[Paul Pluzhnikov <ppluzhnikov@google.com>]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

On Wed, Jul 22, 2009 at 1:55 AM, Andreas Schwab<schwab@redhat.com> wrote:

>> +       return (char *) a - (char *) b;
>
> This can overflow.

Fixed in the updated patch.

Thanks,
-- 
Paul Pluzhnikov

009-07-21  Paul Pluzhnikov  <ppluzhnikov@google.com>

       gold/10400
       * dwarf2-frame.c (qsort_fde_cmp): Use stable sort.

[-- Attachment #2: gdb-gold-workaround-20090722.txt --]
[-- Type: text/plain, Size: 969 bytes --]

Index: src/gdb/dwarf2-frame.c
===================================================================
--- src.orig/gdb/dwarf2-frame.c	2009-07-22 13:26:17.000000000 -0700
+++ src/gdb/dwarf2-frame.c	2009-07-22 13:29:46.000000000 -0700
@@ -1958,9 +1958,18 @@
 {
   struct dwarf2_fde *aa = *(struct dwarf2_fde **)a;
   struct dwarf2_fde *bb = *(struct dwarf2_fde **)b;
+
   if (aa->initial_location == bb->initial_location)
-    /* Put eh_frame entries after debug_frame ones.  */
-    return aa->eh_frame_p - bb->eh_frame_p;
+    {
+      if (aa->address_range != bb->address_range
+          && aa->eh_frame_p == 0 && bb->eh_frame_p == 0)
+        /* Linker bug, e.g. gold/10400.
+           Work around it by keeping stable sort order.  */
+        return (a < b) ? -1 : 1;
+      else
+        /* Put eh_frame entries after debug_frame ones.  */
+        return aa->eh_frame_p - bb->eh_frame_p;
+    }
 
   return (aa->initial_location < bb->initial_location) ? -1 : 1;
 }