From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Sep 2025 20:53:20 +0000 (+0200)
Subject: errno-iter, strerrorname_np: Remove support for IRIX.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72a55752c7293d0aa9a9acfe2babacf7cb52fa6f;p=thirdparty%2Fgnulib.git

errno-iter, strerrorname_np: Remove support for IRIX.

* lib/errno-iter.c (errno_iterate): Remove cases for EBADFILT,
EBADRSPEC, EBADTSPEC, EBDHDL, EBUFSIZE, ECANTEXTENT, ECELLDOWN, ECKPT,
ECLOCKCPU, ECONTROLLER, EDELAY, EDESTROYED, EDIRCORRUPTED, EDISJOINT,
EEMPTY, EENDOFMINOR, EENQUEUED, EFSCORRUPTED, EGROUPLOOP, EINIT,
EINVALMODE, EINVALSTATE, EINVALTIME, EIORESID, EJOINED, ELOGINLIM,
EMEMRETRY, EMIGRATED, EMIGRATING, EMUSTRUN, ENFSREMOTE, ENOATTACH,
ENOBWD, ENOEXIST, ENOINTRGROUP, ENOLIMFILE, ENOLOGIN, ENOMESSAGE,
ENOPROC, ENOSERVICE, ENOTCONTROLLER, ENOTENQUEUED, ENOTJOINED,
ENOTSTOPPED, EREMDEV, EWRONGFS.
* lib/strerrorname_np.c (strerrorname_np): Likewise.
* tests/test-strerrorname_np.c (main): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index d2961d359a..d1cbc4326c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+	errno-iter, strerrorname_np: Remove support for IRIX.
+	* lib/errno-iter.c (errno_iterate): Remove cases for EBADFILT,
+	EBADRSPEC, EBADTSPEC, EBDHDL, EBUFSIZE, ECANTEXTENT, ECELLDOWN, ECKPT,
+	ECLOCKCPU, ECONTROLLER, EDELAY, EDESTROYED, EDIRCORRUPTED, EDISJOINT,
+	EEMPTY, EENDOFMINOR, EENQUEUED, EFSCORRUPTED, EGROUPLOOP, EINIT,
+	EINVALMODE, EINVALSTATE, EINVALTIME, EIORESID, EJOINED, ELOGINLIM,
+	EMEMRETRY, EMIGRATED, EMIGRATING, EMUSTRUN, ENFSREMOTE, ENOATTACH,
+	ENOBWD, ENOEXIST, ENOINTRGROUP, ENOLIMFILE, ENOLOGIN, ENOMESSAGE,
+	ENOPROC, ENOSERVICE, ENOTCONTROLLER, ENOTENQUEUED, ENOTJOINED,
+	ENOTSTOPPED, EREMDEV, EWRONGFS.
+	* lib/strerrorname_np.c (strerrorname_np): Likewise.
+	* tests/test-strerrorname_np.c (main): Likewise.
+
 	acl-permissions, file-has-acl: Remove support for IRIX.
 	* lib/acl-internal.h (MODE_INSIDE_ACL): Remove code for IRIX.
 	* lib/acl-internal.c (acl_access_nontrivial): Likewise.
diff --git a/lib/errno-iter.c b/lib/errno-iter.c
index 8c18fcaa30..bd4a7b504d 100644
--- a/lib/errno-iter.c
+++ b/lib/errno-iter.c
@@ -278,7 +278,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EADI
   if (callback (data, EADI)) return;
   #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined EADV
   if (callback (data, EADV)) return;
   #endif
@@ -302,7 +302,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EBADCPU
   if (callback (data, EBADCPU)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADE && EBADE != ECKSUM
   if (callback (data, EBADE)) return;
   #endif
@@ -314,14 +314,10 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EBADEXEC
   if (callback (data, EBADEXEC)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADFD
   if (callback (data, EBADFD)) return;
   #endif
-  /* IRIX */
-  #if defined EBADFILT
-  if (callback (data, EBADFILT)) return;
-  #endif
   /* Minix */
   #if defined EBADIOCTL
   if (callback (data, EBADIOCTL)) return;
@@ -334,7 +330,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EBADMODE
   if (callback (data, EBADMODE)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADR && EBADR != EFRAGS
   if (callback (data, EBADR)) return;
   #endif
@@ -346,46 +342,26 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EBADRPC
   if (callback (data, EBADRPC)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADRQC
   if (callback (data, EBADRQC)) return;
   #endif
-  /* IRIX */
-  #if defined EBADRSPEC
-  if (callback (data, EBADRSPEC)) return;
-  #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADSLT
   if (callback (data, EBADSLT)) return;
   #endif
-  /* IRIX */
-  #if defined EBADTSPEC
-  if (callback (data, EBADTSPEC)) return;
-  #endif
   /* HP-UX */
   #if defined EBADVER
   if (callback (data, EBADVER)) return;
   #endif
-  /* IRIX */
-  #if defined EBDHDL
-  if (callback (data, EBDHDL)) return;
-  #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBFONT
   if (callback (data, EBFONT)) return;
   #endif
-  /* IRIX */
-  #if defined EBUFSIZE
-  if (callback (data, EBUFSIZE)) return;
-  #endif
   /* Minix */
   #if defined ECALLDENIED
   if (callback (data, ECALLDENIED)) return;
   #endif
-  /* IRIX */
-  #if defined ECANTEXTENT
-  if (callback (data, ECANTEXTENT)) return;
-  #endif
   /* FreeBSD */
   #if defined ECAPMODE
   if (callback (data, ECAPMODE)) return;
@@ -394,27 +370,15 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ECASECLASH
   if (callback (data, ECASECLASH)) return;
   #endif
-  /* IRIX */
-  #if defined ECELLDOWN
-  if (callback (data, ECELLDOWN)) return;
-  #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined ECHRNG
   if (callback (data, ECHRNG)) return;
   #endif
-  /* IRIX */
-  #if defined ECKPT
-  if (callback (data, ECKPT)) return;
-  #endif
   /* Solaris */
   #if defined ECKSUM
   if (callback (data, ECKSUM)) return;
   #endif
-  /* IRIX */
-  #if defined ECLOCKCPU
-  if (callback (data, ECLOCKCPU)) return;
-  #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ECOMM
   if (callback (data, ECOMM)) return;
   #endif
@@ -422,10 +386,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ECONFIG
   if (callback (data, ECONFIG)) return;
   #endif
-  /* IRIX */
-  #if defined ECONTROLLER
-  if (callback (data, ECONTROLLER)) return;
-  #endif
   /* AIX */
   #if defined ECORRUPT
   if (callback (data, ECORRUPT)) return;
@@ -438,7 +398,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EDEADEPT
   if (callback (data, EDEADEPT)) return;
   #endif
-  /* IRIX, Solaris, Cygwin */
+  /* Solaris, Cygwin */
   #if defined EDEADLOCK && EDEADLOCK != EDEADLK
   if (callback (data, EDEADLOCK)) return;
   #endif
@@ -446,14 +406,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EDEADSRCDST
   if (callback (data, EDEADSRCDST)) return;
   #endif
-  /* IRIX */
-  #if defined EDELAY
-  if (callback (data, EDELAY)) return;
-  #endif
-  /* IRIX */
-  #if defined EDESTROYED
-  if (callback (data, EDESTROYED)) return;
-  #endif
   /* Mac OS X */
   #if defined EDEVERR
   if (callback (data, EDEVERR)) return;
@@ -462,18 +414,10 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EDIED
   if (callback (data, EDIED)) return;
   #endif
-  /* IRIX */
-  #if defined EDIRCORRUPTED && EDIRCORRUPTED != EFSCORRUPTED
-  if (callback (data, EDIRCORRUPTED)) return;
-  #endif
   /* FreeBSD */
   #if defined EDIRIOCTL
   if (callback (data, EDIRIOCTL)) return;
   #endif
-  /* IRIX */
-  #if defined EDISJOINT
-  if (callback (data, EDISJOINT)) return;
-  #endif
   /* AIX */
   #if defined EDIST
   if (callback (data, EDIST)) return;
@@ -530,18 +474,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ED_WOULD_BLOCK
   if (callback (data, ED_WOULD_BLOCK)) return;
   #endif
-  /* IRIX */
-  #if defined EEMPTY
-  if (callback (data, EEMPTY)) return;
-  #endif
-  /* IRIX */
-  #if defined EENDOFMINOR
-  if (callback (data, EENDOFMINOR)) return;
-  #endif
-  /* IRIX */
-  #if defined EENQUEUED
-  if (callback (data, EENQUEUED)) return;
-  #endif
   /* AIX */
   #if defined EFORMAT
   if (callback (data, EFORMAT)) return;
@@ -554,10 +486,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EFRAGS
   if (callback (data, EFRAGS)) return;
   #endif
-  /* IRIX */
-  #if defined EFSCORRUPTED
-  if (callback (data, EFSCORRUPTED)) return;
-  #endif
   /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Cygwin */
   #if defined EFTYPE
   if (callback (data, EFTYPE)) return;
@@ -574,11 +502,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EGREGIOUS
   if (callback (data, EGREGIOUS)) return;
   #endif
-  /* IRIX */
-  #if defined EGROUPLOOP
-  if (callback (data, EGROUPLOOP)) return;
-  #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined EHOSTDOWN
   if (callback (data, EHOSTDOWN)) return;
   #endif
@@ -590,38 +514,14 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EIEIO
   if (callback (data, EIEIO)) return;
   #endif
-  /* IRIX */
-  #if defined EINIT
-  if (callback (data, EINIT)) return;
-  #endif
-  /* IRIX */
-  #if defined EINVALMODE
-  if (callback (data, EINVALMODE)) return;
-  #endif
-  /* IRIX */
-  #if defined EINVALSTATE
-  if (callback (data, EINVALSTATE)) return;
-  #endif
-  /* IRIX */
-  #if defined EINVALTIME
-  if (callback (data, EINVALTIME)) return;
-  #endif
-  /* IRIX */
-  #if defined EIORESID
-  if (callback (data, EIORESID)) return;
-  #endif
   /* OpenBSD */
   #if defined EIPSEC
   if (callback (data, EIPSEC)) return;
   #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined EISNAM
   if (callback (data, EISNAM)) return;
   #endif
-  /* IRIX */
-  #if defined EJOINED
-  if (callback (data, EJOINED)) return;
-  #endif
   /* FreeBSD */
   #if defined EJUSTRETURN
   if (callback (data, EJUSTRETURN)) return;
@@ -742,19 +642,19 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EKEYREVOKED
   if (callback (data, EKEYREVOKED)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL2HLT
   if (callback (data, EL2HLT)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL2NSYNC
   if (callback (data, EL2NSYNC)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL3HLT
   if (callback (data, EL3HLT)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL3RST
   if (callback (data, EL3RST)) return;
   #endif
@@ -766,27 +666,27 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ELBIN
   if (callback (data, ELBIN)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBACC
   if (callback (data, ELIBACC)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBBAD
   if (callback (data, ELIBBAD)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBEXEC
   if (callback (data, ELIBEXEC)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBMAX
   if (callback (data, ELIBMAX)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBSCN
   if (callback (data, ELIBSCN)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined ELNRNG
   if (callback (data, ELNRNG)) return;
   #endif
@@ -798,10 +698,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ELOCKUNMAPPED
   if (callback (data, ELOCKUNMAPPED)) return;
   #endif
-  /* IRIX */
-  #if defined ELOGINLIM
-  if (callback (data, ELOGINLIM)) return;
-  #endif
   /* GNU/Hurd */
   #if defined EMACH_RCV_BODY_ERROR
   if (callback (data, EMACH_RCV_BODY_ERROR)) return;
@@ -922,18 +818,6 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EMEDIUMTYPE
   if (callback (data, EMEDIUMTYPE)) return;
   #endif
-  /* IRIX */
-  #if defined EMEMRETRY
-  if (callback (data, EMEMRETRY)) return;
-  #endif
-  /* IRIX */
-  #if defined EMIGRATED
-  if (callback (data, EMIGRATED)) return;
-  #endif
-  /* IRIX */
-  #if defined EMIGRATING
-  if (callback (data, EMIGRATING)) return;
-  #endif
   /* GNU/Hurd */
   #if defined EMIG_ARRAY_TOO_LARGE
   if (callback (data, EMIG_ARRAY_TOO_LARGE)) return;
@@ -974,11 +858,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EMIG_TYPE_ERROR
   if (callback (data, EMIG_TYPE_ERROR)) return;
   #endif
-  /* IRIX */
-  #if defined EMUSTRUN
-  if (callback (data, EMUSTRUN)) return;
-  #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined ENAVAIL
   if (callback (data, ENAVAIL)) return;
   #endif
@@ -986,30 +866,18 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENEEDAUTH
   if (callback (data, ENEEDAUTH)) return;
   #endif
-  /* IRIX */
-  #if defined ENFSREMOTE
-  if (callback (data, ENFSREMOTE)) return;
-  #endif
   /* Cygwin */
   #if defined ENMFILE
   if (callback (data, ENMFILE)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ENOANO && ENOANO != ENOKEY
   if (callback (data, ENOANO)) return;
   #endif
-  /* IRIX */
-  #if defined ENOATTACH
-  if (callback (data, ENOATTACH)) return;
-  #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, Minix */
   #if defined ENOATTR
   if (callback (data, ENOATTR)) return;
   #endif
-  /* IRIX */
-  #if defined ENOBWD
-  if (callback (data, ENOBWD)) return;
-  #endif
   /* MirBSD */
   #if defined ENOCOFFEE
   if (callback (data, ENOCOFFEE)) return;
@@ -1022,18 +890,10 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOCONNECT
   if (callback (data, ENOCONNECT)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined ENOCSI
   if (callback (data, ENOCSI)) return;
   #endif
-  /* IRIX */
-  #if defined ENOEXIST
-  if (callback (data, ENOEXIST)) return;
-  #endif
-  /* IRIX */
-  #if defined ENOINTRGROUP
-  if (callback (data, ENOINTRGROUP)) return;
-  #endif
   /* FreeBSD */
   #if defined ENOIOCTL
   if (callback (data, ENOIOCTL)) return;
@@ -1042,18 +902,10 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOKEY
   if (callback (data, ENOKEY)) return;
   #endif
-  /* IRIX */
-  #if defined ENOLIMFILE
-  if (callback (data, ENOLIMFILE)) return;
-  #endif
   /* HP-UX */
   #if defined ENOLOAD
   if (callback (data, ENOLOAD)) return;
   #endif
-  /* IRIX */
-  #if defined ENOLOGIN
-  if (callback (data, ENOLOGIN)) return;
-  #endif
   /* HP-UX */
   #if defined ENOMATCH
   if (callback (data, ENOMATCH)) return;
@@ -1062,15 +914,11 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOMEDIUM
   if (callback (data, ENOMEDIUM)) return;
   #endif
-  /* IRIX */
-  #if defined ENOMESSAGE
-  if (callback (data, ENOMESSAGE)) return;
-  #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ENONET
   if (callback (data, ENONET)) return;
   #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ENOPKG
   if (callback (data, ENOPKG)) return;
   #endif
@@ -1078,18 +926,10 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOPOLICY
   if (callback (data, ENOPOLICY)) return;
   #endif
-  /* IRIX */
-  #if defined ENOPROC
-  if (callback (data, ENOPROC)) return;
-  #endif
   /* HP-UX */
   #if defined ENOREG
   if (callback (data, ENOREG)) return;
   #endif
-  /* IRIX */
-  #if defined ENOSERVICE
-  if (callback (data, ENOSERVICE)) return;
-  #endif
   /* Cygwin */
   #if defined ENOSHARE
   if (callback (data, ENOSHARE)) return;
@@ -1102,7 +942,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOTACTIVE
   if (callback (data, ENOTACTIVE)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined ENOTBLK
   if (callback (data, ENOTBLK)) return;
   #endif
@@ -1110,19 +950,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOTCAPABLE
   if (callback (data, ENOTCAPABLE)) return;
   #endif
-  /* IRIX */
-  #if defined ENOTCONTROLLER
-  if (callback (data, ENOTCONTROLLER)) return;
-  #endif
-  /* IRIX */
-  #if defined ENOTENQUEUED
-  if (callback (data, ENOTENQUEUED)) return;
-  #endif
-  /* IRIX */
-  #if defined ENOTJOINED
-  if (callback (data, ENOTJOINED)) return;
-  #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined ENOTNAM
   if (callback (data, ENOTNAM)) return;
   #endif
@@ -1134,11 +962,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ENOTRUST
   if (callback (data, ENOTRUST)) return;
   #endif
-  /* IRIX */
-  #if defined ENOTSTOPPED
-  if (callback (data, ENOTSTOPPED)) return;
-  #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ENOTUNIQ
   if (callback (data, ENOTUNIQ)) return;
   #endif
@@ -1162,11 +986,11 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EPACKSIZE
   if (callback (data, EPACKSIZE)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined EPFNOSUPPORT
   if (callback (data, EPFNOSUPPORT)) return;
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, Minix, Cygwin */
   #if defined EPROCLIM
   if (callback (data, EPROCLIM)) return;
   #endif
@@ -1198,19 +1022,15 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ERELOOKUP
   if (callback (data, ERELOOKUP)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EREMCHG
   if (callback (data, EREMCHG)) return;
   #endif
-  /* IRIX */
-  #if defined EREMDEV
-  if (callback (data, EREMDEV)) return;
-  #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined EREMOTE
   if (callback (data, EREMOTE)) return;
   #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined EREMOTEIO
   if (callback (data, EREMOTEIO)) return;
   #endif
@@ -1218,7 +1038,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EREMOTERELEASE
   if (callback (data, EREMOTERELEASE)) return;
   #endif
-  /* Linux, FreeBSD, AIX, IRIX, Solaris, Minix */
+  /* Linux, FreeBSD, AIX, Solaris, Minix */
   #if defined ERESTART
   if (callback (data, ERESTART)) return;
   #endif
@@ -1238,7 +1058,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ESHLIBVERS
   if (callback (data, ESHLIBVERS)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined ESHUTDOWN
   if (callback (data, ESHUTDOWN)) return;
   #endif
@@ -1250,11 +1070,11 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ESOFT
   if (callback (data, ESOFT)) return;
   #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ESRMNT
   if (callback (data, ESRMNT)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ESTRPIPE
   if (callback (data, ESTRPIPE)) return;
   #endif
@@ -1262,7 +1082,7 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ESYSERROR
   if (callback (data, ESYSERROR)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined ETOOMANYREFS
   if (callback (data, ETOOMANYREFS)) return;
   #endif
@@ -1270,11 +1090,11 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined ETRAPDENIED
   if (callback (data, ETRAPDENIED)) return;
   #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined EUCLEAN
   if (callback (data, EUCLEAN)) return;
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EUNATCH
   if (callback (data, EUNATCH)) return;
   #endif
@@ -1282,19 +1102,15 @@ errno_iterate (errno_iterate_callback_fn callback, void *data)
   #if defined EURG
   if (callback (data, EURG)) return;
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined EUSERS
   if (callback (data, EUSERS)) return;
   #endif
-  /* IRIX */
-  #if defined EWRONGFS
-  if (callback (data, EWRONGFS)) return;
-  #endif
   /* AIX */
   #if defined EWRPROTECT
   if (callback (data, EWRPROTECT)) return;
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EXFULL
   if (callback (data, EXFULL)) return;
   #endif
diff --git a/lib/strerrorname_np.c b/lib/strerrorname_np.c
index a4e2c7af0f..0e10c4c64f 100644
--- a/lib/strerrorname_np.c
+++ b/lib/strerrorname_np.c
@@ -278,7 +278,7 @@ strerrorname_np (int errnum)
     #if defined EADI
     case EADI:            return "EADI";
     #endif
-    /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, HP-UX, Solaris, Cygwin */
     #if defined EADV
     case EADV:            return "EADV";
     #endif
@@ -302,7 +302,7 @@ strerrorname_np (int errnum)
     #if defined EBADCPU
     case EBADCPU:         return "EBADCPU";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EBADE && EBADE != ECKSUM
     case EBADE:           return "EBADE";
     #endif
@@ -314,14 +314,10 @@ strerrorname_np (int errnum)
     #if defined EBADEXEC
     case EBADEXEC:        return "EBADEXEC";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EBADFD
     case EBADFD:          return "EBADFD";
     #endif
-    /* IRIX */
-    #if defined EBADFILT
-    case EBADFILT:        return "EBADFILT";
-    #endif
     /* Minix */
     #if defined EBADIOCTL
     case EBADIOCTL:       return "EBADIOCTL";
@@ -334,7 +330,7 @@ strerrorname_np (int errnum)
     #if defined EBADMODE
     case EBADMODE:        return "EBADMODE";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EBADR && EBADR != EFRAGS
     case EBADR:           return "EBADR";
     #endif
@@ -346,46 +342,26 @@ strerrorname_np (int errnum)
     #if defined EBADRPC
     case EBADRPC:         return "EBADRPC";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EBADRQC
     case EBADRQC:         return "EBADRQC";
     #endif
-    /* IRIX */
-    #if defined EBADRSPEC
-    case EBADRSPEC:       return "EBADRSPEC";
-    #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EBADSLT
     case EBADSLT:         return "EBADSLT";
     #endif
-    /* IRIX */
-    #if defined EBADTSPEC
-    case EBADTSPEC:       return "EBADTSPEC";
-    #endif
     /* HP-UX */
     #if defined EBADVER
     case EBADVER:         return "EBADVER";
     #endif
-    /* IRIX */
-    #if defined EBDHDL
-    case EBDHDL:          return "EBDHDL";
-    #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EBFONT
     case EBFONT:          return "EBFONT";
     #endif
-    /* IRIX */
-    #if defined EBUFSIZE
-    case EBUFSIZE:        return "EBUFSIZE";
-    #endif
     /* Minix */
     #if defined ECALLDENIED
     case ECALLDENIED:     return "ECALLDENIED";
     #endif
-    /* IRIX */
-    #if defined ECANTEXTENT
-    case ECANTEXTENT:     return "ECANTEXTENT";
-    #endif
     /* FreeBSD */
     #if defined ECAPMODE
     case ECAPMODE:        return "ECAPMODE";
@@ -394,27 +370,15 @@ strerrorname_np (int errnum)
     #if defined ECASECLASH
     case ECASECLASH:      return "ECASECLASH";
     #endif
-    /* IRIX */
-    #if defined ECELLDOWN
-    case ECELLDOWN:       return "ECELLDOWN";
-    #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined ECHRNG
     case ECHRNG:          return "ECHRNG";
     #endif
-    /* IRIX */
-    #if defined ECKPT
-    case ECKPT:           return "ECKPT";
-    #endif
     /* Solaris */
     #if defined ECKSUM
     case ECKSUM:          return "ECKSUM";
     #endif
-    /* IRIX */
-    #if defined ECLOCKCPU
-    case ECLOCKCPU:       return "ECLOCKCPU";
-    #endif
-    /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, HP-UX, Solaris, Cygwin */
     #if defined ECOMM
     case ECOMM:           return "ECOMM";
     #endif
@@ -422,10 +386,6 @@ strerrorname_np (int errnum)
     #if defined ECONFIG
     case ECONFIG:         return "ECONFIG";
     #endif
-    /* IRIX */
-    #if defined ECONTROLLER
-    case ECONTROLLER:     return "ECONTROLLER";
-    #endif
     /* AIX */
     #if defined ECORRUPT
     case ECORRUPT:        return "ECORRUPT";
@@ -438,7 +398,7 @@ strerrorname_np (int errnum)
     #if defined EDEADEPT
     case EDEADEPT:        return "EDEADEPT";
     #endif
-    /* IRIX, Solaris, Cygwin */
+    /* Solaris, Cygwin */
     #if defined EDEADLOCK && EDEADLOCK != EDEADLK
     case EDEADLOCK:       return "EDEADLOCK";
     #endif
@@ -446,14 +406,6 @@ strerrorname_np (int errnum)
     #if defined EDEADSRCDST
     case EDEADSRCDST:     return "EDEADSRCDST";
     #endif
-    /* IRIX */
-    #if defined EDELAY
-    case EDELAY:          return "EDELAY";
-    #endif
-    /* IRIX */
-    #if defined EDESTROYED
-    case EDESTROYED:      return "EDESTROYED";
-    #endif
     /* Mac OS X */
     #if defined EDEVERR
     case EDEVERR:         return "EDEVERR";
@@ -462,18 +414,10 @@ strerrorname_np (int errnum)
     #if defined EDIED
     case EDIED:           return "EDIED";
     #endif
-    /* IRIX */
-    #if defined EDIRCORRUPTED && EDIRCORRUPTED != EFSCORRUPTED
-    case EDIRCORRUPTED:   return "EDIRCORRUPTED";
-    #endif
     /* FreeBSD */
     #if defined EDIRIOCTL
     case EDIRIOCTL:       return "EDIRIOCTL";
     #endif
-    /* IRIX */
-    #if defined EDISJOINT
-    case EDISJOINT:       return "EDISJOINT";
-    #endif
     /* AIX */
     #if defined EDIST
     case EDIST:           return "EDIST";
@@ -530,18 +474,6 @@ strerrorname_np (int errnum)
     #if defined ED_WOULD_BLOCK
     case ED_WOULD_BLOCK:  return "ED_WOULD_BLOCK";
     #endif
-    /* IRIX */
-    #if defined EEMPTY
-    case EEMPTY:          return "EEMPTY";
-    #endif
-    /* IRIX */
-    #if defined EENDOFMINOR
-    case EENDOFMINOR:     return "EENDOFMINOR";
-    #endif
-    /* IRIX */
-    #if defined EENQUEUED
-    case EENQUEUED:       return "EENQUEUED";
-    #endif
     /* AIX */
     #if defined EFORMAT
     case EFORMAT:         return "EFORMAT";
@@ -554,10 +486,6 @@ strerrorname_np (int errnum)
     #if defined EFRAGS
     case EFRAGS:          return "EFRAGS";
     #endif
-    /* IRIX */
-    #if defined EFSCORRUPTED
-    case EFSCORRUPTED:    return "EFSCORRUPTED";
-    #endif
     /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Cygwin */
     #if defined EFTYPE
     case EFTYPE:          return "EFTYPE";
@@ -574,11 +502,7 @@ strerrorname_np (int errnum)
     #if defined EGREGIOUS
     case EGREGIOUS:       return "EGREGIOUS";
     #endif
-    /* IRIX */
-    #if defined EGROUPLOOP
-    case EGROUPLOOP:      return "EGROUPLOOP";
-    #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
     #if defined EHOSTDOWN
     case EHOSTDOWN:       return "EHOSTDOWN";
     #endif
@@ -590,38 +514,14 @@ strerrorname_np (int errnum)
     #if defined EIEIO
     case EIEIO:           return "EIEIO";
     #endif
-    /* IRIX */
-    #if defined EINIT
-    case EINIT:           return "EINIT";
-    #endif
-    /* IRIX */
-    #if defined EINVALMODE
-    case EINVALMODE:      return "EINVALMODE";
-    #endif
-    /* IRIX */
-    #if defined EINVALSTATE
-    case EINVALSTATE:     return "EINVALSTATE";
-    #endif
-    /* IRIX */
-    #if defined EINVALTIME
-    case EINVALTIME:      return "EINVALTIME";
-    #endif
-    /* IRIX */
-    #if defined EIORESID
-    case EIORESID:        return "EIORESID";
-    #endif
     /* OpenBSD */
     #if defined EIPSEC
     case EIPSEC:          return "EIPSEC";
     #endif
-    /* Linux, IRIX */
+    /* Linux */
     #if defined EISNAM
     case EISNAM:          return "EISNAM";
     #endif
-    /* IRIX */
-    #if defined EJOINED
-    case EJOINED:         return "EJOINED";
-    #endif
     /* FreeBSD */
     #if defined EJUSTRETURN
     case EJUSTRETURN:     return "EJUSTRETURN";
@@ -742,19 +642,19 @@ strerrorname_np (int errnum)
     #if defined EKEYREVOKED
     case EKEYREVOKED:     return "EKEYREVOKED";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined EL2HLT
     case EL2HLT:          return "EL2HLT";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined EL2NSYNC
     case EL2NSYNC:        return "EL2NSYNC";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined EL3HLT
     case EL3HLT:          return "EL3HLT";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined EL3RST
     case EL3RST:          return "EL3RST";
     #endif
@@ -766,27 +666,27 @@ strerrorname_np (int errnum)
     #if defined ELBIN
     case ELBIN:           return "ELBIN";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ELIBACC
     case ELIBACC:         return "ELIBACC";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ELIBBAD
     case ELIBBAD:         return "ELIBBAD";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ELIBEXEC
     case ELIBEXEC:        return "ELIBEXEC";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ELIBMAX
     case ELIBMAX:         return "ELIBMAX";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ELIBSCN
     case ELIBSCN:         return "ELIBSCN";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined ELNRNG
     case ELNRNG:          return "ELNRNG";
     #endif
@@ -798,10 +698,6 @@ strerrorname_np (int errnum)
     #if defined ELOCKUNMAPPED
     case ELOCKUNMAPPED:   return "ELOCKUNMAPPED";
     #endif
-    /* IRIX */
-    #if defined ELOGINLIM
-    case ELOGINLIM:       return "ELOGINLIM";
-    #endif
     /* GNU/Hurd */
     #if defined EMACH_RCV_BODY_ERROR
     case EMACH_RCV_BODY_ERROR:return "EMACH_RCV_BODY_ERROR";
@@ -922,18 +818,6 @@ strerrorname_np (int errnum)
     #if defined EMEDIUMTYPE
     case EMEDIUMTYPE:     return "EMEDIUMTYPE";
     #endif
-    /* IRIX */
-    #if defined EMEMRETRY
-    case EMEMRETRY:       return "EMEMRETRY";
-    #endif
-    /* IRIX */
-    #if defined EMIGRATED
-    case EMIGRATED:       return "EMIGRATED";
-    #endif
-    /* IRIX */
-    #if defined EMIGRATING
-    case EMIGRATING:      return "EMIGRATING";
-    #endif
     /* GNU/Hurd */
     #if defined EMIG_ARRAY_TOO_LARGE
     case EMIG_ARRAY_TOO_LARGE:return "EMIG_ARRAY_TOO_LARGE";
@@ -974,11 +858,7 @@ strerrorname_np (int errnum)
     #if defined EMIG_TYPE_ERROR
     case EMIG_TYPE_ERROR: return "EMIG_TYPE_ERROR";
     #endif
-    /* IRIX */
-    #if defined EMUSTRUN
-    case EMUSTRUN:        return "EMUSTRUN";
-    #endif
-    /* Linux, IRIX */
+    /* Linux */
     #if defined ENAVAIL
     case ENAVAIL:         return "ENAVAIL";
     #endif
@@ -986,30 +866,18 @@ strerrorname_np (int errnum)
     #if defined ENEEDAUTH
     case ENEEDAUTH:       return "ENEEDAUTH";
     #endif
-    /* IRIX */
-    #if defined ENFSREMOTE
-    case ENFSREMOTE:      return "ENFSREMOTE";
-    #endif
     /* Cygwin */
     #if defined ENMFILE
     case ENMFILE:         return "ENMFILE";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ENOANO && ENOANO != ENOKEY
     case ENOANO:          return "ENOANO";
     #endif
-    /* IRIX */
-    #if defined ENOATTACH
-    case ENOATTACH:       return "ENOATTACH";
-    #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, Minix */
     #if defined ENOATTR
     case ENOATTR:         return "ENOATTR";
     #endif
-    /* IRIX */
-    #if defined ENOBWD
-    case ENOBWD:          return "ENOBWD";
-    #endif
     /* MirBSD */
     #if defined ENOCOFFEE
     case ENOCOFFEE:       return "ENOCOFFEE";
@@ -1022,18 +890,10 @@ strerrorname_np (int errnum)
     #if defined ENOCONNECT
     case ENOCONNECT:      return "ENOCONNECT";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined ENOCSI
     case ENOCSI:          return "ENOCSI";
     #endif
-    /* IRIX */
-    #if defined ENOEXIST
-    case ENOEXIST:        return "ENOEXIST";
-    #endif
-    /* IRIX */
-    #if defined ENOINTRGROUP
-    case ENOINTRGROUP:    return "ENOINTRGROUP";
-    #endif
     /* FreeBSD */
     #if defined ENOIOCTL
     case ENOIOCTL:        return "ENOIOCTL";
@@ -1042,18 +902,10 @@ strerrorname_np (int errnum)
     #if defined ENOKEY
     case ENOKEY:          return "ENOKEY";
     #endif
-    /* IRIX */
-    #if defined ENOLIMFILE
-    case ENOLIMFILE:      return "ENOLIMFILE";
-    #endif
     /* HP-UX */
     #if defined ENOLOAD
     case ENOLOAD:         return "ENOLOAD";
     #endif
-    /* IRIX */
-    #if defined ENOLOGIN
-    case ENOLOGIN:        return "ENOLOGIN";
-    #endif
     /* HP-UX */
     #if defined ENOMATCH
     case ENOMATCH:        return "ENOMATCH";
@@ -1062,15 +914,11 @@ strerrorname_np (int errnum)
     #if defined ENOMEDIUM
     case ENOMEDIUM:       return "ENOMEDIUM";
     #endif
-    /* IRIX */
-    #if defined ENOMESSAGE
-    case ENOMESSAGE:      return "ENOMESSAGE";
-    #endif
-    /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, HP-UX, Solaris, Cygwin */
     #if defined ENONET
     case ENONET:          return "ENONET";
     #endif
-    /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, HP-UX, Solaris, Cygwin */
     #if defined ENOPKG
     case ENOPKG:          return "ENOPKG";
     #endif
@@ -1078,18 +926,10 @@ strerrorname_np (int errnum)
     #if defined ENOPOLICY
     case ENOPOLICY:       return "ENOPOLICY";
     #endif
-    /* IRIX */
-    #if defined ENOPROC
-    case ENOPROC:         return "ENOPROC";
-    #endif
     /* HP-UX */
     #if defined ENOREG
     case ENOREG:          return "ENOREG";
     #endif
-    /* IRIX */
-    #if defined ENOSERVICE
-    case ENOSERVICE:      return "ENOSERVICE";
-    #endif
     /* Cygwin */
     #if defined ENOSHARE
     case ENOSHARE:        return "ENOSHARE";
@@ -1102,7 +942,7 @@ strerrorname_np (int errnum)
     #if defined ENOTACTIVE
     case ENOTACTIVE:      return "ENOTACTIVE";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
     #if defined ENOTBLK
     case ENOTBLK:         return "ENOTBLK";
     #endif
@@ -1110,19 +950,7 @@ strerrorname_np (int errnum)
     #if defined ENOTCAPABLE
     case ENOTCAPABLE:     return "ENOTCAPABLE";
     #endif
-    /* IRIX */
-    #if defined ENOTCONTROLLER
-    case ENOTCONTROLLER:  return "ENOTCONTROLLER";
-    #endif
-    /* IRIX */
-    #if defined ENOTENQUEUED
-    case ENOTENQUEUED:    return "ENOTENQUEUED";
-    #endif
-    /* IRIX */
-    #if defined ENOTJOINED
-    case ENOTJOINED:      return "ENOTJOINED";
-    #endif
-    /* Linux, IRIX */
+    /* Linux */
     #if defined ENOTNAM
     case ENOTNAM:         return "ENOTNAM";
     #endif
@@ -1134,11 +962,7 @@ strerrorname_np (int errnum)
     #if defined ENOTRUST
     case ENOTRUST:        return "ENOTRUST";
     #endif
-    /* IRIX */
-    #if defined ENOTSTOPPED
-    case ENOTSTOPPED:     return "ENOTSTOPPED";
-    #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ENOTUNIQ
     case ENOTUNIQ:        return "ENOTUNIQ";
     #endif
@@ -1162,11 +986,11 @@ strerrorname_np (int errnum)
     #if defined EPACKSIZE
     case EPACKSIZE:       return "EPACKSIZE";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
     #if defined EPFNOSUPPORT
     case EPFNOSUPPORT:    return "EPFNOSUPPORT";
     #endif
-    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix, Cygwin */
+    /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, Minix, Cygwin */
     #if defined EPROCLIM
     case EPROCLIM:        return "EPROCLIM";
     #endif
@@ -1198,19 +1022,15 @@ strerrorname_np (int errnum)
     #if defined ERELOOKUP
     case ERELOOKUP:       return "ERELOOKUP";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EREMCHG
     case EREMCHG:         return "EREMCHG";
     #endif
-    /* IRIX */
-    #if defined EREMDEV
-    case EREMDEV:         return "EREMDEV";
-    #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
     #if defined EREMOTE
     case EREMOTE:         return "EREMOTE";
     #endif
-    /* Linux, IRIX */
+    /* Linux */
     #if defined EREMOTEIO
     case EREMOTEIO:       return "EREMOTEIO";
     #endif
@@ -1218,7 +1038,7 @@ strerrorname_np (int errnum)
     #if defined EREMOTERELEASE
     case EREMOTERELEASE:  return "EREMOTERELEASE";
     #endif
-    /* Linux, FreeBSD, AIX, IRIX, Solaris, Minix */
+    /* Linux, FreeBSD, AIX, Solaris, Minix */
     #if defined ERESTART
     case ERESTART:        return "ERESTART";
     #endif
@@ -1238,7 +1058,7 @@ strerrorname_np (int errnum)
     #if defined ESHLIBVERS
     case ESHLIBVERS:      return "ESHLIBVERS";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
     #if defined ESHUTDOWN
     case ESHUTDOWN:       return "ESHUTDOWN";
     #endif
@@ -1250,11 +1070,11 @@ strerrorname_np (int errnum)
     #if defined ESOFT
     case ESOFT:           return "ESOFT";
     #endif
-    /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, HP-UX, Solaris, Cygwin */
     #if defined ESRMNT
     case ESRMNT:          return "ESRMNT";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined ESTRPIPE
     case ESTRPIPE:        return "ESTRPIPE";
     #endif
@@ -1262,7 +1082,7 @@ strerrorname_np (int errnum)
     #if defined ESYSERROR
     case ESYSERROR:       return "ESYSERROR";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
     #if defined ETOOMANYREFS
     case ETOOMANYREFS:    return "ETOOMANYREFS";
     #endif
@@ -1270,11 +1090,11 @@ strerrorname_np (int errnum)
     #if defined ETRAPDENIED
     case ETRAPDENIED:     return "ETRAPDENIED";
     #endif
-    /* Linux, IRIX */
+    /* Linux */
     #if defined EUCLEAN
     case EUCLEAN:         return "EUCLEAN";
     #endif
-    /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+    /* Linux, AIX, HP-UX, Solaris, Cygwin */
     #if defined EUNATCH
     case EUNATCH:         return "EUNATCH";
     #endif
@@ -1282,19 +1102,15 @@ strerrorname_np (int errnum)
     #if defined EURG
     case EURG:            return "EURG";
     #endif
-    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+    /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
     #if defined EUSERS
     case EUSERS:          return "EUSERS";
     #endif
-    /* IRIX */
-    #if defined EWRONGFS
-    case EWRONGFS:        return "EWRONGFS";
-    #endif
     /* AIX */
     #if defined EWRPROTECT
     case EWRPROTECT:      return "EWRPROTECT";
     #endif
-    /* Linux, IRIX, Solaris, Cygwin */
+    /* Linux, Solaris, Cygwin */
     #if defined EXFULL
     case EXFULL:          return "EXFULL";
     #endif
diff --git a/tests/test-strerrorname_np.c b/tests/test-strerrorname_np.c
index 69f5935bf2..2298642adf 100644
--- a/tests/test-strerrorname_np.c
+++ b/tests/test-strerrorname_np.c
@@ -277,7 +277,7 @@ main (void)
   #if defined EADI
   ASSERT (strcmp (strerrorname_np (EADI), "EADI") == 0);
   #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined EADV
   ASSERT (strcmp (strerrorname_np (EADV), "EADV") == 0);
   #endif
@@ -301,7 +301,7 @@ main (void)
   #if defined EBADCPU
   ASSERT (strcmp (strerrorname_np (EBADCPU), "EBADCPU") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADE && EBADE != ECKSUM
   ASSERT (strcmp (strerrorname_np (EBADE), "EBADE") == 0);
   #endif
@@ -313,14 +313,10 @@ main (void)
   #if defined EBADEXEC
   ASSERT (strcmp (strerrorname_np (EBADEXEC), "EBADEXEC") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADFD
   ASSERT (strcmp (strerrorname_np (EBADFD), "EBADFD") == 0);
   #endif
-  /* IRIX */
-  #if defined EBADFILT
-  ASSERT (strcmp (strerrorname_np (EBADFILT), "EBADFILT") == 0);
-  #endif
   /* Minix */
   #if defined EBADIOCTL
   ASSERT (strcmp (strerrorname_np (EBADIOCTL), "EBADIOCTL") == 0);
@@ -333,7 +329,7 @@ main (void)
   #if defined EBADMODE
   ASSERT (strcmp (strerrorname_np (EBADMODE), "EBADMODE") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADR && EBADR != EFRAGS
   ASSERT (strcmp (strerrorname_np (EBADR), "EBADR") == 0);
   #endif
@@ -345,46 +341,26 @@ main (void)
   #if defined EBADRPC
   ASSERT (strcmp (strerrorname_np (EBADRPC), "EBADRPC") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADRQC
   ASSERT (strcmp (strerrorname_np (EBADRQC), "EBADRQC") == 0);
   #endif
-  /* IRIX */
-  #if defined EBADRSPEC
-  ASSERT (strcmp (strerrorname_np (EBADRSPEC), "EBADRSPEC") == 0);
-  #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBADSLT
   ASSERT (strcmp (strerrorname_np (EBADSLT), "EBADSLT") == 0);
   #endif
-  /* IRIX */
-  #if defined EBADTSPEC
-  ASSERT (strcmp (strerrorname_np (EBADTSPEC), "EBADTSPEC") == 0);
-  #endif
   /* HP-UX */
   #if defined EBADVER
   ASSERT (strcmp (strerrorname_np (EBADVER), "EBADVER") == 0);
   #endif
-  /* IRIX */
-  #if defined EBDHDL
-  ASSERT (strcmp (strerrorname_np (EBDHDL), "EBDHDL") == 0);
-  #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EBFONT
   ASSERT (strcmp (strerrorname_np (EBFONT), "EBFONT") == 0);
   #endif
-  /* IRIX */
-  #if defined EBUFSIZE
-  ASSERT (strcmp (strerrorname_np (EBUFSIZE), "EBUFSIZE") == 0);
-  #endif
   /* Minix */
   #if defined ECALLDENIED
   ASSERT (strcmp (strerrorname_np (ECALLDENIED), "ECALLDENIED") == 0);
   #endif
-  /* IRIX */
-  #if defined ECANTEXTENT
-  ASSERT (strcmp (strerrorname_np (ECANTEXTENT), "ECANTEXTENT") == 0);
-  #endif
   /* FreeBSD */
   #if defined ECAPMODE
   ASSERT (strcmp (strerrorname_np (ECAPMODE), "ECAPMODE") == 0);
@@ -393,27 +369,15 @@ main (void)
   #if defined ECASECLASH
   ASSERT (strcmp (strerrorname_np (ECASECLASH), "ECASECLASH") == 0);
   #endif
-  /* IRIX */
-  #if defined ECELLDOWN
-  ASSERT (strcmp (strerrorname_np (ECELLDOWN), "ECELLDOWN") == 0);
-  #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined ECHRNG
   ASSERT (strcmp (strerrorname_np (ECHRNG), "ECHRNG") == 0);
   #endif
-  /* IRIX */
-  #if defined ECKPT
-  ASSERT (strcmp (strerrorname_np (ECKPT), "ECKPT") == 0);
-  #endif
   /* Solaris */
   #if defined ECKSUM
   ASSERT (strcmp (strerrorname_np (ECKSUM), "ECKSUM") == 0);
   #endif
-  /* IRIX */
-  #if defined ECLOCKCPU
-  ASSERT (strcmp (strerrorname_np (ECLOCKCPU), "ECLOCKCPU") == 0);
-  #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ECOMM
   ASSERT (strcmp (strerrorname_np (ECOMM), "ECOMM") == 0);
   #endif
@@ -421,10 +385,6 @@ main (void)
   #if defined ECONFIG
   ASSERT (strcmp (strerrorname_np (ECONFIG), "ECONFIG") == 0);
   #endif
-  /* IRIX */
-  #if defined ECONTROLLER
-  ASSERT (strcmp (strerrorname_np (ECONTROLLER), "ECONTROLLER") == 0);
-  #endif
   /* AIX */
   #if defined ECORRUPT
   ASSERT (strcmp (strerrorname_np (ECORRUPT), "ECORRUPT") == 0);
@@ -437,7 +397,7 @@ main (void)
   #if defined EDEADEPT
   ASSERT (strcmp (strerrorname_np (EDEADEPT), "EDEADEPT") == 0);
   #endif
-  /* IRIX, Solaris, Cygwin */
+  /* Solaris, Cygwin */
   #if defined EDEADLOCK && EDEADLOCK != EDEADLK
   ASSERT (strcmp (strerrorname_np (EDEADLOCK), "EDEADLOCK") == 0);
   #endif
@@ -445,14 +405,6 @@ main (void)
   #if defined EDEADSRCDST
   ASSERT (strcmp (strerrorname_np (EDEADSRCDST), "EDEADSRCDST") == 0);
   #endif
-  /* IRIX */
-  #if defined EDELAY
-  ASSERT (strcmp (strerrorname_np (EDELAY), "EDELAY") == 0);
-  #endif
-  /* IRIX */
-  #if defined EDESTROYED
-  ASSERT (strcmp (strerrorname_np (EDESTROYED), "EDESTROYED") == 0);
-  #endif
   /* Mac OS X */
   #if defined EDEVERR
   ASSERT (strcmp (strerrorname_np (EDEVERR), "EDEVERR") == 0);
@@ -461,18 +413,10 @@ main (void)
   #if defined EDIED
   ASSERT (strcmp (strerrorname_np (EDIED), "EDIED") == 0);
   #endif
-  /* IRIX */
-  #if defined EDIRCORRUPTED && EDIRCORRUPTED != EFSCORRUPTED
-  ASSERT (strcmp (strerrorname_np (EDIRCORRUPTED), "EDIRCORRUPTED") == 0);
-  #endif
   /* FreeBSD */
   #if defined EDIRIOCTL
   ASSERT (strcmp (strerrorname_np (EDIRIOCTL), "EDIRIOCTL") == 0);
   #endif
-  /* IRIX */
-  #if defined EDISJOINT
-  ASSERT (strcmp (strerrorname_np (EDISJOINT), "EDISJOINT") == 0);
-  #endif
   /* AIX */
   #if defined EDIST
   ASSERT (strcmp (strerrorname_np (EDIST), "EDIST") == 0);
@@ -529,18 +473,6 @@ main (void)
   #if defined ED_WOULD_BLOCK
   ASSERT (strcmp (strerrorname_np (ED_WOULD_BLOCK), "ED_WOULD_BLOCK") == 0);
   #endif
-  /* IRIX */
-  #if defined EEMPTY
-  ASSERT (strcmp (strerrorname_np (EEMPTY), "EEMPTY") == 0);
-  #endif
-  /* IRIX */
-  #if defined EENDOFMINOR
-  ASSERT (strcmp (strerrorname_np (EENDOFMINOR), "EENDOFMINOR") == 0);
-  #endif
-  /* IRIX */
-  #if defined EENQUEUED
-  ASSERT (strcmp (strerrorname_np (EENQUEUED), "EENQUEUED") == 0);
-  #endif
   /* AIX */
   #if defined EFORMAT
   ASSERT (strcmp (strerrorname_np (EFORMAT), "EFORMAT") == 0);
@@ -553,10 +485,6 @@ main (void)
   #if defined EFRAGS
   ASSERT (strcmp (strerrorname_np (EFRAGS), "EFRAGS") == 0);
   #endif
-  /* IRIX */
-  #if defined EFSCORRUPTED
-  ASSERT (strcmp (strerrorname_np (EFSCORRUPTED), "EFSCORRUPTED") == 0);
-  #endif
   /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, Cygwin */
   #if defined EFTYPE
   ASSERT (strcmp (strerrorname_np (EFTYPE), "EFTYPE") == 0);
@@ -573,11 +501,7 @@ main (void)
   #if defined EGREGIOUS
   ASSERT (strcmp (strerrorname_np (EGREGIOUS), "EGREGIOUS") == 0);
   #endif
-  /* IRIX */
-  #if defined EGROUPLOOP
-  ASSERT (strcmp (strerrorname_np (EGROUPLOOP), "EGROUPLOOP") == 0);
-  #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined EHOSTDOWN
   ASSERT (strcmp (strerrorname_np (EHOSTDOWN), "EHOSTDOWN") == 0);
   #endif
@@ -589,38 +513,14 @@ main (void)
   #if defined EIEIO
   ASSERT (strcmp (strerrorname_np (EIEIO), "EIEIO") == 0);
   #endif
-  /* IRIX */
-  #if defined EINIT
-  ASSERT (strcmp (strerrorname_np (EINIT), "EINIT") == 0);
-  #endif
-  /* IRIX */
-  #if defined EINVALMODE
-  ASSERT (strcmp (strerrorname_np (EINVALMODE), "EINVALMODE") == 0);
-  #endif
-  /* IRIX */
-  #if defined EINVALSTATE
-  ASSERT (strcmp (strerrorname_np (EINVALSTATE), "EINVALSTATE") == 0);
-  #endif
-  /* IRIX */
-  #if defined EINVALTIME
-  ASSERT (strcmp (strerrorname_np (EINVALTIME), "EINVALTIME") == 0);
-  #endif
-  /* IRIX */
-  #if defined EIORESID
-  ASSERT (strcmp (strerrorname_np (EIORESID), "EIORESID") == 0);
-  #endif
   /* OpenBSD */
   #if defined EIPSEC
   ASSERT (strcmp (strerrorname_np (EIPSEC), "EIPSEC") == 0);
   #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined EISNAM
   ASSERT (strcmp (strerrorname_np (EISNAM), "EISNAM") == 0);
   #endif
-  /* IRIX */
-  #if defined EJOINED
-  ASSERT (strcmp (strerrorname_np (EJOINED), "EJOINED") == 0);
-  #endif
   /* FreeBSD */
   #if defined EJUSTRETURN
   ASSERT (strcmp (strerrorname_np (EJUSTRETURN), "EJUSTRETURN") == 0);
@@ -741,19 +641,19 @@ main (void)
   #if defined EKEYREVOKED
   ASSERT (strcmp (strerrorname_np (EKEYREVOKED), "EKEYREVOKED") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL2HLT
   ASSERT (strcmp (strerrorname_np (EL2HLT), "EL2HLT") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL2NSYNC
   ASSERT (strcmp (strerrorname_np (EL2NSYNC), "EL2NSYNC") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL3HLT
   ASSERT (strcmp (strerrorname_np (EL3HLT), "EL3HLT") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EL3RST
   ASSERT (strcmp (strerrorname_np (EL3RST), "EL3RST") == 0);
   #endif
@@ -765,27 +665,27 @@ main (void)
   #if defined ELBIN
   ASSERT (strcmp (strerrorname_np (ELBIN), "ELBIN") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBACC
   ASSERT (strcmp (strerrorname_np (ELIBACC), "ELIBACC") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBBAD
   ASSERT (strcmp (strerrorname_np (ELIBBAD), "ELIBBAD") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBEXEC
   ASSERT (strcmp (strerrorname_np (ELIBEXEC), "ELIBEXEC") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBMAX
   ASSERT (strcmp (strerrorname_np (ELIBMAX), "ELIBMAX") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ELIBSCN
   ASSERT (strcmp (strerrorname_np (ELIBSCN), "ELIBSCN") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined ELNRNG
   ASSERT (strcmp (strerrorname_np (ELNRNG), "ELNRNG") == 0);
   #endif
@@ -797,10 +697,6 @@ main (void)
   #if defined ELOCKUNMAPPED
   ASSERT (strcmp (strerrorname_np (ELOCKUNMAPPED), "ELOCKUNMAPPED") == 0);
   #endif
-  /* IRIX */
-  #if defined ELOGINLIM
-  ASSERT (strcmp (strerrorname_np (ELOGINLIM), "ELOGINLIM") == 0);
-  #endif
   /* GNU/Hurd */
   #if defined EMACH_RCV_BODY_ERROR
   ASSERT (strcmp (strerrorname_np (EMACH_RCV_BODY_ERROR), "EMACH_RCV_BODY_ERROR") == 0);
@@ -921,18 +817,6 @@ main (void)
   #if defined EMEDIUMTYPE
   ASSERT (strcmp (strerrorname_np (EMEDIUMTYPE), "EMEDIUMTYPE") == 0);
   #endif
-  /* IRIX */
-  #if defined EMEMRETRY
-  ASSERT (strcmp (strerrorname_np (EMEMRETRY), "EMEMRETRY") == 0);
-  #endif
-  /* IRIX */
-  #if defined EMIGRATED
-  ASSERT (strcmp (strerrorname_np (EMIGRATED), "EMIGRATED") == 0);
-  #endif
-  /* IRIX */
-  #if defined EMIGRATING
-  ASSERT (strcmp (strerrorname_np (EMIGRATING), "EMIGRATING") == 0);
-  #endif
   /* GNU/Hurd */
   #if defined EMIG_ARRAY_TOO_LARGE
   ASSERT (strcmp (strerrorname_np (EMIG_ARRAY_TOO_LARGE), "EMIG_ARRAY_TOO_LARGE") == 0);
@@ -973,11 +857,7 @@ main (void)
   #if defined EMIG_TYPE_ERROR
   ASSERT (strcmp (strerrorname_np (EMIG_TYPE_ERROR), "EMIG_TYPE_ERROR") == 0);
   #endif
-  /* IRIX */
-  #if defined EMUSTRUN
-  ASSERT (strcmp (strerrorname_np (EMUSTRUN), "EMUSTRUN") == 0);
-  #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined ENAVAIL
   ASSERT (strcmp (strerrorname_np (ENAVAIL), "ENAVAIL") == 0);
   #endif
@@ -985,30 +865,18 @@ main (void)
   #if defined ENEEDAUTH
   ASSERT (strcmp (strerrorname_np (ENEEDAUTH), "ENEEDAUTH") == 0);
   #endif
-  /* IRIX */
-  #if defined ENFSREMOTE
-  ASSERT (strcmp (strerrorname_np (ENFSREMOTE), "ENFSREMOTE") == 0);
-  #endif
   /* Cygwin */
   #if defined ENMFILE
   ASSERT (strcmp (strerrorname_np (ENMFILE), "ENMFILE") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ENOANO && ENOANO != ENOKEY
   ASSERT (strcmp (strerrorname_np (ENOANO), "ENOANO") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOATTACH
-  ASSERT (strcmp (strerrorname_np (ENOATTACH), "ENOATTACH") == 0);
-  #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, Minix */
   #if defined ENOATTR
   ASSERT (strcmp (strerrorname_np (ENOATTR), "ENOATTR") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOBWD
-  ASSERT (strcmp (strerrorname_np (ENOBWD), "ENOBWD") == 0);
-  #endif
   /* MirBSD */
   #if defined ENOCOFFEE
   ASSERT (strcmp (strerrorname_np (ENOCOFFEE), "ENOCOFFEE") == 0);
@@ -1021,18 +889,10 @@ main (void)
   #if defined ENOCONNECT
   ASSERT (strcmp (strerrorname_np (ENOCONNECT), "ENOCONNECT") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined ENOCSI
   ASSERT (strcmp (strerrorname_np (ENOCSI), "ENOCSI") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOEXIST
-  ASSERT (strcmp (strerrorname_np (ENOEXIST), "ENOEXIST") == 0);
-  #endif
-  /* IRIX */
-  #if defined ENOINTRGROUP
-  ASSERT (strcmp (strerrorname_np (ENOINTRGROUP), "ENOINTRGROUP") == 0);
-  #endif
   /* FreeBSD */
   #if defined ENOIOCTL
   ASSERT (strcmp (strerrorname_np (ENOIOCTL), "ENOIOCTL") == 0);
@@ -1041,18 +901,10 @@ main (void)
   #if defined ENOKEY
   ASSERT (strcmp (strerrorname_np (ENOKEY), "ENOKEY") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOLIMFILE
-  ASSERT (strcmp (strerrorname_np (ENOLIMFILE), "ENOLIMFILE") == 0);
-  #endif
   /* HP-UX */
   #if defined ENOLOAD
   ASSERT (strcmp (strerrorname_np (ENOLOAD), "ENOLOAD") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOLOGIN
-  ASSERT (strcmp (strerrorname_np (ENOLOGIN), "ENOLOGIN") == 0);
-  #endif
   /* HP-UX */
   #if defined ENOMATCH
   ASSERT (strcmp (strerrorname_np (ENOMATCH), "ENOMATCH") == 0);
@@ -1061,15 +913,11 @@ main (void)
   #if defined ENOMEDIUM
   ASSERT (strcmp (strerrorname_np (ENOMEDIUM), "ENOMEDIUM") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOMESSAGE
-  ASSERT (strcmp (strerrorname_np (ENOMESSAGE), "ENOMESSAGE") == 0);
-  #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ENONET
   ASSERT (strcmp (strerrorname_np (ENONET), "ENONET") == 0);
   #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ENOPKG
   ASSERT (strcmp (strerrorname_np (ENOPKG), "ENOPKG") == 0);
   #endif
@@ -1077,18 +925,10 @@ main (void)
   #if defined ENOPOLICY
   ASSERT (strcmp (strerrorname_np (ENOPOLICY), "ENOPOLICY") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOPROC
-  ASSERT (strcmp (strerrorname_np (ENOPROC), "ENOPROC") == 0);
-  #endif
   /* HP-UX */
   #if defined ENOREG
   ASSERT (strcmp (strerrorname_np (ENOREG), "ENOREG") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOSERVICE
-  ASSERT (strcmp (strerrorname_np (ENOSERVICE), "ENOSERVICE") == 0);
-  #endif
   /* Cygwin */
   #if defined ENOSHARE
   ASSERT (strcmp (strerrorname_np (ENOSHARE), "ENOSHARE") == 0);
@@ -1101,7 +941,7 @@ main (void)
   #if defined ENOTACTIVE
   ASSERT (strcmp (strerrorname_np (ENOTACTIVE), "ENOTACTIVE") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined ENOTBLK
   ASSERT (strcmp (strerrorname_np (ENOTBLK), "ENOTBLK") == 0);
   #endif
@@ -1109,19 +949,7 @@ main (void)
   #if defined ENOTCAPABLE
   ASSERT (strcmp (strerrorname_np (ENOTCAPABLE), "ENOTCAPABLE") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOTCONTROLLER
-  ASSERT (strcmp (strerrorname_np (ENOTCONTROLLER), "ENOTCONTROLLER") == 0);
-  #endif
-  /* IRIX */
-  #if defined ENOTENQUEUED
-  ASSERT (strcmp (strerrorname_np (ENOTENQUEUED), "ENOTENQUEUED") == 0);
-  #endif
-  /* IRIX */
-  #if defined ENOTJOINED
-  ASSERT (strcmp (strerrorname_np (ENOTJOINED), "ENOTJOINED") == 0);
-  #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined ENOTNAM
   ASSERT (strcmp (strerrorname_np (ENOTNAM), "ENOTNAM") == 0);
   #endif
@@ -1133,11 +961,7 @@ main (void)
   #if defined ENOTRUST
   ASSERT (strcmp (strerrorname_np (ENOTRUST), "ENOTRUST") == 0);
   #endif
-  /* IRIX */
-  #if defined ENOTSTOPPED
-  ASSERT (strcmp (strerrorname_np (ENOTSTOPPED), "ENOTSTOPPED") == 0);
-  #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ENOTUNIQ
   ASSERT (strcmp (strerrorname_np (ENOTUNIQ), "ENOTUNIQ") == 0);
   #endif
@@ -1161,11 +985,11 @@ main (void)
   #if defined EPACKSIZE
   ASSERT (strcmp (strerrorname_np (EPACKSIZE), "EPACKSIZE") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined EPFNOSUPPORT
   ASSERT (strcmp (strerrorname_np (EPFNOSUPPORT), "EPFNOSUPPORT") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Minix, Cygwin */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, Minix, Cygwin */
   #if defined EPROCLIM
   ASSERT (strcmp (strerrorname_np (EPROCLIM), "EPROCLIM") == 0);
   #endif
@@ -1197,19 +1021,15 @@ main (void)
   #if defined ERELOOKUP
   ASSERT (strcmp (strerrorname_np (ERELOOKUP), "ERELOOKUP") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EREMCHG
   ASSERT (strcmp (strerrorname_np (EREMCHG), "EREMCHG") == 0);
   #endif
-  /* IRIX */
-  #if defined EREMDEV
-  ASSERT (strcmp (strerrorname_np (EREMDEV), "EREMDEV") == 0);
-  #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined EREMOTE
   ASSERT (strcmp (strerrorname_np (EREMOTE), "EREMOTE") == 0);
   #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined EREMOTEIO
   ASSERT (strcmp (strerrorname_np (EREMOTEIO), "EREMOTEIO") == 0);
   #endif
@@ -1217,7 +1037,7 @@ main (void)
   #if defined EREMOTERELEASE
   ASSERT (strcmp (strerrorname_np (EREMOTERELEASE), "EREMOTERELEASE") == 0);
   #endif
-  /* Linux, FreeBSD, AIX, IRIX, Solaris, Minix */
+  /* Linux, FreeBSD, AIX, Solaris, Minix */
   #if defined ERESTART
   ASSERT (strcmp (strerrorname_np (ERESTART), "ERESTART") == 0);
   #endif
@@ -1237,7 +1057,7 @@ main (void)
   #if defined ESHLIBVERS
   ASSERT (strcmp (strerrorname_np (ESHLIBVERS), "ESHLIBVERS") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Haiku, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Haiku, Cygwin */
   #if defined ESHUTDOWN
   ASSERT (strcmp (strerrorname_np (ESHUTDOWN), "ESHUTDOWN") == 0);
   #endif
@@ -1245,7 +1065,7 @@ main (void)
   #if defined ESIGPARM
   ASSERT (strcmp (strerrorname_np (ESIGPARM), "ESIGPARM") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined ESOCKTNOSUPPORT
   ASSERT (strcmp (strerrorname_np (ESOCKTNOSUPPORT), "ESOCKTNOSUPPORT") == 0);
   #endif
@@ -1253,11 +1073,11 @@ main (void)
   #if defined ESOFT
   ASSERT (strcmp (strerrorname_np (ESOFT), "ESOFT") == 0);
   #endif
-  /* Linux, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, HP-UX, Solaris, Cygwin */
   #if defined ESRMNT
   ASSERT (strcmp (strerrorname_np (ESRMNT), "ESRMNT") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined ESTRPIPE
   ASSERT (strcmp (strerrorname_np (ESTRPIPE), "ESTRPIPE") == 0);
   #endif
@@ -1265,7 +1085,7 @@ main (void)
   #if defined ESYSERROR
   ASSERT (strcmp (strerrorname_np (ESYSERROR), "ESYSERROR") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined ETOOMANYREFS
   ASSERT (strcmp (strerrorname_np (ETOOMANYREFS), "ETOOMANYREFS") == 0);
   #endif
@@ -1273,11 +1093,11 @@ main (void)
   #if defined ETRAPDENIED
   ASSERT (strcmp (strerrorname_np (ETRAPDENIED), "ETRAPDENIED") == 0);
   #endif
-  /* Linux, IRIX */
+  /* Linux */
   #if defined EUCLEAN
   ASSERT (strcmp (strerrorname_np (EUCLEAN), "EUCLEAN") == 0);
   #endif
-  /* Linux, AIX, HP-UX, IRIX, Solaris, Cygwin */
+  /* Linux, AIX, HP-UX, Solaris, Cygwin */
   #if defined EUNATCH
   ASSERT (strcmp (strerrorname_np (EUNATCH), "EUNATCH") == 0);
   #endif
@@ -1285,19 +1105,15 @@ main (void)
   #if defined EURG
   ASSERT (strcmp (strerrorname_np (EURG), "EURG") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, IRIX, Solaris, Minix, Cygwin */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, Minix, Cygwin */
   #if defined EUSERS
   ASSERT (strcmp (strerrorname_np (EUSERS), "EUSERS") == 0);
   #endif
-  /* IRIX */
-  #if defined EWRONGFS
-  ASSERT (strcmp (strerrorname_np (EWRONGFS), "EWRONGFS") == 0);
-  #endif
   /* AIX */
   #if defined EWRPROTECT
   ASSERT (strcmp (strerrorname_np (EWRPROTECT), "EWRPROTECT") == 0);
   #endif
-  /* Linux, IRIX, Solaris, Cygwin */
+  /* Linux, Solaris, Cygwin */
   #if defined EXFULL
   ASSERT (strcmp (strerrorname_np (EXFULL), "EXFULL") == 0);
   #endif