diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 665c87904d..65adbf937b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-12  Andrew Cagney  <cagney@gnu.org>
+
+	* cris-tdep.c (cris_register_offset): Delete, never called.
+	(cris_spec_reg_applicable): Delete cris_ver_sim.
+	* MAINTAINERS: List d10v as OBSOLETE.
+	* rdi-share/host.h (FOPEN_WB): #ifdef 0 out definitions of
+	FOPEN_WB et.al., defined by "fopen-bin.h".
+
 2004-11-12  Randolph Chung  <tausq@debian.org>
 
 	* hppa-tdep.c (hppa_skip_permanent_breakpoint): Move definition ...
diff --git a/gdb/MAINTAINERS b/gdb/MAINTAINERS
index b63a7afb01..6f930cfbf2 100644
--- a/gdb/MAINTAINERS
+++ b/gdb/MAINTAINERS
@@ -72,8 +72,7 @@ maintainer works with the native maintainer when resolving API issues.
 	cris		--target=cris-elf ,-Werror
 			Orjan Friberg		orjanf@axis.com
 
-	d10v		--target=d10v-elf ,-Werror
-			Maintenance only
+	d10v		OBSOLETE
 
 	d30v		Deleted.
 
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 64f1e5f92e..20af40f838 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -1278,9 +1278,6 @@ cris_spec_reg_applicable (struct cris_spec_reg spec_reg)
     case cris_ver_warning:
       /* Indeterminate/obsolete.  */
       return 0;
-    case cris_ver_sim:
-      /* Simulator only.  */
-      return 0;
     case cris_ver_v0_3:
       return (version >= 0 && version <= 3);
     case cris_ver_v3p:
@@ -1376,33 +1373,6 @@ cris_cannot_store_register (int regno)
   return 0;
 }
 
-/* Returns the register offset for the first byte of register regno's space 
-   in the saved register state.  Returns -1 for an invalid or unimplemented
-   register.  */
-
-static int
-cris_register_offset (int regno)
-{
-  int i;
-  int reg_size;
-  int offset = 0;
-  
-  if (regno >= 0 && regno < NUM_REGS)
-    {
-      /* FIXME: The offsets should be cached and calculated only once,
-         when the architecture being debugged has changed.  */
-      for (i = 0; i < regno; i++)
-        offset += cris_register_size (i);
-      
-      return offset;
-    }
-  else
-    {
-      /* Invalid register.  */
-      return -1;
-    }
-}
-
 /* Return the GDB type (defined in gdbtypes.c) for the "standard" data type
    of data in register regno.  */
 
diff --git a/gdb/rdi-share/host.h b/gdb/rdi-share/host.h
index 121a823fcd..2a715fd994 100644
--- a/gdb/rdi-share/host.h
+++ b/gdb/rdi-share/host.h
@@ -158,6 +158,7 @@ typedef char *ArgvType;
 #define ROR_32(val, n) \
 ((((unsigned32)(val) >> (n)) | ((unsigned32)(val) << (32-(n)))) & 0xFFFFFFFFL)
 
+#if 0
 #ifdef COMPILING_ON_UNIX
 #  define FOPEN_WB     "w"
 #  define FOPEN_RB     "r"
@@ -170,6 +171,7 @@ typedef char *ArgvType;
 #  define FOPEN_RB     "rb"
 #  define FOPEN_RWB    "rb+"
 #endif
+#endif
 
 #ifndef FILENAME_MAX
 #  define FILENAME_MAX 256