* m/mips.h: Mention this file is also used for netbsd.

* m/pmax.h: Remove file.

* configure.in (--enable-profiling): New option.
(mips-*-netbsd*, mipsel-*-netbsd*, mipseb-*-netbsd*): Use machine=mips.

6 files changed, 14 insertions, 63 deletions

diff --git a/ChangeLog b/ChangeLog
index 769f58c21be..1501dc98bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 2009-07-03  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * configure.in (--enable-profiling): New option.
+        (mips-*-netbsd*, mipsel-*-netbsd*, mipseb-*-netbsd*): Use machine=mips.
 
 2009-06-27  Glenn Morris  <rgm@gnu.org>
 
-        * configure: Restore netbsd on mips, mipsel, mipseb.
+        * configure.in: Restore netbsd on mips, mipsel, mipseb.
 
 2009-06-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
diff --git a/configure b/configure
index b850521aba9..3b76c7a9f5a 100755
--- a/configure
+++ b/configure
@@ -2535,9 +2535,9 @@ _ACEOF
     case "${canonical}" in
       alpha*-*-netbsd*) machine=alpha ;;
       i[3456]86-*-netbsd*) machine=intel386 ;;
-      mips-*-netbsd*)   machine=pmax ;;
-      mipsel-*-netbsd*) machine=pmax ;;
-      mipseb-*-netbsd*) machine=pmax ;;
+      mips-*-netbsd*)   machine=mips ;;
+      mipsel-*-netbsd*) machine=mips ;;
+      mipseb-*-netbsd*) machine=mips ;;
       powerpc-*-netbsd*) machine=macppc ;;
       sparc*-*-netbsd*) machine=sparc ;;
       vax-*-netbsd*)    machine=vax ;;
diff --git a/configure.in b/configure.in
index 3bcd60b3860..414d9b236bb 100644
--- a/configure.in
+++ b/configure.in
@@ -406,9 +406,9 @@ dnl see the `changequote' comment above.
     case "${canonical}" in
       alpha*-*-netbsd*) machine=alpha ;;
       i[3456]86-*-netbsd*) machine=intel386 ;;
-      mips-*-netbsd*)   machine=pmax ;;
-      mipsel-*-netbsd*) machine=pmax ;;
-      mipseb-*-netbsd*) machine=pmax ;;
+      mips-*-netbsd*)   machine=mips ;;
+      mipsel-*-netbsd*) machine=mips ;;
+      mipseb-*-netbsd*) machine=mips ;;
       powerpc-*-netbsd*) machine=macppc ;;
       sparc*-*-netbsd*) machine=sparc ;;
       vax-*-netbsd*)    machine=vax ;;
diff --git a/src/ChangeLog b/src/ChangeLog
index 5f852a75496..ad7bf8a544b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/mips.h: Mention this file is also used for netbsd.
+        * m/pmax.h: Remove file.
+
 2009-07-03  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xterm.h (struct x_display_info): Add invisible_cursor.
diff --git a/src/m/mips.h b/src/m/mips.h
index cd8d994a5f9..d7ca85dbd47 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -23,7 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    USUAL-OPSYS="note"
 
 NOTE-START
-This is only used on GNU/Linux.
+This is used on GNU/Linux and netbsd.
 NOTE-END  */
 
 /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
diff --git a/src/m/pmax.h b/src/m/pmax.h
deleted file mode 100644
index ac54997d5e4..00000000000
--- a/src/m/pmax.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Machine description file for DEC MIPS machines.
-
-   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "mips.h"
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="netbsd"
-
-NOTE-START
-The only operating system is NetBSD (osf1 and ultrix removed after 22.3).
-NOTE-END  */
-
-#ifndef __MIPSEB__
-#undef WORDS_BIG_ENDIAN
-#endif
-
-#define BROKEN_NOCOMBRELOC
-#undef COFF
-#undef TERMINFO
-#define MAIL_USE_FLOCK
-#define HAVE_UNION_WAIT
-
-#ifdef MACH
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#endif
-
-/* Supposedly the following will overcome a kernel bug.  */
-#undef LD_SWITCH_MACHINE
-#undef DATA_START
-#define DATA_START 0x10000000
-#define DATA_SEG_BITS 0x10000000
-
-/* Enable a fix in process.c.  */
-#define SET_CHILD_PTY_PGRP
-
-/* arch-tag: 45d5070e-d2b7-479f-b336-3fd497c36e15
-   (do not change this comment) */