 diff -ru orig/s/freebsd.h src/s/freebsd.h
 --- orig/s/freebsd.h	Mon Oct 13 07:05:45 1997
 +++ src/s/freebsd.h	Wed Sep 30 12:08:58 1998
 @@ -53,10 +53,27 @@
  /* freebsd has POSIX-style pgrp behavior. */
  #define GETPGRP_NO_ARG
  
 +#ifdef __ELF__ /* since from 3.0-CURRENT(maybe 19980831 or later) */
 +#ifndef NOT_C_CODE
 +#include <stddef.h>
 +#endif
 +#define LD_SWITCH_SYSTEM
 +#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
 +#define UNEXEC unexelf.o
 +#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
 +#undef LIB_GCC
 +#define LIB_GCC
 +
 +#else /* not __ELF__ */
 +
  #ifndef NO_SHARED_LIBS
  #define LD_SWITCH_SYSTEM -e start -dc -dp
  #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
 +#if __FreeBSD_version >= 300002
 +#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
 +#else /* __FreeBSD_version < 300002 */
  #define START_FILES pre-crt0.o /usr/lib/crt0.o
 +#endif /* __FreeBSD_version < 300002 */
  #define UNEXEC unexfreebsd.o
  #define RUN_TIME_REMAP
  
 @@ -73,6 +90,8 @@
  #define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
  #endif /* __FreeBSD__ */
  #endif /* NO_SHARED_LIBS */
 +
 +#endif /* not __ELF__ */
  
  #define HAVE_GETLOADAVG
  #define NO_TERMIO
 diff -ru orig/unexelf.c src/unexelf.c
 --- orig/unexelf.c	Wed Dec 18 12:38:00 1996
 +++ src/unexelf.c	Wed Sep 30 04:14:34 1998
 @@ -845,7 +845,9 @@
  
        for (; symp < symendp; symp ++)
  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
 -	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
 +	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
 +	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
 +	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
  	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
      }
