[Emacs-diffs] /srv/bzr/emacs/trunk r99697: Remove non-working support for lynxos 3.0.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99697
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Fri 2010-03-19 18:03:39 -0700
message:
  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.
removed:
  src/s/lynxos.h
modified:
  ChangeLog
  admin/CPP-DEFINES
  configure.in
  doc/lispref/ChangeLog
  doc/lispref/os.texi
  src/ChangeLog
  src/unexec.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-03-19 09:46:08 +0000
+++ b/ChangeLog 2010-03-20 01:03:39 +0000
@@ -1,3 +1,7 @@
+2010-03-20  Dan Nicolaescu  <address@hidden>
+
+       * configure.in: Remove non-working lynxos port.
+
 2010-03-19  Dan Nicolaescu  <address@hidden>
 
        * .dir-locals.el (c-mode): Turn on whitespace-mode for diff-mode.

=== modified file 'admin/CPP-DEFINES'
--- a/admin/CPP-DEFINES 2009-02-04 14:11:36 +0000
+++ b/admin/CPP-DEFINES 2010-03-20 01:03:39 +0000
@@ -299,7 +299,7 @@
 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

=== modified file 'configure.in'
--- a/configure.in      2010-03-19 02:42:32 +0000
+++ b/configure.in      2010-03-20 01:03:39 +0000
@@ -458,15 +458,6 @@
     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
   ;;

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2010-03-10 15:17:13 +0000
+++ b/doc/lispref/ChangeLog     2010-03-20 01:03:39 +0000
@@ -1,3 +1,7 @@
+2010-03-20  Dan Nicolaescu  <address@hidden>
+
+       * os.texi (System Environment): Do not mention lynxos.
+
 2010-03-10  Chong Yidong  <address@hidden>
 
        * Branch for 23.2.

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2010-01-13 08:35:10 +0000
+++ b/doc/lispref/os.texi       2010-03-20 01:03:39 +0000
@@ -786,9 +786,6 @@
 @item irix
 Silicon Graphics Irix system.
 
address@hidden 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-20 00:46:01 +0000
+++ b/src/ChangeLog     2010-03-20 01:03:39 +0000
@@ -1,5 +1,13 @@
 2010-03-20  Dan Nicolaescu  <address@hidden>
 
+       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  <address@hidden>
+
        Remove obsolete uses of HAVE_SHM.
        * emacs.c (standard_args):
        (Fdump_emacs):

=== removed file 'src/s/lynxos.h'
--- a/src/s/lynxos.h    2010-01-13 08:35:10 +0000
+++ b/src/s/lynxos.h    1970-01-01 00:00:00 +0000
@@ -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) */

=== modified file 'src/unexec.c'
--- a/src/unexec.c      2010-01-13 08:35:10 +0000
+++ b/src/unexec.c      2010-03-20 01:03:39 +0000
@@ -630,7 +630,6 @@
     PERROR (name);
 }
 
-#ifndef COFF_BSD_SYMBOLS
 
 /*
  *     If the COFF file contains a symbol table and a line number section,
@@ -699,8 +698,6 @@
   return 0;
 }
 
-#endif /* COFF_BSD_SYMBOLS */
-
 /* ****************************************************************
  * unexec
  *
@@ -724,9 +721,7 @@
   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);