Merge GDB 7.5.1

gdb/testsuite/gdb.threads/watchpoint-fork.h

Index: gdb/testsuite/gdb.threads/watchpoint-fork.h
diff --git a/bfd/aout32.c b/gdb/testsuite/gdb.threads/watchpoint-fork.h
similarity index 53%
copy from bfd/aout32.c
copy to gdb/testsuite/gdb.threads/watchpoint-fork.h
index 3ad1bd51c05794fc2ad7134000351a8fc8bbb2e3..cb109fa3d2169678a6505067bb2ff0c75251011c 100644
--- a/bfd/aout32.c
+++ b/gdb/testsuite/gdb.threads/watchpoint-fork.h
@@ -1,13 +1,12 @@
-/* BFD back-end for 32-bit a.out files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 2005, 2007
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
+/* Test case for forgotten hw-watchpoints after fork()-off of a process.
 
-   This file is part of BFD, the Binary File Descriptor library.
+   Copyright 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
+   the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -17,9 +16,17 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifdef THREAD
+#include <pthread.h>
+
+extern volatile int step;
+extern pthread_t thread;
+#endif /* THREAD */
 
-#define ARCH_SIZE 32
+extern volatile int var;
 
-#include "aoutx.h"
+extern void marker (void);
+extern void forkoff (int nr);