diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | admin/CPP-DEFINES | 43 | ||||
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 3 | ||||
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/MACHINES | 19 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/m/masscomp.h | 122 | ||||
| -rw-r--r-- | src/s/rtu.h | 150 |
10 files changed, 60 insertions, 299 deletions
@@ -1,3 +1,7 @@ +2008-01-05 Dan Nicolaescu <[email protected]> + + * configure.in: Remove support for Masscomp. + 2008-01-05 Glenn Morris <[email protected]> * Makefile.in (desktopdir, icondir): New variables. diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 56693064c9..ea2ae95b25 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -43,4 +43,47 @@ FRAME_WINDOW_P A GUI frame (like X, w32, etc.) REL_ALLOC Compile in the relocatable memory allocator ralloc.c. SYSTEM_MALLOC Use the system library's malloc. + +** Temporarily put defines from removed files here ** + + +ADJUST_EXEC_HEADER +BSD4_2 +BSD_PGRPS +BSD_SYSTEM +BSTRING +CANNOT_DUMP +CLASH_DETECTION +COFF +CRT0_DUMMIES +EXPLICIT_SIGN_EXTEND +FIRST_PTY_LETTER +HAVE_PTYS +HAVE_SOCKETS +HAVE_SYSVIPC +HAVE_TERMIO +HAVE_UNION_WAIT +INTERRUPT_INPUT +KERNEL_FILE +LDAV_SYMBOL +LIBS_DEBUG +LOAD_AVE_CVT +LOAD_AVE_TYPE +MAIL_USE_FLOCK +MASSC_REGISTER_BUG +NOMULTIPLEJOBS +NONSYSTEM_DIR_LIBRARY +NO_ARG_ARRAY +NO_REMAP +NO_UNION_TYPE +PTY_NAME_SPRINTF +PTY_TTY_NAME_SPRINTF +RTU +SYSTEM_TYPE +VIRT_ADDR_VARIES +WORDS_BIG_ENDIAN +WORD_MACHINE +m68000 +subprocesses + # arch-tag: bc80061a-1168-4911-9766-46aaf2640250 diff --git a/configure.in b/configure.in index c07541fe1b..6d727dd642 100644 --- a/configure.in +++ b/configure.in @@ -815,11 +815,6 @@ dnl see the `changequote' comment above. machine=macppc opsys=gnu-linux ;; - ## Masscomp machines - m68*-masscomp-rtu* ) - machine=masscomp opsys=rtu - ;; - ## Megatest machines m68*-megatest-bsd* ) machine=mega68 opsys=bsd4-2 diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9f98547e59..d0beaba9a8 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,7 @@ +2008-01-05 Dan Nicolaescu <[email protected]> + + * os.texi (System Environment): Remove mention for Masscomp. + 2007-12-30 Richard Stallman <[email protected]> * commands.texi (Accessing Mouse): Renamed from Accessing Events. diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 6c237d8345..fc7003d7d8 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -670,9 +670,6 @@ MS-Windows. @item next-mach NeXT Mach-based system. -@item rtu -Masscomp RTU, UCB universe. - @item unisoft-unix UniSoft UniPlus. diff --git a/etc/ChangeLog b/etc/ChangeLog index d349aa4cdc..f3ff65730d 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2008-01-05 Dan Nicolaescu <[email protected]> + + * MACHINES: Remove Masscomp. + 2008-01-03 Dan Nicolaescu <[email protected]> * images/icons/emacs_16.png, images/icons/emacs_24.png diff --git a/etc/MACHINES b/etc/MACHINES index 9f84d8ac18..028062d2e2 100644 --- a/etc/MACHINES +++ b/etc/MACHINES @@ -774,25 +774,6 @@ Iris 4D (mips-sgi-irix[456].*) could also try reinstalling the same version of GCC, and telling us whether that fixes the problem. -Masscomp (m68k-masscomp-rtu) - - 18.36 worked on a 5500DP running RTU v3.1a and compiler version 3.2 - with minor fixes that are included in 18.37. However, bizarre behavior - was reported for 18.36 on a Masscomp (model and version unknown but probably - a 68020 system). The report sounds like a compiler bug. - - A compiler bug affecting statements like - unsigned char k; unsigned char *p;... x = p[k]; - has been reported for "C version 1.2 under RTU 3.1". We do not wish - to take the time to install the numerous workarounds required to - compensate for this bug. - - For RTU version 3.1, define FIRST_PTY_LETTER to be 'p' in `src/s/rtu.h' - (or #undef and redefine it in config.h) so that ptys will be used. - - GNU Emacs is said to have no chance of compiling on RTU versions - prior to v3.0. - Megatest (m68k-megatest-bsd) Emacs 15 worked; do not have any reports about Emacs 16 or 17 diff --git a/src/ChangeLog b/src/ChangeLog index 9265ab6636..3ad3584a23 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-01-05 Dan Nicolaescu <[email protected]> + + * s/rtu.h: + * m/masscomp.h: Remove files. Platform is obsolete. + 2008-01-04 Michael Albinus <[email protected]> * dbusbind.c (Fdbus_method_return): New function. diff --git a/src/m/masscomp.h b/src/m/masscomp.h deleted file mode 100644 index 4e95c26886..0000000000 --- a/src/m/masscomp.h +++ /dev/null @@ -1,122 +0,0 @@ -/* machine description file for Masscomp 5000 series running RTU, ucb universe. - Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, - 2006, 2007 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, 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; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ - - -/* The following line tells the configuration script what sort of - operating system this machine is likely to run. - USUAL-OPSYS="rtu" */ - -/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word - is the most significant byte. */ - -#define WORDS_BIG_ENDIAN - -/* Define NO_ARG_ARRAY if you cannot take the address of the first of a - * group of arguments and treat it as an array of the arguments. */ - -#undef NO_ARG_ARRAY - -/* Define WORD_MACHINE if addresses and such have - * to be corrected before they can be used as byte counts. */ - -#undef WORD_MACHINE - -/* Now define a symbol for the cpu type, if your compiler - does not define it automatically: - vax, m68000, ns16000, pyramid, orion, tahoe and APOLLO - are the ones defined so far. */ -/* Masscomp predefines mc68000. */ -#define m68000 mc68000 - -/* Use type int rather than a union, to represent Lisp_Object */ -/* This is desirable for most machines. */ - -#define NO_UNION_TYPE - -/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend - the 24-bit bit field into an int. In other words, if bit fields - are always unsigned. - - If you use NO_UNION_TYPE, this flag does not matter. */ - -#undef EXPLICIT_SIGN_EXTEND - -/* Data type of load average, as read out of kmem. */ - -#define LOAD_AVE_TYPE double - -/* Convert that into an integer that is 100 for a load average of 1.0 */ - -#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) - -/* 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. */ - -#undef CANNOT_DUMP - -/* 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. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ - -#undef VIRT_ADDR_VARIES - -/* Define NO_REMAP if memory segmentation makes it not work well - to change the boundary between the text section and data section - when Emacs is dumped. If you define this, the preloaded Lisp - code will not be sharable; but that's better than failing completely. */ - -#undef NO_REMAP - -/* crt0.c should use the vax-bsd style of entry, with a dummy arg. */ - -#define CRT0_DUMMIES bogus_fp, - -/* Name of file the to look in - for the kernel symbol table (for load average) */ - -#define KERNEL_FILE "/unix" - -/* This triggers some stuff to avoid a compiler bug */ - -#define MASSC_REGISTER_BUG - -/* Prevent -lg from being used for debugging. Not implemented? */ - -#define LIBS_DEBUG - -/* - * Define HAVE_TERMIO if the system provides sysV-style ioctls - * for terminal control. - */ - -#define HAVE_TERMIO - -/* Adjust a header field for the executable file about to be dumped. */ - -#define ADJUST_EXEC_HEADER \ - hdr.a_stamp = STAMP13; /* really want the latest stamp, whatever it is */ - -/* arch-tag: 572bf8d1-7a94-48c6-b188-bf69754e0cd2 - (do not change this comment) */ diff --git a/src/s/rtu.h b/src/s/rtu.h deleted file mode 100644 index 6dd8fa5a20..0000000000 --- a/src/s/rtu.h +++ /dev/null @@ -1,150 +0,0 @@ -/* Definitions file for GNU Emacs running on RTU 3.0, ucb universe. - Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004, - 2005, 2006, 2007 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, 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; see the file COPYING. If not, write to -the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ - - -/* - * Define symbols to identify the version of Unix this is. - * Define all the symbols that apply correctly. - */ - -#define BSD4_2 -#define BSD_SYSTEM -#define RTU - -/* SYSTEM_TYPE should indicate the kind of system you are using. - It sets the Lisp variable system-type. */ - -#define SYSTEM_TYPE "rtu" - -/* NOMULTIPLEJOBS should be defined if your system's shell - does not have "job control" (the ability to stop a program, - run some other program, then continue the first one). */ - -#define NOMULTIPLEJOBS - -/* Emacs can read input using SIGIO and buffering characters itself, - or using CBREAK mode and making C-g cause SIGINT. - The choice is controlled by the variable interrupt_input. - Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO) - - SIGIO can be used only on systems that implement it (4.2 and 4.3). - CBREAK mode has two disadvantages - 1) At least in 4.2, it is impossible to handle the Meta key properly. - I hear that in system V this problem does not exist. - 2) Control-G causes output to be discarded. - I do not know whether this can be fixed in system V. - - Another method of doing input is planned but not implemented. - It would have Emacs fork off a separate process - to read the input and send it to the true Emacs process - through a pipe. -*/ - -#undef INTERRUPT_INPUT - -/* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ - -#define FIRST_PTY_LETTER 'z' /* i.e. no PTY_LETTERs */ - -/* - * Define HAVE_PTYS if the system supports pty devices. - */ - -#define HAVE_PTYS - -/* Define this macro if system defines a type `union wait'. */ - -#define HAVE_UNION_WAIT - -/* Define HAVE_SOCKETS if system supports 4.2-compatible sockets. */ - -#define HAVE_SOCKETS - -/* - * Define NONSYSTEM_DIR_LIBRARY to make Emacs emulate - * The 4.2 opendir, etc., library functions. - */ - -#define NONSYSTEM_DIR_LIBRARY - -/* Define this symbol if your system has the functions bcopy, etc. */ -/* The system library bcopy() is broken in RTU. For one thing, it expects - the length to be less than 64k. */ -#undef BSTRING - -/* subprocesses should be defined if you want to - have code for asynchronous subprocesses - (as used in M-x compile and M-x shell). - This is generally OS dependent, and not supported - under most USG systems. */ - -#define subprocesses - -/* If your system uses COFF (Common Object File Format) then define the - preprocessor symbol "COFF". */ - -#undef COFF - -/* define MAIL_USE_FLOCK if the mailer uses flock - to interlock access to /usr/spool/mail/$USER. - The alternative is that a lock file named - /usr/spool/mail/$USER.lock. */ - -#undef MAIL_USE_FLOCK - -/* Define CLASH_DETECTION if you want lock files to be written - so that Emacs can tell instantly when you try to modify - a file that someone else has modified in his Emacs. */ - -#undef CLASH_DETECTION - -/* The symbol in the kernel where the load average is found - is named _avenrun. */ - -#define LDAV_SYMBOL "_avenrun" - -/* Special hacks needed to make Emacs run on this system. */ - -/* The "fsync" call on RTU versions 3.0 and 3.1 is badly broken! - This hack below isn't the best solution, but without it this - program will cause the whole system to hang! !@#$#%$ Masscomp! */ - -#define fsync(x) 0 /* "Comment out" fsync calls */ - -/* RTU has IPC instead of Unix-domain sockets. */ - -#define HAVE_SYSVIPC - -/* This is how to get the device name of the tty end of a pty. */ -#define PTY_TTY_NAME_SPRINTF \ - sprintf (pty_name, "/dev/ttyp%x", i); - -/* This is how to get the device name of the control end of a pty. */ -#define PTY_NAME_SPRINTF \ - sprintf (pty_name, "/dev/pty%x", i); - -/* Process groups work in the traditional BSD manner. */ - -#define BSD_PGRPS - -/* arch-tag: 0908970b-1cc0-4d57-b866-61b9bd029a0d - (do not change this comment) */ |