Fix fallout from 2010-07-29T03:25:08Z!dann@ics.uci.edu, remove dead code in unexcoff.c.

 unexcoff.c: Remove the parts used when "emacs" is not defined.
 (report_error, report_error_1): Ditto.
 (write_segment): Remove "#if 0" unused code.
 (make_hdr): Remove code that was "#ifndef NO_REMAP" before
 NO_REMAP was removed (in 2010-07-29T03:25:08Z!dann@ics.uci.edu).
 (start_of_text): Remove unused function (was used only if NO_REMAP
 was NOT defined).

diff --git a/src/ChangeLog b/src/ChangeLog
index 527a5f1d8657b00c1eb0d61dc2440dbc68c97174..024cf18efb629b170d84aecbf6276cf25a5678b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-13  Eli Zaretskii  <eliz@gnu.org>
 
+       * unexcoff.c: Remove the parts used when "emacs" is not defined.
+       (report_error, report_error_1): Ditto.
+       (write_segment): Remove "#if 0" unused code.
+       (make_hdr): Remove code that was "#ifndef NO_REMAP" before
+       NO_REMAP was removed (in 2010-07-29T03:25:08Z!dann@ics.uci.edu).
+       (start_of_text): Remove unused function (was used only if NO_REMAP
+       was NOT defined).
+
        * msdos.c (IT_set_face): Fix format string to match argument
        types.
        (IT_write_glyphs, IT_note_mode_line_highlight)

diff --git a/src/unexcoff.c b/src/unexcoff.c
index ed319ec8e7f229f6b81b1cc47d36ed1866ba828e..3e9786348c3e7e546cbd61c3357d5b5a97c12605 100644 (file)
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -74,12 +74,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  * of Dell Computer Corporation.  james@bigtex.cactus.org.
  */
 
-#ifndef emacs
-#define PERROR(arg) perror (arg); return -1
-#else
 #include <config.h>
 #define PERROR(file) report_error (file, new)
-#endif
 
 #ifndef CANNOT_DUMP  /* all rest of file!  */
 
@@ -132,7 +128,6 @@ struct aouthdr
 #endif
 
 
-extern char *start_of_text ();         /* Start of text */
 extern char *start_of_data ();         /* Start of initialized data */
 
 static long block_copy_start;          /* Old executable start point */
@@ -155,8 +150,6 @@ static int pagemask;
 
 #define ADDR_CORRECT(x) ((char *)(x) - (char*)0)
 
-#ifdef emacs
-
 #include <setjmp.h>
 #include "lisp.h"
 
@@ -169,7 +162,6 @@ report_error (file, fd)
     close (fd);
   report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil));
 }
-#endif /* emacs */
 
 #define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1
 #define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1
@@ -182,12 +174,7 @@ report_error_1 (fd, msg, a1, a2)
      int a1, a2;
 {
   close (fd);
-#ifdef emacs
   error (msg, a1, a2);
-#else
-  fprintf (stderr, msg, a1, a2);
-  fprintf (stderr, "\n");
-#endif
 }
 \f
 static int make_hdr ();
@@ -319,9 +306,6 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
      to correspond to what we want to dump.  */
 
   f_hdr.f_flags |= (F_RELFLG | F_EXEC);
-  f_ohdr.text_start = (long) start_of_text ();
-  f_ohdr.tsize = data_start - f_ohdr.text_start;
-  f_ohdr.data_start = data_start;
   f_ohdr.dsize = bss_start - f_ohdr.data_start;
   f_ohdr.bsize = bss_end - bss_start;
   f_thdr.s_size = f_ohdr.tsize;
@@ -417,16 +401,6 @@ write_segment (new, ptr, end)
            nwrite = pagesize;
          write (new, zeros, nwrite);
        }
-#if 0 /* Now that we have can ask `write' to write more than a page,
-        it is legit for write do less than the whole amount specified.  */
-      else if (nwrite != ret)
-       {
-         sprintf (buf,
-                  "unexec write failure: addr 0x%x, fileno %d, size 0x%x, wrote 0x%x, errno %d",
-                  ptr, new, nwrite, ret, errno);
-         PERROR (buf);
-       }
-#endif
       i += nwrite;
       ptr += nwrite;
     }
@@ -606,21 +580,6 @@ adjust_lnnoptrs (writedesc, readdesc, new_name)
   return 0;
 }
 
-extern unsigned start __asm__ ("start");
-
-/*
- *     Return the address of the start of the text segment prior to
- *     doing an unexec.  After unexec the return value is undefined.
- *     See crt0.c for further explanation and _start.
- *
- */
-
-char *
-start_of_text (void)
-{
-  return ((char *) &start);
-}
-
 /* ****************************************************************
  * unexec
  *