Typo in comment.

[gnu-emacs] / src / s / netbsd.h

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 354ace7e9a04f67797bd49b63a090777b0b3fd50..206ff55c854057bc72b94cf4a6e7e38403b43038 100644 (file)
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -60,13 +60,21 @@
 #endif /* not NO_SHARED_LIBS and not ELF */
 
 #if !defined (NO_SHARED_LIBS) && defined (__ELF__)
-#define START_FILES pre-crt0.o /usr/lib/crt0.o /usr/lib/crtbegin.o
+#define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o
 #define UNEXEC unexelf.o
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o END_FILES_1
 #undef LIB_GCC
 #define LIB_GCC
 #endif
 
+#ifdef HAVE_CRTIN
+#define START_FILES_1 /usr/lib/crti.o 
+#define END_FILES_1 /usr/lib/crtn.o
+#else
+#define START_FILES_1
+#define END_FILES_1
+#endif
+
 #define HAVE_WAIT_HEADER
 #define WAIT_USE_INT
 
@@ -77,7 +85,7 @@
    says where to find X windows at run time.  We convert it to a -rpath option
    which is what OSF1 uses.  */
 #define LD_SWITCH_SYSTEM_tmp `echo LD_SWITCH_X_SITE_AUX | sed -e 's/-R/-Wl,-rpath,/'`
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -L/usr/pkg/lib -L/usr/local/lib
+#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Wl,-rpath,/usr/pkg/lib -L/usr/pkg/lib -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 
 /* The following is needed to make `configure' find Xpm, Xaw3d and
    image include and library files if using /usr/bin/gcc.  That
@@ -86,6 +94,13 @@
 
 #define C_SWITCH_SYSTEM -I/usr/X11R6/include -I/usr/pkg/include -I/usr/local/include -L/usr/pkg/lib -L/usr/local/lib
 
+/* Link temacs with -z nocombreloc so that unexec works right, whether or
+   not -z combreloc is the default.  GNU ld ignores unknown -z KEYWORD
+   switches, so this also works with older versions that don't implement
+   -z combreloc.  */
+
+#define LD_SWITCH_SYSTEM_TEMACS -Wl,-z,nocombreloc
+
 #endif /* __ELF__ */
 
 /* On post 1.3 releases of NetBSD, gcc -nostdlib also clears
@@ -112,14 +127,16 @@
    ioctl TIOCSCTTY.  */
 
 #define DONT_REOPEN_PTY
- 
+
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the
    jmp_buf.  */
 
 #define GC_SETJMP_WORKS 1
- 
+
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
 
 #define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS
 
+/* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
+   (do not change this comment) */