* unexec.c:

* m/ia64.h:
* m/hp800.h: Remove dead code.

4 files changed, 1 insertions, 22 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d648b8a90d0..9ad4e855859 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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:
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 27c22f7b957..14769077034 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -127,17 +127,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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 --git a/src/m/ia64.h b/src/m/ia64.h
index ecd3a801760..2b11fa78540 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -65,13 +65,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #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 --git a/src/unexec.c b/src/unexec.c
index 6b46c00150e..7116685051b 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -503,10 +503,6 @@ make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name)
   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