Merge GDB 7.5.1

gdb/testsuite/gdb.base/watchpoints.c

 /* This testcase is part of GDB, the GNU debugger.
 
    Copyright 2009-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 12 matching lines @@
 
 int count = -1;
 int ival1 = -1;
 int ival2 = -1;
 int ival3 = -1;
 int ival4 = -1;
 
 int 
 main ()
 {
-#ifdef usestubs
-  set_debug_traps();
-  breakpoint();
-#endif
-
   for (count = 0; count < 4; count++) {
     ival1 = count; ival2 = count;
     ival3 = count; ival4 = count;
   }
 
   ival1 = count; ival2 = count;  /* Outside loop */
   ival3 = count; ival4 = count;
 
   return 0;
 }