From 1d459d38863e6ef9c4ae77834a8f1193f4699b65 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu, 18 Nov 2010 21:11:57 +0100
Subject: [PATCH] - Drop gdb-6.8-glibc-headers-compat.patch: GNU/Linux
 irrelevant (Tom Tromey). - Drop gdb-6.3-terminal-fix-20050214.patch: The bug
 is not reproducible. - Drop gdb-6.7-kernel-headers-compat.patch:
 kernel-headers seem to be fixed.

---
 gdb-6.7-kernel-headers-compat.patch | 24 ------------------------
 gdb.spec                            |  6 +-----
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 gdb-6.7-kernel-headers-compat.patch

diff --git a/gdb-6.7-kernel-headers-compat.patch b/gdb-6.7-kernel-headers-compat.patch
deleted file mode 100644
index f169b78..0000000
--- a/gdb-6.7-kernel-headers-compat.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-kernel-headers-2.6.25-0.40.rc1.git2.fc9.x86_64
-
-In file included from /usr/include/asm/ptrace.h:4,
-                 from ../../gdb/amd64-linux-nat.c:44:
-/usr/include/asm/ptrace-abi.h:92: error: expected specifier-qualifier-list before ‘u32’
-
---- gdb-6.7.1-13.fc9.x86_64/gdb/amd64-linux-nat.c-orig	2008-02-15 15:37:28.000000000 -0500
-+++ gdb-6.7.1-13.fc9.x86_64/gdb/amd64-linux-nat.c	2008-02-15 15:40:13.000000000 -0500
-@@ -35,13 +35,13 @@
- #include <sys/procfs.h>
- #include <asm/prctl.h>
- /* FIXME ezannoni-2003-07-09: we need <sys/reg.h> to be included after
--   <asm/ptrace.h> because the latter redefines FS and GS for no apparent
-+   <sys/ptrace.h> because the latter redefines FS and GS for no apparent
-    reason, and those definitions don't match the ones that libpthread_db
-    uses, which come from <sys/reg.h>.  */
- /* ezannoni-2003-07-09: I think this is fixed. The extraneous defs have
-    been removed from ptrace.h in the kernel.  However, better safe than
-    sorry.  */
--#include <asm/ptrace.h>
-+#include <sys/ptrace.h>
- #include <sys/reg.h>
- #include "gdb_proc_service.h"
- 
diff --git a/gdb.spec b/gdb.spec
index dcf15ee..8e6d93a 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -366,10 +366,6 @@ Patch296: gdb-6.5-gcore-buffer-limit-test.patch
 #=fedoratest
 Patch298: gdb-6.6-threads-static-test.patch
 
-# Fix #include <asm/ptrace.h> on kernel-headers-2.6.25-0.40.rc1.git2.fc9.x86_64.
-#=push
-Patch304: gdb-6.7-kernel-headers-compat.patch
-
 # Test GCORE for shmid 0 shared memory mappings.
 #=fedoratest: But it is broken anyway, sometimes the case being tested is not reproducible.
 Patch309: gdb-6.3-mapping-zero-inode-test.patch
@@ -753,7 +749,6 @@ rm -f gdb/jv-exp.c gdb/m2-exp.c gdb/objc-exp.c gdb/p-exp.c
 %patch294 -p1
 %patch296 -p1
 %patch298 -p1
-%patch304 -p1
 %patch309 -p1
 %patch311 -p1
 %patch315 -p1
@@ -1173,6 +1168,7 @@ fi
 * Thu Nov 18 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.2.50.20101117-2.fc15
 - Drop gdb-6.8-glibc-headers-compat.patch: GNU/Linux irrelevant (Tom Tromey).
 - Drop gdb-6.3-terminal-fix-20050214.patch: The bug is not reproducible.
+- Drop gdb-6.7-kernel-headers-compat.patch: kernel-headers seem to be fixed.
 
 * Thu Nov 18 2010 Jan Kratochvil <jan.kratochvil@redhat.com> - 7.2.50.20101117-1.fc15
 - Rebase to FSF GDB 7.2.50.20101117 (which is a 7.3 pre-release).