From: Bruno Haible Date: Wed, 10 Sep 2025 21:15:59 +0000 (+0200) Subject: sigabbrev_np, sigdescr_np: Remove support for IRIX. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4140da0c85c8e149e0aa4f3b733a17c1e65aae7a;p=thirdparty%2Fgnulib.git sigabbrev_np, sigdescr_np: Remove support for IRIX. * lib/sigabbrev_np.c (sigabbrev_np): Remove cases for SIGCKPT, SIGPTINTR, SIGPTRESCHED, SIGRESTART, SIGUME. * lib/sigdescr_np.c (sigdescr_np): Likewise. --- diff --git a/ChangeLog b/ChangeLog index cf022d2d37..422901735b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2025-09-10 Bruno Haible + sigabbrev_np, sigdescr_np: Remove support for IRIX. + * lib/sigabbrev_np.c (sigabbrev_np): Remove cases for SIGCKPT, + SIGPTINTR, SIGPTRESCHED, SIGRESTART, SIGUME. + * lib/sigdescr_np.c (sigdescr_np): Likewise. + setlocale-null: Remove support for IRIX. * m4/setlocale_null.m4 (gl_FUNC_SETLOCALE_NULL): Remove code for IRIX. diff --git a/lib/sigabbrev_np.c b/lib/sigabbrev_np.c index ef71e583b0..8e12a836fe 100644 --- a/lib/sigabbrev_np.c +++ b/lib/sigabbrev_np.c @@ -110,11 +110,7 @@ sigabbrev_np (int sig) #if defined SIGBREAK case SIGBREAK: return "BREAK"; #endif - /* IRIX */ - #if defined SIGCKPT - case SIGCKPT: return "CKPT"; - #endif - /* Linux, IRIX, Cygwin */ + /* Linux, Cygwin */ #if defined SIGCLD && SIGCLD != SIGCHLD case SIGCLD: return "CLD"; #endif @@ -126,7 +122,7 @@ sigabbrev_np (int sig) #if defined SIGDANGER case SIGDANGER: return "DANGER"; #endif - /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, mingw */ + /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, mingw */ #if defined SIGEMT case SIGEMT: return "EMT"; #endif @@ -134,11 +130,11 @@ sigabbrev_np (int sig) #if defined SIGINFO && SIGINFO != SIGPWR case SIGINFO: return "INFO"; #endif - /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin */ + /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin */ #if defined SIGIO && SIGIO != SIGPOLL case SIGIO: return "IO"; #endif - /* Linux, IRIX, Cygwin, mingw */ + /* Linux, Cygwin, mingw */ #if defined SIGIOT && SIGIOT != SIGABRT case SIGIOT: return "IOT"; #endif @@ -186,15 +182,7 @@ sigabbrev_np (int sig) #if defined SIGPRE case SIGPRE: return "PRE"; #endif - /* IRIX */ - #if defined SIGPTINTR - case SIGPTINTR: return "PTINTR"; - #endif - /* IRIX */ - #if defined SIGPTRESCHED - case SIGPTRESCHED:return "PTRESCHED"; - #endif - /* Linux, NetBSD, Minix, AIX, IRIX, Cygwin */ + /* Linux, NetBSD, Minix, AIX, Cygwin */ #if defined SIGPWR case SIGPWR: return "PWR"; #endif @@ -206,10 +194,6 @@ sigabbrev_np (int sig) #if defined SIGRECOVERY case SIGRECOVERY: return "RECOVERY"; #endif - /* IRIX */ - #if defined SIGRESTART - case SIGRESTART: return "RESTART"; - #endif /* AIX */ #if defined SIGRETRACT case SIGRETRACT: return "RETRACT"; @@ -242,10 +226,6 @@ sigabbrev_np (int sig) #if defined SIGTHR case SIGTHR: return "THR"; #endif - /* IRIX */ - #if defined SIGUME - case SIGUME: return "UME"; - #endif /* AIX */ #if defined SIGVIRT case SIGVIRT: return "VIRT"; @@ -254,7 +234,7 @@ sigabbrev_np (int sig) #if defined SIGWAITING case SIGWAITING: return "WAITING"; #endif - /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, Haiku */ + /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, Haiku */ #if defined SIGWINCH case SIGWINCH: return "WINCH"; #endif diff --git a/lib/sigdescr_np.c b/lib/sigdescr_np.c index 46c746ae07..6715269e05 100644 --- a/lib/sigdescr_np.c +++ b/lib/sigdescr_np.c @@ -26,7 +26,7 @@ const char * sigdescr_np (int sig) { - /* Note: Some platforms (glibc, FreeBSD, NetBSD, OpenBSD, AIX, IRIX, Haiku, + /* Note: Some platforms (glibc, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Android) have an array 'sys_siglist'. (On AIX, you need to declare it yourself, and it has fewer than NSIG elements.) Its contents varies depending on the OS. @@ -160,12 +160,7 @@ sigdescr_np (int sig) case SIGBREAK: return "Ctrl-Break"; #endif - /* IRIX */ - #if defined SIGCKPT - case SIGCKPT: - return "Checkpoint"; /* See man 1 cpr, man 3C atcheckpoint */ - #endif - /* Linux, IRIX, Cygwin */ + /* Linux, Cygwin */ #if defined SIGCLD && SIGCLD != SIGCHLD case SIGCLD: return "Child stopped or exited"; @@ -182,7 +177,7 @@ sigdescr_np (int sig) /* AIX: "Paging space low". */ return "Swap space nearly exhausted"; #endif - /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, mingw */ + /* Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, mingw */ #if defined SIGEMT case SIGEMT: /* glibc/Hurd, *BSD: "EMT trap". Solaris: "Emulation trap". */ @@ -193,12 +188,12 @@ sigdescr_np (int sig) case SIGINFO: return "Information request"; #endif - /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin */ + /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin */ #if defined SIGIO && SIGIO != SIGPOLL case SIGIO: return "I/O possible"; #endif - /* Linux, IRIX, Cygwin, mingw */ + /* Linux, Cygwin, mingw */ #if defined SIGIOT && SIGIOT != SIGABRT case SIGIOT: return "IOT instruction"; /* a PDP-11 instruction */ @@ -267,17 +262,7 @@ sigdescr_np (int sig) case SIGPRE: return "Programmed exception"; #endif - /* IRIX */ - #if defined SIGPTINTR - case SIGPTINTR: - return "Pthread interrupt"; - #endif - /* IRIX */ - #if defined SIGPTRESCHED - case SIGPTRESCHED: - return "Pthread rescheduling"; - #endif - /* Linux, NetBSD, Minix, AIX, IRIX, Cygwin */ + /* Linux, NetBSD, Minix, AIX, Cygwin */ #if defined SIGPWR case SIGPWR: /* glibc: "Power failure". NetBSD: "Power fail/restart". */ @@ -293,11 +278,6 @@ sigdescr_np (int sig) case SIGRECOVERY: return "Kernel recovery"; #endif - /* IRIX */ - #if defined SIGRESTART - case SIGRESTART: - return "Checkpoint restart"; /* See man 1 cpr, man 3C atrestart */ - #endif /* AIX */ #if defined SIGRETRACT case SIGRETRACT: @@ -347,11 +327,6 @@ sigdescr_np (int sig) /* OpenBSD: "Thread AST". */ return "Thread library interrupt"; #endif - /* IRIX */ - #if defined SIGUME - case SIGUME: - return "Uncorrectable memory error"; - #endif /* AIX */ #if defined SIGVIRT case SIGVIRT: @@ -363,7 +338,7 @@ sigdescr_np (int sig) /* AIX: "No runnable lwp". */ return "Thread waiting"; #endif - /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, IRIX, Cygwin, Haiku */ + /* Linux, Mac OS X, FreeBSD, NetBSD, OpenBSD, Minix, AIX, Cygwin, Haiku */ #if defined SIGWINCH case SIGWINCH: /* glibc: "Window changed". *BSD: "Window size changed" or "Window size changes". */