diff options
| author | Paul Eggert | 2016-03-07 08:22:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-03-07 08:26:36 -0800 |
| commit | 6bc8689c042830ae8c13e34af993e8f923e47c9d (patch) | |
| tree | 98265a59d0d556209f237443760f21be51a2cdaf /src | |
| parent | 7882dc625e1ec562fcd0e1b743ef11b160cae18e (diff) | |
| download | emacs-6bc8689c042830ae8c13e34af993e8f923e47c9d.tar.gz emacs-6bc8689c042830ae8c13e34af993e8f923e47c9d.zip | |
Remove support for IRIX
The IRIX port wasn’t really working anyway, and the code was
getting in the way of other changes (e.g., getaddrinfo fixes).
IRIX’s supplier dropped support for IRIX in 2013.
* admin/CPP-DEFINES:
* configure.ac (opsys):
* doc/lispref/os.texi (System Environment):
* etc/MACHINES, etc/PROBLEMS:
* lisp/find-dired.el (find-grep-options):
* lisp/lpr.el (lpr-lp-system):
* lisp/ls-lisp.el (ls-lisp-emulation):
* lisp/mail/rmail.el (rmail-spool-directory):
* lisp/net/net-utils.el (ping-program-options):
* lisp/progmodes/gud.el (gud-irix-p, gud-dbx-use-stopformat-p):
* lisp/progmodes/ps-mode.el (ps-mode-print-function):
* src/conf_post.h [IRIX6_5]:
* src/emacs.c (Vsystem_type):
* src/filelock.c (get_boot_time_1):
* src/process.c (process_send_signal):
* src/unexelf.c (unexec):
Omit IRIX-specific code and/or documentation.
* configure.ac (NON_GCC_TEST_OPTIONS, IRIX6_5, PREFER_VSUSP):
Remove. All uses removed.
* etc/NEWS: Document the change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf_post.h | 8 | ||||
| -rw-r--r-- | src/emacs.c | 4 | ||||
| -rw-r--r-- | src/filelock.c | 9 | ||||
| -rw-r--r-- | src/process.c | 2 | ||||
| -rw-r--r-- | src/unexelf.c | 26 |
5 files changed, 4 insertions, 45 deletions
diff --git a/src/conf_post.h b/src/conf_post.h index 2788abf58a2..11dbb6e81af 100644 --- a/src/conf_post.h +++ b/src/conf_post.h | |||
| @@ -117,14 +117,6 @@ typedef bool bool_bf; | |||
| 117 | #undef HAVE_RINT | 117 | #undef HAVE_RINT |
| 118 | #endif /* HPUX */ | 118 | #endif /* HPUX */ |
| 119 | 119 | ||
| 120 | #ifdef IRIX6_5 | ||
| 121 | #ifdef emacs | ||
| 122 | char *_getpty(); | ||
| 123 | #endif | ||
| 124 | #define INET6 /* Needed for struct sockaddr_in6. */ | ||
| 125 | #undef HAVE_GETADDRINFO /* IRIX has getaddrinfo but not struct addrinfo. */ | ||
| 126 | #endif /* IRIX6_5 */ | ||
| 127 | |||
| 128 | #ifdef MSDOS | 120 | #ifdef MSDOS |
| 129 | #ifndef __DJGPP__ | 121 | #ifndef __DJGPP__ |
| 130 | You lose; /* Emacs for DOS must be compiled with DJGPP */ | 122 | You lose; /* Emacs for DOS must be compiled with DJGPP */ |
diff --git a/src/emacs.c b/src/emacs.c index a381da4fb8f..cdc4ebbe437 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -2419,8 +2419,8 @@ Special values: | |||
| 2419 | `ms-dos' compiled as an MS-DOS application. | 2419 | `ms-dos' compiled as an MS-DOS application. |
| 2420 | `windows-nt' compiled as a native W32 application. | 2420 | `windows-nt' compiled as a native W32 application. |
| 2421 | `cygwin' compiled using the Cygwin library. | 2421 | `cygwin' compiled using the Cygwin library. |
| 2422 | Anything else (in Emacs 24.1, the possibilities are: aix, berkeley-unix, | 2422 | Anything else (in Emacs 26, the possibilities are: aix, berkeley-unix, |
| 2423 | hpux, irix, usg-unix-v) indicates some sort of Unix system. */); | 2423 | hpux, usg-unix-v) indicates some sort of Unix system. */); |
| 2424 | Vsystem_type = intern_c_string (SYSTEM_TYPE); | 2424 | Vsystem_type = intern_c_string (SYSTEM_TYPE); |
| 2425 | /* See configure.ac for the possible SYSTEM_TYPEs. */ | 2425 | /* See configure.ac for the possible SYSTEM_TYPEs. */ |
| 2426 | 2426 | ||
diff --git a/src/filelock.c b/src/filelock.c index 1b32b931107..57e3990041a 100644 --- a/src/filelock.c +++ b/src/filelock.c | |||
| @@ -253,14 +253,7 @@ get_boot_time_1 (const char *filename, bool newest) | |||
| 253 | struct utmp ut, *utp; | 253 | struct utmp ut, *utp; |
| 254 | 254 | ||
| 255 | if (filename) | 255 | if (filename) |
| 256 | { | 256 | utmpname (filename); |
| 257 | /* On some versions of IRIX, opening a nonexistent file name | ||
| 258 | is likely to crash in the utmp routines. */ | ||
| 259 | if (faccessat (AT_FDCWD, filename, R_OK, AT_EACCESS) != 0) | ||
| 260 | return; | ||
| 261 | |||
| 262 | utmpname (filename); | ||
| 263 | } | ||
| 264 | 257 | ||
| 265 | setutent (); | 258 | setutent (); |
| 266 | 259 | ||
diff --git a/src/process.c b/src/process.c index 4359f681b45..69f5e1ddca6 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -6464,7 +6464,7 @@ process_send_signal (Lisp_Object process, int signo, Lisp_Object current_group, | |||
| 6464 | break; | 6464 | break; |
| 6465 | 6465 | ||
| 6466 | case SIGTSTP: | 6466 | case SIGTSTP: |
| 6467 | #if defined (VSWTCH) && !defined (PREFER_VSUSP) | 6467 | #ifdef VSWTCH |
| 6468 | sig_char = &t.c_cc[VSWTCH]; | 6468 | sig_char = &t.c_cc[VSWTCH]; |
| 6469 | #else | 6469 | #else |
| 6470 | sig_char = &t.c_cc[VSUSP]; | 6470 | sig_char = &t.c_cc[VSUSP]; |
diff --git a/src/unexelf.c b/src/unexelf.c index e90199472ed..6343207bd14 100644 --- a/src/unexelf.c +++ b/src/unexelf.c | |||
| @@ -461,29 +461,6 @@ unexec (const char *new_name, const char *old_name) | |||
| 461 | || !strcmp (old_section_names + new_shdr->sh_name, ".sdata") | 461 | || !strcmp (old_section_names + new_shdr->sh_name, ".sdata") |
| 462 | || !strcmp (old_section_names + new_shdr->sh_name, ".lit4") | 462 | || !strcmp (old_section_names + new_shdr->sh_name, ".lit4") |
| 463 | || !strcmp (old_section_names + new_shdr->sh_name, ".lit8") | 463 | || !strcmp (old_section_names + new_shdr->sh_name, ".lit8") |
| 464 | /* The conditional bit below was in Oliva's original code | ||
| 465 | (1999-08-25) and seems to have been dropped by mistake | ||
| 466 | subsequently. It prevents a crash at startup under X in | ||
| 467 | `IRIX64 6.5 6.5.17m', whether compiled on that release or | ||
| 468 | an earlier one. It causes no trouble on the other ELF | ||
| 469 | platforms I could test (Irix 6.5.15m, Solaris 8, Debian | ||
| 470 | Potato x86, Debian Woody SPARC); however, it's reported | ||
| 471 | to cause crashes under some version of GNU/Linux. It's | ||
| 472 | not yet clear what's changed in that Irix version to | ||
| 473 | cause the problem, or why the fix sometimes fails under | ||
| 474 | GNU/Linux. There's probably no good reason to have | ||
| 475 | something Irix-specific here, but this will have to do | ||
| 476 | for now. IRIX6_5 is the most specific macro we have to | ||
| 477 | test. -- fx 2002-10-01 | ||
| 478 | |||
| 479 | The issue _looks_ as though it's gone away on 6.5.18m, | ||
| 480 | but maybe it's still lurking, to be triggered by some | ||
| 481 | change in the binary. It appears to concern the dynamic | ||
| 482 | loader, but I never got anywhere with an SGI support call | ||
| 483 | seeking clues. -- fx 2002-11-29. */ | ||
| 484 | #ifdef IRIX6_5 | ||
| 485 | || !strcmp (old_section_names + new_shdr->sh_name, ".got") | ||
| 486 | #endif | ||
| 487 | || !strcmp (old_section_names + new_shdr->sh_name, ".sdata1") | 464 | || !strcmp (old_section_names + new_shdr->sh_name, ".sdata1") |
| 488 | || !strcmp (old_section_names + new_shdr->sh_name, ".data1")) | 465 | || !strcmp (old_section_names + new_shdr->sh_name, ".data1")) |
| 489 | src = (caddr_t) old_shdr->sh_addr; | 466 | src = (caddr_t) old_shdr->sh_addr; |
| @@ -665,9 +642,6 @@ unexec (const char *new_name, const char *old_name) | |||
| 665 | || !strcmp (old_section_names + shdr->sh_name, ".sdata") | 642 | || !strcmp (old_section_names + shdr->sh_name, ".sdata") |
| 666 | || !strcmp (old_section_names + shdr->sh_name, ".lit4") | 643 | || !strcmp (old_section_names + shdr->sh_name, ".lit4") |
| 667 | || !strcmp (old_section_names + shdr->sh_name, ".lit8") | 644 | || !strcmp (old_section_names + shdr->sh_name, ".lit8") |
| 668 | #ifdef IRIX6_5 /* see above */ | ||
| 669 | || !strcmp (old_section_names + shdr->sh_name, ".got") | ||
| 670 | #endif | ||
| 671 | || !strcmp (old_section_names + shdr->sh_name, ".sdata1") | 645 | || !strcmp (old_section_names + shdr->sh_name, ".sdata1") |
| 672 | || !strcmp (old_section_names + shdr->sh_name, ".data1")) | 646 | || !strcmp (old_section_names + shdr->sh_name, ".data1")) |
| 673 | { | 647 | { |