From 62bb752fdb28faef342e94d93f914386d65d95bc Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Mon, 10 Aug 1998 02:41:44 +0000 Subject: [PATCH] (__FreeBSD_version): Define it, or else include osreldate.h to define it. (LIB_GCC): Unconditional definition deleted. [ELF] (LD_SWITCH_SYSTEM, START_FILES, UNEXEC, LIB_STANDARD, LIB_GCC): New alternative definitions. [! ELF] (START_FILES, LIB_GCC): New alternative definitions. --- src/s/freebsd.h | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/s/freebsd.h b/src/s/freebsd.h index 1a04cf0f56a..114265b8fd0 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -1,5 +1,15 @@ /* s/ file for freebsd system. */ +/* Get the correct __FreeBSD_version, even if this is before that was + defined. */ +#ifndef __FreeBSD__ +#define __FreeBSD_version 199401 +#elif __FreeBSD__ == 1 +#define __FreeBSD_version 199405 +#else +#include +#endif + /* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up. Earlier versions do not have shared libraries, so inhibit them. You can inhibit them on newer systems if you wish @@ -34,7 +44,6 @@ #define LIBS_DEBUG #define LIBS_SYSTEM -lutil #define LIBS_TERMCAP -ltermcap -#define LIB_GCC -lgcc #define SYSV_SYSTEM_DIR @@ -42,12 +51,28 @@ #undef BSD_PGRPS #define GETPGRP_NO_ARG +#ifdef __ELF__ + +#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 unexsunos4.o #define RUN_TIME_REMAP +#define LIB_GCC -lgcc #ifndef N_TRELOFF #define N_PAGSIZ(x) __LDPGSZ @@ -63,6 +88,8 @@ #endif /* __FreeBSD__ */ #endif /* NO_SHARED_LIBS */ +#endif /* not __ELF__ */ + #define HAVE_WAIT_HEADER #define HAVE_GETLOADAVG /*#define HAVE_GETPAGESIZE /* configure now puts this in config.h */ -- 2.39.2