From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Sep 2025 21:19:32 +0000 (+0200)
Subject: tests: Remove support for IRIX.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ecbad17ca4c398f6491be71280c3fdcc6aa508f;p=thirdparty%2Fgnulib.git

tests: Remove support for IRIX.

* tests/minus-zero.h (compute_minus_zerof, compute_minus_zerod,
compute_minus_zerol): Remove code for IRIX.
* tests/test-c32isgraph.c (main): Likewise.
* tests/test-c32isprint.c (main): Likewise.
* tests/test-getaddrinfo.c (simple): Likewise.
* tests/test-isgraph_l.c (main): Likewise.
* tests/test-isprint_l.c (main): Likewise.
* tests/test-localeconv-mt.c (ENCODING): Likewise.
* tests/test-nl_langinfo-mt.c (ENCODING): Likewise.
* tests/test-setlocale_null-mt-all.c (ENCODING): Likewise.
* tests/test-setlocale_null-mt-one.c (ENCODING): Likewise.
* tests/test-sethostname1.c: Likewise.
* tests/test-striconveha.c (main): Likewise.
* tests/uniconv/test-u8-conv-from-enc.c (main): Likewise.
* tests/uniconv/test-u8-strconv-from-enc.c (main): Likewise.
* tests/uniconv/test-u16-conv-from-enc.c (main): Likewise.
* tests/uniconv/test-u16-strconv-from-enc.c (main): Likewise.
* tests/uniconv/test-u32-conv-from-enc.c (main): Likewise.
* tests/uniconv/test-u32-strconv-from-enc.c (main): Likewise.
* tests/test-frexpl.c (MIN_NORMAL_EXP): Likewise.
* tests/test-ilogbl.c (MIN_NORMAL_EXP): Likewise.
* tests/test-logbl.c (MIN_NORMAL_EXP): Likewise.
* tests/test-printf-frexpl.c (MIN_NORMAL_EXP, MIN_SUBNORMAL_EXP):
Likewise.
* tests/test-fma2.h (MIN_SUBNORMAL_EXP): Remove macro.
(test_function): Inline its value.
* tests/test-lseek.c (main): Update comments.
* tests/test-sigabbrev_np.c (main): Remove cases for SIGCKPT, SIGPTINTR,
SIGPTRESCHED, SIGRESTART, SIGUME.
* tests/test-sigdescr_np.c (main): Likewise.
* modules/math-h-c++-tests (Makefile.am): Don't link test-math-h-c++
with extra libraries.
---

diff --git a/ChangeLog b/ChangeLog
index 989527fd2e..755c0293a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,39 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+	tests: Remove support for IRIX.
+	* tests/minus-zero.h (compute_minus_zerof, compute_minus_zerod,
+	compute_minus_zerol): Remove code for IRIX.
+	* tests/test-c32isgraph.c (main): Likewise.
+	* tests/test-c32isprint.c (main): Likewise.
+	* tests/test-getaddrinfo.c (simple): Likewise.
+	* tests/test-isgraph_l.c (main): Likewise.
+	* tests/test-isprint_l.c (main): Likewise.
+	* tests/test-localeconv-mt.c (ENCODING): Likewise.
+	* tests/test-nl_langinfo-mt.c (ENCODING): Likewise.
+	* tests/test-setlocale_null-mt-all.c (ENCODING): Likewise.
+	* tests/test-setlocale_null-mt-one.c (ENCODING): Likewise.
+	* tests/test-sethostname1.c: Likewise.
+	* tests/test-striconveha.c (main): Likewise.
+	* tests/uniconv/test-u8-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u8-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u16-strconv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-conv-from-enc.c (main): Likewise.
+	* tests/uniconv/test-u32-strconv-from-enc.c (main): Likewise.
+	* tests/test-frexpl.c (MIN_NORMAL_EXP): Likewise.
+	* tests/test-ilogbl.c (MIN_NORMAL_EXP): Likewise.
+	* tests/test-logbl.c (MIN_NORMAL_EXP): Likewise.
+	* tests/test-printf-frexpl.c (MIN_NORMAL_EXP, MIN_SUBNORMAL_EXP):
+	Likewise.
+	* tests/test-fma2.h (MIN_SUBNORMAL_EXP): Remove macro.
+	(test_function): Inline its value.
+	* tests/test-lseek.c (main): Update comments.
+	* tests/test-sigabbrev_np.c (main): Remove cases for SIGCKPT, SIGPTINTR,
+	SIGPTRESCHED, SIGRESTART, SIGUME.
+	* tests/test-sigdescr_np.c (main): Likewise.
+	* modules/math-h-c++-tests (Makefile.am): Don't link test-math-h-c++
+	with extra libraries.
+
 	relocatable-prog: Remove support for IRIX.
 	* build-aux/config.libpath: Remove code for IRIX.
 
diff --git a/modules/math-h-c++-tests b/modules/math-h-c++-tests
index e955e2c9fb..6ea533b0d4 100644
--- a/modules/math-h-c++-tests
+++ b/modules/math-h-c++-tests
@@ -16,6 +16,4 @@ if ANSICXX
 TESTS += test-math-h-c++
 check_PROGRAMS += test-math-h-c++
 test_math_h_c___SOURCES = test-math-h-c++.cc test-math-h-c++2.cc
-# These link dependencies are needed on IRIX 6.5 with cc.
-test_math_h_c___LDADD = $(LDADD) $(COPYSIGNL_LIBM) $(RINT_LIBM) $(RINTL_LIBM)
 endif
diff --git a/tests/minus-zero.h b/tests/minus-zero.h
index f7bef0d339..6383064be3 100644
--- a/tests/minus-zero.h
+++ b/tests/minus-zero.h
@@ -25,7 +25,7 @@
    ICC 10.0 has a bug when optimizing the expression -zero.
    The expression -FLT_MIN * FLT_MIN does not work when cross-compiling
    to PowerPC on Mac OS X 10.5.  */
-#if defined __hpux || defined __sgi || defined __ICC
+#if defined __hpux || defined __ICC
 static float
 compute_minus_zerof (void)
 {
@@ -43,7 +43,7 @@ float minus_zerof = -0.0f;
    ICC 10.0 has a bug when optimizing the expression -zero.
    The expression -DBL_MIN * DBL_MIN does not work when cross-compiling
    to PowerPC on Mac OS X 10.5.  */
-#if defined __hpux || defined __sgi || defined __ICC
+#if defined __hpux || defined __ICC
 static double
 compute_minus_zerod (void)
 {
@@ -58,11 +58,10 @@ double minus_zerod = -0.0;
 /* minus_zerol represents the value -0.0L.  */
 
 /* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0L.
-   IRIX cc can't put -0.0L into .data, but can compute at runtime.
    ICC 10.0 has a bug when optimizing the expression -zero.
    The expression -LDBL_MIN * LDBL_MIN does not work when cross-compiling
    to PowerPC on Mac OS X 10.5.  */
-#if defined __hpux || defined __sgi || defined __ICC
+#if defined __hpux || defined __ICC
 static long double
 compute_minus_zerol (void)
 {
diff --git a/tests/test-c32isgraph.c b/tests/test-c32isgraph.c
index 9a11ca166c..f6f7276ff8 100644
--- a/tests/test-c32isgraph.c
+++ b/tests/test-c32isgraph.c
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
           /* U+007F <control> */
           is = for_character ("\177", 1);
           ASSERT (is == 0);
-        #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sgi || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
+        #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
           /* U+00A0 NO-BREAK SPACE */
           is = for_character ("\240", 1);
           ASSERT (is != 0);
diff --git a/tests/test-c32isprint.c b/tests/test-c32isprint.c
index 2879543bcf..b025d7cb4c 100644
--- a/tests/test-c32isprint.c
+++ b/tests/test-c32isprint.c
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
           /* U+007F <control> */
           is = for_character ("\177", 1);
           ASSERT (is == 0);
-        #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sgi || (defined _WIN32 && !defined __CYGWIN__))
+        #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || (defined _WIN32 && !defined __CYGWIN__))
           /* U+00A0 NO-BREAK SPACE */
           is = for_character ("\240", 1);
           ASSERT (is != 0);
diff --git a/tests/test-fma2.h b/tests/test-fma2.h
index d7350e3074..a2f996d925 100644
--- a/tests/test-fma2.h
+++ b/tests/test-fma2.h
@@ -26,7 +26,7 @@
 #define YE_RANGE 0
 
 /* Define to 1 if you want to allow the behaviour of the 'double-double'
-   implementation of 'long double' (seen on IRIX 6.5 and Linux/PowerPC).
+   implementation of 'long double' (seen on Linux/PowerPC).
    This floating-point type does not follow IEEE 754.  */
 #if MANT_BIT == LDBL_MANT_BIT && LDBL_MANT_BIT == 2 * DBL_MANT_BIT
 # define FORGIVE_DOUBLEDOUBLE_BUG 1
@@ -34,13 +34,6 @@
 # define FORGIVE_DOUBLEDOUBLE_BUG 0
 #endif
 
-/* Subnormal numbers appear to not work as expected on IRIX 6.5.  */
-#ifdef __sgi
-# define MIN_SUBNORMAL_EXP (MIN_EXP - 1)
-#else
-# define MIN_SUBNORMAL_EXP (MIN_EXP - MANT_BIT)
-#endif
-
 /* Check rounding behaviour.  */
 
 static void
@@ -159,7 +152,7 @@ test_function (DOUBLE (*my_fma) (DOUBLE, DOUBLE, DOUBLE))
                      (-1)^(xs+ys) * (2^(xe+ye) + 2^(xe+ye-i+1) + 2^(xe+ye-2*i)) */
 
                   /* Test addition (same signs).  */
-                  for (ze = MIN_SUBNORMAL_EXP; ze <= MAX_EXP - 1;)
+                  for (ze = MIN_EXP - MANT_BIT; ze <= MAX_EXP - 1;)
                     {
                       z = sign * POW2 (ze); /* (-1)^(xs+ys) * 2^ze */
                       result = my_fma (x, y, z);
@@ -256,7 +249,7 @@ test_function (DOUBLE (*my_fma) (DOUBLE, DOUBLE, DOUBLE))
 
                   /* Test subtraction (opposite signs).  */
                   if (i > 1)
-                    for (ze = MIN_SUBNORMAL_EXP; ze <= MAX_EXP - 1;)
+                    for (ze = MIN_EXP - MANT_BIT; ze <= MAX_EXP - 1;)
                       {
                         z = - sign * POW2 (ze); /* (-1)^(xs+ys+1) * 2^ze */
                         result = my_fma (x, y, z);
@@ -457,7 +450,7 @@ test_function (DOUBLE (*my_fma) (DOUBLE, DOUBLE, DOUBLE))
 
                   /* Test subtraction (opposite signs).  */
                   if (i > 1)
-                    for (ze = MIN_SUBNORMAL_EXP; ze <= MAX_EXP - 1;)
+                    for (ze = MIN_EXP - MANT_BIT; ze <= MAX_EXP - 1;)
                       {
                         z = - sign * POW2 (ze); /* (-1)^(xs+ys+1) * 2^ze */
                         result = my_fma (x, y, z);
diff --git a/tests/test-frexpl.c b/tests/test-frexpl.c
index 5cb4e99afb..550648b623 100644
--- a/tests/test-frexpl.c
+++ b/tests/test-frexpl.c
@@ -49,14 +49,10 @@ SIGNATURE_CHECK (frexpl, long double, (long double, int *));
 #define MINUS_ZERO minus_zerol
 #define MAX_EXP LDBL_MAX_EXP
 #define MIN_EXP LDBL_MIN_EXP
-/* On MIPS IRIX machines, LDBL_MIN_EXP is -1021, but the smallest reliable
-   exponent for 'long double' is -964.  Similarly, on PowerPC machines,
-   LDBL_MIN_EXP is -1021, but the smallest reliable exponent for 'long double'
-   is -968.  For exponents below that, the precision may be truncated to the
-   precision used for 'double'.  */
-#ifdef __sgi
-# define MIN_NORMAL_EXP (LDBL_MIN_EXP + 57)
-#elif defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
+/* On PowerPC machines, LDBL_MIN_EXP is -1021, but the smallest reliable
+   exponent for 'long double' is -968.  For exponents below that, the precision
+   may be truncated to the precision used for 'double'.  */
+#if defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
 # define MIN_NORMAL_EXP (LDBL_MIN_EXP + 53)
 #else
 # define MIN_NORMAL_EXP LDBL_MIN_EXP
diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index de0f4b3208..62f156a02c 100644
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -120,10 +120,6 @@ simple (int pass, char const *host, char const *service)
           fprintf (stderr, "skipping getaddrinfo test: no network?\n");
           return 77;
         }
-      /* IRIX reports EAI_NONAME for "https".  Don't fail the test
-         merely because of this.  */
-      if (res == EAI_NONAME)
-        return 0;
       /* Solaris reports EAI_SERVICE for "http" and "https".  Don't
          fail the test merely because of this.  */
       if (res == EAI_SERVICE)
diff --git a/tests/test-ilogbl.c b/tests/test-ilogbl.c
index ede4ce5702..3b274fa197 100644
--- a/tests/test-ilogbl.c
+++ b/tests/test-ilogbl.c
@@ -42,14 +42,10 @@ SIGNATURE_CHECK (ilogbl, int, (long double));
 #define MINUS_ZERO minus_zerol
 #define MAX_EXP LDBL_MAX_EXP
 #define MIN_EXP LDBL_MIN_EXP
-/* On MIPS IRIX machines, LDBL_MIN_EXP is -1021, but the smallest reliable
-   exponent for 'long double' is -964.  Similarly, on PowerPC machines,
-   LDBL_MIN_EXP is -1021, but the smallest reliable exponent for 'long double'
-   is -968.  For exponents below that, the precision may be truncated to the
-   precision used for 'double'.  */
-#ifdef __sgi
-# define MIN_NORMAL_EXP (LDBL_MIN_EXP + 57)
-#elif defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
+/* On PowerPC machines, LDBL_MIN_EXP is -1021, but the smallest reliable
+   exponent for 'long double' is -968.  For exponents below that, the precision
+   may be truncated to the precision used for 'double'.  */
+#if defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
 # define MIN_NORMAL_EXP (LDBL_MIN_EXP + 53)
 #else
 # define MIN_NORMAL_EXP LDBL_MIN_EXP
diff --git a/tests/test-isgraph_l.c b/tests/test-isgraph_l.c
index 2ad0033ce2..006e412817 100644
--- a/tests/test-isgraph_l.c
+++ b/tests/test-isgraph_l.c
@@ -112,7 +112,7 @@ main ()
         /* U+007F <control> */
         is = isgraph_l ((unsigned char) '\177', locale);
         ASSERT (is == 0);
-      #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sgi || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
+      #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__ || defined __sun || defined __CYGWIN__ || (defined _WIN32 && !defined __CYGWIN__))
         /* U+00A0 NO-BREAK SPACE */
         is = isgraph_l ((unsigned char) '\240', locale);
         ASSERT (is != 0);
diff --git a/tests/test-isprint_l.c b/tests/test-isprint_l.c
index 222e5567bd..39182e83dd 100644
--- a/tests/test-isprint_l.c
+++ b/tests/test-isprint_l.c
@@ -111,7 +111,7 @@ main ()
         /* U+007F <control> */
         is = isprint_l ((unsigned char) '\177', locale);
         ASSERT (is == 0);
-      #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || defined __sgi || (defined _WIN32 && !defined __CYGWIN__))
+      #if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __DragonFly__ || (defined _WIN32 && !defined __CYGWIN__))
         /* U+00A0 NO-BREAK SPACE */
         is = isprint_l ((unsigned char) '\240', locale);
         ASSERT (is != 0);
diff --git a/tests/test-localeconv-mt.c b/tests/test-localeconv-mt.c
index a1316046c7..b6c28c2285 100644
--- a/tests/test-localeconv-mt.c
+++ b/tests/test-localeconv-mt.c
@@ -48,9 +48,7 @@
 # define ENGLISH "en_US"
 # define FRENCH  "fr_FR"
 # define GERMAN  "de_DE"
-# if defined __sgi
-#  define ENCODING ".ISO8859-15"
-# elif defined __hpux
+# if defined __hpux
 #  define ENCODING ".utf8"
 # else
 #  define ENCODING ".UTF-8"
diff --git a/tests/test-logbl.c b/tests/test-logbl.c
index 4a328a27df..74ba4f53a2 100644
--- a/tests/test-logbl.c
+++ b/tests/test-logbl.c
@@ -35,14 +35,10 @@ SIGNATURE_CHECK (logbl, long double, (long double));
 #define MINUS_ZERO minus_zerol
 #define MAX_EXP LDBL_MAX_EXP
 #define MIN_EXP LDBL_MIN_EXP
-/* On MIPS IRIX machines, LDBL_MIN_EXP is -1021, but the smallest reliable
-   exponent for 'long double' is -964.  Similarly, on PowerPC machines,
-   LDBL_MIN_EXP is -1021, but the smallest reliable exponent for 'long double'
-   is -968.  For exponents below that, the precision may be truncated to the
-   precision used for 'double'.  */
-#ifdef __sgi
-# define MIN_NORMAL_EXP (LDBL_MIN_EXP + 57)
-#elif defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
+/* On PowerPC machines, LDBL_MIN_EXP is -1021, but the smallest reliable
+   exponent for 'long double' is -968.  For exponents below that, the precision
+   may be truncated to the precision used for 'double'.  */
+#if defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
 # define MIN_NORMAL_EXP (LDBL_MIN_EXP + 53)
 #else
 # define MIN_NORMAL_EXP LDBL_MIN_EXP
diff --git a/tests/test-lseek.c b/tests/test-lseek.c
index d134d64c10..170f91a29c 100644
--- a/tests/test-lseek.c
+++ b/tests/test-lseek.c
@@ -47,7 +47,7 @@ main (int argc, char **argv)
          the current offset.  But BeOS sets it to 0.  */
       ASSERT (lseek (0, (off_t)0, SEEK_CUR) == 2);
 #endif
-#if 0 /* leads to SIGSYS on IRIX 6.5 */
+#if 0 /* unportable test */
       ASSERT (lseek (0, (off_t)0, (SEEK_SET | SEEK_CUR | SEEK_END) + 1) == -1);
       ASSERT (errno == EINVAL);
 #endif
@@ -61,7 +61,7 @@ main (int argc, char **argv)
          the current offset.  But BeOS sets it to 0.  */
       ASSERT (lseek (1, (off_t)0, SEEK_CUR) == 2);
 #endif
-#if 0 /* leads to SIGSYS on IRIX 6.5 */
+#if 0 /* unportable test */
       ASSERT (lseek (1, (off_t)0, (SEEK_SET | SEEK_CUR | SEEK_END) + 1) == -1);
       ASSERT (errno == EINVAL);
 #endif
diff --git a/tests/test-nl_langinfo-mt.c b/tests/test-nl_langinfo-mt.c
index e4eb47ae34..8095849dd0 100644
--- a/tests/test-nl_langinfo-mt.c
+++ b/tests/test-nl_langinfo-mt.c
@@ -48,9 +48,7 @@
 # define ENGLISH "en_US"
 # define FRENCH  "fr_FR"
 # define GERMAN  "de_DE"
-# if defined __sgi
-#  define ENCODING ".ISO8859-15"
-# elif defined __hpux
+# if defined __hpux
 #  define ENCODING ".utf8"
 # else
 #  define ENCODING ".UTF-8"
diff --git a/tests/test-printf-frexpl.c b/tests/test-printf-frexpl.c
index caf46b12a2..f64f16d53d 100644
--- a/tests/test-printf-frexpl.c
+++ b/tests/test-printf-frexpl.c
@@ -25,15 +25,10 @@
 #include "fpucw.h"
 #include "macros.h"
 
-/* On MIPS IRIX machines, LDBL_MIN_EXP is -1021, but the smallest reliable
-   exponent for 'long double' is -964.  Similarly, on PowerPC machines,
-   LDBL_MIN_EXP is -1021, but the smallest reliable exponent for 'long double'
-   is -968.  For exponents below that, the precision may be truncated to the
-   precision used for 'double'.  */
-#ifdef __sgi
-# define MIN_NORMAL_EXP (LDBL_MIN_EXP + 57)
-# define MIN_SUBNORMAL_EXP MIN_NORMAL_EXP
-#elif defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
+/* On PowerPC machines, LDBL_MIN_EXP is -1021, but the smallest reliable
+   exponent for 'long double' is -968.  For exponents below that, the precision
+   may be truncated to the precision used for 'double'.  */
+#if defined __ppc || defined __ppc__ || defined __powerpc || defined __powerpc__
 # define MIN_NORMAL_EXP (LDBL_MIN_EXP + 53)
 # define MIN_SUBNORMAL_EXP MIN_NORMAL_EXP
 #else
diff --git a/tests/test-sethostname1.c b/tests/test-sethostname1.c
index f6b85fc644..384f691616 100644
--- a/tests/test-sethostname1.c
+++ b/tests/test-sethostname1.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 
 #include "signature.h"
-#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __sgi || defined __sun)
+#if !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __sun)
 SIGNATURE_CHECK (sethostname, int, (const char *, size_t));
 #endif
 
diff --git a/tests/test-setlocale_null-mt-all.c b/tests/test-setlocale_null-mt-all.c
index 09528f243a..44efcba854 100644
--- a/tests/test-setlocale_null-mt-all.c
+++ b/tests/test-setlocale_null-mt-all.c
@@ -51,9 +51,7 @@
 # define ENGLISH "en_US"
 # define GERMAN  "de_DE"
 # define FRENCH  "fr_FR"
-# if defined __sgi
-#  define ENCODING ".ISO8859-15"
-# elif defined __hpux
+# if defined __hpux
 #  define ENCODING ".utf8"
 # else
 #  define ENCODING ".UTF-8"
@@ -160,7 +158,6 @@ NetBSD               crash < 2 sec
 OpenBSD              crash < 1 sec
 AIX                  crash < 2 sec
 HP-UX                OK
-IRIX                 OK
 Solaris 10           OK
 Solaris 11.0         OK
 Solaris 11.4         OK
diff --git a/tests/test-setlocale_null-mt-one.c b/tests/test-setlocale_null-mt-one.c
index 3857ad6077..e09f88e01b 100644
--- a/tests/test-setlocale_null-mt-one.c
+++ b/tests/test-setlocale_null-mt-one.c
@@ -51,9 +51,7 @@
 # define ENGLISH "en_US"
 # define GERMAN  "de_DE"
 # define FRENCH  "fr_FR"
-# if defined __sgi
-#  define ENCODING ".ISO8859-15"
-# elif defined __hpux
+# if defined __hpux
 #  define ENCODING ".utf8"
 # else
 #  define ENCODING ".UTF-8"
@@ -160,7 +158,6 @@ NetBSD               OK
 OpenBSD              crash < 1 sec
 AIX                  crash < 2 sec
 HP-UX                OK
-IRIX                 OK
 Solaris 10           OK
 Solaris 11.0         OK
 Solaris 11.4         OK
diff --git a/tests/test-sigabbrev_np.c b/tests/test-sigabbrev_np.c
index b4f7fa96de..33e8bf77f1 100644
--- a/tests/test-sigabbrev_np.c
+++ b/tests/test-sigabbrev_np.c
@@ -112,10 +112,6 @@ main (void)
   #ifdef SIGBREAK
   ASSERT (strcmp (sigabbrev_np (SIGBREAK), "BREAK") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGCKPT
-  ASSERT (strcmp (sigabbrev_np (SIGCKPT), "CKPT") == 0);
-  #endif
   /* AIX */
   #ifdef SIGCPUFAIL
   ASSERT (strcmp (sigabbrev_np (SIGCPUFAIL), "CPUFAIL") == 0);
@@ -124,7 +120,7 @@ main (void)
   #ifdef SIGDANGER
   ASSERT (strcmp (sigabbrev_np (SIGDANGER), "DANGER") == 0);
   #endif
-  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, mingw */
+  /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, mingw */
   #ifdef SIGEMT
   ASSERT (strcmp (sigabbrev_np (SIGEMT), "EMT") == 0);
   #endif
@@ -172,15 +168,7 @@ main (void)
   #ifdef SIGPRE
   ASSERT (strcmp (sigabbrev_np (SIGPRE), "PRE") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGPTINTR
-  ASSERT (strcmp (sigabbrev_np (SIGPTINTR), "PTINTR") == 0);
-  #endif
-  /* IRIX */
-  #ifdef SIGPTRESCHED
-  ASSERT (strcmp (sigabbrev_np (SIGPTRESCHED), "PTRESCHED") == 0);
-  #endif
-  /* Linux, NetBSD, Minix, AIX, IRIX, Cygwin */
+  /* Linux, NetBSD, Minix, AIX, Cygwin */
   #ifdef SIGPWR
   ASSERT (strcmp (sigabbrev_np (SIGPWR), "PWR") == 0);
   #endif
@@ -192,10 +180,6 @@ main (void)
   #ifdef SIGRECOVERY
   ASSERT (strcmp (sigabbrev_np (SIGRECOVERY), "RECOVERY") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGRESTART
-  ASSERT (strcmp (sigabbrev_np (SIGRESTART), "RESTART") == 0);
-  #endif
   /* AIX */
   #ifdef SIGRETRACT
   ASSERT (strcmp (sigabbrev_np (SIGRETRACT), "RETRACT") == 0);
@@ -228,10 +212,6 @@ main (void)
   #ifdef SIGTHR
   ASSERT (strcmp (sigabbrev_np (SIGTHR), "THR") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGUME
-  ASSERT (strcmp (sigabbrev_np (SIGUME), "UME") == 0);
-  #endif
   /* AIX */
   #ifdef SIGVIRT
   ASSERT (strcmp (sigabbrev_np (SIGVIRT), "VIRT") == 0);
@@ -240,7 +220,7 @@ main (void)
   #ifdef SIGWAITING
   ASSERT (strcmp (sigabbrev_np (SIGWAITING), "WAITING") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, Haiku */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, Haiku */
   #ifdef SIGWINCH
   ASSERT (strcmp (sigabbrev_np (SIGWINCH), "WINCH") == 0);
   #endif
diff --git a/tests/test-sigdescr_np.c b/tests/test-sigdescr_np.c
index 257ff6652c..7db09d0254 100644
--- a/tests/test-sigdescr_np.c
+++ b/tests/test-sigdescr_np.c
@@ -114,10 +114,6 @@ main (void)
   #ifdef SIGBREAK
   ASSERT (strcmp (sigdescr_np (SIGBREAK), "Ctrl-Break") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGCKPT
-  ASSERT (strcmp (sigdescr_np (SIGCKPT), "Checkpoint") == 0);
-  #endif
   /* AIX */
   #ifdef SIGCPUFAIL
   ASSERT (strcmp (sigdescr_np (SIGCPUFAIL), "CPU going down") == 0);
@@ -126,7 +122,7 @@ main (void)
   #ifdef SIGDANGER
   ASSERT (strcmp (sigdescr_np (SIGDANGER), "Swap space nearly exhausted") == 0);
   #endif
-  /* glibc, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, mingw */
+  /* glibc, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, mingw */
   #ifdef SIGEMT
   ASSERT (strcmp (sigdescr_np (SIGEMT), "Instruction emulation needed") == 0
           /* This completely unintelligible message is seen in glibc.  */
@@ -176,15 +172,7 @@ main (void)
   #ifdef SIGPRE
   ASSERT (strcmp (sigdescr_np (SIGPRE), "Programmed exception") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGPTINTR
-  ASSERT (strcmp (sigdescr_np (SIGPTINTR), "Pthread interrupt") == 0);
-  #endif
-  /* IRIX */
-  #ifdef SIGPTRESCHED
-  ASSERT (strcmp (sigdescr_np (SIGPTRESCHED), "Pthread rescheduling") == 0);
-  #endif
-  /* Linux, NetBSD, Minix, AIX, IRIX, Cygwin */
+  /* Linux, NetBSD, Minix, AIX, Cygwin */
   #ifdef SIGPWR
   ASSERT (strcmp (sigdescr_np (SIGPWR), "Power failure") == 0);
   #endif
@@ -196,10 +184,6 @@ main (void)
   #ifdef SIGRECOVERY
   ASSERT (strcmp (sigdescr_np (SIGRECOVERY), "Kernel recovery") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGRESTART
-  ASSERT (strcmp (sigdescr_np (SIGRESTART), "Checkpoint restart") == 0);
-  #endif
   /* AIX */
   #ifdef SIGRETRACT
   ASSERT (strcmp (sigdescr_np (SIGRETRACT), "Retracting Keep Alive Poll") == 0);
@@ -232,10 +216,6 @@ main (void)
   #ifdef SIGTHR
   ASSERT (strcmp (sigdescr_np (SIGTHR), "Thread library interrupt") == 0);
   #endif
-  /* IRIX */
-  #ifdef SIGUME
-  ASSERT (strcmp (sigdescr_np (SIGUME), "Uncorrectable memory error") == 0);
-  #endif
   /* AIX */
   #ifdef SIGVIRT
   ASSERT (strcmp (sigdescr_np (SIGVIRT), "Virtual time alarm clock") == 0);
@@ -244,7 +224,7 @@ main (void)
   #ifdef SIGWAITING
   ASSERT (strcmp (sigdescr_np (SIGWAITING), "Thread waiting") == 0);
   #endif
-  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, Haiku */
+  /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, Haiku */
   #ifdef SIGWINCH
   ASSERT (strcmp (sigdescr_np (SIGWINCH), "Window changed") == 0 /* glibc */
           || strcmp (sigdescr_np (SIGWINCH), "Window size changed") == 0);
diff --git a/tests/test-striconveha.c b/tests/test-striconveha.c
index d32ed7223b..803a312d96 100644
--- a/tests/test-striconveha.c
+++ b/tests/test-striconveha.c
@@ -309,7 +309,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
@@ -549,7 +549,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
diff --git a/tests/uniconv/test-u16-conv-from-enc.c b/tests/uniconv/test-u16-conv-from-enc.c
index 9a6db116be..6dffc71e8d 100644
--- a/tests/uniconv/test-u16-conv-from-enc.c
+++ b/tests/uniconv/test-u16-conv-from-enc.c
@@ -118,7 +118,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u16-strconv-from-enc.c b/tests/uniconv/test-u16-strconv-from-enc.c
index 7481f48621..93ebead6b0 100644
--- a/tests/uniconv/test-u16-strconv-from-enc.c
+++ b/tests/uniconv/test-u16-strconv-from-enc.c
@@ -72,7 +72,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u32-conv-from-enc.c b/tests/uniconv/test-u32-conv-from-enc.c
index 53c1618640..677c11fcb0 100644
--- a/tests/uniconv/test-u32-conv-from-enc.c
+++ b/tests/uniconv/test-u32-conv-from-enc.c
@@ -118,7 +118,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u32-strconv-from-enc.c b/tests/uniconv/test-u32-strconv-from-enc.c
index 7c50029d95..9d7d7349aa 100644
--- a/tests/uniconv/test-u32-strconv-from-enc.c
+++ b/tests/uniconv/test-u32-strconv-from-enc.c
@@ -72,7 +72,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-16.  */
diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c
index 53bf0cf9c9..f0bc956ecb 100644
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -113,7 +113,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */
diff --git a/tests/uniconv/test-u8-strconv-from-enc.c b/tests/uniconv/test-u8-strconv-from-enc.c
index b118bd6f0e..0211aa343a 100644
--- a/tests/uniconv/test-u8-strconv-from-enc.c
+++ b/tests/uniconv/test-u8-strconv-from-enc.c
@@ -63,7 +63,7 @@ main ()
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
 # if (defined _LIBICONV_VERSION && !(_LIBICONV_VERSION == 0x10b && defined __APPLE__)) \
-     || !(defined _AIX || defined __sgi || defined __hpux || defined __sun)
+     || !(defined _AIX || defined __hpux || defined __sun)
   if (iconv_supports_encoding ("ISO-2022-JP-2"))
     {
       /* Test conversions from autodetect_jp to UTF-8.  */