Merge GDB 7.5.1

gdb/solib-ia64-hpux.c

 /* Copyright (C) 2010, 2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ skipping 146 matching lines @@
           || insn == 0x3c0c9c0);  /* break.i 0x0f0327 */
 }
 
 /* Same as ia64_hpux_at_dld_breakpoint_1_p above, with the following
    differences: It temporarily sets inferior_ptid to PTID, and also
    contains any exception being raised.  */
 
 int
 ia64_hpux_at_dld_breakpoint_p (ptid_t ptid)
 {
-  struct gdb_exception e;
+  volatile struct gdb_exception e;
   ptid_t saved_ptid = inferior_ptid;
   int result = 0;
 
   inferior_ptid = ptid;
   TRY_CATCH (e, RETURN_MASK_ALL)
     {
       result = ia64_hpux_at_dld_breakpoint_1_p (ptid);
     }
   inferior_ptid = saved_ptid;
   if (e.reason < 0)
@@ skipping 93 matching lines @@
   ia64_hpux_move_pc_to_next_bundle (regcache);
 }
 
 /* Same as ia64_hpux_handle_dld_breakpoint_1 above, with the following
    differences: This function temporarily sets inferior_ptid to PTID,
    and also contains any exception.  */
 
 void
 ia64_hpux_handle_dld_breakpoint (ptid_t ptid)
 {
-  struct gdb_exception e;
+  volatile struct gdb_exception e;
   ptid_t saved_ptid = inferior_ptid;
 
   inferior_ptid = ptid;
   TRY_CATCH (e, RETURN_MASK_ALL)
     {
       ia64_hpux_handle_dld_breakpoint_1 (ptid);
     }
   inferior_ptid = saved_ptid;
   if (e.reason < 0)
     warning (_("error detected while handling dld breakpoint: %s"), e.message);
@@ skipping 399 matching lines @@
 }
 
 /* Prevent warning from -Wmissing-prototypes.  */
 void _initialize_solib_ia64_hpux (void);
 
 void
 _initialize_solib_ia64_hpux (void)
 {
   ia64_hpux_so_ops = ia64_hpux_target_so_ops ();
 }