diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 236249e07d..14958473bd 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 Fri Jan 27 17:08:06 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
+	* convex-tdep.c (xfer_core_file): Comment out.
+	* config/convex/tm-convex.h (XFER_CORE_FILE): Remove.
+	* remote.c, remote-pa.c (remote_fetch_word): Change xfer_core_file
+        references to target_read_memory.
+	* gdbcore.h (xfer_core_file, core_open, core_detach): Remove
+	declarations.
+	* corelow.c (core_open, core_detach): Make static.
+
 	* arm-tdep.c: Make it compile.
 	(exec_file_command, xfer_core_file): Comment out.
 	(arm_print_insn): Remove, now in libopcodes.
diff --git a/gdb/convex-tdep.c b/gdb/convex-tdep.c
index 0828d990f9..930d1601ef 100644
--- a/gdb/convex-tdep.c
+++ b/gdb/convex-tdep.c
@@ -130,6 +130,7 @@ exec_file_command (filename, from_tty)
     (*exec_file_display_hook) (filename);
 }
 
+#if 0
 /* Read data from SOFF exec or core file.
    Return 0 on success, EIO if address out of bounds. */
 
@@ -233,7 +234,7 @@ xfer_core_file (memaddr, myaddr, len)
     }
   return returnval;
 }
-
+#endif
 
 /* Here from info files command to print an address map.  */
 
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 90196b93ae..bf4a5fc726 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -1,5 +1,5 @@
 /* Core dump and executable file functions below target vector, for GDB.
-   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1994, 1995
    Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -38,6 +38,10 @@ static void core_files_info PARAMS ((struct target_ops *));
 static int solib_add_stub PARAMS ((char *));
 #endif
 
+static void core_open PARAMS ((char *, int));
+
+static void core_detach PARAMS ((char *, int));
+
 static void core_close PARAMS ((int));
 
 static void get_core_registers PARAMS ((int));
@@ -114,7 +118,7 @@ add_to_thread_list (abfd, asect, reg_sect_arg)
 
 /* This routine opens and sets up the core file bfd.  */
 
-void
+static void
 core_open (filename, from_tty)
      char *filename;
      int from_tty;
@@ -228,7 +232,7 @@ your %s; do ``info files''", target_longname);
     }
 }
 
-void
+static void
 core_detach (args, from_tty)
      char *args;
      int from_tty;
diff --git a/gdb/remote-pa.c b/gdb/remote-pa.c
index 6d5f0796e8..cb8705434e 100644
--- a/gdb/remote-pa.c
+++ b/gdb/remote-pa.c
@@ -867,7 +867,7 @@ remote_fetch_word (addr)
       if (addr >= text_start && addr < text_end)
 	{
 	  int buffer;
-	  xfer_core_file (addr, &buffer, sizeof (int));
+	  target_read_memory (addr, &buffer, sizeof (int));
 	  return buffer;
 	}
     }
diff --git a/gdb/remote.c b/gdb/remote.c
index 7349305dbd..4320bd28f6 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -756,7 +756,7 @@ Packet: '%s'\n",
 	      last_sent_signal = TARGET_SIGNAL_0;
 	      target_terminal_inferior ();
 
-	      strcpy (buf, last_sent_step ? 's' : 'c');
+	      strcpy (buf, last_sent_step ? "s" : "c");
 	      putpkt (buf);
 	      continue;
 	    }
@@ -944,7 +944,7 @@ remote_fetch_word (addr)
       if (addr >= text_start && addr < text_end)
 	{
 	  int buffer;
-	  xfer_core_file (addr, &buffer, sizeof (int));
+	  target_read_memory (addr, &buffer, sizeof (int));
 	  return buffer;
 	}
     }