Revert previous patch. Applied an old version by mistake.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a58386dcc7d1c5b1df5534c4ccdd654597d679c1..c0809007d01c325f0555b16ca3d1419cd12eb02d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,8 +1,3 @@
-2009-10-28  Pedro Alves  <pedro@codesourcery.com>
-
-        * dwarf2-frame.c (dwarf2_build_frame_info): Discard --gc-section
-       leftover FDEs.
-
 2009-10-28  Pedro Alves  <pedro@codesourcery.com>
 
        * infrun.c (keep_going): Wrap with resume_cleanups.

diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 51e0dd423419e9c7e7f7aa4986c283dadd5df4ab..5e9be2ccb2cc7ae896725ade66755e5c79672362 100644 (file)
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -2101,8 +2101,7 @@ dwarf2_build_frame_info (struct objfile *objfile)
   if (fde_table.num_entries != 0)
     {
       struct dwarf2_fde_table *fde_table2;
-      struct dwarf2_fde *fde_prev = NULL;
-      int i;
+      int i, j;
 
       /* Prepare FDE table for lookups.  */
       qsort (fde_table.entries, fde_table.num_entries,
@@ -2111,39 +2110,22 @@ dwarf2_build_frame_info (struct objfile *objfile)
       /* Copy fde_table to obstack: it is needed at runtime.  */
       fde_table2 = (struct dwarf2_fde_table *)
           obstack_alloc (&objfile->objfile_obstack, sizeof (*fde_table2));
-      fde_table2->num_entries = 0;
 
       /* Since we'll be doing bsearch, squeeze out identical (except for
          eh_frame_p) fde entries so bsearch result is predictable.  */
-      for (i = 0; i < fde_table.num_entries; i++)
-       {
-         struct dwarf2_fde *fde = fde_table.entries[i];
-
-         /* Check for leftovers from --gc-sections.  The GNU linker
-            sets the relevant symbols to zero, but doesn't zero the
-            FDE *end* ranges because there's no relocation there.
-            It's (offset, length), not (start, end).  On targets
-            where address zero is just another valid address this can
-            be a problem, since the FDEs appear to be non-empty in
-            the output --- we could pick out the wrong FDE.  To work
-            around this, when overlaps are detected, we prefer FDEs
-            that do not start at zero.  */
-         if (fde->initial_location == 0
-             && (i + 1) < fde_table.num_entries
-             && ((fde_table.entries[i + 1])->initial_location
-                 < fde->initial_location + fde->address_range))
-           continue;
-
-         if (fde_prev != NULL
-             && fde_prev->initial_location == fde->initial_location)
-           continue;
-
-         obstack_grow (&objfile->objfile_obstack, &fde_table.entries[i],
-                       sizeof (fde_table.entries[0]));
-         ++fde_table2->num_entries;
-         fde_prev = fde;
-       }
+      for (i = 0, j = 0; j < fde_table.num_entries; ++i)
+        {
+          const int k = j;
+
+          obstack_grow (&objfile->objfile_obstack, &fde_table.entries[j],
+                        sizeof (fde_table.entries[0]));
+          while (++j < fde_table.num_entries
+                 && (fde_table.entries[k]->initial_location
+                     == fde_table.entries[j]->initial_location))
+            /* Skip.  */;
+        }
       fde_table2->entries = obstack_finish (&objfile->objfile_obstack);
+      fde_table2->num_entries = i;
       set_objfile_data (objfile, dwarf2_frame_objfile_data, fde_table2);
 
       /* Discard the original fde_table.  */