summaryrefslogtreecommitdiff
path: root/src/s/freebsd.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/s/freebsd.h')
-rw-r--r--src/s/freebsd.h8
1 files changed, 8 insertions, 0 deletions
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) */