netbsd-elf fixes

2 files changed, 16 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fbf1f1aeb99..a4f72ea4a44 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+1999-10-24  Ken Raeburn  <raeburn@raeburn.org>
+
+        * s/netbsd.h (HAVE_GETLOADAVG): Define as 1.
+        (UNEXEC, START_FILES, LIB_STANDARD, LIB_GCC): Define ELF versions,
+        if __ELF__ is defined.
+
 1999-10-24  Gerd Moellmann  <gerd@gnu.org>
 
         * window.c (Fnext_window): Add a QUIT in the loop.
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 19938051f68..1adb58736c4 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -12,7 +12,7 @@
 
 #undef KERNEL_FILE
 #undef LDAV_SYMBOL
-#define HAVE_GETLOADAVG
+#define HAVE_GETLOADAVG 1
 
 #define HAVE_UNION_WAIT
 
@@ -57,7 +57,15 @@
 #define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
 #define N_TRELOFF(x) N_RELOFF(x)
 #endif
-#endif /* not NO_SHARED_LIBS */
+#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 UNEXEC unexelf.o
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o
+#undef LIB_GCC
+#define LIB_GCC
+#endif
 
 #define HAVE_WAIT_HEADER
 #define WAIT_USE_INT