* dwarf2read.c (dwarf2_build_psymtabs_hard): Remove extraneous

code in loop condition.  This seemed to be trying to round
info_ptr up to the next four-byte boundary, but that's not what it
actually did.  If we discover the problem the old code was really
trying to address, we can fix it properly.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1626a6c1f9eb746c65ddd92dcf0a3261555015ff..d6694ed45b72625ce9aa5b4b9a1bae9c29628230 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-04  Jim Blandy  <jimb@redhat.com>
+
+       * dwarf2read.c (dwarf2_build_psymtabs_hard): Remove extraneous
+       code in loop condition.  This seemed to be trying to round
+       info_ptr up to the next four-byte boundary, but that's not what it
+       actually did.  If we discover the problem the old code was really
+       trying to address, we can fix it properly.
+
 2001-07-03  Michael Snyder  <msnyder@redhat.com>
 
        * thread_db (find_new_threads_callback, thread_db_thread_alive, 

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 07e15005e136019e4b1000021bcca57a5dd7df35..136f49757610909bb91772efe4c755b19f398760 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -980,8 +980,7 @@ dwarf2_build_psymtabs_hard (struct objfile *objfile, int mainline)
   obstack_init (&dwarf2_tmp_obstack);
   back_to = make_cleanup (dwarf2_free_tmp_obstack, NULL);
 
-  while ((unsigned int) (info_ptr - dwarf_info_buffer)
-        + ((info_ptr - dwarf_info_buffer) % 4) < dwarf_info_size)
+  while (info_ptr < dwarf_info_buffer + dwarf_info_size)
     {
       struct comp_unit_head cu_header;
       beg_of_comp_unit = info_ptr;