(remove-overlays): Fix last change.

[gnu-emacs] / src / m / mips.h

diff --git a/src/m/mips.h b/src/m/mips.h
index 5426ec6473de2edae0e88fa9a08aa737fb368991..9ae74178143cf79f754e73e0430f1b051c49a6df 100644 (file)
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,5 +1,6 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004,
+                 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
@@ -111,10 +112,10 @@ NOTE-END  */
 /* This machine requires completely different unexec code
    which lives in a separate file.  Specify the file name.  */
 
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__NetBSD__)
 #undef UNEXEC
 #define UNEXEC unexmips.o
-#endif /* not __linux__ */
+#endif /* not __linux__ && not __NetBSD__ */
 
 /* Describe layout of the address space in an executing process.  */
 
@@ -141,14 +142,6 @@ NOTE-END  */
 #if defined (__NetBSD__) || defined (__OpenBSD__)
 #else  /* bsd with elf */
 #define LINKER /bsd43/bin/ld
-#endif /* bsd with elf */
-#else /* not BSD_SYSTEM */
-
-#if defined(__GNUC__) && defined(_ABIN32)
-#define LIBS_MACHINE
-#else
-#define LIBS_MACHINE -lmld
-#endif
 
 #define LD_SWITCH_MACHINE -D 800000 -g3
 #define START_FILES pre-crt0.o /usr/lib/crt1.o
@@ -158,6 +151,15 @@ NOTE-END  */
 #define C_SWITCH_MACHINE -I/usr/include/bsd
 #define C_DEBUG_SWITCH -O -g3
 
+#endif /* bsd with elf */
+#else /* not BSD_SYSTEM */
+
+#if defined(__GNUC__) && defined(_ABIN32)
+#define LIBS_MACHINE
+#else
+#define LIBS_MACHINE -lmld
+#endif
+
 #endif /* not BSD_SYSTEM */
 #endif /* not NEWSOS5 && not __linux__ */
 \f
@@ -170,11 +172,6 @@ NOTE-END  */
   ((var) =                                                             \
    ((int)(type) << VALBITS)                                            \
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
-
-#define XUNMARK(a)                                                     \
-  ((a) =                                                               \
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))               \
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
 \f
 #if !defined (NEWSOS5) && !defined (__linux__)
 #ifdef USG