Merge GDB 7.5.1

gdb/testsuite/gdb.base/longjmp.c

 /* This testcase is part of GDB, the GNU debugger.
 
    Copyright 2008-2012 Free Software Foundation, Inc.
 
    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 15 matching lines @@
 int
 call_longjmp (jmp_buf *buf)
 {
   longjmps++;
   longjmp (*buf, 1);
 }
 
 void
 hidden_longjmp (void)
 {
-  if (setjmp (env) == 0) /* longjmp caught */
+  if (setjmp (env) == 0)
     {
       call_longjmp (&env);
     }
   else
     resumes++;
 }
 
 int
 main ()
 {
@@ skipping 21 matching lines @@
   else
     {
       resumes++;
     }
 
   i = 2; /* miss_step_2 */
 
   /* Pattern 3 - setjmp/longjmp inside stepped-over function.  */
   hidden_longjmp (); /* patt3 */
 
+  i = 77; /* longjmp caught */
+
   i = 3; /* patt_end3.  */
 
   return 0;
 }