From b7ec8928fb9aed5070f54389af2dc4c52e928ce7 Mon Sep 17 00:00:00 2001
From: cagney <cagney>
Date: Tue, 10 Jul 2001 22:38:38 +0000
Subject: [PATCH] m88k builds.  Tweek remote-bug.c to include "serial.h".

---
 gdb/ChangeLog    | 8 ++++++++
 gdb/MAINTAINERS  | 2 +-
 gdb/Makefile.in  | 2 +-
 gdb/TODO         | 6 ------
 gdb/remote-bug.c | 1 +
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4935a2cf64..dedb0bea43 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* Makefile.in (remote-bug.o): Depends on serial.h.
+	* remote-bug.c: Include "serial.h".
+	* MAINTAINERS: Mark m88k target as buildable.
+	* TODO: Update.
+
 2001-07-10  Jim Blandy  <jimb@redhat.com>
 
 	Clean up the D10V port so that GDB and the target program no
@@ -63,6 +70,7 @@
 	* valops.c (value_cast): When casting a pointer to an integer,
 	don't convert it to an address.
 
+>>>>>>> 1.1438
 2001-07-10  Andrew Cagney  <ac131313@redhat.com>
 
 	* remote-utils.h (struct serial): Declare as opaque.  Remove
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 9fff326135..176d7ca580 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -97,7 +97,7 @@ maintainer works with the native maintainer when resolving API issues.
 	m68k		--target=m68k-aout,m68k-coff,m68k-elf ,-Werror
 			Maintenance only
 
-	m88k		(--target=m88k broken)
+	m88k		--target=m88k ,-Werror
 			Known problem in 5.1
 			Maintenance only
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f943363c8b..94c59d2dba 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1833,7 +1833,7 @@ rdi-share/libangsd.a:	force
 remote-rdp.o: remote-rdp.c $(defs_h) $(gdbcore_h) \
 	$(inferior_h) $(gdb_string_h)
 
-remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) \
+remote-bug.o: remote-bug.c $(defs_h) $(gdbcore_h) serial.h \
 	$(inferior_h) target.h terminal.h $(remote_utils_h) $(gdb_string_h) \
 	$(regcache_h)
 
diff --git a/gdb/TODO b/gdb/TODO
index 66d3357a51..7cf0eab9ee 100644
--- a/gdb/TODO
+++ b/gdb/TODO
@@ -58,12 +58,6 @@ was occuring in the opcodes directory.
 
 --
 
-m88k
-
-The m88k has suffered bit rot and is known to not build.
-
---
-
 The BFD directory requires bug-fixed AUTOMAKE et.al.
 
 AUTOMAKE 1.4 incorrectly set the TEXINPUTS environment variable.  It
diff --git a/gdb/remote-bug.c b/gdb/remote-bug.c
index 353795720f..ff757a540d 100644
--- a/gdb/remote-bug.c
+++ b/gdb/remote-bug.c
@@ -35,6 +35,7 @@
 #include "gdbcore.h"
 #include "gdbcmd.h"
 
+#include "serial.h"
 #include "remote-utils.h"
 
 /* External data declarations */
-- 
2.11.0