Commit deeaffe1 authored by Dan Nicolaescu's avatar Dan Nicolaescu

* Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete

variable.

* s/gnu-linux.h: Remove commented out code.

* unexec.c: Remove references to obsolete variable
COFF_ENCAPSULATE.

* Makefile.in: Update what RMS says about using autoconf.
(C_COMPILER):
(COFF_ENCAPSULATE):
(MAKE_PARALLEL): Remove obsolete variable.
(C_SWITCH_MACHINE_1, C_SWITCH_SYSTEM_1, C_SWITCH_SITE_1):
(C_SWITCH_X_SITE_1, C_SWITCH_X_MACHINE_1)
(C_SWITCH_X_SYSTEM_1): Move invariant code outside conditional.
parent 05f2964e
2008-02-09 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (REGEXP_IN_LIBC): Remove reference to obsolete
variable.
2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* emacsclient.c (decode_options): Pass --display implicitly if -c
......
......@@ -382,7 +382,7 @@ test-distrib${EXEEXT}: ${srcdir}/test-distrib.c
./test-distrib ${srcdir}/testfile
/* We need the following in order to create a <getopt.h> when the system
doesn't have one that works with the given compiler. */
does not have one that works with the given compiler. */
GETOPT_H = @GETOPT_H@
getopt.h: getopt_.h
cp $(srcdir)/getopt_.h $@-t
......@@ -395,13 +395,8 @@ getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h
getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H)
${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c
#ifdef REGEXP_IN_LIBC
REGEXPOBJ =
REGEXPDEPS =
#else
REGEXPOBJ = regex.o
REGEXPDEPS = $(REGEXPOBJ) $(srcdir)/../src/regex.h
#endif
regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h ../src/config.h
${CC} -c ${BASE_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER ${srcdir}/../src/regex.c
......
2008-02-09 Dan Nicolaescu <dann@ics.uci.edu>
* s/gnu-linux.h: Remove commented out code.
* unexec.c: Remove references to obsolete variable
COFF_ENCAPSULATE.
* Makefile.in: Update what RMS says about using autoconf.
(C_COMPILER):
(COFF_ENCAPSULATE):
(MAKE_PARALLEL): Remove obsolete variable.
(C_SWITCH_MACHINE_1, C_SWITCH_SYSTEM_1, C_SWITCH_SITE_1):
(C_SWITCH_X_SITE_1, C_SWITCH_X_MACHINE_1)
(C_SWITCH_X_SYSTEM_1): Move invariant code outside conditional.
2008-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* keymap.c (Fkey_description): Move side effect outside of macro call.
......
......@@ -27,6 +27,11 @@
# Don't try to replace the cpp processing using autoconf facilities,
# says rms.
# Replacing a particular part of the conditionals to work via autoconf
# is OK.
# Some of the conditionals might be dead now. Finding them and
# deleting them would be fine.
# Here are the things that we expect ../configure to edit.
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
......@@ -100,10 +105,6 @@ SHELL=/bin/sh
MAKE = MAKE_COMMAND
#endif
#ifdef C_COMPILER
CC = C_COMPILER
#endif
/* GNU libc requires ORDINARY_LINK so that its own crt0 is used.
GNU/Linux is an exception because it uses a funny variant of GNU libc. */
#ifdef __GNU_LIBRARY__
......@@ -144,11 +145,11 @@ CC = C_COMPILER
/* Some s/SYSTEM.h files define this to request special switches in ld. */
#ifndef LD_SWITCH_SYSTEM
#if !defined (__GNUC__) && (defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)))
#if !defined (__GNUC__) && ((defined (BSD_SYSTEM) && !defined (COFF)))
#define LD_SWITCH_SYSTEM -X
#else /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */
#else /* (defined (BSD_SYSTEM) && !defined (COFF)) */
#define LD_SWITCH_SYSTEM
#endif /* ! defined(COFF_ENCAPSULATE) || (defined (BSD_SYSTEM) && !defined (COFF)) */
#endif /* (defined (BSD_SYSTEM) && !defined (COFF)) */
#endif /* LD_SWITCH_SYSTEM */
/* This holds special options for linking temacs
......@@ -223,11 +224,7 @@ CC = C_COMPILER
#ifndef START_FILES
#ifdef NO_REMAP
#ifdef COFF_ENCAPSULATE
#define START_FILES pre-crt0.o /usr/local/lib/gcc-crt0.o
#else /* ! defined (COFF_ENCAPSULATE) */
#define START_FILES pre-crt0.o /lib/crt0.o
#endif /* ! defined (COFF_ENCAPSULATE) */
#else /* ! defined (NO_REMAP) */
#define START_FILES ecrt0.o
#endif /* ! defined (NO_REMAP) */
......@@ -536,15 +533,11 @@ STARTFLAGS = -T LD_TEXT_START_ADDR -e __start
#ifdef ORDINARY_LINK
LD = $(CC)
#else
#ifdef COFF_ENCAPSULATE
LD=$(CC) -nostdlib
#else /* not ORDINARY_LINK */
#ifdef LINKER
LD=LINKER
#else /* not LINKER */
LD=ld
#endif /* not LINKER */
#endif /* not COFF_ENCAPSULATE */
#endif /* not ORDINARY_LINK */
/* Flags to pass to LD only for temacs. */
......@@ -1015,12 +1008,7 @@ ${lispsource}international/charprop.el: temacs${EXEEXT} ${UNIDATA}
RUNEMACS="$${RUNEMACS}" DSTDIR=${lispsource}international
#endif
/* Some systems define this to cause parallel Make-ing. */
#ifndef MAKE_PARALLEL
#define MAKE_PARALLEL
#endif
temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-o temacs ${STARTFILES} ${obj} ${otherobj} \
......@@ -1043,9 +1031,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
/* Supply an ordering for parallel make. */
../src/$(OLDXMENU): ${OLDXMENU}
#ifdef USE_X_TOOLKIT
$(OLDXMENU): really-lwlib
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
......@@ -1054,6 +1039,10 @@ C_SWITCH_SITE_1 = C_SWITCH_SITE
C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
#ifdef USE_X_TOOLKIT
$(OLDXMENU): really-lwlib
really-lwlib:
cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
......@@ -1068,14 +1057,6 @@ really-lwlib:
#else /* not USE_X_TOOLKIT */
$(OLDXMENU): really-oldXMenu
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM
C_SWITCH_SITE_1 = C_SWITCH_SITE
C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
really-oldXMenu:
cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
......
......@@ -333,12 +333,6 @@ Boston, MA 02110-1301, USA. */
#define HAVE_XRMSETDATABASE
#endif
/* The regex.o routines are a part of the GNU C-library used with Linux. */
/* However, sometimes they disagree with the src/regex.h that comes with Emacs,
and that can make trouble in etags.c because it gets the regex.h from Emacs
and the function definitions in libc. So turn this off. */
/* #define REGEXP_IN_LIBC */
/* Use BSD process groups, but use setpgid() instead of setpgrp() to
actually set a process group. */
......
......@@ -77,14 +77,6 @@ Boston, MA 02110-1301, USA. */
Define this if your system uses COFF for executables.
* COFF_ENCAPSULATE
Define this if you are using the GNU coff encapsulated a.out format.
This is closer to a.out than COFF. You should *not* define COFF if
you define COFF_ENCAPSULATE
Otherwise we assume you use Berkeley format.
* NO_REMAP
Define this if you do not want to try to save Emacs's pure data areas
......@@ -199,12 +191,7 @@ struct aouthdr
};
#endif /* not MSDOS */
#else /* not COFF */
#ifdef COFF_ENCAPSULATE
int need_coff_header = 1;
#include <coff-encap/a.out.encap.h> /* The location might be a poor assumption */
#else /* not COFF_ENCAPSULATE */
#include <a.out.h>
#endif /* not COFF_ENCAPSULATE */
#endif /* not COFF */
/* Define getpagesize if the system does not.
......@@ -289,7 +276,7 @@ static EXEC_HDR_TYPE hdr, ohdr;
#else /* not HPUX */
#if defined (USG) && !defined (IBMAIX) && !defined (IRIS) && !defined (COFF_ENCAPSULATE) && !defined (GNU_LINUX)
#if defined (USG) && !defined (IBMAIX) && !defined (IRIS) && !defined (GNU_LINUX)
static struct bhdr hdr, ohdr;
#define a_magic fmagic
#define a_text tsize
......@@ -312,11 +299,6 @@ static EXEC_HDR_TYPE hdr, ohdr;
static int unexec_text_start;
static int unexec_data_start;
#ifdef COFF_ENCAPSULATE
/* coffheader is defined in the GNU a.out.encap.h file. */
struct coffheader coffheader;
#endif
#endif /* not COFF */
static int pagemask;
......@@ -686,16 +668,6 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
/* Get symbol table info from header of a.out file if given one. */
if (a_out >= 0)
{
#ifdef COFF_ENCAPSULATE
if (read (a_out, &coffheader, sizeof coffheader) != sizeof coffheader)
{
PERROR(a_name);
}
if (coffheader.f_magic != COFF_MAGIC)
{
ERROR1("%s doesn't have legal coff magic number\n", a_name);
}
#endif
if (read (a_out, &ohdr, sizeof hdr) != sizeof hdr)
{
PERROR (a_name);
......@@ -709,17 +681,10 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
}
else
{
#ifdef COFF_ENCAPSULATE
/* We probably could without too much trouble. The code is in gld
* but I don't have that much time or incentive.
*/
ERROR0 ("can't build a COFF file from scratch yet");
#else
#ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
bzero ((void *)&hdr, sizeof hdr);
#else
bzero (&hdr, sizeof hdr);
#endif
#endif
}
......@@ -749,32 +714,6 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
#endif /* not NO_REMAP */
#ifdef COFF_ENCAPSULATE
/* We are encapsulating BSD format within COFF format. */
{
struct coffscn *tp, *dp, *bp;
tp = &coffheader.scns[0];
dp = &coffheader.scns[1];
bp = &coffheader.scns[2];
tp->s_size = hdr.a_text + sizeof(struct exec);
dp->s_paddr = data_start;
dp->s_vaddr = data_start;
dp->s_size = hdr.a_data;
bp->s_paddr = dp->s_vaddr + dp->s_size;
bp->s_vaddr = bp->s_paddr;
bp->s_size = hdr.a_bss;
coffheader.tsize = tp->s_size;
coffheader.dsize = dp->s_size;
coffheader.bsize = bp->s_size;
coffheader.text_start = tp->s_vaddr;
coffheader.data_start = dp->s_vaddr;
}
if (write (new, &coffheader, sizeof coffheader) != sizeof coffheader)
{
PERROR(new_name);
}
#endif /* COFF_ENCAPSULATE */
if (write (new, &hdr, sizeof hdr) != sizeof hdr)
{
PERROR (new_name);
......
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