From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Mar 2006 14:52:40 +0000 (+0000)
Subject: (BROKEN_NOCOMBRELOC) [__NetBSD__]: Define.
X-Git-Tag: emacs-pretest-22.0.90~3529
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3f5c8258a47e48a17f0c0026a1c2c5e27ec7361;p=emacs.git

(BROKEN_NOCOMBRELOC) [__NetBSD__]: Define.
(LIB_STANDARD, START_FILES) [__NetBSD__]: Don't define.
(START_FILES, RUN_TIME_REMAP, UNEXEC) [__NetBSD__, __OpenBSD__]:
Don't redefine.
---

diff --git a/src/m/pmax.h b/src/m/pmax.h
index 911f84d3c8a..c83c514ab98 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -13,8 +13,12 @@ NOTE-END  */
 #ifndef __MIPSEB__
 #undef WORDS_BIG_ENDIAN
 #endif
+#if defined (__NetBSD__)
+#define BROKEN_NOCOMBRELOC
+#else
 #undef LIB_STANDARD
 #undef START_FILES
+#endif
 #undef COFF
 #undef TERMINFO
 #define MAIL_USE_FLOCK
@@ -24,18 +28,12 @@ NOTE-END  */
 #ifdef MACH
 #define START_FILES pre-crt0.o /usr/lib/crt0.o
 #else
+#if !defined (__NetBSD__)
 /* This line starts being needed with ultrix 4.0.  */
 /* You must delete it for version 3.1.  */
 #define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o
 #endif
-
-#if defined (__NetBSD__) || defined (__OpenBSD__)
-#undef START_FILES
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#undef RUN_TIME_REMAP
-#undef UNEXEC
-#define UNEXEC unexelf.o
-#endif /* NetBSD || OpenBSD */
+#endif
 
 /* Supposedly the following will overcome a kernel bug.  */
 #undef LD_SWITCH_MACHINE