diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index e1db04fb812..c97c2877ea0 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -32,6 +32,7 @@ ChangeLog-3.x
 ChangeLog-9091
 Convex.notes
 Makefile.in
+NEWS
 Projects
 README
 TODO
@@ -162,6 +163,7 @@ regex.h
 rem-multi.shar
 remote-adapt.c
 remote-eb.c
+remote-es1800.c
 remote-hms.c
 remote-mm.c
 remote-nindy.c
@@ -171,6 +173,9 @@ rs6000-pinsn.c
 rs6000-tdep.c
 rs6000-xdep.c
 saber.suppress
+ser-go32.c
+ser-termios.c
+serial.h
 signals.h
 solib.c
 solib.h
@@ -181,9 +186,6 @@ sparc-xdep.c
 stack.c
 standalone.c
 stuff.c
-serial.h
-ser-termios.c
-ser-go32.c
 sun3-xdep.c
 sun386-xdep.c
 symfile.c
@@ -207,6 +209,7 @@ tm-arm.h
 tm-bigmips.h
 tm-convex.h
 tm-delta88.h
+tm-es1800.h
 tm-h8300.h
 tm-hp300bsd.h
 tm-hp300hpux.h
@@ -279,8 +282,8 @@ xm-hppahpux.h
 xm-i386mach.h
 xm-i386sco.h
 xm-i386v.h
-xm-i386v4.h
 xm-i386v32.h
+xm-i386v4.h
 xm-irix3.h
 xm-irix4.h
 xm-isi.h
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c9fbd6d58a..56aac82d735 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+<<<<<<< ChangeLog
+Wed Jul 22 04:23:03 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* es1800.c: use FREAD|FWRITE rather than _FREAD|_FWRITE.
+	include <sgtty.h> on USG.  (from sef).
+
+	* depend: es1800 dependency needed here.
+
+Mon Jul 20 11:25:18 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* configure.in: es1800 ok for 68000 too.
+
+=======
 Wed Jul 22 21:39:33 1992  Fred Fish  (fnf@cygnus.com)
 
 	* lmode_inferior_valid, lmode_ours_valid:  New static vars.
@@ -25,6 +38,7 @@ Mon Jul 20 21:09:53 1992  Fred Fish  (fnf@cygnus.com)
 	messages for C++ classes with no data members.  Also use new
 	fprintfi_filtered function.
 
+>>>>>>> 1.651
 Sat Jul 18 15:48:58 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
 
 	* configure.in: echo error messages to stderr, not stdout
diff --git a/gdb/config/hppahpux.mh b/gdb/config/hppahpux.mh
index 82cd6e87486..12a6fc785c9 100644
--- a/gdb/config/hppahpux.mh
+++ b/gdb/config/hppahpux.mh
@@ -1,4 +1,5 @@
 # Host: Hewlett-Packard PA-RISC machine, running HPUX 
+TERMCAP = -lcurses
 XDEPFILES= hppahpux-xdep.o hppa-coredep.o
 XM_FILE= xm-hppahpux.h
 REGEX=regex.o
diff --git a/gdb/configure.in b/gdb/configure.in
index b6c86e9f376..37749c9dddf 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -229,6 +229,7 @@ m68000)
 		*)	gdb_target=sun2 ;;
 		esac
 		;;
+	ericsson) gdb_target=es1800 ;;
 	wrs)	gdb_target=vxworks68 ;;
 	esac
 	;;
diff --git a/gdb/depend b/gdb/depend
index 5f2cd039dce..c7c42c733d2 100755
--- a/gdb/depend
+++ b/gdb/depend
@@ -238,6 +238,10 @@ remote-eb.o : remote-eb.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.sta
   tm-29k.h inferior.h symtab.h ${srcdir}/../include/obstack.h breakpoint.h frame.h value.h \
   gdbtypes.h expression.h ${srcdir}/../include/wait.h terminal.h target.h ${srcdir}/../include/bfd.h \
   gdbcore.h 
+remote-es1800.o : remote-es1800.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status ${srcdir}/../include/fopen-same.h \
+  tm.h inferior.h symtab.h ${srcdir}/../include/obstack.h breakpoint.h frame.h value.h \
+  gdbtypes.h expression.h ${srcdir}/../include/wait.h terminal.h target.h ${srcdir}/../include/bfd.h \
+  gdbcore.h 
 remote-hms.o : remote-hms.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status ${srcdir}/../include/fopen-same.h \
   tm.h config.status inferior.h symtab.h ${srcdir}/../include/obstack.h breakpoint.h frame.h value.h \
   gdbtypes.h expression.h ${srcdir}/../include/wait.h terminal.h target.h ${srcdir}/../include/bfd.h \
diff --git a/gdb/remote-es1800.c b/gdb/remote-es1800.c
index 71a4bf79e6e..f32440bbef5 100644
--- a/gdb/remote-es1800.c
+++ b/gdb/remote-es1800.c
@@ -109,6 +109,7 @@ STP
 
 #ifdef USG
 #include <sys/types.h>
+#include <sgtty.h>
 #endif
 
 #include <signal.h>
@@ -255,8 +256,8 @@ es1800_init_break PARAMS ((char *, int));
 static FILE *log_file;
 #endif
 
-static struct target_ops es1800_ops;		/* Forward decl */
-static struct target_ops es1800_child_ops;	/* Forward decl */
+extern struct target_ops es1800_ops;		/* Forward decl */
+extern struct target_ops es1800_child_ops;	/* Forward decl */
 
 static int kiodebug;
 static int timeout = 100; 
@@ -399,7 +400,7 @@ es1800_open (name, from_tty)
     }
   es1800_fc_save = fcflag;
 
-  fcflag = (fcflag & (_FREAD | _FWRITE)); /* mask out any funny stuff */
+  fcflag = (fcflag & (FREAD | FWRITE)); /* mask out any funny stuff */
   if (fcntl (es1800_desc, F_SETFL, fcflag) == -1)
     {
       perror_with_name ("fcntl serial");
diff --git a/gdb/tm-es1800.h b/gdb/tm-es1800.h
index 67dc04e62f3..c2f9670c514 100644
--- a/gdb/tm-es1800.h
+++ b/gdb/tm-es1800.h
@@ -27,8 +27,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Kludge... */
 #include "tm-sun3.h"
 
+#undef SAVED_PC_AFTER_CALL
 
-
-
-
-
+#define SAVED_PC_AFTER_CALL(frame) \
+        read_memory_integer (read_register (SP_REGNUM), 4)
diff --git a/gdb/tm-vx68.h b/gdb/tm-vx68.h
index 106080e6141..81122fc3952 100644
--- a/gdb/tm-vx68.h
+++ b/gdb/tm-vx68.h
@@ -25,6 +25,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Kludge... */
 #include "tm-sun3.h"
 
+#undef SAVED_PC_AFTER_CALL
+#define SAVED_PC_AFTER_CALL(frame) \
+	read_memory_integer (read_register (SP_REGNUM), 4)
+
 /* We have more complex, useful breakpoints on the target.  */
 #undef DECR_PC_AFTER_BREAK
 #define	DECR_PC_AFTER_BREAK	0