[gdb/f14/master] Fix i386 rwatch+awatch before run (BZ 688788, on top of BZ 541866).

[Jan Kratochvil]

commit 1e4b7d3ea61c6fb82798ae7afa715781ed332637
Author: Jan Kratochvil <jan.kratochvil at redhat.com>
Date:   Fri Mar 18 17:56:38 2011 +0100

    Fix i386 rwatch+awatch before run (BZ 688788, on top of BZ 541866).

 gdb-bz541866-rwatch-before-run.patch |   41 ++++++++++++++++++++++++++++++++++
 gdb.spec                             |    5 +++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---
diff --git a/gdb-bz541866-rwatch-before-run.patch b/gdb-bz541866-rwatch-before-run.patch
index f485b2f..0fcaa79 100644
--- a/gdb-bz541866-rwatch-before-run.patch
+++ b/gdb-bz541866-rwatch-before-run.patch
@@ -11,6 +11,47 @@ Index: gdb-7.1.90.20100711/gdb/config/i386/linux64.mh
  NAT_CDEPS = $(srcdir)/proc-service.list
  
  # The dynamically loaded libthread_db needs access to symbols in the
+--- gdb-7.2/gdb/config/i386/linux.mh-orig	2010-06-11 14:08:51.000000000 +0200
++++ gdb-7.2/gdb/config/i386/linux.mh	2011-03-18 12:00:32.000000000 +0100
+@@ -1,6 +1,6 @@
+ # Host: Intel 386 running GNU/Linux.
+ 
+-NAT_FILE= config/nm-linux.h
++NAT_FILE= nm-linux.h
+ NATDEPFILES= inf-ptrace.o fork-child.o \
+ 	i386-nat.o i386-linux-nat.o \
+ 	proc-service.o linux-thread-db.o \
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gdb-7.1.90.20100711/gdb/config/i386/nm-linux.h	2010-07-13 19:02:28.000000000 +0200
+@@ -0,0 +1,28 @@
++/* Native support for GNU/Linux i386.
++
++   Copyright 2010 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,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++#ifndef NM_LINUX_H
++#define NM_LINUX_H
++
++#include "config/nm-linux.h"
++
++/* Red Hat backward compatibility with gdb-6.8.  */
++#define target_can_use_hardware_watchpoint(type, cnt, ot) 1
++
++#endif /* NM_LINUX64_H */
 Index: gdb-7.1.90.20100711/gdb/config/i386/nm-linux64.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/gdb.spec b/gdb.spec
index a120d65..2ce4ca3 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -27,7 +27,7 @@ Version: 7.2
 
 # The release always contains a leading reserved number, start it at 1.
 # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing.
-Release: 47%{?_with_upstream:.upstream}%{dist}
+Release: 48%{?_with_upstream:.upstream}%{dist}
 
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and GFDL and BSD and Public Domain
 Group: Development/Debuggers
@@ -1464,6 +1464,9 @@ fi
 %endif
 
 %changelog
+* Fri Mar 18 2011 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.2-48.fc14
+- Fix i386 rwatch+awatch before run (BZ 688788, on top of BZ 541866).
+
 * Tue Mar  8 2011 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.2-47.fc14
 - [vla] New testcase for the unfinished types garbage collector (for BZ 682286).