Add patch to Makefile.in to default the demangling style to ARM/Lucid instead

of gcc style.

Remove the mipsread.c patch fragment that added #include <strings.h>.  It
is unnecessary, and causes compile failures on NCR/SVR4.

diff --git a/gdb/cadillac-patches b/gdb/cadillac-patches
index 7d15ba5d658e4fc9cc78eb0ac3fbc79d8f3427bd..2d145fe18e49fa21cb69888da5e3ce62efda993e 100755 (executable)
--- a/gdb/cadillac-patches
+++ b/gdb/cadillac-patches
@@ -1,6 +1,32 @@
 # 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.
 ===================================================================
+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
@@ -580,22 +606,6 @@ diff -c -r1.47 main.c
   }
   \f
 ===================================================================
-RCS file: /local/cvsfiles/devo/gdb/mipsread.c,v
-retrieving revision 1.71
-diff -c -r1.71 mipsread.c
-*** 1.71       1992/06/17 18:14:19
---- mipsread.c 1992/06/23 04:19:41
-***************
-*** 67,72 ****
---- 67,73 ----
-  #include <sys/param.h>
-  #include <sys/file.h>
-  #include <sys/stat.h>
-+ #include <strings.h>
-  
-  #include "coff/mips.h"               /* COFF-like aspects of ecoff files */
-  #include "coff/ecoff-ext.h"  /* External forms of ecoff sym structures */
-===================================================================
 RCS file: /local/cvsfiles/devo/gdb/printcmd.c,v
 retrieving revision 1.28
 diff -c -r1.28 printcmd.c