From bd0975d11ac66f7b5f18c79a9202526bb29cd36f Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Sat, 27 Jun 1992 19:41:24 +0000
Subject: [PATCH] Update Cadillac patch kit.

---
 gdb/cadillac-patches | 341 ++++++++++++++++++++++++-------------------
 1 file changed, 190 insertions(+), 151 deletions(-)

diff --git a/gdb/cadillac-patches b/gdb/cadillac-patches
index 0a569337df1..74fff634249 100755
--- a/gdb/cadillac-patches
+++ b/gdb/cadillac-patches
@@ -1,37 +1,12 @@
 # Apply these patches to GDB to produce an Energize GDB.
-# To apply these patches, first cd to gdb-XX/gdb, then run patch -p0 < thisfile.
+# To apply these patches, first cd to gdb-XX/gdb, run "patch -p0 <thisfile",
+# and then Sanitize.
+
 ===================================================================
-diff -rc Makefile.in.orig Makefile.in
-*** Makefile.in.orig	Tue Jun 23 08:59:44 1992
---- Makefile.in	Tue Jun 23 12:00:54 1992
-***************
-*** 182,188 ****
-  # demangling.  For other demangling styles, such as the Annotated C++
-  # Reference Manual (section 7.2.1c) style, set this define in the target-
-  # dependent makefile fragment.
-! DEMANGLE_OPTS=
-  
-  # Host and target-dependent makefile fragments come in here.
-  ####
---- 182,193 ----
-  # demangling.  For other demangling styles, such as the Annotated C++
-  # Reference Manual (section 7.2.1c) style, set this define in the target-
-  # dependent makefile fragment.
-! #
-! # For Energize, default to using style specified in the Annotated C++
-! # Reference Manual, section 7.2.1c, which is what is used by the Lucid C++
-! # compiler for most things.  But there are places where Lucid varies from
-! # the ARM, so select the Lucid specific code also.
-! DEMANGLE_OPTS=-DARM_DEMANGLING -DLUCID_DEMANGLING
-  
-  # Host and target-dependent makefile fragments come in here.
-  ####
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/.Sanitize,v
-retrieving revision 2.55
-diff -c -r2.55 .Sanitize
-*** 2.55	1992/06/23 05:03:32
---- .Sanitize	1992/06/23 05:03:51
+
+diff -rc .Sanitize .Sanitize
+*** .Sanitize	Mon Jun 22 23:26:00 1992
+--- .Sanitize	Sat Jun 27 12:29:59 1992
 ***************
 *** 53,58 ****
 --- 53,59 ----
@@ -52,28 +27,27 @@ diff -c -r2.55 .Sanitize
   defs.h
   demangle.h
   depend
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/Makefile.in,v
-retrieving revision 1.158
-diff -c -r1.158 Makefile.in
-*** 1.158	1992/06/19 22:39:40
---- Makefile.in	1992/06/23 04:22:01
-***************
-*** 124,129 ****
---- 124,134 ----
+diff -rc Makefile.in Makefile.in
+*** Makefile.in	Sat Jun 27 12:16:43 1992
+--- Makefile.in	Sat Jun 27 12:31:29 1992
+***************
+*** 123,128 ****
+--- 123,135 ----
   READLINE_DEP = $$(READLINE_DIR)
   RL_LIB = ./../readline${subdir}/libreadline.a
   
 + # Cadillac libraries
++ CONNECTION_DIR = deblib/connection
++ CONNECTION_LIB = ${CONNECTION_DIR}/libconn.a
 + CADILLAC_DIR = ${srcdir}/deblib
 + CADILLAC_INCLUDES = -I${CADILLAC_DIR}/connection -I${CADILLAC_DIR}/debugger
-+ CADILLAC_LIBS = ${srcdir}/deblib/connection/libconn.a
++ CADILLAC_LIBS = ${CONNECTION_LIB}
 + 
   # All the includes used for CFLAGS and for lint.
   # -I. for config files.
   # -I${srcdir} possibly for regex.h also.
 ***************
-*** 156,162 ****
+*** 155,166 ****
   # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
   # TERMCAP comes after readline, since readline depends on it.
   CLIBS = ${BFD_LIB}  ${RL_LIB} ${TERMCAP} ${MMALLOC_LIB} ${LIBIBERTY} \
@@ -81,7 +55,12 @@ diff -c -r1.158 Makefile.in
   CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
   	${RL_LIB} ${MMALLOC_LIB}
   
---- 161,167 ----
+  ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
+! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES}
+  
+  VERSION = 4.5.6
+  DIST=gdb
+--- 162,174 ----
   # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
   # TERMCAP comes after readline, since readline depends on it.
   CLIBS = ${BFD_LIB}  ${RL_LIB} ${TERMCAP} ${MMALLOC_LIB} ${LIBIBERTY} \
@@ -89,8 +68,36 @@ diff -c -r1.158 Makefile.in
   CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${MMALLOC_LIB} ${LIBIBERTY} \
   	${RL_LIB} ${MMALLOC_LIB}
   
+  ADD_FILES = ${REGEX} ${ALLOCA} ${XM_ADD_FILES} ${TM_ADD_FILES}
+! ADD_DEPS = ${REGEX1} ${ALLOCA1} ${XM_ADD_FILES} ${TM_ADD_FILES} \
+! 	${CONNECTION_LIB}
+  
+  VERSION = 4.5.6
+  DIST=gdb
 ***************
-*** 195,201 ****
+*** 176,182 ****
+  # demangling.  For other demangling styles, such as the Annotated C++
+  # Reference Manual (section 7.2.1c) style, set this define in the target-
+  # dependent makefile fragment.
+! DEMANGLE_OPTS=
+  
+  # Host and target-dependent makefile fragments come in here.
+  ####
+--- 184,195 ----
+  # demangling.  For other demangling styles, such as the Annotated C++
+  # Reference Manual (section 7.2.1c) style, set this define in the target-
+  # dependent makefile fragment.
+! #
+! # For Energize, default to using style specified in the Annotated C++
+! # Reference Manual, section 7.2.1c, which is what is used by the Lucid C++
+! # compiler for most things.  But there are places where Lucid varies from
+! # the ARM, so select the Lucid specific code also.
+! DEMANGLE_OPTS=-DARM_DEMANGLING -DLUCID_DEMANGLING
+  
+  # Host and target-dependent makefile fragments come in here.
+  ####
+***************
+*** 194,200 ****
   	 ${DEMANGLER}.c mem-break.c target.c inftarg.c \
   	 dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
   	 ieee-float.c language.c parse.c buildsym.c objfiles.c \
@@ -98,7 +105,7 @@ diff -c -r1.158 Makefile.in
   
   # Source files in subdirectories (which will be handled separately by
   #  'make gdb.tar.Z').
---- 200,206 ----
+--- 207,213 ----
   	 ${DEMANGLER}.c mem-break.c target.c inftarg.c \
   	 dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c \
   	 ieee-float.c language.c parse.c buildsym.c objfiles.c \
@@ -107,7 +114,7 @@ diff -c -r1.158 Makefile.in
   # Source files in subdirectories (which will be handled separately by
   #  'make gdb.tar.Z').
 ***************
-*** 280,286 ****
+*** 279,285 ****
       command.o utils.o expprint.o environ.o version.o gdbtypes.o \
       copying.o $(DEPFILES) ${DEMANGLER}.o mem-break.o target.o \
       inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
@@ -115,7 +122,7 @@ diff -c -r1.158 Makefile.in
       dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o
   
   RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
---- 285,291 ----
+--- 292,298 ----
       command.o utils.o expprint.o environ.o version.o gdbtypes.o \
       copying.o $(DEPFILES) ${DEMANGLER}.o mem-break.o target.o \
       inftarg.o ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
@@ -124,8 +131,48 @@ diff -c -r1.158 Makefile.in
   
   RAPP_OBS = rgdb.o rudp.o rserial.o serial.o udp.o $(XDEPFILES)
 ***************
-*** 695,700 ****
---- 700,708 ----
+*** 292,298 ****
+  
+  NTSSTART = kdb-start.o
+  
+! SUBDIRS = doc
+  
+  # For now, shortcut the "configure GDB for fewer languages" stuff.
+  YYFILES = c-exp.tab.c m2-exp.tab.c
+--- 305,311 ----
+  
+  NTSSTART = kdb-start.o
+  
+! SUBDIRS = doc ${CONNECTION_DIR}
+  
+  # For now, shortcut the "configure GDB for fewer languages" stuff.
+  YYFILES = c-exp.tab.c m2-exp.tab.c
+***************
+*** 346,351 ****
+--- 359,378 ----
+  	#load `echo " "$(DEPFILES) | sed -e 's/\.o/.c/g' -e 's, , ../,g'`
+  	echo "Load .c corresponding to:" $(DEPFILES)
+  
++ ${CONNECTION_LIB} :
++ 	@(cd ${CONNECTION_DIR}; \
++ 		$(MAKE) \
++ 			"against=$(against)" \
++ 			"AR=$(AR)" \
++ 			"AR_FLAGS=$(AR_FLAGS)" \
++ 			"CC=$(CC)" \
++ 			"CFLAGS=$(CFLAGS)" \
++ 			"RANLIB=$(RANLIB)" \
++ 			"MAKEINFO=$(MAKEINFO)" \
++ 			"INSTALL=$(INSTALL)" \
++ 			"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
++ 			"INSTALL_DATA=$(INSTALL_DATA)" \
++ 			"BISON=$(BISON)")
+  
+  # This is useful when debugging GDB, because some Unix's don't let you run GDB
+  # on itself without copying the executable.  So "make gdb1" will make
+***************
+*** 694,699 ****
+--- 721,729 ----
   
   ttyflush.o: ${srcdir}/nindy-share/ttyflush.c
   	${CC} -c ${INTERNAL_CFLAGS} ${srcdir}/nindy-share/ttyflush.c
@@ -135,12 +182,9 @@ diff -c -r1.158 Makefile.in
   
   lint: $(LINTFILES)
   	$(LINT) $(INCLUDE_CFLAGS) $(LINTFLAGS) $(LINTFILES) \
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/breakpoint.c,v
-retrieving revision 1.36
-diff -c -r1.36 breakpoint.c
-*** 1.36	1992/06/17 21:53:28
---- breakpoint.c	1992/06/23 04:19:21
+diff -rc breakpoint.c breakpoint.c
+*** breakpoint.c	Wed Jun 17 14:53:28 1992
+--- breakpoint.c	Sat Jun 27 12:30:01 1992
 ***************
 *** 273,278 ****
 --- 273,280 ----
@@ -286,12 +330,9 @@ diff -c -r1.36 breakpoint.c
     bpt->enable = disabled;
   
     if (xgdb_verbose && bpt->type == bp_breakpoint)
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/command.c,v
-retrieving revision 1.15
-diff -c -r1.15 command.c
-*** 1.15	1992/06/23 03:33:41
---- command.c	1992/06/23 04:19:26
+diff -rc command.c command.c
+*** command.c	Mon Jun 22 20:33:41 1992
+--- command.c	Sat Jun 27 12:30:01 1992
 ***************
 *** 1149,1155 ****
       }
@@ -309,15 +350,58 @@ diff -c -r1.15 command.c
         ;
     else
       error ("Fork failed");
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/defs.h,v
-retrieving revision 1.36
-diff -c -r1.36 defs.h
-*** 1.36	1992/06/15 14:26:55
---- defs.h	1992/06/16 01:24:19
-***************
-*** 774,777 ****
---- 774,846 ----
+diff -rc config/amix.mh config/amix.mh
+*** config/amix.mh	Tue Jun  9 19:05:16 1992
+--- config/amix.mh	Sat Jun 27 12:31:29 1992
+***************
+*** 22,24 ****
+--- 22,31 ----
+  
+  # SVR4 puts the BSD compatible install in /usr/ucb.
+  INSTALL = /usr/ucb/install -c
++ 
++ # These are the libs that are needed for the Cadillac version of gdb on
++ # SVR4.  Note that we MUST include the standard C library before libucb.a,
++ # otherwise we get lots of broken stuff we don't want.
++ CONNECTION_LIB = deblib/connection/libconn.a
++ CADILLAC_LIBS = ${CONNECTION_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
++ 	-lsocket -lc /usr/ucblib/libucb.a -lnsl
+diff -rc config/ncr3000.mh config/ncr3000.mh
+*** config/ncr3000.mh	Mon Jun 15 12:25:13 1992
+--- config/ncr3000.mh	Sat Jun 27 12:31:30 1992
+***************
+*** 38,40 ****
+--- 38,47 ----
+  # The /usr/ucb/install program is incompatible (complains about unknown
+  # group staff).  Use good old cp...
+  INSTALL = cp
++ 
++ # These are the libs that are needed for the Cadillac version of gdb on
++ # SVR4.  Note that we MUST include the standard C library before libucb.a,
++ # otherwise we get lots of broken stuff we don't want.
++ CONNECTION_LIB = deblib/connection/libconn.a
++ CADILLAC_LIBS = ${CONNECTION_LIB} -L/usr/lib -lm -lnet -lresolv -lform \
++ 	-lsocket -lc /usr/ucblib/libucb.a -lnsl
+diff -rc configure.in configure.in
+*** configure.in	Mon Jun 22 17:25:00 1992
+--- configure.in	Sat Jun 27 12:31:29 1992
+***************
+*** 1,4 ****
+! configdirs="doc"
+  srcname="GDB"
+  srctrigger=main.c
+  target_dependent=true
+--- 1,4 ----
+! configdirs="deblib doc"
+  srcname="GDB"
+  srctrigger=main.c
+  target_dependent=true
+diff -rc defs.h defs.h
+*** defs.h	Thu Jun 25 04:50:31 1992
+--- defs.h	Sat Jun 27 12:30:02 1992
+***************
+*** 770,773 ****
+--- 770,842 ----
   extern CORE_ADDR
   push_word ();
   
@@ -391,12 +475,9 @@ diff -c -r1.36 defs.h
 + extern void cadillac_disable_breakpoint PARAMS ((struct breakpoint *));
 + 
   #endif /* !defined (DEFS_H) */
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/inflow.c,v
-retrieving revision 1.25
-diff -c -r1.25 inflow.c
-*** 1.25	1992/05/17 23:54:22
---- inflow.c	1992/06/15 23:02:32
+diff -rc inflow.c inflow.c
+*** inflow.c	Tue Jun 23 21:49:19 1992
+--- inflow.c	Sat Jun 27 12:30:03 1992
 ***************
 *** 81,87 ****
   static short pgrp_inferior;
@@ -414,15 +495,12 @@ diff -c -r1.25 inflow.c
   static int pgrp_ours;
   # endif /* not def SHORT_PGRP */
   #else /* not def TIOCGPGRP */
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/infrun.c,v
-retrieving revision 1.49
-diff -c -r1.49 infrun.c
-*** 1.49	1992/06/23 00:24:50
---- infrun.c	1992/06/23 04:19:35
-***************
-*** 615,620 ****
---- 615,622 ----
+diff -rc infrun.c infrun.c
+*** infrun.c	Tue Jun 23 21:49:22 1992
+--- infrun.c	Sat Jun 27 12:30:04 1992
+***************
+*** 617,622 ****
+--- 617,624 ----
      Here we must get it up to actual execution of the real program.  */
   
     inferior_pid = pid;		/* Needed for wait_for_inferior stuff below */
@@ -432,8 +510,8 @@ diff -c -r1.49 infrun.c
     clear_proceed_status ();
   
 ***************
-*** 753,758 ****
---- 755,762 ----
+*** 755,760 ****
+--- 757,764 ----
   
     attach (pid);
     inferior_pid = pid;
@@ -442,12 +520,9 @@ diff -c -r1.49 infrun.c
     push_target (&child_ops);
   
     mark_breakpoints_out ();
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/inftarg.c,v
-retrieving revision 1.11
-diff -c -r1.11 inftarg.c
-*** 1.11	1992/03/29 23:21:27
---- inftarg.c	1992/06/15 23:56:08
+diff -rc inftarg.c inftarg.c
+*** inftarg.c	Sun Mar 29 15:21:27 1992
+--- inftarg.c	Sat Jun 27 12:30:04 1992
 ***************
 *** 58,64 ****
   #ifdef USE_PROC_FS
@@ -468,12 +543,9 @@ diff -c -r1.11 inftarg.c
   #endif
       if (pid == -1)		/* No more children to wait for */
         {
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/main.c,v
-retrieving revision 1.47
-diff -c -r1.47 main.c
-*** 1.47	1992/06/09 06:09:23
---- main.c	1992/06/13 03:32:16
+diff -rc main.c main.c
+*** main.c	Mon Jun  8 23:09:23 1992
+--- main.c	Sat Jun 27 12:30:05 1992
 ***************
 *** 397,402 ****
 --- 397,403 ----
@@ -605,12 +677,9 @@ diff -c -r1.47 main.c
     fflush (stdout);
   }
   
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/printcmd.c,v
-retrieving revision 1.28
-diff -c -r1.28 printcmd.c
-*** 1.28	1992/06/13 18:20:41
---- printcmd.c	1992/06/14 22:11:35
+diff -rc printcmd.c printcmd.c
+*** printcmd.c	Thu Jun 25 03:58:47 1992
+--- printcmd.c	Sat Jun 27 12:30:05 1992
 ***************
 *** 778,783 ****
 --- 778,792 ----
@@ -641,8 +710,8 @@ diff -c -r1.28 printcmd.c
         if (inspect)
   	printf("\") )\030");
 ***************
-*** 1608,1618 ****
---- 1619,1639 ----
+*** 1610,1620 ****
+--- 1621,1641 ----
   	 standard indentation here is 4 spaces, and val_print indents
   	 2 for each recurse.  */
         val = read_var_value (sym, FRAME_INFO_ID (fi));
@@ -664,12 +733,9 @@ diff -c -r1.28 printcmd.c
         first = 0;
       }
   
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/stack.c,v
-retrieving revision 1.30
-diff -c -r1.30 stack.c
-*** 1.30	1992/06/20 23:30:33
---- stack.c	1992/06/23 04:19:48
+diff -rc stack.c stack.c
+*** stack.c	Sat Jun 20 16:30:33 1992
+--- stack.c	Sat Jun 27 12:30:06 1992
 ***************
 *** 159,165 ****
         if (addressprint)
@@ -749,12 +815,9 @@ diff -c -r1.30 stack.c
       }
     wrap_here ("   ");
     if (sal.symtab)
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/symfile.c,v
-retrieving revision 1.53
-diff -c -r1.53 symfile.c
-*** 1.53	1992/06/13 16:20:12
---- symfile.c	1992/06/14 22:11:39
+diff -rc symfile.c symfile.c
+*** symfile.c	Sat Jun 13 09:20:12 1992
+--- symfile.c	Sat Jun 27 12:30:06 1992
 ***************
 *** 555,560 ****
 --- 555,563 ----
@@ -767,12 +830,9 @@ diff -c -r1.53 symfile.c
     return (objfile);
   }
   
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/utils.c,v
-retrieving revision 1.50
-diff -c -r1.50 utils.c
-*** 1.50	1992/06/15 14:27:07
---- utils.c	1992/06/16 01:24:28
+diff -rc utils.c utils.c
+*** utils.c	Mon Jun 15 07:27:07 1992
+--- utils.c	Sat Jun 27 12:30:07 1992
 ***************
 *** 96,101 ****
 --- 96,102 ----
@@ -882,12 +942,9 @@ diff -c -r1.50 utils.c
     /* Don't do any filtering if it is disabled.  */
     if (stream != stdout
      || (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/valprint.c,v
-retrieving revision 1.42
-diff -c -r1.42 valprint.c
-*** 1.42	1992/06/23 03:33:47
---- valprint.c	1992/06/23 04:19:55
+diff -rc valprint.c valprint.c
+*** valprint.c	Tue Jun 23 23:24:51 1992
+--- valprint.c	Sat Jun 27 12:30:07 1992
 ***************
 *** 485,490 ****
 --- 485,491 ----
@@ -901,7 +958,7 @@ diff -c -r1.42 valprint.c
 ***************
 *** 549,554 ****
 --- 550,563 ----
-  	      fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
+  	      fprint_symbol (stream, TYPE_FIELD_NAME (type, i));
   	      fputs_filtered (" = ", stream);
   	    }
 + 
@@ -962,21 +1019,3 @@ diff -c -r1.42 valprint.c
   		}
   	      if (i < len)
   		fprintf_filtered (stream, "...");
-===================================================================
-RCS file: /local/cvsfiles/devo/gdb/config/ncr3000.mh,v
-retrieving revision 1.4
-diff -c -r1.4 config/ncr3000.mh
-*** 1.4	1992/06/15 19:25:13
---- config/ncr3000.mh	1992/06/16 01:28:40
-***************
-*** 38,40 ****
---- 38,46 ----
-  # The /usr/ucb/install program is incompatible (complains about unknown
-  # group staff).  Use good old cp...
-  INSTALL = cp
-+ 
-+ # These are the libs that are needed for the Cadillac version of gdb on
-+ # SVR4.  Note that we MUST include the standard C library before libucb.a,
-+ # otherwise we get lots of broken stuff we don't want.
-+ CADILLAC_LIBS = ${srcdir}/deblib/connection/libconn.a -L/usr/lib -lm -lnet \
-+ 	-lresolv -lform -lsocket -lc /usr/ucblib/libucb.a -lnsl
-- 
2.30.2