Commit 4285ac5a authored by Dan Nicolaescu's avatar Dan Nicolaescu

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.
parent fcc93746
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.
......
......@@ -113,13 +113,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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) */
......@@ -179,12 +179,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* _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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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
......
......@@ -105,11 +105,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment