Commit eb697db5 authored by Dan Nicolaescu's avatar Dan Nicolaescu

Move UNEXEC definition to autoconf.

* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.

* msdos/sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.

* src/s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* src/s/sol2-10.h (UNEXEC):
* src/s/irix6-5.h (UNEXEC):
* src/s/hpux10-20.h (UNEXEC):
* src/s/gnu-linux.h (UNEXEC):
* src/s/darwin.h (UNEXEC):
* src/s/cygwin.h (UNEXEC):
* src/s/bsd-common.h (UNEXEC):
* src/s/aix4-2.h (UNEXEC):
* src/m/alpha.h (UNEXEC): Likewise.
* src/Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
parent aa3830c4
2010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in (unxec): Do not define and substitute.
(UNEXEC_OBJ): New output variable, replaces cpp UNEXEC.
2010-06-03 Glenn Morris <rgm@gnu.org>
* configure.in (AH_BOTTOM): Remove NOT_C_CODE test, it is always true.
......
......@@ -277,7 +277,6 @@ TIME_WITH_SYS_TIME
TIOCSIGSEND
TM_IN_SYS_TIME
ULIMIT_BREAK_VALUE
UNEXEC
UNIX98_PTYS
USE_CRT_DLL
USE_TOOLKIT_SCROLL_BARS
......
This diff is collapsed.
......@@ -854,8 +854,6 @@ echo '
configure___ LIBX=-lX11
configure___ unexec=UNEXEC
#ifdef CANNOT_DUMP
configure___ cannot_dump=yes
#else
......@@ -925,6 +923,35 @@ rm ${tempcname}
AC_SUBST(cannot_dump)
UNEXEC_OBJ=unexelf.o
case "$opsys" in
aix4-2)
UNEXEC_OBJ=unexaix.o
;;
cygwin)
UNEXEC_OBJ=unexcw.o
;;
darwin)
UNEXEC_OBJ=unexmacosx.o
;;
hpux10-20 | hpux11)
UNEXEC_OBJ=unexhp9k800.o
;;
sol2-10)
# Use the Solaris dldump() function, called from unexsol.c, to dump
# emacs, instead of the generic ELF dump code found in unexelf.c.
# The resulting binary has a complete symbol table, and is better
# for debugging and other observability tools (debuggers, pstack, etc).
#
# If you encounter a problem using dldump(), please consider sending
# a message to the OpenSolaris tools-linking mailing list:
# http://mail.opensolaris.org/mailman/listinfo/tools-linking
#
# It is likely that dldump() works with older Solaris too, but this has
# not been tested, so for now this change is for Solaris 10 or newer.
UNEXEC_OBJ=unexsol.o
;;
esac
LD_SWITCH_SYSTEM=
case "$opsys" in
......@@ -985,10 +1012,13 @@ if test "$machine" = "alpha"; then
else
AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.])
fi
else
UNEXEC_OBJ=unexalpha.o
fi
fi
AC_SUBST(C_SWITCH_MACHINE)
AC_SUBST(UNEXEC_OBJ)
C_SWITCH_SYSTEM=
## Some programs in src produce warnings saying certain subprograms
......@@ -3082,7 +3112,6 @@ AC_SUBST(docdir)
AC_SUBST(bitmapdir)
AC_SUBST(gamedir)
AC_SUBST(gameuser)
AC_SUBST(unexec)
## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
## end of LIBX_BASE, but nothing ever set it.
......
2010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
* sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec.
2010-06-03 Glenn Morris <rgm@gnu.org>
* sed2v2.inp: Do not edit HAVE_ALLOCA.
......
......@@ -121,7 +121,7 @@ s/\.h\.in/.h-in/
/^RALLOC_OBJ *=/s/@RALLOC_OBJ@/ralloc.o/
/^PRE_ALLOC_OBJ *=/s/@PRE_ALLOC_OBJ@/lastfile.o/
/^POST_ALLOC_OBJ *=/s/@POST_ALLOC_OBJ@/$(vmlimitobj)/
/^UNEXEC_OBJ *=/s/@unexec@/unexec.o/
/^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexec.o/
/^CANNOT_DUMP *=/s/@cannot_dump@/no/
/^DEPFLAGS *=/s/@DEPFLAGS@//
/^MKDEPDIR *=/s/@MKDEPDIR@/:/
......
2010-06-03 Dan Nicolaescu <dann@ics.uci.edu>
Move UNEXEC definition to autoconf.
* s/usg5-4.h (UNEXEC): Remove, move to configure.in.
* s/sol2-10.h (UNEXEC):
* s/irix6-5.h (UNEXEC):
* s/hpux10-20.h (UNEXEC):
* s/gnu-linux.h (UNEXEC):
* s/darwin.h (UNEXEC):
* s/cygwin.h (UNEXEC):
* s/bsd-common.h (UNEXEC):
* s/aix4-2.h (UNEXEC):
* m/alpha.h (UNEXEC): Likewise.
* Makefile.in (UNEXEC_OBJ): Define using @UNEXEC_OBJ@.
2010-06-03 Juanma Barranquero <lekktu@gmail.com>
Remove obsolete pre-unicode2 macros.
......
......@@ -281,7 +281,7 @@ RUN_TEMACS = `/bin/pwd`/temacs
START_FILES = @START_FILES@
UNEXEC_OBJ = @unexec@
UNEXEC_OBJ = @UNEXEC_OBJ@
CANNOT_DUMP=@cannot_dump@
......
......@@ -62,8 +62,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef __ELF__
#undef UNEXEC
#define UNEXEC unexelf.o
#if !defined(GNU_LINUX) && !defined(__NetBSD__)
#define DATA_START 0x140000000
#endif
......@@ -78,9 +76,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define TEXT_START 0x120000000
#define DATA_START 0x140000000
/* The program to be used for unexec. */
#define UNEXEC unexalpha.o
#endif /* __ELF__ */
/* On the Alpha it's best to avoid including TERMIO since struct
......
......@@ -104,7 +104,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
to avoid a crash just use the Emacs implementation for that function. */
#define BROKEN_GET_CURRENT_DIR_NAME 1
#define UNEXEC unexaix.o
/* arch-tag: 38fe75ea-6aef-42bd-8449-bc34d921a562
(do not change this comment) */
......@@ -47,8 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define SYSV_SYSTEM_DIR
#define UNEXEC unexelf.o
/* If the system's imake configuration file defines `NeedWidePrototypes'
as `NO', we must define NARROWPROTO manually. Such a define is
generated in the Makefile generated by `xmkmf'. If we don't
......
......@@ -93,7 +93,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
#define SYSV_SYSTEM_DIR 1
#define UNEXEC unexcw.o
#define HAVE_SOCKETS
......
......@@ -123,9 +123,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */
#define HAVE_SOCKETS
/* Definitions for how to dump. Copied from nextstep.h. */
#define UNEXEC unexmacosx.o
/* start_of_text isn't actually used, so make it compile without error. */
#define TEXT_START (0)
......
......@@ -131,8 +131,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define POSIX /* affects getpagesize.h and systty.h */
#define UNEXEC unexelf.o
/* This is to work around mysterious gcc failures in some system versions.
It is unlikely that Emacs changes will work around this problem;
therefore, this should remain permanently. */
......
......@@ -68,8 +68,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Some additional system facilities exist. */
#define HAVE_PERROR /* Delete this line for version 6. */
#define UNEXEC unexhp9k800.o
/* This is how to get the device name of the tty end of a pty. */
#define PTY_TTY_NAME_SPRINTF \
sprintf (pty_name, "/dev/pty/tty%c%x", c, i);
......
......@@ -83,8 +83,6 @@ char *_getpty();
/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
#define PREFER_VSUSP
#define UNEXEC unexelf.o
#define NARROWPROTO 1
#define USE_MMAP_FOR_BUFFERS 1
......
......@@ -4,20 +4,6 @@
#define SYSTEM_MALLOC
/* Use the Solaris dldump() function, called from unexsol.c, to dump
emacs, instead of the generic ELF dump code found in unexelf.c.
The resulting binary has a complete symbol table, and is better
for debugging and other observability tools (debuggers, pstack, etc).
If you encounter a problem using dldump(), please consider sending
a message to the OpenSolaris tools-linking mailing list:
http://mail.opensolaris.org/mailman/listinfo/tools-linking
It is likely that dldump() works with older Solaris too, but this has
not been tested, so for now this change is for Solaris 10 or newer. */
#undef UNEXEC
#define UNEXEC unexsol.o
/* This is used in list_system_processes. */
#define HAVE_PROCFS 1
......
......@@ -69,11 +69,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* On USG systems signal handlers return void. */
#define SIGTYPE void
/* Undump with ELF. */
#undef COFF
#define UNEXEC unexelf.o
/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
But get <termio.h> first to make sure ttold.h doesn't interfere.
And don't try to use SIGIO yet. */
......
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