[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/unexec.c,v
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/src/unexec.c,v |
Date: |
Sat, 09 Feb 2008 07:42:07 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/02/09 07:42:06
Index: src/unexec.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/unexec.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- src/unexec.c 13 Jan 2008 00:43:53 -0000 1.45
+++ src/unexec.c 9 Feb 2008 07:42:04 -0000 1.46
@@ -77,14 +77,6 @@
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 @@
};
#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 @@
#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 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 @@
/* 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,18 +681,11 @@
}
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
}
unexec_text_start = (long) start_of_text ();
@@ -749,32 +714,6 @@
#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);
- [Emacs-diffs] Changes to emacs/src/unexec.c,v,
Dan Nicolaescu <=