Remove non-working support for lynxos 3.0.

* s/lynxos.h: Remove file.

* unexec.c (unexec, adjust_lnnoptrs): Do not depend on
COFF_BSD_SYMBOLS, nothing defines it anymore.

* os.texi (System Environment): Do not mention lynxos.

* configure.in: Remove non-working lynxos port.

diff --git a/ChangeLog b/ChangeLog
index 1d7c4d423e7694166466d8342ba1e6b26d050f2f..7ea7a22392262faf3aa40f1303137b640e818b39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * configure.in: Remove non-working lynxos port.
+
 2010-03-19  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 9e656c39aa16d94cfa5f49e63c09cad20ad3c49c..3c69e9e6a4aa889d4905b09e82ee5823fb1dfc74 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -299,7 +299,7 @@ PTY_TTY_NAME_SPRINTF
 PURESIZE
 RUN_TIME_REMAP
 SA_RESTART
-SECTION_ALIGNMENT
+SECTION_ALIGNMENT  -- was only used by s/lynxos.h, maybe all code depending on it can be removed.
 SEGMENT_MASK
 SETPGRP_RELEASES_CTTY
 SETUP_SLAVE_PTY

diff --git a/configure.in b/configure.in
index f8282b738c830ccffcdcc3653c598d365792edcc..869deec37b1b39458dbdb857d21680c8f5f64e21 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -458,15 +458,6 @@ dnl see the `changequote' comment above.
     esac
   ;;
 
-  ## LynxOS ports
-  *-*-lynxos* )
-    opsys=lynxos
-    case "${canonical}" in
-      i[3456]86-*-lynxos*) machine=intel386 ;;
-      powerpc-*-lynxos*) machine=powerpc ;;
-    esac
-  ;;
-
   alpha*-*-linux-gnu* )
     machine=alpha opsys=gnu-linux
   ;;

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c78a7eec77d00101d6cad40058649be768defdf3..1ffd3f182e9510b152b79b288b1c9cec65698343 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * os.texi (System Environment): Do not mention lynxos.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
        * Branch for 23.2.

diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index b0c241cf918a43070ba9266f910decd89d5b7c46..9fbc51ae12fd8f90a2f535d41d95702533c66f38 100644 (file)
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -786,9 +786,6 @@ Hewlett-Packard HPUX operating system.
 @item irix
 Silicon Graphics Irix system.
 
-@item lynxos 3.0.1
-LynxOS-3.0.1.
-
 @item ms-dos
 Microsoft MS-DOS ``operating system.''  Emacs compiled with DJGPP for
 MS-DOS binds @code{system-type} to @code{ms-dos} even when you run it on

diff --git a/src/ChangeLog b/src/ChangeLog
index 799dab11529e78e1e5ad07c41adf6818d7871867..80d45c6fe45337ffc46b7fd5ee2f418fd1152255 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       Remove non-working support for lynxos 3.0.
+       * s/lynxos.h: Remove file.
+
+       * unexec.c (unexec, adjust_lnnoptrs): Do not depend on
+       COFF_BSD_SYMBOLS, nothing defines it anymore.
+
 2010-03-20  Dan Nicolaescu  <dann@ics.uci.edu>
 
        Remove obsolete uses of HAVE_SHM.

diff --git a/src/s/lynxos.h b/src/s/lynxos.h
deleted file mode 100644 (file)
index 180b600..0000000
--- a/src/s/lynxos.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Definitions file for GNU Emacs running on LynxOS-3.0.1
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* LynxOS is almost a bsd 4.2 system */
-#include "s/bsd4-2.h"
-
-/* SYSTEM_TYPE should indicate the kind of system you are using.
- It sets the Lisp variable system-type.  */
-
-/* override the bsd definition */
-#undef SYSTEM_TYPE
-#define SYSTEM_TYPE "lynxos 3.0.1"
-
-/* System stuff redefined from bsd4-2.h */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/lynx.os"
-#undef LDAV_SYMBOL
-#define LDAV_SYMBOL "load_average"
-
-/* misc defines */
-#define LNOFLSH 0
-
-/* COFF related */
-#define COFF
-#define NO_REMAP
-#define SECTION_ALIGNMENT 0x1
-#define COFF_BSD_SYMBOLS
-#define etext __etext
-#define edata __edata
-#define _start __text
-
-/* Compilation options */
-#define LIBS_DEBUG
-#define ORDINARY_LINK
-/* we define following to prevent all the lynxos's stupid compilation */
-/* warning messages */
-#define C_SWITCH_SYSTEM -D__NO_INCLUDE_WARN__
-#define LIBS_SYSTEM -lbsd
-
-/* arch-tag: fbc81ec9-1c45-416b-a368-799ae7c094a1
-   (do not change this comment) */

diff --git a/src/unexec.c b/src/unexec.c
index d1921069af7b3773ebe0dc1bb2370d9a267e164a..a1bb5460d3ca56b3e77399dd1974813a0d33de11 100644 (file)
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -630,7 +630,6 @@ mark_x (name)
     PERROR (name);
 }
 \f
-#ifndef COFF_BSD_SYMBOLS
 
 /*
  *     If the COFF file contains a symbol table and a line number section,
@@ -699,8 +698,6 @@ adjust_lnnoptrs (writedesc, readdesc, new_name)
   return 0;
 }
 
-#endif /* COFF_BSD_SYMBOLS */
-
 /* ****************************************************************
  * unexec
  *
@@ -724,9 +721,7 @@ unexec (new_name, a_name, data_start, bss_start, entry_address)
   if (make_hdr (new, a_out, data_start, bss_start, entry_address, a_name, new_name) < 0
       || copy_text_and_data (new, a_out) < 0
       || copy_sym (new, a_out, a_name, new_name) < 0
-#ifndef COFF_BSD_SYMBOLS
       || adjust_lnnoptrs (new, a_out, new_name) < 0
-#endif
       )
     {
       close (new);