dummy_frame_dtor_ftype vs. call_function_by_hand_dummy_dtor_ftype cleanup

[deliverable/binutils-gdb.git] / gdb / solib-spu.c

diff --git a/gdb/solib-spu.c b/gdb/solib-spu.c
index 3c8cd1a4617b274cc396325ad5713bd91f7b6bfd..44fbf91506c4eb0758f1e6c4e75f54ada09d4429 100644 (file)
--- a/gdb/solib-spu.c
+++ b/gdb/solib-spu.c
@@ -110,8 +110,7 @@ append_ocl_sos (struct so_list **link_ptr)
         {
          enum bfd_endian byte_order = bfd_big_endian (objfile->obfd)?
                                         BFD_ENDIAN_BIG : BFD_ENDIAN_LITTLE;
-         volatile struct gdb_exception ex;
-         TRY_CATCH (ex, RETURN_MASK_ALL)
+         TRY
            {
              CORE_ADDR data =
                read_memory_unsigned_integer (*ocl_program_addr_base,
@@ -134,7 +133,7 @@ append_ocl_sos (struct so_list **link_ptr)
                  link_ptr = &newobj->next;
                }
            }
-         if (ex.reason < 0)
+         CATCH (ex, RETURN_MASK_ALL)
            {
              /* Ignore memory errors.  */
              switch (ex.error)
@@ -146,6 +145,7 @@ append_ocl_sos (struct so_list **link_ptr)
                  break;
                }
            }
+         END_CATCH
        }
     }
 }
@@ -313,6 +313,7 @@ spu_bfd_iovec_stat (bfd *abfd, void *stream, struct stat *sb)
      table to find the extent of the last section but that seems
      pointless when the size is needed only for checks of other
      parsed values in dbxread.c.  */
+  memset (sb, 0, sizeof (struct stat));
   sb->st_size = INT_MAX;
   return 0;
 }