* ocd.h (ocd_xfer_memory): Add ``attrib'' parameter.

* ocd.c (ocd_xfer_memory): Ditto.
* ser-ocd.c (ocd_setstopbits): New function. Add to ocd_ops.
* MAINTAINERS: Document powerpc-eabi and powerpcle-eabi as
buildable with ,-Werror.

* Makefile.in (symfile_h): Define.
(mcore-tdep.o): Add $(symfile_h), $(gdbcore_h) and $(inferior_h).
* mcore-tdep.c: Include "symfile.h", "gdbcore.h" and "inferior.h".
* MAINTAINERS: Document mcore-elf and mcore-pe as buildable with
,-Werror.

* dsrec.c (make_srec): Fix internal_error fmt arg.
* MAINTAINERS: Document i960-coff as buildable with ,-Werror.

8 files changed, 40 insertions, 9 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 45a491cea6d..fd6960f8b98 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+2001-03-04  Andrew Cagney  <ac131313@redhat.com>
+
+	* ocd.h (ocd_xfer_memory): Add ``attrib'' parameter.
+	* ocd.c (ocd_xfer_memory): Ditto.
+	* ser-ocd.c (ocd_setstopbits): New function. Add to ocd_ops.
+	* MAINTAINERS: Document powerpc-eabi and powerpcle-eabi as
+	buildable with ,-Werror.
+
+	* Makefile.in (symfile_h): Define.
+	(mcore-tdep.o): Add $(symfile_h), $(gdbcore_h) and $(inferior_h).
+	* mcore-tdep.c: Include "symfile.h", "gdbcore.h" and "inferior.h".
+	* MAINTAINERS: Document mcore-elf and mcore-pe as buildable with
+	,-Werror.
+
+	* dsrec.c (make_srec): Fix internal_error fmt arg.
+	* MAINTAINERS: Document i960-coff as buildable with ,-Werror.
+
 2001-03-03  Kevin Buettner  <kevinb@redhat.com>
 
 	* solib-aix5.c (aix5_relocate_main_executable): Don't use ANOFFSET
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index 462e3015757..72e393ee4a2 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -83,7 +83,7 @@ maintainer works with the native maintainer when resolving API issues.
 	i386		--target=i386-elf,i386-aout ,-Werror
 			Mark Kettenis           kettenis@gnu.org
 
-	i960		(--target=i960-coff broken)
+	i960		--target=i960-coff ,-Werror
 			Maintenance only
 
 	ia64		(--target=ia64-elf broken)
@@ -101,7 +101,7 @@ maintainer works with the native maintainer when resolving API issues.
 	m88k		(?)
 			Maintenance only
 
-	mcore		(--target=mcore-elf,mcore-pe broken)
+	mcore		--target=mcore-elf,mcore-pe ,-Werror
 			Maintenance only
 
 	mips		--target=mips-elf,mips64-elf ,-Werror
@@ -113,13 +113,13 @@ maintainer works with the native maintainer when resolving API issues.
 	mn10300		--target=mn10300-elf ,-Werror
 			Andrew Cagney		cagney@cygnus.com
 
-	ns32k		(--target=ns32k-netbsd broken)
+	ns32k		(--target=ns32k-pc532 broken)
 			Maintenance only
 
 	pa		(--target=hppa1.1-hp-proelf broken)
 			Jeff Law		law@cygnus.com
 
-	powerpc		(--target=powerpc-eabi,powerpcle-eabi broken)
+	powerpc		--target=powerpc-eabi,powerpcle-eabi ,-Werror
 			Kevin Buettner		kevinb@cygnus.com
 			Nick Duffek		nsd@cygnus.com
 
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index c619fc58ab5..a70e1df5d26 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -574,6 +574,7 @@ gdbcore_h =	gdbcore.h $(bfd_h)
 
 frame_h =	frame.h
 symtab_h =	symtab.h bcache.h
+symfile_h =	symfile.h
 gdbtypes_h =	gdbtypes.h
 expression_h =	expression.h
 value_h =	value.h $(symtab_h) $(gdbtypes_h) $(expression_h)
@@ -1623,7 +1624,8 @@ main.o: main.c top.h $(defs_h) gdb_string.h $(event_loop_h) \
 maint.o: maint.c $(defs_h) $(gdbcmd_h) $(gdbtypes_h) $(symtab_h) language.h \
 	$(expression_h) objfiles.h symfile.h
 
-mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(gdbcmd_h) $(value_h) $(symtab_h)
+mcore-tdep.o: mcore-tdep.c $(defs_h) $(frame_h) $(gdbcmd_h) $(value_h) \
+	$(symtab_h) $(symfile_h) $(gdbcore_h) $(inferior_h)
 
 mcore-rom.o: mcore-rom.c $(defs_h) $(gdbcore_h) target.h monitor.h \
 	gdb_string.h $(regcache_h)
diff --git a/gdb/dsrec.c b/gdb/dsrec.c
index 7c7941ee14f..4995a3c208b 100644
--- a/gdb/dsrec.c
+++ b/gdb/dsrec.c
@@ -251,8 +251,8 @@ make_srec (char *srec, CORE_ADDR targ_addr, bfd *abfd, asection *sect,
     addr_size = 4;
   else
     internal_error (__FILE__, __LINE__,
-		    "make_srec:  Bad address (0x%x), or bad flags (0x%x).",
-		    targ_addr, flags);
+		    "make_srec:  Bad address (0x%s), or bad flags (0x%x).",
+		    paddr (targ_addr), flags);
 
   /* Now that we know the address size, we can figure out how much
      data this record can hold.  */
diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c
index d7678e3d663..4b68f91aa4e 100644
--- a/gdb/mcore-tdep.c
+++ b/gdb/mcore-tdep.c
@@ -23,6 +23,9 @@
 #include "value.h"
 #include "gdbcmd.h"
 #include "regcache.h"
+#include "symfile.h"
+#include "gdbcore.h"
+#include "inferior.h"
 
 /* Functions declared and used only in this file */
 
diff --git a/gdb/ocd.c b/gdb/ocd.c
index 42f2bba62ff..78b8ca6a8c1 100644
--- a/gdb/ocd.c
+++ b/gdb/ocd.c
@@ -760,7 +760,7 @@ ocd_read_bytes (CORE_ADDR memaddr, char *myaddr, int len)
 /* ARGSUSED */
 int
 ocd_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int should_write,
-		 struct target_ops *target)
+		 struct mem_attrib *attrib, struct target_ops *target)
 {
   int res;
 
diff --git a/gdb/ocd.h b/gdb/ocd.h
index 85636e83281..28fc219db3c 100644
--- a/gdb/ocd.h
+++ b/gdb/ocd.h
@@ -103,7 +103,9 @@ void ocd_files_info (struct target_ops *ignore);
 
 
 int ocd_xfer_memory (CORE_ADDR memaddr, char *myaddr,
-		     int len, int should_write, struct target_ops *target);
+		     int len, int should_write,
+		     struct mem_attrib *attrib,
+		     struct target_ops *target);
 
 void ocd_mourn (void);
 
diff --git a/gdb/ser-ocd.c b/gdb/ser-ocd.c
index 9ce7519fc24..de7240f6b2d 100644
--- a/gdb/ser-ocd.c
+++ b/gdb/ser-ocd.c
@@ -134,6 +134,12 @@ ocd_setbaudrate (serial_t scb, int rate)
 }
 
 static int
+ocd_setstopbits (serial_t scb, int rate)
+{
+  return 0;
+}
+
+static int
 ocd_write (serial_t scb, const char *str, int len)
 {
 #ifdef _WIN32
@@ -168,6 +174,7 @@ static struct serial_ops ocd_ops =
   ocd_print_tty_state,
   ocd_noflush_set_tty_state,
   ocd_setbaudrate,
+  ocd_setstopbits,
   ocd_noop,			/* wait for output to drain */
 };