From 6a1f93f6a28653ea37b3cf02b47a9ef7e67e2fdc Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Thu, 8 Oct 1992 02:09:28 +0000
Subject: [PATCH] * Makefile.in (nindy.o): Define "STRIP" as pathname of strip
 program. * nindy-share/nindy.c (coffstrip): Use that pathname, instead of
 searching for a "bfd_strip" program.  Also, fixed up arguments passed to that
 program.

* tm-nindy960.h (ADDITIONAL_OPTIONS): Use "-ser" rather than "-r", which is now
used for something else.  Rewrite description of associated parameters to match
how gdb does it now.
(ADDITIONAL_OPTION_HELP): Fix message accordingly.

* m68k-pinsn.c (print_insn_arg): Handle new "`" operand type.
---
 gdb/ChangeLog     | 15 +++++++++++++++
 gdb/Makefile.in   |  4 +++-
 gdb/m68k-pinsn.c  |  1 +
 gdb/tm-nindy960.h | 10 +++++-----
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e6c0ab451c1..5119c829a39 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+Wed Oct  7 12:24:01 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+	* Makefile.in (nindy.o): Define "STRIP" as pathname of strip
+	program.
+	* nindy-share/nindy.c (coffstrip): Use that pathname, instead of
+	searching for a "bfd_strip" program.  Also, fixed up arguments
+	passed to that program.
+
+	* tm-nindy960.h (ADDITIONAL_OPTIONS): Use "-ser" rather than "-r",
+	which is now used for something else.  Rewrite description of
+	associated parameters to match how gdb does it now.
+	(ADDITIONAL_OPTION_HELP): Fix message accordingly.
+
+	* m68k-pinsn.c (print_insn_arg): Handle new "`" operand type.
+
 Tue Oct  6 14:47:11 1992  K. Richard Pixley  (rich@sendai.cygnus.com)
 
 	NOTICE_SIGNAL_HANDLING_CHANGE macro added to the target vector as
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index b61417a490e..7a68be7b0fa 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -22,6 +22,7 @@ program_transform_name =
 exec_prefix = $(prefix)
 bindir = $(exec_prefix)/bin
 libdir = $(exec_prefix)/lib
+tooldir = $(libdir)/$(target_alias)
 
 datadir = $(prefix)/lib
 mandir = $(prefix)/man
@@ -746,7 +747,8 @@ xdr_regs.o: ${srcdir}/vx-share/xdr_regs.c
 	${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/vx-share/xdr_regs.c
 
 nindy.o: ${srcdir}/nindy-share/nindy.c
-	${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/nindy-share/nindy.c
+	${CC} -c ${INTERNAL_CFLAGS} -DSTRIP='"$(tooldir)/bin/strip"' \
+		${srcdir}/nindy-share/nindy.c
 
 Onindy.o: ${srcdir}/nindy-share/Onindy.c
 	${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/nindy-share/Onindy.c
diff --git a/gdb/m68k-pinsn.c b/gdb/m68k-pinsn.c
index 859d8d9dd77..60c6c592e21 100644
--- a/gdb/m68k-pinsn.c
+++ b/gdb/m68k-pinsn.c
@@ -403,6 +403,7 @@ print_insn_arg (d, buffer, p, addr, stream)
     case '?':
     case '/':
     case '&':
+    case '`':
 
       if (place == 'd')
 	{
diff --git a/gdb/tm-nindy960.h b/gdb/tm-nindy960.h
index 520eb6b8cca..7237278d971 100644
--- a/gdb/tm-nindy960.h
+++ b/gdb/tm-nindy960.h
@@ -37,12 +37,12 @@ extern int nindy_initial_brk;	/* Send a BREAK to reset board first */
 extern char *nindy_ttyname;	/* Name of serial port to talk to nindy */
 
 #define	ADDITIONAL_OPTIONS \
-	{"O", 0, &nindy_old_protocol, 1},	\
-	{"brk", 0, &nindy_initial_brk, 1},	\
-	{"r", 1, 0, 1004},  /* 1004 is magic cookie for ADDL_CASES */
+	{"O", no_argument, &nindy_old_protocol, 1},	\
+	{"brk", no_argument, &nindy_initial_brk, 1},	\
+	{"ser", required_argument, 0, 1004},  /* 1004 is magic cookie for ADDL_CASES */
 
 #define	ADDITIONAL_OPTION_CASES	\
-	case 1004:	/* -r option:  remote nindy auto-start */	\
+	case 1004:	/* -ser option:  remote nindy auto-start */	\
 	  nindy_ttyname = optarg;	\
 	  break;
 
@@ -50,7 +50,7 @@ extern char *nindy_ttyname;	/* Name of serial port to talk to nindy */
 	"\
   -O                Use old protocol to talk to a Nindy target\n\
   -brk              Send a break to a Nindy target to reset it.\n\
-  -r SERIAL         Open remote Nindy session to SERIAL port.\n\
+  -ser SERIAL       Open remote Nindy session to SERIAL port.\n\
 "
 
 /* If specified on the command line, open tty for talking to nindy,
-- 
2.30.2