* Makefile.in (COMMON_OBS): Use corefile.o rather than core.o

	* core.c:  Rename to corefile.c.
	* config/pyr/tm-pyr.h, umax-xdep.c, sun386-nat.c, pyr-xdep.c,
	* Makefile.in (SFILES), gould-xdep.c, coredep.c, armtdep.c,
 	arm-xdep.c, altos-xdep.c: Change core.c references to corefile.c.

 	From Graham Stoney <greyham@research.canon.oz.au>.
	* Makefile.in (remote-array.o):  Add rule to build.
	(ALLDEPFILES): Add remote-array.c
	* remote-array.c (baud_rate):  Remove unnecessary declaration.
	(baudrate):  Remove.
	(array_files_info):  Print global baud_rate not baudrate.

12 files changed, 26 insertions, 14 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index 06d9a51..d6c074a 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -140,7 +140,7 @@ copying.awk
 copying.c
 core-sol2.c
 core-svr4.c
-core.c
+corefile.c
 coredep.c
 corelow.c
 cp-valprint.c
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 38ddf94..d11114e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+Fri Nov  3 12:30:43 1995  Fred Fish  <fnf@cygnus.com>
+
+	* Makefile.in (COMMON_OBS): Use corefile.o rather than core.o
+	* core.c:  Rename to corefile.c.
+	* config/pyr/tm-pyr.h, umax-xdep.c, sun386-nat.c, pyr-xdep.c,
+	* Makefile.in (SFILES), gould-xdep.c, coredep.c, armtdep.c,
+ 	arm-xdep.c, altos-xdep.c: Change core.c references to corefile.c.
+
+ 	From Graham Stoney <greyham@research.canon.oz.au>.
+	* Makefile.in (remote-array.o):  Add rule to build.
+	(ALLDEPFILES): Add remote-array.c
+	* remote-array.c (baud_rate):  Remove unnecessary declaration.
+	(baudrate):  Remove.
+	(array_files_info):  Print global baud_rate not baudrate.
+
 Sat Nov  4 10:21:58 1995  Stu Grossman  (grossman@cygnus.com)
 
 	* Makefile.in (INTERNAL_CFLAGS):  Add ENABLE_CFLAGS.
diff --git a/gdb/TODO b/gdb/TODO
index 5e4a53e..07716af 100644
--- a/gdb/TODO
+++ b/gdb/TODO
@@ -294,7 +294,7 @@ versions of GDB can do something halfway reasonable.
 Clean up formatting of "info registers" on MIPS and 88k.  See if it
 is possible to do this generically across all target architectures.
 
-GDB gets bfd/core.c and gdb/core.c confused (this should be easy to
+GDB gets bfd/corefile.c and gdb/corefile.c confused (this should be easy to
 repeat even with something more recent than GDB 4.9).
 
 Check that unmatched RBRAC doesn't abort().
diff --git a/gdb/altos-xdep.c b/gdb/altos-xdep.c
index 4cb13b0..e7b652c 100644
--- a/gdb/altos-xdep.c
+++ b/gdb/altos-xdep.c
@@ -46,7 +46,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 /* Work with core dump and executable files, for GDB. 
-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */
 
 void
 core_file_command (filename, from_tty)
diff --git a/gdb/arm-xdep.c b/gdb/arm-xdep.c
index 32f1feb..b855ac8 100644
--- a/gdb/arm-xdep.c
+++ b/gdb/arm-xdep.c
@@ -129,7 +129,7 @@ store_inferior_registers (regno)
 }
 
 /* Work with core dump and executable files, for GDB. 
-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */
 
 /* Structure to describe the chain of shared libraries used
    by the execfile.
diff --git a/gdb/coredep.c b/gdb/coredep.c
index 89a0fa7..5a33a0a 100644
--- a/gdb/coredep.c
+++ b/gdb/coredep.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* core.c is supposed to be the more machine-independent aspects of this;
+/* corefile.c is supposed to be the more machine-independent aspects of this;
    this file is more machine-specific.  */
 
 #include "defs.h"
diff --git a/gdb/core.c b/gdb/corefile.c
index a916bf8..a916bf8 100644
--- a/gdb/core.c
+++ b/gdb/corefile.c
diff --git a/gdb/gould-xdep.c b/gdb/gould-xdep.c
index 7ec91fb..bf2c33a 100644
--- a/gdb/gould-xdep.c
+++ b/gdb/gould-xdep.c
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 
 /* Work with core dump and executable files, for GDB. 
-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */
 
 void
 core_file_command (filename, from_tty)
diff --git a/gdb/pyr-xdep.c b/gdb/pyr-xdep.c
index bedbc61..e205b50 100644
--- a/gdb/pyr-xdep.c
+++ b/gdb/pyr-xdep.c
@@ -171,7 +171,7 @@ extern unsigned int last_frame_offset;
 
 #ifdef PYRAMID_CORE
 
-/* Can't make definitions here static, since core.c needs them
+/* Can't make definitions here static, since corefile.c needs them
    to do bounds checking on the core-file areas. O well. */
 
 /* have two stacks: one for data, one for register windows. */
@@ -192,7 +192,7 @@ extern int reg_stack_offset;
 
 
 /* Work with core dump and executable files, for GDB. 
-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */
 
 void
 core_file_command (filename, from_tty)
diff --git a/gdb/remote-array.c b/gdb/remote-array.c
index f480beb..8be758e 100644
--- a/gdb/remote-array.c
+++ b/gdb/remote-array.c
@@ -41,8 +41,6 @@
 #include "monitor.h"
 #include "remote-utils.h"
 
-extern int baud_rate;
-
 static const char hexchars[]="0123456789abcdef";
 static char *hex2mem();
 
@@ -559,7 +557,6 @@ array_create_inferior (execfile, args, env)
  * array_open -- open a connection to a remote debugger.
  *	NAME is the filename used for communication.
  */
-static int baudrate = 9600;
 static char dev_name[100];
 
 static void
@@ -845,7 +842,7 @@ static void
 array_files_info ()
 {
   printf ("\tAttached to %s at %d baud.\n",
-	  dev_name, baudrate);
+	  dev_name, baud_rate);
 }
 
 /*
diff --git a/gdb/sun386-nat.c b/gdb/sun386-nat.c
index d4edd3c..fd9ca04 100644
--- a/gdb/sun386-nat.c
+++ b/gdb/sun386-nat.c
@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <sys/core.h>
 
 
-/* Machine-dependent code which would otherwise be in core.c */
+/* Machine-dependent code which would otherwise be in corefile.c */
 /* Work with core files, for GDB. */
 
 
diff --git a/gdb/umax-xdep.c b/gdb/umax-xdep.c
index 0aca1a5..d54519e 100644
--- a/gdb/umax-xdep.c
+++ b/gdb/umax-xdep.c
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "gdb_stat.h"
 
 /* Work with core dump and executable files, for GDB. 
-   This code would be in core.c if it weren't machine-dependent. */
+   This code would be in corefile.c if it weren't machine-dependent. */
 
 void
 core_file_command (filename, from_tty)