summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch')
-rw-r--r--meta/recipes-devtools/gdb/gdb/renesas-sh-native-support.patch194
1 files changed, 92 insertions, 102 deletions
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