diff options
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/s/freebsd.h | 8 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6b6a85d7cdd..5c6a1de926c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2003-11-24 Gerd Moellmann <gerd@gnu.org> + + * s/freebsd.h (LD_SWITCH_SYSTEM_TEMACS) + [__FreeBSD_version >= 500042]: Define as -znocombreloc because + ld's default is incompatible with unexec. + 2003-11-23 Kim F. Storm <storm@cua.dk> * window.c (enum window_loop): Add REDISPLAY_BUFFER_WINDOWS. diff --git a/src/s/freebsd.h b/src/s/freebsd.h index f3049724d12..dbd08f5b3be 100644 --- a/src/s/freebsd.h +++ b/src/s/freebsd.h @@ -220,5 +220,13 @@ Boston, MA 02111-1307, USA. */ #define POSIX_SIGNALS 1 +/* The `combreloc' setting became the default, and it seems to be + incompatible with unexec. Symptom is an immediate SEGV in + XtInitializeWidget when starting Emacs under X11. */ + +#if defined __FreeBSD_version && __FreeBSD_version >= 500042 +#define LD_SWITCH_SYSTEM_TEMACS -znocombreloc +#endif + /* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb (do not change this comment) */ |