summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-09-19 14:57:32 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-21 11:10:21 +0100
commit0c6aec8bd2e9ac9e7aab7170e06bd2f6b1ced8f4 (patch)
treed71a6de268b9bc60534595e28fc171ef3cf5b0c3
parent32a0d1b89e9d5612b2346faf3d0004f8cf045357 (diff)
downloadpoky-0c6aec8bd2e9ac9e7aab7170e06bd2f6b1ced8f4.tar.gz
gdb: Upgrade 7.4 -> 7.5
This is a simple upgrade. Dropping the unneeded patches and adding --disable-werror to configure since thats is what one of the patch was doing which was dropped. (From OE-Core rev: 452f26b6d189b9fafba644e41921091925fb6a47) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc11
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.bb (renamed from meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb-cross_7.5.bb (renamed from meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb)0
-rw-r--r--meta/recipes-devtools/gdb/gdb.inc1
-rw-r--r--meta/recipes-devtools/gdb/gdb/no-werror.patch80
-rw-r--r--meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch194
-rw-r--r--meta/recipes-devtools/gdb/gdb/siginfo_t.patch403
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.5.bb (renamed from meta/recipes-devtools/gdb/gdb_7.4.1.bb)0
8 files changed, 97 insertions, 592 deletions
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 348bdeedc0..ea4098c723 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -12,7 +12,7 @@ LTTNGUST_mips64 = ""
12LTTNGUST_mips64el = "" 12LTTNGUST_mips64el = ""
13LTTNGUST_sh4 = "" 13LTTNGUST_sh4 = ""
14 14
15INC_PR = "r1" 15INC_PR = "r0"
16 16
17LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ 17LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
18 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ 18 file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \
@@ -21,10 +21,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
21inherit autotools 21inherit autotools
22 22
23SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \ 23SRC_URI = "${GNU_MIRROR}/gdb/gdb-${PV}.tar.gz \
24 file://no-werror.patch" 24 "
25 25SRC_URI[md5sum] = "c9f5ed81008194f8f667f131234f3ef0"
26SRC_URI[md5sum] = "5fb7fca9ef7a9e3cfee0e2f2c0e52051" 26SRC_URI[sha256sum] = "8dcf38dd04f7f031b51d0672050d6b14626302ddc24d74e486b4666335de2df3"
27SRC_URI[sha256sum] = "f99d2be831ead324712ae4f11868e07e545272f10aac4186060f1386f2629b38"
28 27
29export CC_FOR_BUILD = "${BUILD_CC}" 28export CC_FOR_BUILD = "${BUILD_CC}"
30export CXX_FOR_BUILD = "${BUILD_CXX}" 29export CXX_FOR_BUILD = "${BUILD_CXX}"
@@ -39,7 +38,7 @@ EXTRA_OEMAKE = "'SUBDIRS=intl mmalloc libiberty opcodes bfd sim gdb etc utils'"
39 38
40EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}" 39EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}"
41 40
42EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x \ 41EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \
43 --with-curses --disable-multilib --with-system-readline --disable-sim \ 42 --with-curses --disable-multilib --with-system-readline --disable-sim \
44 ${GDBPROPREFIX} ${EXPAT} \ 43 ${GDBPROPREFIX} ${EXPAT} \
45 ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ 44 ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.bb
index c15aa7a489..c15aa7a489 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.5.bb
diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb b/meta/recipes-devtools/gdb/gdb-cross_7.5.bb
index a14d0ba952..a14d0ba952 100644
--- a/meta/recipes-devtools/gdb/gdb-cross_7.4.1.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross_7.5.bb
diff --git a/meta/recipes-devtools/gdb/gdb.inc b/meta/recipes-devtools/gdb/gdb.inc
index c1ad83ae04..a620eca501 100644
--- a/meta/recipes-devtools/gdb/gdb.inc
+++ b/meta/recipes-devtools/gdb/gdb.inc
@@ -5,7 +5,6 @@ inherit gettext
5SRC_URI += "file://kill_arm_map_symbols.patch \ 5SRC_URI += "file://kill_arm_map_symbols.patch \
6 file://gdbserver-cflags-last.diff;striplevel=0 \ 6 file://gdbserver-cflags-last.diff;striplevel=0 \
7 file://renesas-sh-native-support.patch \ 7 file://renesas-sh-native-support.patch \
8 file://siginfo_t.patch \
9 " 8 "
10#LDFLAGS_append = " -s" 9#LDFLAGS_append = " -s"
11#export CFLAGS_append=" -L${STAGING_LIBDIR}" 10#export CFLAGS_append=" -L${STAGING_LIBDIR}"
diff --git a/meta/recipes-devtools/gdb/gdb/no-werror.patch b/meta/recipes-devtools/gdb/gdb/no-werror.patch
deleted file mode 100644
index 989e2c5162..0000000000
--- a/meta/recipes-devtools/gdb/gdb/no-werror.patch
+++ /dev/null
@@ -1,80 +0,0 @@
1Upstream-Status: Pending
2
3---
4 bfd/warning.m4 | 2 +-
5 configure.ac | 2 +-
6 gdb/Makefile.in | 4 ++--
7 gdb/configure.ac | 8 ++------
8 4 files changed, 6 insertions(+), 10 deletions(-)
9
10Index: gdb-7.1/bfd/warning.m4
11===================================================================
12--- gdb-7.1.orig/bfd/warning.m4
13+++ gdb-7.1/bfd/warning.m4
14@@ -23,7 +23,7 @@ esac
15
16 # Enable -Werror by default when using gcc
17 if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
18- ERROR_ON_WARNING=yes
19+ ERROR_ON_WARNING=no
20 fi
21
22 NO_WERROR=
23Index: gdb-7.1/configure.ac
24===================================================================
25--- gdb-7.1.orig/configure.ac
26+++ gdb-7.1/configure.ac
27@@ -3371,7 +3371,7 @@ AC_SUBST(stage1_checking)
28 AC_ARG_ENABLE(werror,
29 [ --enable-werror enable -Werror in bootstrap stage2 and later], [],
30 [if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
31- enable_werror=yes
32+ enable_werror=no
33 else
34 enable_werror=no
35 fi])
36Index: gdb-7.1/gdb/Makefile.in
37===================================================================
38--- gdb-7.1.orig/gdb/Makefile.in
39+++ gdb-7.1/gdb/Makefile.in
40@@ -151,9 +151,9 @@ READLINE_CFLAGS = @READLINE_CFLAGS@
41 LIBEXPAT = @LIBEXPAT@
42
43 WARN_CFLAGS = @WARN_CFLAGS@
44-WERROR_CFLAGS = @WERROR_CFLAGS@
45+WERROR_CFLAGS =
46 GDB_WARN_CFLAGS = $(WARN_CFLAGS)
47-GDB_WERROR_CFLAGS = $(WERROR_CFLAGS)
48+GDB_WERROR_CFLAGS =
49
50 GDB_WARN_CFLAGS_NO_FORMAT = `echo " $(GDB_WARN_CFLAGS) " | sed "s/ -Wformat-nonliteral / /g"`
51
52Index: gdb-7.1/gdb/configure.ac
53===================================================================
54--- gdb-7.1.orig/gdb/configure.ac
55+++ gdb-7.1/gdb/configure.ac
56@@ -1525,15 +1525,12 @@ GDB_AC_WITH_DIR(SYSTEM_GDBINIT, system-g
57 AC_ARG_ENABLE(werror,
58 AS_HELP_STRING([--enable-werror], [treat compile warnings as errors]),
59 [case "${enableval}" in
60- yes | y) ERROR_ON_WARNING="yes" ;;
61+ yes | y) ERROR_ON_WARNING="no" ;;
62 no | n) ERROR_ON_WARNING="no" ;;
63 *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;;
64 esac])
65
66 WERROR_CFLAGS=""
67-if test "${ERROR_ON_WARNING}" = yes ; then
68- WERROR_CFLAGS="-Werror"
69-fi
70
71 # The entries after -Wno-pointer-sign are disabled warnings which may
72 # be enabled in the future, which can not currently be used to build
73@@ -1587,7 +1584,6 @@ then
74 # compiled with it enabled.
75 for w in ${build_warnings}; do
76 case $w in
77- -Werr*) WERROR_CFLAGS=-Werror ;;
78 *) # Check that GCC accepts it
79 saved_CFLAGS="$CFLAGS"
80 CFLAGS="$CFLAGS $w"
diff --git a/meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch b/meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch
index 2b1ceb79f2..15ff62013e 100644
--- a/meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch
+++ b/meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch
@@ -20,11 +20,11 @@ Last-Update: <2011-11-17>
20Upstream-Status: Pending 20Upstream-Status: Pending
21Signed-off-by: Khem Raj <raj.khem@gmail.com> 21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22 22
23Index: gdb-7.4/gdb/configure.host 23Index: gdb-7.5/gdb/configure.host
24=================================================================== 24===================================================================
25--- gdb-7.4.orig/gdb/configure.host 2012-04-24 07:06:35.085317177 -0700 25--- gdb-7.5.orig/gdb/configure.host 2012-05-30 12:41:34.000000000 -0700
26+++ gdb-7.4/gdb/configure.host 2012-04-24 07:09:14.365324889 -0700 26+++ gdb-7.5/gdb/configure.host 2012-09-19 14:40:42.974609772 -0700
27@@ -139,6 +139,7 @@ 27@@ -140,6 +140,7 @@
28 28
29 s390*-*-*) gdb_host=s390 ;; 29 s390*-*-*) gdb_host=s390 ;;
30 30
@@ -32,11 +32,11 @@ Index: gdb-7.4/gdb/configure.host
32 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu) 32 sh*-*-netbsdelf* | sh*-*-knetbsd*-gnu)
33 gdb_host=nbsd ;; 33 gdb_host=nbsd ;;
34 sh*-*-openbsd*) gdb_host=nbsd ;; 34 sh*-*-openbsd*) gdb_host=nbsd ;;
35Index: gdb-7.4/gdb/Makefile.in 35Index: gdb-7.5/gdb/Makefile.in
36=================================================================== 36===================================================================
37--- gdb-7.4.orig/gdb/Makefile.in 2012-04-24 07:06:35.093317178 -0700 37--- gdb-7.5.orig/gdb/Makefile.in 2012-07-02 08:29:33.000000000 -0700
38+++ gdb-7.4/gdb/Makefile.in 2012-04-24 07:09:14.369324886 -0700 38+++ gdb-7.5/gdb/Makefile.in 2012-09-19 14:40:42.974609772 -0700
39@@ -1544,6 +1544,7 @@ 39@@ -1493,6 +1493,7 @@
40 score-tdep.c \ 40 score-tdep.c \
41 ser-go32.c ser-pipe.c ser-tcp.c ser-mingw.c \ 41 ser-go32.c ser-pipe.c ser-tcp.c ser-mingw.c \
42 sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \ 42 sh-tdep.c sh64-tdep.c shnbsd-tdep.c shnbsd-nat.c \
@@ -44,11 +44,11 @@ Index: gdb-7.4/gdb/Makefile.in
44 sol2-tdep.c \ 44 sol2-tdep.c \
45 solib-irix.c solib-svr4.c solib-sunos.c \ 45 solib-irix.c solib-svr4.c solib-sunos.c \
46 sparc-linux-nat.c sparc-linux-tdep.c \ 46 sparc-linux-nat.c sparc-linux-tdep.c \
47Index: gdb-7.4/gdb/sh-linux-tdep.c 47Index: gdb-7.5/gdb/sh-linux-tdep.c
48=================================================================== 48===================================================================
49--- gdb-7.4.orig/gdb/sh-linux-tdep.c 2012-04-24 07:06:35.073317177 -0700 49--- gdb-7.5.orig/gdb/sh-linux-tdep.c 2012-05-07 06:17:29.000000000 -0700
50+++ gdb-7.4/gdb/sh-linux-tdep.c 2012-04-24 07:09:14.369324886 -0700 50+++ gdb-7.5/gdb/sh-linux-tdep.c 2012-09-19 14:46:50.610623784 -0700
51@@ -18,11 +18,34 @@ 51@@ -18,14 +18,37 @@
52 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 52 along with this program. If not, see <http://www.gnu.org/licenses/>. */
53 53
54 #include "defs.h" 54 #include "defs.h"
@@ -71,6 +71,9 @@ Index: gdb-7.4/gdb/sh-linux-tdep.c
71+#include "command.h" 71+#include "command.h"
72+#include "gdb_assert.h" 72+#include "gdb_assert.h"
73 73
74 #include "trad-frame.h"
75 #include "tramp-frame.h"
76
74+#include <sys/ptrace.h> 77+#include <sys/ptrace.h>
75+#include <sys/types.h> 78+#include <sys/types.h>
76+#include <sys/param.h> 79+#include <sys/param.h>
@@ -83,8 +86,8 @@ Index: gdb-7.4/gdb/sh-linux-tdep.c
83 #include "glibc-tdep.h" 86 #include "glibc-tdep.h"
84 #include "sh-tdep.h" 87 #include "sh-tdep.h"
85 #include "linux-tdep.h" 88 #include "linux-tdep.h"
86@@ -70,9 +93,505 @@ 89@@ -180,9 +203,505 @@
87 {-1 /* Terminator. */, 0} 90 sh_linux_rt_sigreturn_init
88 }; 91 };
89 92
90+/* Recognizing signal handler frames. */ 93+/* Recognizing signal handler frames. */
@@ -589,10 +592,10 @@ Index: gdb-7.4/gdb/sh-linux-tdep.c
589 linux_init_abi (info, gdbarch); 592 linux_init_abi (info, gdbarch);
590 593
591 /* GNU/Linux uses SVR4-style shared libraries. */ 594 /* GNU/Linux uses SVR4-style shared libraries. */
592Index: gdb-7.4/gdb/sh-tdep.h 595Index: gdb-7.5/gdb/sh-tdep.h
593=================================================================== 596===================================================================
594--- gdb-7.4.orig/gdb/sh-tdep.h 2012-04-24 07:06:35.101317178 -0700 597--- gdb-7.5.orig/gdb/sh-tdep.h 2012-03-01 15:55:40.000000000 -0800
595+++ gdb-7.4/gdb/sh-tdep.h 2012-04-24 07:09:14.369324886 -0700 598+++ gdb-7.5/gdb/sh-tdep.h 2012-09-19 14:48:32.406627602 -0700
596@@ -21,6 +21,12 @@ 599@@ -21,6 +21,12 @@
597 600
598 /* Contributed by Steve Chamberlain sac@cygnus.com. */ 601 /* Contributed by Steve Chamberlain sac@cygnus.com. */
@@ -614,10 +617,10 @@ Index: gdb-7.4/gdb/sh-tdep.h
614 PC_REGNUM = 16, 617 PC_REGNUM = 16,
615 PR_REGNUM = 17, 618 PR_REGNUM = 17,
616 GBR_REGNUM = 18, 619 GBR_REGNUM = 18,
617@@ -82,8 +89,26 @@ 620@@ -81,6 +88,24 @@
621 FV0_REGNUM = 76,
618 FV_LAST_REGNUM = 79 622 FV_LAST_REGNUM = 79
619 }; 623 };
620
621+#define SH_NUM_REGS 67 624+#define SH_NUM_REGS 67
622+ 625+
623+struct sh_frame_cache 626+struct sh_frame_cache
@@ -635,13 +638,11 @@ Index: gdb-7.4/gdb/sh-tdep.h
635+ CORE_ADDR saved_sp; 638+ CORE_ADDR saved_sp;
636+}; 639+};
637+ 640+
638 extern gdbarch_init_ftype sh64_gdbarch_init;
639 extern void sh64_show_regs (struct frame_info *);
640+extern struct sh_frame_cache *sh_frame_cache (struct frame_info *next_frame, void **this_cache); 641+extern struct sh_frame_cache *sh_frame_cache (struct frame_info *next_frame, void **this_cache);
641 642
642 /* This structure describes a register in a core-file. */ 643 /* This structure describes a register in a core-file. */
643 struct sh_corefile_regmap 644 struct sh_corefile_regmap
644@@ -92,8 +117,32 @@ 645@@ -89,8 +114,32 @@
645 unsigned int offset; 646 unsigned int offset;
646 }; 647 };
647 648
@@ -674,10 +675,10 @@ Index: gdb-7.4/gdb/sh-tdep.h
674 /* Non-NULL when debugging from a core file. Provides the offset 675 /* Non-NULL when debugging from a core file. Provides the offset
675 where each general-purpose register is stored inside the associated 676 where each general-purpose register is stored inside the associated
676 core file section. */ 677 core file section. */
677Index: gdb-7.4/gdb/sh-linux-nat.c 678Index: gdb-7.5/gdb/sh-linux-nat.c
678=================================================================== 679===================================================================
679--- /dev/null 1970-01-01 00:00:00.000000000 +0000 680--- /dev/null 1970-01-01 00:00:00.000000000 +0000
680+++ gdb-7.4/gdb/sh-linux-nat.c 2012-04-24 07:09:28.557325573 -0700 681+++ gdb-7.5/gdb/sh-linux-nat.c 2012-09-19 14:40:42.978609771 -0700
681@@ -0,0 +1,269 @@ 682@@ -0,0 +1,269 @@
682+/* Low level SH interface to ptrace, for GDB when running native. 683+/* Low level SH interface to ptrace, for GDB when running native.
683+ Copyright (C) 2002, 2004 Free Software Foundation, Inc. 684+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
@@ -948,10 +949,10 @@ Index: gdb-7.4/gdb/sh-linux-nat.c
948+ /* Register the target. */ 949+ /* Register the target. */
949+ linux_nat_add_target (t); 950+ linux_nat_add_target (t);
950+} 951+}
951Index: gdb-7.4/gdb/sh-tdep.c 952Index: gdb-7.5/gdb/sh-tdep.c
952=================================================================== 953===================================================================
953--- gdb-7.4.orig/gdb/sh-tdep.c 2012-04-24 07:06:35.109317179 -0700 954--- gdb-7.5.orig/gdb/sh-tdep.c 2012-06-08 07:24:57.000000000 -0700
954+++ gdb-7.4/gdb/sh-tdep.c 2012-04-24 07:09:14.369324886 -0700 955+++ gdb-7.5/gdb/sh-tdep.c 2012-09-19 14:45:09.770619943 -0700
955@@ -21,6 +21,9 @@ 956@@ -21,6 +21,9 @@
956 sac@cygnus.com. */ 957 sac@cygnus.com. */
957 958
@@ -972,7 +973,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
972 #include "reggroups.h" 973 #include "reggroups.h"
973@@ -69,23 +73,6 @@ 974@@ -69,23 +73,6 @@
974 975
975 static void (*sh_show_regs) (struct frame_info *); 976 static const char *sh_active_calling_convention = sh_cc_gcc;
976 977
977-#define SH_NUM_REGS 67 978-#define SH_NUM_REGS 67
978- 979-
@@ -994,7 +995,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
994 static int 995 static int
995 sh_is_renesas_calling_convention (struct type *func_type) 996 sh_is_renesas_calling_convention (struct type *func_type)
996 { 997 {
997@@ -1040,7 +1027,7 @@ 998@@ -1045,7 +1032,7 @@
998 return 0; 999 return 0;
999 /* Otherwise if the type of that member is float, the whole type is 1000 /* Otherwise if the type of that member is float, the whole type is
1000 treated as float. */ 1001 treated as float. */
@@ -1003,7 +1004,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1003 return 1; 1004 return 1;
1004 /* Otherwise it's not treated as float. */ 1005 /* Otherwise it's not treated as float. */
1005 return 0; 1006 return 0;
1006@@ -1090,7 +1077,7 @@ 1007@@ -1095,7 +1082,7 @@
1007 in four registers available. Loop thru args from first to last. */ 1008 in four registers available. Loop thru args from first to last. */
1008 for (argnum = 0; argnum < nargs; argnum++) 1009 for (argnum = 0; argnum < nargs; argnum++)
1009 { 1010 {
@@ -1012,7 +1013,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1012 len = TYPE_LENGTH (type); 1013 len = TYPE_LENGTH (type);
1013 val = sh_justify_value_in_reg (gdbarch, args[argnum], len); 1014 val = sh_justify_value_in_reg (gdbarch, args[argnum], len);
1014 1015
1015@@ -2508,7 +2495,7 @@ 1016@@ -1809,7 +1796,7 @@
1016 reg->how = DWARF2_FRAME_REG_UNDEFINED; 1017 reg->how = DWARF2_FRAME_REG_UNDEFINED;
1017 } 1018 }
1018 1019
@@ -1021,7 +1022,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1021 sh_alloc_frame_cache (void) 1022 sh_alloc_frame_cache (void)
1022 { 1023 {
1023 struct sh_frame_cache *cache; 1024 struct sh_frame_cache *cache;
1024@@ -2535,7 +2522,7 @@ 1025@@ -1836,7 +1823,7 @@
1025 return cache; 1026 return cache;
1026 } 1027 }
1027 1028
@@ -1030,7 +1031,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1030 sh_frame_cache (struct frame_info *this_frame, void **this_cache) 1031 sh_frame_cache (struct frame_info *this_frame, void **this_cache)
1031 { 1032 {
1032 struct gdbarch *gdbarch = get_frame_arch (this_frame); 1033 struct gdbarch *gdbarch = get_frame_arch (this_frame);
1033@@ -2593,9 +2580,9 @@ 1034@@ -1903,9 +1890,9 @@
1034 return cache; 1035 return cache;
1035 } 1036 }
1036 1037
@@ -1043,7 +1044,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1043 { 1044 {
1044 struct gdbarch *gdbarch = get_frame_arch (this_frame); 1045 struct gdbarch *gdbarch = get_frame_arch (this_frame);
1045 struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache); 1046 struct sh_frame_cache *cache = sh_frame_cache (this_frame, this_cache);
1046@@ -2609,7 +2596,7 @@ 1047@@ -1919,7 +1906,7 @@
1047 the current frame. Frob regnum so that we pull the value from 1048 the current frame. Frob regnum so that we pull the value from
1048 the correct place. */ 1049 the correct place. */
1049 if (regnum == gdbarch_pc_regnum (gdbarch)) 1050 if (regnum == gdbarch_pc_regnum (gdbarch))
@@ -1052,7 +1053,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1052 1053
1053 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1) 1054 if (regnum < SH_NUM_REGS && cache->saved_regs[regnum] != -1)
1054 return frame_unwind_got_memory (this_frame, regnum, 1055 return frame_unwind_got_memory (this_frame, regnum,
1055@@ -2853,8 +2840,8 @@ 1056@@ -2225,8 +2212,8 @@
1056 static struct gdbarch * 1057 static struct gdbarch *
1057 sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 1058 sh_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
1058 { 1059 {
@@ -1060,9 +1061,9 @@ Index: gdb-7.4/gdb/sh-tdep.c
1060 struct gdbarch_tdep *tdep; 1061 struct gdbarch_tdep *tdep;
1061+ struct gdbarch *gdbarch; 1062+ struct gdbarch *gdbarch;
1062 1063
1063 sh_show_regs = sh_generic_show_regs; 1064 /* SH5 is handled entirely in sh64-tdep.c. */
1064 switch (info.bfd_arch_info->mach) 1065 if (info.bfd_arch_info->mach == bfd_mach_sh5)
1065@@ -2917,6 +2904,18 @@ 1066@@ -2242,6 +2229,18 @@
1066 tdep = XZALLOC (struct gdbarch_tdep); 1067 tdep = XZALLOC (struct gdbarch_tdep);
1067 gdbarch = gdbarch_alloc (&info, tdep); 1068 gdbarch = gdbarch_alloc (&info, tdep);
1068 1069
@@ -1081,7 +1082,7 @@ Index: gdb-7.4/gdb/sh-tdep.c
1081 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT); 1082 set_gdbarch_short_bit (gdbarch, 2 * TARGET_CHAR_BIT);
1082 set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); 1083 set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT);
1083 set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT); 1084 set_gdbarch_long_bit (gdbarch, 4 * TARGET_CHAR_BIT);
1084@@ -3062,10 +3061,11 @@ 1085@@ -2389,10 +2388,11 @@
1085 break; 1086 break;
1086 } 1087 }
1087 1088
@@ -1091,13 +1092,13 @@ Index: gdb-7.4/gdb/sh-tdep.c
1091 gdbarch_init_osabi (info, gdbarch); 1092 gdbarch_init_osabi (info, gdbarch);
1092 1093
1093- dwarf2_append_unwinders (gdbarch); 1094- dwarf2_append_unwinders (gdbarch);
1095 frame_unwind_append_unwinder (gdbarch, &sh_stub_unwind);
1094 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind); 1096 frame_unwind_append_unwinder (gdbarch, &sh_frame_unwind);
1095 1097
1096 return gdbarch; 1098Index: gdb-7.5/gdb/testsuite/gdb.asm/sh-linux.inc
1097Index: gdb-7.4/gdb/testsuite/gdb.asm/sh-linux.inc
1098=================================================================== 1099===================================================================
1099--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1100--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1100+++ gdb-7.4/gdb/testsuite/gdb.asm/sh-linux.inc 2012-04-24 07:09:14.369324886 -0700 1101+++ gdb-7.5/gdb/testsuite/gdb.asm/sh-linux.inc 2012-09-19 14:40:42.978609771 -0700
1101@@ -0,0 +1,78 @@ 1102@@ -0,0 +1,78 @@
1102+# You'll find a bunch of nop opcodes in the below macros. They are 1103+# You'll find a bunch of nop opcodes in the below macros. They are
1103+# there to keep the code correctly aligned. Be careful to maintain 1104+# there to keep the code correctly aligned. Be careful to maintain
@@ -1177,10 +1178,10 @@ Index: gdb-7.4/gdb/testsuite/gdb.asm/sh-linux.inc
1177+\name: 1178+\name:
1178+ .long \value 1179+ .long \value
1179+ .endm 1180+ .endm
1180Index: gdb-7.4/gdb/testsuite/gdb.asm/sh.inc 1181Index: gdb-7.5/gdb/testsuite/gdb.asm/sh.inc
1181=================================================================== 1182===================================================================
1182--- gdb-7.4.orig/gdb/testsuite/gdb.asm/sh.inc 2012-04-24 07:06:35.001317175 -0700 1183--- gdb-7.5.orig/gdb/testsuite/gdb.asm/sh.inc 2012-04-16 01:02:09.000000000 -0700
1183+++ gdb-7.4/gdb/testsuite/gdb.asm/sh.inc 2012-04-24 07:09:14.369324886 -0700 1184+++ gdb-7.5/gdb/testsuite/gdb.asm/sh.inc 2012-09-19 14:40:42.978609771 -0700
1184@@ -40,9 +40,8 @@ 1185@@ -40,9 +40,8 @@
1185 mov.l .Lconst\@,r1 1186 mov.l .Lconst\@,r1
1186 bra .Lafterconst\@ 1187 bra .Lafterconst\@
@@ -1192,11 +1193,11 @@ Index: gdb-7.4/gdb/testsuite/gdb.asm/sh.inc
1192 .long \subr 1193 .long \subr
1193 .align 1 1194 .align 1
1194 .Lafterconst\@: 1195 .Lafterconst\@:
1195Index: gdb-7.4/gdb/testsuite/gdb.asm/asm-source.exp 1196Index: gdb-7.5/gdb/testsuite/gdb.asm/asm-source.exp
1196=================================================================== 1197===================================================================
1197--- gdb-7.4.orig/gdb/testsuite/gdb.asm/asm-source.exp 2012-04-24 07:06:35.009317179 -0700 1198--- gdb-7.5.orig/gdb/testsuite/gdb.asm/asm-source.exp 2012-06-25 13:11:43.000000000 -0700
1198+++ gdb-7.4/gdb/testsuite/gdb.asm/asm-source.exp 2012-04-24 07:09:14.369324886 -0700 1199+++ gdb-7.5/gdb/testsuite/gdb.asm/asm-source.exp 2012-09-19 14:40:42.978609771 -0700
1199@@ -110,6 +110,11 @@ 1200@@ -108,6 +108,11 @@
1200 append link-flags " -m elf32ppc" 1201 append link-flags " -m elf32ppc"
1201 } 1202 }
1202 } 1203 }
@@ -1208,80 +1209,69 @@ Index: gdb-7.4/gdb/testsuite/gdb.asm/asm-source.exp
1208 "sh*-*-*" { 1209 "sh*-*-*" {
1209 set asm-arch sh 1210 set asm-arch sh
1210 set debug-flags "-gdwarf-2" 1211 set debug-flags "-gdwarf-2"
1211Index: gdb-7.4/gdb/testsuite/gdb.base/sigall.c 1212Index: gdb-7.5/gdb/testsuite/gdb.base/sigall.c
1212=================================================================== 1213===================================================================
1213--- gdb-7.4.orig/gdb/testsuite/gdb.base/sigall.c 2012-04-24 07:06:35.037317176 -0700 1214--- gdb-7.5.orig/gdb/testsuite/gdb.base/sigall.c 2012-02-28 02:24:15.000000000 -0800
1214+++ gdb-7.4/gdb/testsuite/gdb.base/sigall.c 2012-04-24 07:09:14.369324886 -0700 1215+++ gdb-7.5/gdb/testsuite/gdb.base/sigall.c 2012-09-19 14:42:02.202612808 -0700
1215@@ -1,9 +1,9 @@ 1216@@ -5,6 +5,10 @@
1216 #include <signal.h>
1217 #include <unistd.h>
1218
1219-#ifdef __sh__
1220-#define signal(a,b) /* Signals not supported on this target - make them go away */
1221-#endif
1222+
1223+
1224+
1225
1226 /* Signal handlers, we set breakpoints in them to make sure that the 1217 /* Signal handlers, we set breakpoints in them to make sure that the
1227 signals really get delivered. */ 1218 signals really get delivered. */
1228Index: gdb-7.4/gdb/testsuite/gdb.base/signals.c 1219
1220+#ifdef __sh__
1221+#define signal(a,b) /* Signals not supported on this target - make them go away */
1222+#endif
1223+
1224 #ifdef PROTOTYPES
1225 void
1226 handle_ABRT (int sig)
1227Index: gdb-7.5/gdb/testsuite/gdb.base/signals.c
1229=================================================================== 1228===================================================================
1230--- gdb-7.4.orig/gdb/testsuite/gdb.base/signals.c 2012-04-24 07:06:35.049317176 -0700 1229--- gdb-7.5.orig/gdb/testsuite/gdb.base/signals.c 2012-02-28 02:24:15.000000000 -0800
1231+++ gdb-7.4/gdb/testsuite/gdb.base/signals.c 2012-04-24 07:09:14.373324884 -0700 1230+++ gdb-7.5/gdb/testsuite/gdb.base/signals.c 2012-09-19 14:43:22.034615831 -0700
1232@@ -3,10 +3,10 @@ 1231@@ -3,6 +3,10 @@
1233 #include <signal.h> 1232 #include <signal.h>
1234 #include <unistd.h> 1233 #include <unistd.h>
1235 1234
1236-#ifdef __sh__ 1235+#ifdef __sh__
1237-#define signal(a,b) /* Signals not supported on this target - make them go away */ 1236+#define signal(a,b) /* Signals not supported on this target - make them go away */
1238-#define alarm(a) /* Ditto for alarm() */ 1237+#define alarm(a) /* Ditto for alarm() */
1239-#endif 1238+#endif
1240+
1241+
1242+
1243+
1244 1239
1245 static int count = 0; 1240 static int count = 0;
1246 1241
1247Index: gdb-7.4/gdb/testsuite/gdb.base/annota1.c 1242Index: gdb-7.5/gdb/testsuite/gdb.base/annota1.c
1248=================================================================== 1243===================================================================
1249--- gdb-7.4.orig/gdb/testsuite/gdb.base/annota1.c 2012-04-24 07:06:35.021317172 -0700 1244--- gdb-7.5.orig/gdb/testsuite/gdb.base/annota1.c 2012-02-28 14:40:48.000000000 -0800
1250+++ gdb-7.4/gdb/testsuite/gdb.base/annota1.c 2012-04-24 07:09:14.373324884 -0700 1245+++ gdb-7.5/gdb/testsuite/gdb.base/annota1.c 2012-09-19 14:42:42.074614308 -0700
1251@@ -1,9 +1,9 @@ 1246@@ -1,6 +1,9 @@
1252 #include <stdio.h> 1247 #include <stdio.h>
1253 #include <signal.h> 1248 #include <signal.h>
1254 1249
1255-#ifdef __sh__ 1250+#ifdef __sh__
1256-#define signal(a,b) /* Signals not supported on this target - make them go away */ 1251+#define signal(a,b) /* Signals not supported on this target - make them go away */
1257-#endif 1252+#endif
1258+
1259+
1260+
1261
1262 1253
1263 #ifdef PROTOTYPES 1254 #ifdef PROTOTYPES
1264Index: gdb-7.4/gdb/testsuite/gdb.base/annota3.c 1255 void
1256Index: gdb-7.5/gdb/testsuite/gdb.base/annota3.c
1265=================================================================== 1257===================================================================
1266--- gdb-7.4.orig/gdb/testsuite/gdb.base/annota3.c 2012-04-24 07:06:35.029317176 -0700 1258--- gdb-7.5.orig/gdb/testsuite/gdb.base/annota3.c 2012-02-28 14:40:48.000000000 -0800
1267+++ gdb-7.4/gdb/testsuite/gdb.base/annota3.c 2012-04-24 07:09:14.373324884 -0700 1259+++ gdb-7.5/gdb/testsuite/gdb.base/annota3.c 2012-09-19 14:43:54.410617081 -0700
1268@@ -1,9 +1,9 @@ 1260@@ -1,6 +1,10 @@
1269 #include <stdio.h> 1261 #include <stdio.h>
1270 #include <signal.h> 1262 #include <signal.h>
1271 1263
1272-#ifdef __sh__ 1264+#ifdef __sh__
1273-#define signal(a,b) /* Signals not supported on this target - make them go away */ 1265+#define signal(a,b) /* Signals not supported on this target - make them go away */
1274-#endif 1266+#endif
1275+
1276+ 1267+
1277+
1278
1279 1268
1280 #ifdef PROTOTYPES 1269 #ifdef PROTOTYPES
1281Index: gdb-7.4/gdb/config/sh/xm-linux.h 1270 void
1271Index: gdb-7.5/gdb/config/sh/xm-linux.h
1282=================================================================== 1272===================================================================
1283--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1273--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1284+++ gdb-7.4/gdb/config/sh/xm-linux.h 2012-04-24 07:09:14.373324884 -0700 1274+++ gdb-7.5/gdb/config/sh/xm-linux.h 2012-09-19 14:40:42.994609807 -0700
1285@@ -0,0 +1,32 @@ 1275@@ -0,0 +1,32 @@
1286+/* Native support for GNU/Linux, for GDB, the GNU debugger. 1276+/* Native support for GNU/Linux, for GDB, the GNU debugger.
1287+ Copyright (C) 2000 Free Software Foundation, Inc. 1277+ Copyright (C) 2000 Free Software Foundation, Inc.
@@ -1315,10 +1305,10 @@ Index: gdb-7.4/gdb/config/sh/xm-linux.h
1315+#include <unistd.h> 1305+#include <unistd.h>
1316+ 1306+
1317+#endif /* #ifndef XM_LINUX_H */ 1307+#endif /* #ifndef XM_LINUX_H */
1318Index: gdb-7.4/gdb/config/sh/nm-linux.h 1308Index: gdb-7.5/gdb/config/sh/nm-linux.h
1319=================================================================== 1309===================================================================
1320--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1310--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1321+++ gdb-7.4/gdb/config/sh/nm-linux.h 2012-04-24 07:09:14.373324884 -0700 1311+++ gdb-7.5/gdb/config/sh/nm-linux.h 2012-09-19 14:40:42.994609807 -0700
1322@@ -0,0 +1,54 @@ 1312@@ -0,0 +1,54 @@
1323+/* Native-dependent definitions for SuperH running Linux, for GDB. 1313+/* Native-dependent definitions for SuperH running Linux, for GDB.
1324+ Copyright 2004 Free Software Foundation, Inc. 1314+ Copyright 2004 Free Software Foundation, Inc.
@@ -1374,10 +1364,10 @@ Index: gdb-7.4/gdb/config/sh/nm-linux.h
1374+#define CANNOT_STORE_REGISTER(regno) cannot_store_register (regno) 1364+#define CANNOT_STORE_REGISTER(regno) cannot_store_register (regno)
1375+ 1365+
1376+#endif /* NM_LINUX_H */ 1366+#endif /* NM_LINUX_H */
1377Index: gdb-7.4/gdb/config/sh/linux.mh 1367Index: gdb-7.5/gdb/config/sh/linux.mh
1378=================================================================== 1368===================================================================
1379--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1369--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1380+++ gdb-7.4/gdb/config/sh/linux.mh 2012-04-24 07:36:11.709403160 -0700 1370+++ gdb-7.5/gdb/config/sh/linux.mh 2012-09-19 14:40:42.994609807 -0700
1381@@ -0,0 +1,8 @@ 1371@@ -0,0 +1,8 @@
1382+# Host: Renesas Super-H running GNU/Linux 1372+# Host: Renesas Super-H running GNU/Linux
1383+NAT_FILE= config/sh/nm-linux.h 1373+NAT_FILE= config/sh/nm-linux.h
diff --git a/meta/recipes-devtools/gdb/gdb/siginfo_t.patch b/meta/recipes-devtools/gdb/gdb/siginfo_t.patch
deleted file mode 100644
index 465645da38..0000000000
--- a/meta/recipes-devtools/gdb/gdb/siginfo_t.patch
+++ /dev/null
@@ -1,403 +0,0 @@
1POSIX says you get "siginto_t" *not* "struct siginfo
2
3Upstream-Status: Pending
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: gdb-7.4.1/gdb/alpha-linux-tdep.c
8===================================================================
9--- gdb-7.4.1.orig/gdb/alpha-linux-tdep.c 2012-01-05 20:43:04.000000000 -0800
10+++ gdb-7.4.1/gdb/alpha-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700
11@@ -114,7 +114,7 @@
12 /* __NR_rt_sigreturn has a couple of structures on the stack. This is:
13
14 struct rt_sigframe {
15- struct siginfo info;
16+ siginfo_t info;
17 struct ucontext uc;
18 };
19
20Index: gdb-7.4.1/gdb/amd64-linux-nat.c
21===================================================================
22--- gdb-7.4.1.orig/gdb/amd64-linux-nat.c 2012-01-05 20:43:04.000000000 -0800
23+++ gdb-7.4.1/gdb/amd64-linux-nat.c 2012-07-03 10:12:30.154227388 -0700
24@@ -671,13 +671,13 @@
25 INF. */
26
27 static int
28-amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction)
29+amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction)
30 {
31 /* Is the inferior 32-bit? If so, then do fixup the siginfo
32 object. */
33 if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32)
34 {
35- gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t));
36+ gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
37
38 if (direction == 0)
39 compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
40Index: gdb-7.4.1/gdb/arm-linux-nat.c
41===================================================================
42--- gdb-7.4.1.orig/gdb/arm-linux-nat.c 2012-01-05 20:43:04.000000000 -0800
43+++ gdb-7.4.1/gdb/arm-linux-nat.c 2012-07-03 10:12:30.154227388 -0700
44@@ -1137,7 +1137,7 @@
45 static int
46 arm_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
47 {
48- struct siginfo *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
49+ siginfo_t *siginfo_p = linux_nat_get_siginfo (inferior_ptid);
50 int slot = siginfo_p->si_errno;
51
52 /* This must be a hardware breakpoint. */
53Index: gdb-7.4.1/gdb/arm-linux-tdep.c
54===================================================================
55--- gdb-7.4.1.orig/gdb/arm-linux-tdep.c 2012-01-05 20:43:04.000000000 -0800
56+++ gdb-7.4.1/gdb/arm-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700
57@@ -301,7 +301,7 @@
58
59 /* There are three elements in an rt_sigframe before the ucontext:
60 pinfo, puc, and info. The first two are pointers and the third
61- is a struct siginfo, with size 128 bytes. We could follow puc
62+ is a siginfo_t, with size 128 bytes. We could follow puc
63 to the ucontext, but it's simpler to skip the whole thing. */
64 #define ARM_OLD_RT_SIGFRAME_SIGINFO 0x8
65 #define ARM_OLD_RT_SIGFRAME_UCONTEXT 0x88
66Index: gdb-7.4.1/gdb/frv-linux-tdep.c
67===================================================================
68--- gdb-7.4.1.orig/gdb/frv-linux-tdep.c 2012-01-05 20:43:12.000000000 -0800
69+++ gdb-7.4.1/gdb/frv-linux-tdep.c 2012-07-03 10:12:30.154227388 -0700
70@@ -94,9 +94,9 @@
71 {
72 void (*pretcode)(void);
73 int sig;
74- struct siginfo *pinfo;
75+ siginfo_t *pinfo;
76 void *puc;
77- struct siginfo info;
78+ siginfo_t info;
79 struct ucontext uc;
80 uint32_t retcode[2];
81 };
82Index: gdb-7.4.1/gdb/gdbserver/linux-arm-low.c
83===================================================================
84--- gdb-7.4.1.orig/gdb/gdbserver/linux-arm-low.c 2012-01-05 20:43:37.000000000 -0800
85+++ gdb-7.4.1/gdb/gdbserver/linux-arm-low.c 2012-07-03 10:12:30.154227388 -0700
86@@ -631,7 +631,7 @@
87 arm_stopped_by_watchpoint (void)
88 {
89 struct lwp_info *lwp = get_thread_lwp (current_inferior);
90- struct siginfo siginfo;
91+ siginfo_t siginfo;
92
93 /* We must be able to set hardware watchpoints. */
94 if (arm_linux_get_hw_watchpoint_count () == 0)
95Index: gdb-7.4.1/gdb/gdbserver/linux-low.c
96===================================================================
97--- gdb-7.4.1.orig/gdb/gdbserver/linux-low.c 2012-01-05 20:43:37.000000000 -0800
98+++ gdb-7.4.1/gdb/gdbserver/linux-low.c 2012-07-03 10:12:30.154227388 -0700
99@@ -4522,7 +4522,7 @@
100 layout of the inferiors' architecture. */
101
102 static void
103-siginfo_fixup (struct siginfo *siginfo, void *inf_siginfo, int direction)
104+siginfo_fixup (siginfo_t *siginfo, void *inf_siginfo, int direction)
105 {
106 int done = 0;
107
108@@ -4534,9 +4534,9 @@
109 if (!done)
110 {
111 if (direction == 1)
112- memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
113+ memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
114 else
115- memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
116+ memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
117 }
118 }
119
120@@ -4545,8 +4545,8 @@
121 unsigned const char *writebuf, CORE_ADDR offset, int len)
122 {
123 int pid;
124- struct siginfo siginfo;
125- char inf_siginfo[sizeof (struct siginfo)];
126+ siginfo_t siginfo;
127+ char inf_siginfo[sizeof (siginfo_t)];
128
129 if (current_inferior == NULL)
130 return -1;
131Index: gdb-7.4.1/gdb/gdbserver/linux-low.h
132===================================================================
133--- gdb-7.4.1.orig/gdb/gdbserver/linux-low.h 2012-01-05 20:43:37.000000000 -0800
134+++ gdb-7.4.1/gdb/gdbserver/linux-low.h 2012-07-03 10:20:28.554250548 -0700
135@@ -22,6 +22,7 @@
136 #endif
137
138 #include "gdb_proc_service.h"
139+#include <signal.h>
140
141 #ifdef HAVE_LINUX_REGSETS
142 typedef void (*regset_fill_func) (struct regcache *, void *);
143@@ -46,8 +47,6 @@
144 extern struct regset_info target_regsets[];
145 #endif
146
147-struct siginfo;
148-
149 struct process_info_private
150 {
151 /* Arch-specific additions. */
152@@ -103,7 +102,7 @@
153 Returns true if any conversion was done; false otherwise.
154 If DIRECTION is 1, then copy from INF to NATIVE.
155 If DIRECTION is 0, copy from NATIVE to INF. */
156- int (*siginfo_fixup) (struct siginfo *native, void *inf, int direction);
157+ int (*siginfo_fixup) (siginfo_t *native, void *inf, int direction);
158
159 /* Hook to call when a new process is created or attached to.
160 If extra per-process architecture-specific data is needed,
161Index: gdb-7.4.1/gdb/gdbserver/linux-x86-low.c
162===================================================================
163--- gdb-7.4.1.orig/gdb/gdbserver/linux-x86-low.c 2012-01-05 20:43:37.000000000 -0800
164+++ gdb-7.4.1/gdb/gdbserver/linux-x86-low.c 2012-07-03 10:12:30.154227388 -0700
165@@ -906,13 +906,13 @@
166 INF. */
167
168 static int
169-x86_siginfo_fixup (struct siginfo *native, void *inf, int direction)
170+x86_siginfo_fixup (siginfo_t *native, void *inf, int direction)
171 {
172 #ifdef __x86_64__
173 /* Is the inferior 32-bit? If so, then fixup the siginfo object. */
174 if (register_size (0) == 4)
175 {
176- if (sizeof (struct siginfo) != sizeof (compat_siginfo_t))
177+ if (sizeof (siginfo_t) != sizeof (compat_siginfo_t))
178 fatal ("unexpected difference in siginfo");
179
180 if (direction == 0)
181Index: gdb-7.4.1/gdb/hppa-linux-tdep.c
182===================================================================
183--- gdb-7.4.1.orig/gdb/hppa-linux-tdep.c 2012-01-05 20:43:15.000000000 -0800
184+++ gdb-7.4.1/gdb/hppa-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
185@@ -181,10 +181,10 @@
186 }
187
188 /* sp + sfoffs[try] points to a struct rt_sigframe, which contains
189- a struct siginfo and a struct ucontext. struct ucontext contains
190+ a siginfo_t and a struct ucontext. struct ucontext contains
191 a struct sigcontext. Return an offset to this sigcontext here. Too
192 bad we cannot include system specific headers :-(.
193- sizeof(struct siginfo) == 128
194+ sizeof(siginfo_t) == 128
195 offsetof(struct ucontext, uc_mcontext) == 24. */
196 return sp + sfoffs[try] + 128 + 24;
197 }
198Index: gdb-7.4.1/gdb/ia64-linux-nat.c
199===================================================================
200--- gdb-7.4.1.orig/gdb/ia64-linux-nat.c 2012-01-05 20:43:16.000000000 -0800
201+++ gdb-7.4.1/gdb/ia64-linux-nat.c 2012-07-03 10:12:30.158227388 -0700
202@@ -637,7 +637,7 @@
203 ia64_linux_stopped_data_address (struct target_ops *ops, CORE_ADDR *addr_p)
204 {
205 CORE_ADDR psr;
206- struct siginfo *siginfo_p;
207+ siginfo_t *siginfo_p;
208 struct regcache *regcache = get_current_regcache ();
209
210 siginfo_p = linux_nat_get_siginfo (inferior_ptid);
211Index: gdb-7.4.1/gdb/linux-nat.c
212===================================================================
213--- gdb-7.4.1.orig/gdb/linux-nat.c 2012-01-05 20:43:19.000000000 -0800
214+++ gdb-7.4.1/gdb/linux-nat.c 2012-07-03 10:12:30.158227388 -0700
215@@ -179,7 +179,7 @@
216 /* The method to call, if any, when the siginfo object needs to be
217 converted between the layout returned by ptrace, and the layout in
218 the architecture of the inferior. */
219-static int (*linux_nat_siginfo_fixup) (struct siginfo *,
220+static int (*linux_nat_siginfo_fixup) (siginfo_t *,
221 gdb_byte *,
222 int);
223
224@@ -4138,7 +4138,7 @@
225 layout of the inferiors' architecture. */
226
227 static void
228-siginfo_fixup (struct siginfo *siginfo, gdb_byte *inf_siginfo, int direction)
229+siginfo_fixup (siginfo_t *siginfo, gdb_byte *inf_siginfo, int direction)
230 {
231 int done = 0;
232
233@@ -4150,9 +4150,9 @@
234 if (!done)
235 {
236 if (direction == 1)
237- memcpy (siginfo, inf_siginfo, sizeof (struct siginfo));
238+ memcpy (siginfo, inf_siginfo, sizeof (siginfo_t));
239 else
240- memcpy (inf_siginfo, siginfo, sizeof (struct siginfo));
241+ memcpy (inf_siginfo, siginfo, sizeof (siginfo_t));
242 }
243 }
244
245@@ -4162,8 +4162,8 @@
246 const gdb_byte *writebuf, ULONGEST offset, LONGEST len)
247 {
248 int pid;
249- struct siginfo siginfo;
250- gdb_byte inf_siginfo[sizeof (struct siginfo)];
251+ siginfo_t siginfo;
252+ gdb_byte inf_siginfo[sizeof (siginfo_t)];
253
254 gdb_assert (object == TARGET_OBJECT_SIGNAL_INFO);
255 gdb_assert (readbuf || writebuf);
256@@ -5852,7 +5852,7 @@
257 inferior. */
258 void
259 linux_nat_set_siginfo_fixup (struct target_ops *t,
260- int (*siginfo_fixup) (struct siginfo *,
261+ int (*siginfo_fixup) (siginfo_t *,
262 gdb_byte *,
263 int))
264 {
265@@ -5861,7 +5861,7 @@
266 }
267
268 /* Return the saved siginfo associated with PTID. */
269-struct siginfo *
270+siginfo_t *
271 linux_nat_get_siginfo (ptid_t ptid)
272 {
273 struct lwp_info *lp = find_lwp_pid (ptid);
274Index: gdb-7.4.1/gdb/linux-nat.h
275===================================================================
276--- gdb-7.4.1.orig/gdb/linux-nat.h 2012-01-05 20:43:19.000000000 -0800
277+++ gdb-7.4.1/gdb/linux-nat.h 2012-07-03 10:12:30.158227388 -0700
278@@ -76,7 +76,7 @@
279
280 /* Non-zero si_signo if this LWP stopped with a trap. si_addr may
281 be the address of a hardware watchpoint. */
282- struct siginfo siginfo;
283+ siginfo_t siginfo;
284
285 /* STOPPED_BY_WATCHPOINT is non-zero if this LWP stopped with a data
286 watchpoint trap. */
287@@ -171,7 +171,7 @@
288 that ptrace returns, and the layout in the architecture of the
289 inferior. */
290 void linux_nat_set_siginfo_fixup (struct target_ops *,
291- int (*) (struct siginfo *,
292+ int (*) (siginfo_t *,
293 gdb_byte *,
294 int));
295
296@@ -180,7 +180,7 @@
297 void linux_nat_switch_fork (ptid_t new_ptid);
298
299 /* Return the saved siginfo associated with PTID. */
300-struct siginfo *linux_nat_get_siginfo (ptid_t ptid);
301+siginfo_t *linux_nat_get_siginfo (ptid_t ptid);
302
303 /* Compute and return the processor core of a given thread. */
304 int linux_nat_core_of_thread_1 (ptid_t ptid);
305Index: gdb-7.4.1/gdb/linux-tdep.c
306===================================================================
307--- gdb-7.4.1.orig/gdb/linux-tdep.c 2012-01-05 20:43:19.000000000 -0800
308+++ gdb-7.4.1/gdb/linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
309@@ -150,7 +150,7 @@
310 append_composite_type_field (type, "si_fd", int_type);
311 append_composite_type_field (sifields_type, "_sigpoll", type);
312
313- /* struct siginfo */
314+ /* siginfo_t */
315 siginfo_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
316 TYPE_NAME (siginfo_type) = xstrdup ("siginfo");
317 append_composite_type_field (siginfo_type, "si_signo", int_type);
318Index: gdb-7.4.1/gdb/mips-linux-tdep.c
319===================================================================
320--- gdb-7.4.1.orig/gdb/mips-linux-tdep.c 2012-01-05 20:43:20.000000000 -0800
321+++ gdb-7.4.1/gdb/mips-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
322@@ -905,7 +905,7 @@
323 struct rt_sigframe {
324 u32 rs_ass[4]; [argument save space for o32]
325 u32 rs_code[2] [signal trampoline or fill]
326- struct siginfo rs_info;
327+ siginfo_t rs_info;
328 struct ucontext rs_uc;
329 };
330
331@@ -1033,7 +1033,7 @@
332 struct rt_sigframe_n32 {
333 u32 rs_ass[4]; [ argument save space for o32 ]
334 u32 rs_code[2]; [ signal trampoline or fill ]
335- struct siginfo rs_info;
336+ siginfo_t rs_info;
337 struct ucontextn32 rs_uc;
338 };
339
340@@ -1048,7 +1048,7 @@
341 struct rt_sigframe {
342 u32 rs_ass[4]; [ argument save space for o32 ]
343 u32 rs_code[2]; [ signal trampoline ]
344- struct siginfo rs_info;
345+ siginfo_t rs_info;
346 struct ucontext rs_uc;
347 };
348
349Index: gdb-7.4.1/gdb/mn10300-linux-tdep.c
350===================================================================
351--- gdb-7.4.1.orig/gdb/mn10300-linux-tdep.c 2012-01-05 20:43:20.000000000 -0800
352+++ gdb-7.4.1/gdb/mn10300-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
353@@ -528,9 +528,9 @@
354 {
355 void (*pretcode)(void);
356 int sig;
357- struct siginfo *pinfo;
358+ siginfo_t *pinfo;
359 void *puc;
360- struct siginfo info;
361+ siginfo_t info;
362 struct ucontext uc;
363 struct fpucontext fpuctx;
364 char retcode[8];
365Index: gdb-7.4.1/gdb/ppc-linux-nat.c
366===================================================================
367--- gdb-7.4.1.orig/gdb/ppc-linux-nat.c 2012-01-05 20:43:22.000000000 -0800
368+++ gdb-7.4.1/gdb/ppc-linux-nat.c 2012-07-03 10:12:30.158227388 -0700
369@@ -2213,7 +2213,7 @@
370 static int
371 ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
372 {
373- struct siginfo *siginfo_p;
374+ siginfo_t *siginfo_p;
375
376 siginfo_p = linux_nat_get_siginfo (inferior_ptid);
377
378Index: gdb-7.4.1/gdb/procfs.c
379===================================================================
380--- gdb-7.4.1.orig/gdb/procfs.c 2012-01-05 20:43:25.000000000 -0800
381+++ gdb-7.4.1/gdb/procfs.c 2012-07-03 10:12:30.158227388 -0700
382@@ -262,7 +262,7 @@
383 #ifdef HAVE_PR_SIGINFO64_T
384 typedef pr_siginfo64_t gdb_siginfo_t;
385 #else
386-typedef struct siginfo gdb_siginfo_t;
387+typedef siginfo_t gdb_siginfo_t;
388 #endif
389
390 /* On mips-irix, praddset and prdelset are defined in such a way that
391Index: gdb-7.4.1/gdb/tic6x-linux-tdep.c
392===================================================================
393--- gdb-7.4.1.orig/gdb/tic6x-linux-tdep.c 2012-01-05 20:54:31.000000000 -0800
394+++ gdb-7.4.1/gdb/tic6x-linux-tdep.c 2012-07-03 10:12:30.158227388 -0700
395@@ -34,7 +34,7 @@
396
397 /* The offset from rt_sigframe pointer to SP register. */
398 #define TIC6X_SP_RT_SIGFRAME 8
399-/* Size of struct siginfo info. */
400+/* Size of siginfo_t info. */
401 #define TIC6X_SIGINFO_SIZE 128
402 /* Size of type stack_t, which contains three fields of type void*, int, and
403 size_t respectively. */
diff --git a/meta/recipes-devtools/gdb/gdb_7.4.1.bb b/meta/recipes-devtools/gdb/gdb_7.5.bb
index 0645b5619d..0645b5619d 100644
--- a/meta/recipes-devtools/gdb/gdb_7.4.1.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.5.bb
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 02:46:05 +0000