# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1215672586 0
# Node ID 31cae2dacc054e4dc9bea427ba0294736f993e3f
# Parent  0669124dbfea51f56a89f109441b39415cc7ac71
* unexec.c:
* m/ia64.h:
* m/hp800.h: Remove dead code.

diff -r 0669124dbfea -r 31cae2dacc05 src/ChangeLog
--- a/src/ChangeLog	Thu Jul 10 04:27:32 2008 +0000
+++ b/src/ChangeLog	Thu Jul 10 06:49:46 2008 +0000
@@ -1,5 +1,6 @@
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* unexec.c:
 	* s/vms.h:
 	* s/usg5-4-2.h:
 	* s/sol2-5.h:
@@ -15,6 +16,7 @@
 	* m/ibms390x.h:
 	* m/ibms390.h:
 	* m/ia64.h:
+
 	* m/hp800.h:
 	* m/arm.h:
 	* m/amdx86-64.h: Remove dead code and references to unused
diff -r 0669124dbfea -r 31cae2dacc05 src/m/hp800.h
--- a/src/m/hp800.h	Thu Jul 10 04:27:32 2008 +0000
+++ b/src/m/hp800.h	Thu Jul 10 06:49:46 2008 +0000
@@ -127,17 +127,6 @@
 /* no underscore please */
 #define LDAV_SYMBOL "avenrun"
 
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
 /* On USG systems these have different names. */
 
 #define index strchr
diff -r 0669124dbfea -r 31cae2dacc05 src/m/ia64.h
--- a/src/m/ia64.h	Thu Jul 10 04:27:32 2008 +0000
+++ b/src/m/ia64.h	Thu Jul 10 06:49:46 2008 +0000
@@ -65,13 +65,6 @@
 
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-#if 0
-#define CANNOT_DUMP
-#endif
-
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
    pure and impure space as loaded can vary, and even their
    relative order cannot be relied on.
diff -r 0669124dbfea -r 31cae2dacc05 src/unexec.c
--- a/src/unexec.c	Thu Jul 10 04:27:32 2008 +0000
+++ b/src/unexec.c	Thu Jul 10 06:49:46 2008 +0000
@@ -503,10 +503,6 @@
   f_thdr.s_size = f_ohdr.tsize;
   f_thdr.s_scnptr = sizeof (f_hdr) + sizeof (f_ohdr);
   f_thdr.s_scnptr += (f_hdr.f_nscns) * (sizeof (f_thdr));
-#ifdef ADJUST_TEXT_SCNHDR_SIZE
-  /* On some machines, `text size' includes all headers.  */
-  f_thdr.s_size -= f_thdr.s_scnptr;
-#endif /* ADJUST_TEST_SCNHDR_SIZE */
   lnnoptr = f_thdr.s_lnnoptr;
 #ifdef SECTION_ALIGNMENT
   /* Some systems require special alignment