diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a1a599c9a8..ca934decf3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-12  Andrew Cagney  <cagney@redhat.com>
+
+	* MAINTAINERS: Mention --enable-sim-build-warnings.
+	(m68hc11-elf): Disable sim build warnings.
+	(m32r-elf): Mark as broken obsolete candidate.
+	(x86_64-linux-gnu): Mark as buildable with -Werror.
+	(arm-elf): Change -w to ``,'' which enables warnings but not
+	-Werror.
+
 2002-07-12  Andrew Cagney  <ac131313@redhat.com>
 
 	* bcache.h: Update copyright.
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index d524bb7bc2..f2e4485983 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -63,7 +63,7 @@ maintainer works with the native maintainer when resolving API issues.
 			Maintenance only
 			OBSOLETE candidate, not multi-arch
 
-	arm		--target=arm-elf -w
+	arm		--target=arm-elf ,
 			Fernando Nasser		fnasser@redhat.com
 			Scott Bambrough		scottb@netwinder.org
 			Richard Earnshaw	rearnsha@arm.com
@@ -107,11 +107,11 @@ maintainer works with the native maintainer when resolving API issues.
 	ia64		--target=ia64-linux ,-Werror
 			Kevin Buettner		kevinb@redhat.com
 
-	m32r		--target=m32r-elf -Werror
+	m32r		(--target=m32r-elf broken)
 			Michael Snyder		msnyder@redhat.com
-			Not multi-arch
+			OBSOLETE candidate, not multi-arch
 
-	m68hc11		--target=m68hc11-elf ,-Werror
+	m68hc11		--target=m68hc11-elf ,-Werror ,
 			Stephane Carrez		stcarrez@nerim.fr
 
 	m68k		--target=m68k-elf ,-Werror
@@ -167,7 +167,7 @@ maintainer works with the native maintainer when resolving API issues.
 
 	w65		Deleted.
 
-	x86-64		(--target=x86_64-linux-gnu broken)
+	x86-64		--target=x86_64-linux-gnu ,-Werror
 			Maintenance only
 
 	xstormy16	--target=xstormy16-elf ,-Werror
@@ -208,11 +208,15 @@ b loop
 p
 '
 
-can be used to generate a complete list of --target=
---enable-gdb-build-warnings= pairs of the form:
+can be used to generate a list of buildable targets.  The list
+containing values for the configure options --target=,
+--enable-gdb-build-warnings= and optionally
+--enable-sim-build-warnings vis:
 
 	arc-elf ,-Werror
 	...
+	m68hc11-elf ,-Werror ,
+	...
 	hppa1.1-hp-proelf broken
 	...