[gdb/f14/master] - Fix ppc* compilation of PRPSINFO in the core files (BZ 662995, for BZ 254229). - Fix (disable) non

[Jan Kratochvil]

commit f6c5ba8706898895fe103d08e8641b5cb377edc9
Author: Jan Kratochvil <jan.kratochvil at redhat.com>
Date:   Sat Jan 1 10:13:09 2011 +0100

    - Fix ppc* compilation of PRPSINFO in the core files (BZ 662995, for BZ 254229).
    - Fix (disable) non-x86* compilation of libinproctrace.so (for BZ 662995).

 gdb-6.8-bz254229-gcore-prpsinfo.patch |    5 +++--
 gdb.spec                              |    8 ++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/gdb-6.8-bz254229-gcore-prpsinfo.patch b/gdb-6.8-bz254229-gcore-prpsinfo.patch
index 87fd255..216a95d 100644
--- a/gdb-6.8-bz254229-gcore-prpsinfo.patch
+++ b/gdb-6.8-bz254229-gcore-prpsinfo.patch
@@ -2,11 +2,12 @@ Index: gdb-7.1.90.20100711/bfd/elf-bfd.h
 ===================================================================
 --- gdb-7.1.90.20100711.orig/bfd/elf-bfd.h	2010-06-27 06:07:51.000000000 +0200
 +++ gdb-7.1.90.20100711/bfd/elf-bfd.h	2010-07-12 23:00:04.000000000 +0200
-@@ -2171,8 +2171,9 @@ extern Elf_Internal_Phdr * _bfd_elf_find
+@@ -2171,8 +2171,10 @@ extern Elf_Internal_Phdr * _bfd_elf_find
  /* Exported interface for writing elf corefile notes. */
  extern char *elfcore_write_note
    (bfd *, char *, int *, const char *, int, const void *, int);
-+#include <sys/procfs.h>
++struct elf_prpsinfo;
++typedef struct elf_prpsinfo prpsinfo_t;
  extern char *elfcore_write_prpsinfo
 -  (bfd *, char *, int *, const char *, const char *);
 +  (bfd *, char *, int *, const prpsinfo_t *);
diff --git a/gdb.spec b/gdb.spec
index 14694a6..7d767c2 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: 26%{?_with_upstream:.upstream}%{dist}
+Release: 27%{?_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
@@ -1272,12 +1272,16 @@ fi
 %endif
 %{_bindir}/gdbserver
 %{_mandir}/*/gdbserver.1*
-%ifnarch s390 s390x %{sparc}
+%ifarch %{ix86} x86_64
 %{_libdir}/libinproctrace.so
 %endif
 %endif
 
 %changelog
+* Sat Jan  1 2011 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.2-27.fc14
+- Fix ppc* compilation of PRPSINFO in the core files (BZ 662995, for BZ 254229).
+- Fix (disable) non-x86* compilation of libinproctrace.so (for BZ 662995).
+
 * Thu Nov 18 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 7.2-26.fc14
 - Revert the previous patch (7.2-25.fc14).
 - Fix .gdb_index memory corruption (BZ 653644).