Mercurial > emacs
changeset 108017:5eae2b195dc6
Simplify LD_SWITCH_SYSTEM_TEMACS usage.
* s/freebsd.h (LD_SWITCH_SYSTEM_TEMACS):
* s/gnu-linux.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure
detects -znocombreloc and passes it to the linker
* s/hpux10-20.h (LD_SWITCH_SYSTEM_TEMACS): Remove, empty.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Tue, 20 Apr 2010 22:33:24 -0700 |
| parents | 6be35f3ece28 |
| children | a60efd79d8af |
| files | src/ChangeLog src/s/freebsd.h src/s/gnu-linux.h src/s/hpux10-20.h |
| diffstat | 4 files changed, 10 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Apr 21 05:53:42 2010 +0200 +++ b/src/ChangeLog Tue Apr 20 22:33:24 2010 -0700 @@ -1,3 +1,11 @@ +2010-04-21 Dan Nicolaescu <local_user@dannlt> + + Simplify LD_SWITCH_SYSTEM_TEMACS usage. + * s/freebsd.h (LD_SWITCH_SYSTEM_TEMACS): + * s/gnu-linux.h (LD_SWITCH_SYSTEM_TEMACS): Remove, configure + detects -znocombreloc and passes it to the linker + * s/hpux10-20.h (LD_SWITCH_SYSTEM_TEMACS): Remove, empty. + 2010-04-21 Glenn Morris <rgm@gnu.org> * Makefile.in (LIBSELINUX_LIBS): Move out of #ifdef.
--- a/src/s/freebsd.h Wed Apr 21 05:53:42 2010 +0200 +++ b/src/s/freebsd.h Tue Apr 20 22:33:24 2010 -0700 @@ -113,13 +113,5 @@ #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) */
--- a/src/s/gnu-linux.h Wed Apr 21 05:53:42 2010 +0200 +++ b/src/s/gnu-linux.h Tue Apr 20 22:33:24 2010 -0700 @@ -179,12 +179,6 @@ #define LD_SWITCH_SYSTEM LD_SWITCH_X_SITE_AUX #endif /* __mips__ */ -/* Link temacs with -z nocombreloc so that unexec works right, whether or - not -z combreloc is the default. GNU ld ignores unknown -z KEYWORD - switches, so this also works with older versions that don't implement - -z combreloc. */ -#define LD_SWITCH_SYSTEM_TEMACS -z nocombreloc - #ifdef emacs #define INTERRUPT_INPUT #endif @@ -201,7 +195,7 @@ /* _BSD_SOURCE is redundant, at least in glibc2, since we define _GNU_SOURCE. Left in in case it's relevant to libc5 systems and anyone's still using Emacs on those. --fx 2002-12-14 */ -#define C_SWITCH_SYSTEM -D_BSD_SOURCE +/* #define C_SWITCH_SYSTEM -D_BSD_SOURCE */ /* Paul Abrahams <abrahams@equinox.shaysnet.com> says this is needed. */ #define LIB_MOTIF -lXm -lXpm @@ -223,7 +217,7 @@ /* Use BSD process groups, but use setpgid() instead of setpgrp() to actually set a process group. */ /* Interesting: only GNU/Linux defines this, but the BSDs do not... */ -#define BSD_PGRPS +/* #define BSD_PGRPS */ #define NARROWPROTO 1
--- a/src/s/hpux10-20.h Wed Apr 21 05:53:42 2010 +0200 +++ b/src/s/hpux10-20.h Tue Apr 20 22:33:24 2010 -0700 @@ -105,11 +105,6 @@ /* This triggers a conditional in xfaces.c. */ #define XOS_NEEDS_TIME_H -/* Don't use shared libraries. unexec doesn't handle them. - Note GCC automatically passes -a archive to ld, and it has its own - conflicting -a. */ -#define LD_SWITCH_SYSTEM_TEMACS - #ifndef HAVE_LIBXMU /* HP-UX doesn't supply Xmu. */ #define LIBXMU