Update of the hppa patch to fix the inclusion of asm/offset[s].h

3 files changed, 37 insertions, 28 deletions

diff --git a/sys-devel/gdb/ChangeLog b/sys-devel/gdb/ChangeLog
index d428b306fe5a..c105ee877c3c 100644
--- a/sys-devel/gdb/ChangeLog
+++ b/sys-devel/gdb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gdb
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.40 2004/05/30 01:35:27 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/ChangeLog,v 1.41 2004/06/06 21:00:02 gmsoft Exp $
+
+  06 Jun 2004; Guy Martin <gmsoft@gentoo.org> gdb-6.1.ebuild,
+  files/gdb-6.1-hppa-01.patch, files/gdb-6.1-hppa.patch:
+  Update of the hppa patch to fix the inclusion of asm/offset[s].h
 
   30 May 2004; Guy Martin <gmsoft@gentoo.org> gdb-6.1.ebuild,
   files/gdb-6.1-hppa.patch:
diff --git a/sys-devel/gdb/files/gdb-6.1-hppa.patch b/sys-devel/gdb/files/gdb-6.1-hppa-01.patch
index d362eb92ed1a..84fae8cf54d5 100644
--- a/sys-devel/gdb/files/gdb-6.1-hppa.patch
+++ b/sys-devel/gdb/files/gdb-6.1-hppa-01.patch
@@ -1,6 +1,6 @@
 diff -uNr gdb-6.1.orig/gdb/config/djgpp/fnchange.lst gdb-6.1/gdb/config/djgpp/fnchange.lst
---- gdb-6.1.orig/gdb/config/djgpp/fnchange.lst	2004-05-29 19:34:06.045080792 +0000
-+++ gdb-6.1/gdb/config/djgpp/fnchange.lst	2004-05-29 19:37:43.094084328 +0000
+--- gdb-6.1.orig/gdb/config/djgpp/fnchange.lst	2004-06-06 20:16:24.469809664 +0000
++++ gdb-6.1/gdb/config/djgpp/fnchange.lst	2004-06-06 20:16:53.664371416 +0000
 @@ -232,6 +232,8 @@
  @V@/gdb/testsuite/gdb.mi/mi2-var-display.exp @V@/gdb/testsuite/gdb.mi/mi2vardisplay.exp
  @V@/gdb/amd64-linux-tdep.c @V@/gdb/amd64-ltdep.c
@@ -12,7 +12,7 @@ diff -uNr gdb-6.1.orig/gdb/config/djgpp/fnchange.lst gdb-6.1/gdb/config/djgpp/fn
  @V@/include/elf/ChangeLog-9103 @V@/include/elf/ChangeLog.9103
 diff -uNr gdb-6.1.orig/gdb/config/pa/linux.mh gdb-6.1/gdb/config/pa/linux.mh
 --- gdb-6.1.orig/gdb/config/pa/linux.mh	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/config/pa/linux.mh	2004-05-29 19:37:43.097083872 +0000
++++ gdb-6.1/gdb/config/pa/linux.mh	2004-06-06 20:16:53.667370960 +0000
 @@ -0,0 +1,9 @@
 +# Host: Hewlett-Packard PA-RISC machine, running Linux
 +XDEPFILES=
@@ -25,14 +25,14 @@ diff -uNr gdb-6.1.orig/gdb/config/pa/linux.mh gdb-6.1/gdb/config/pa/linux.mh
 +XM_CLIBS= -ldl -rdynamic
 diff -uNr gdb-6.1.orig/gdb/config/pa/linux.mt gdb-6.1/gdb/config/pa/linux.mt
 --- gdb-6.1.orig/gdb/config/pa/linux.mt	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/config/pa/linux.mt	2004-05-29 19:37:43.099083568 +0000
++++ gdb-6.1/gdb/config/pa/linux.mt	2004-06-06 20:16:53.669370656 +0000
 @@ -0,0 +1,3 @@
 +# Target: HP PA-RISC running Linux
 +TDEPFILES= hppa-tdep.o hppa-linux-tdep.o glibc-tdep.o solib.o solib-svr4.o
 +TM_FILE=tm-hppa.h
 diff -uNr gdb-6.1.orig/gdb/config/pa/nm-linux.h gdb-6.1/gdb/config/pa/nm-linux.h
 --- gdb-6.1.orig/gdb/config/pa/nm-linux.h	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/config/pa/nm-linux.h	2004-05-29 19:37:43.101083264 +0000
++++ gdb-6.1/gdb/config/pa/nm-linux.h	2004-06-06 20:16:53.671370352 +0000
 @@ -0,0 +1,56 @@
 +/* Native support for GNU/Linux, for GDB, the GNU debugger.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -91,8 +91,8 @@ diff -uNr gdb-6.1.orig/gdb/config/pa/nm-linux.h gdb-6.1/gdb/config/pa/nm-linux.h
 +#endif
 +
 diff -uNr gdb-6.1.orig/gdb/config/pa/tm-hppa.h gdb-6.1/gdb/config/pa/tm-hppa.h
---- gdb-6.1.orig/gdb/config/pa/tm-hppa.h	2004-05-29 19:34:06.251049480 +0000
-+++ gdb-6.1/gdb/config/pa/tm-hppa.h	2004-05-29 19:48:49.432785448 +0000
+--- gdb-6.1.orig/gdb/config/pa/tm-hppa.h	2004-06-06 20:16:24.652781848 +0000
++++ gdb-6.1/gdb/config/pa/tm-hppa.h	2004-06-06 20:16:53.676369592 +0000
 @@ -26,9 +26,6 @@
  
  #include "regcache.h"
@@ -239,8 +239,8 @@ diff -uNr gdb-6.1.orig/gdb/config/pa/tm-hppa.h gdb-6.1/gdb/config/pa/tm-hppa.h
   * Unwind table and descriptor.
   */
 diff -uNr gdb-6.1.orig/gdb/config/pa/tm-hppa64.h gdb-6.1/gdb/config/pa/tm-hppa64.h
---- gdb-6.1.orig/gdb/config/pa/tm-hppa64.h	2004-05-29 19:34:06.252049328 +0000
-+++ gdb-6.1/gdb/config/pa/tm-hppa64.h	2004-05-29 19:48:49.436784840 +0000
+--- gdb-6.1.orig/gdb/config/pa/tm-hppa64.h	2004-06-06 20:16:24.653781696 +0000
++++ gdb-6.1/gdb/config/pa/tm-hppa64.h	2004-06-06 20:16:53.679369136 +0000
 @@ -57,81 +57,9 @@
  
  /* jimb: omitted dynamic linking stuff here */
@@ -324,8 +324,8 @@ diff -uNr gdb-6.1.orig/gdb/config/pa/tm-hppa64.h gdb-6.1/gdb/config/pa/tm-hppa64
 -
  /* jimb: omitted purify call support */
 diff -uNr gdb-6.1.orig/gdb/config/pa/tm-hppah.h gdb-6.1/gdb/config/pa/tm-hppah.h
---- gdb-6.1.orig/gdb/config/pa/tm-hppah.h	2004-05-29 19:34:06.253049176 +0000
-+++ gdb-6.1/gdb/config/pa/tm-hppah.h	2004-05-29 19:48:49.438784536 +0000
+--- gdb-6.1.orig/gdb/config/pa/tm-hppah.h	2004-06-06 20:16:24.654781544 +0000
++++ gdb-6.1/gdb/config/pa/tm-hppah.h	2004-06-06 20:16:53.682368680 +0000
 @@ -36,21 +36,6 @@
  #include "somsolib.h"
  #endif
@@ -350,7 +350,7 @@ diff -uNr gdb-6.1.orig/gdb/config/pa/tm-hppah.h gdb-6.1/gdb/config/pa/tm-hppah.h
  #define CHILD_ENABLE_EXCEPTION_CALLBACK
 diff -uNr gdb-6.1.orig/gdb/config/pa/xm-linux.h gdb-6.1/gdb/config/pa/xm-linux.h
 --- gdb-6.1.orig/gdb/config/pa/xm-linux.h	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/config/pa/xm-linux.h	2004-05-29 19:37:43.103082960 +0000
++++ gdb-6.1/gdb/config/pa/xm-linux.h	2004-06-06 20:16:53.685368224 +0000
 @@ -0,0 +1,31 @@
 +/* Host-dependent definitions for the hppa-linux.
 +
@@ -384,8 +384,8 @@ diff -uNr gdb-6.1.orig/gdb/config/pa/xm-linux.h gdb-6.1/gdb/config/pa/xm-linux.h
 +
 +#endif /* xm-linux.h */
 diff -uNr gdb-6.1.orig/gdb/configure.host gdb-6.1/gdb/configure.host
---- gdb-6.1.orig/gdb/configure.host	2004-05-29 19:34:05.288195856 +0000
-+++ gdb-6.1/gdb/configure.host	2004-05-29 19:37:43.106082504 +0000
+--- gdb-6.1.orig/gdb/configure.host	2004-06-06 20:16:23.393973216 +0000
++++ gdb-6.1/gdb/configure.host	2004-06-06 20:16:53.687367920 +0000
 @@ -48,6 +48,7 @@
  hppa*64*-*-hpux11*)	gdb_host=hpux11w ;;
  hppa*-*-hpux11*)	gdb_host=hpux11 ;;
@@ -395,8 +395,8 @@ diff -uNr gdb-6.1.orig/gdb/configure.host gdb-6.1/gdb/configure.host
  i[34567]86-ncr-*)	gdb_host=ncr3000 ;;
  i[34567]86-*-dgux*)	gdb_host=i386v4 ;;
 diff -uNr gdb-6.1.orig/gdb/configure.tgt gdb-6.1/gdb/configure.tgt
---- gdb-6.1.orig/gdb/configure.tgt	2004-05-29 19:34:05.291195400 +0000
-+++ gdb-6.1/gdb/configure.tgt	2004-05-29 19:37:43.109082048 +0000
+--- gdb-6.1.orig/gdb/configure.tgt	2004-06-06 20:16:23.396972760 +0000
++++ gdb-6.1/gdb/configure.tgt	2004-06-06 20:16:53.690367464 +0000
 @@ -74,6 +74,7 @@
  hppa*64*-*-hpux11*)	gdb_target=hppa64 ;;
  hppa*-*-hpux*)		gdb_target=hppahpux ;;
@@ -406,8 +406,8 @@ diff -uNr gdb-6.1.orig/gdb/configure.tgt gdb-6.1/gdb/configure.tgt
  
  i[34567]86-ncr-*)	gdb_target=ncr3000 ;;
 diff -uNr gdb-6.1.orig/gdb/hppa-hpux-tdep.c gdb-6.1/gdb/hppa-hpux-tdep.c
---- gdb-6.1.orig/gdb/hppa-hpux-tdep.c	2004-05-29 19:34:05.464169104 +0000
-+++ gdb-6.1/gdb/hppa-hpux-tdep.c	2004-05-29 19:49:00.099163912 +0000
+--- gdb-6.1.orig/gdb/hppa-hpux-tdep.c	2004-06-06 20:16:23.571946160 +0000
++++ gdb-6.1/gdb/hppa-hpux-tdep.c	2004-06-06 20:16:53.700365944 +0000
 @@ -24,11 +24,32 @@
  #include "osabi.h"
  #include "gdb_string.h"
@@ -1005,8 +1005,8 @@ diff -uNr gdb-6.1.orig/gdb/hppa-hpux-tdep.c gdb-6.1/gdb/hppa-hpux-tdep.c
  static void
 diff -uNr gdb-6.1.orig/gdb/hppa-linux-nat.c gdb-6.1/gdb/hppa-linux-nat.c
 --- gdb-6.1.orig/gdb/hppa-linux-nat.c	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/hppa-linux-nat.c	2004-05-29 19:37:43.114081288 +0000
-@@ -0,0 +1,350 @@
++++ gdb-6.1/gdb/hppa-linux-nat.c	2004-06-06 20:19:05.443337968 +0000
+@@ -0,0 +1,355 @@
 +/* Functions specific to running gdb native on HPPA running Linux.
 +   Copyright 2004 Free Software Foundation, Inc.
 +
@@ -1039,12 +1039,17 @@ diff -uNr gdb-6.1.orig/gdb/hppa-linux-nat.c gdb-6.1/gdb/hppa-linux-nat.c
 +#include <sys/user.h>
 +#include <sys/procfs.h>
 +#include <string.h>
++#include <linux/version.h>
 +
 +#ifdef HAVE_SYS_REG_H
 +#include <sys/reg.h>
 +#endif
 +
++#if LINUX_VERSION_CODE < 0x02052c
 +#include <asm/offset.h>
++#else
++#include <asm/offsets.h>
++#endif
 +
 +/* Prototypes for supply_gregset etc. */
 +#include "gregset.h"
@@ -1359,7 +1364,7 @@ diff -uNr gdb-6.1.orig/gdb/hppa-linux-nat.c gdb-6.1/gdb/hppa-linux-nat.c
 +}
 diff -uNr gdb-6.1.orig/gdb/hppa-linux-tdep.c gdb-6.1/gdb/hppa-linux-tdep.c
 --- gdb-6.1.orig/gdb/hppa-linux-tdep.c	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/hppa-linux-tdep.c	2004-05-29 19:37:43.117080832 +0000
++++ gdb-6.1/gdb/hppa-linux-tdep.c	2004-06-06 20:16:53.708364728 +0000
 @@ -0,0 +1,58 @@
 +/* Target-dependent code for Linux running on PA-RISC, for GDB.
 +
@@ -1421,7 +1426,7 @@ diff -uNr gdb-6.1.orig/gdb/hppa-linux-tdep.c gdb-6.1/gdb/hppa-linux-tdep.c
 +
 diff -uNr gdb-6.1.orig/gdb/hppa-linux-tdep.h gdb-6.1/gdb/hppa-linux-tdep.h
 --- gdb-6.1.orig/gdb/hppa-linux-tdep.h	1970-01-01 00:00:00.000000000 +0000
-+++ gdb-6.1/gdb/hppa-linux-tdep.h	2004-05-29 19:37:43.121080224 +0000
++++ gdb-6.1/gdb/hppa-linux-tdep.h	2004-06-06 20:16:53.712364120 +0000
 @@ -0,0 +1,140 @@
 +/* Definitions to target GDB to any Hewlett-Packard PA-RISC machine.
 +   Copyright 2004 Free Software Foundation, Inc. 
@@ -1564,8 +1569,8 @@ diff -uNr gdb-6.1.orig/gdb/hppa-linux-tdep.h gdb-6.1/gdb/hppa-linux-tdep.h
 +#endif
 +
 diff -uNr gdb-6.1.orig/gdb/hppa-tdep.c gdb-6.1/gdb/hppa-tdep.c
---- gdb-6.1.orig/gdb/hppa-tdep.c	2004-05-29 19:34:05.471168040 +0000
-+++ gdb-6.1/gdb/hppa-tdep.c	2004-05-29 19:49:00.114161632 +0000
+--- gdb-6.1.orig/gdb/hppa-tdep.c	2004-06-06 20:16:23.578945096 +0000
++++ gdb-6.1/gdb/hppa-tdep.c	2004-06-06 20:16:53.773354848 +0000
 @@ -48,12 +48,10 @@
  #include <sys/types.h>
  #endif
diff --git a/sys-devel/gdb/gdb-6.1.ebuild b/sys-devel/gdb/gdb-6.1.ebuild
index d693832dd52a..a80556b3ac5e 100644
--- a/sys-devel/gdb/gdb-6.1.ebuild
+++ b/sys-devel/gdb/gdb-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.1.ebuild,v 1.3 2004/05/30 01:35:27 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gdb/gdb-6.1.ebuild,v 1.4 2004/06/06 21:00:02 gmsoft Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://mirrors.rcn.net/pub/sourceware/gdb/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc64"
+KEYWORDS="~x86 ppc64 ~hppa"
 IUSE="nls"
 
 DEPEND=">=sys-libs/ncurses-5.2-r2
@@ -20,7 +20,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/gdb-6.1-ppc64-01.patch
-	epatch ${FILESDIR}/gdb-6.1-hppa.patch
+	epatch ${FILESDIR}/gdb-6.1-hppa-01.patch
 }
 
 src_compile() {