diff options
| author | Paul Pluzhnikov <ppluzhnikov@google.com> | 2009-08-06 23:25:49 +0000 |
|---|---|---|
| committer | Paul Pluzhnikov <ppluzhnikov@google.com> | 2009-08-06 23:25:49 +0000 |
| commit | e5af178fbf5b6b0d317633d4a74b3377ca582c56 (patch) | |
| tree | ad6a406b2bf0ee39a302d75035f3d9f77a8c02d9 /gdb | |
| parent | b01c84103b9aeb50d2c34d2e562579b79a0c604c (diff) | |
| download | binutils-gdb-e5af178fbf5b6b0d317633d4a74b3377ca582c56.tar.gz | |
2009-08-06 Paul Pluzhnikov <ppluzhnikov@google.com>
gold/10400
* dwarf2-frame.c (qsort_fde_cmp): Use stable sort.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2-frame.c | 13 |
2 files changed, 16 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4fa11597509..d25bd48c916 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,9 @@ 2009-08-06 Paul Pluzhnikov <ppluzhnikov@google.com> + + gold/10400 + * dwarf2-frame.c (qsort_fde_cmp): Use stable sort. + +2009-08-06 Paul Pluzhnikov <ppluzhnikov@google.com> * dwarf2-frame.c (struct dwarf2_cie): Remove 'next'. (struct dwarf2_cie_table): New. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index 66176591b9a..0f6da4052b4 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -1958,9 +1958,18 @@ qsort_fde_cmp (const void *a, const void *b) { 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; } |