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

nproc: Remove support for IRIX.

* lib/nproc.c: Remove code for IRIX.
* m4/nproc.m4 (gl_PREREQ_NPROC): Don't test for <sys/sysmp.h> and sysmp.
---

diff --git a/ChangeLog b/ChangeLog
index 84c85f42cf..7d5ab08d27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+	nproc: Remove support for IRIX.
+	* lib/nproc.c: Remove code for IRIX.
+	* m4/nproc.m4 (gl_PREREQ_NPROC): Don't test for <sys/sysmp.h> and sysmp.
+
 	mprotect: Remove support for IRIX.
 	* m4/mprotect.m4 (gl_FUNC_MPROTECT_WORKS): Remove cross-compilation
 	guess for IRIX.
diff --git a/lib/nproc.c b/lib/nproc.c
index f0b77ab381..f63d19a646 100644
--- a/lib/nproc.c
+++ b/lib/nproc.c
@@ -44,10 +44,6 @@
 # include <sys/pstat.h>
 #endif
 
-#if HAVE_SYS_SYSMP_H
-# include <sys/sysmp.h>
-#endif
-
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
@@ -337,20 +333,6 @@ num_processors_available (enum nproc_query query)
   }
 #endif
 
-#if HAVE_SYSMP && defined MP_NAPROCS && defined MP_NPROCS
-  { /* This works on IRIX.  */
-    /* MP_NPROCS yields the number of installed processors.
-       MP_NAPROCS yields the number of processors available to unprivileged
-       processes.  */
-    int nprocs =
-      sysmp (query == NPROC_CURRENT && getuid () != 0
-             ? MP_NAPROCS
-             : MP_NPROCS);
-    if (nprocs > 0)
-      return nprocs;
-  }
-#endif
-
   /* Finally, as fallback, use the APIs that don't distinguish between
      NPROC_CURRENT and NPROC_ALL.  */
 
diff --git a/m4/nproc.m4 b/m4/nproc.m4
index 5e96afc93a..9225779585 100644
--- a/m4/nproc.m4
+++ b/m4/nproc.m4
@@ -1,5 +1,5 @@
 # nproc.m4
-# serial 6
+# serial 7
 dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@ AC_DEFUN([gl_PREREQ_NPROC],
   dnl Persuade glibc <sched.h> to declare CPU_SETSIZE, CPU_ISSET etc.
   AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-  AC_CHECK_HEADERS([mntent.h sys/pstat.h sys/sysmp.h sys/param.h],,,
+  AC_CHECK_HEADERS([mntent.h sys/pstat.h sys/param.h],,,
     [AC_INCLUDES_DEFAULT])
   dnl <sys/sysctl.h> requires <sys/param.h> on OpenBSD 4.0.
   AC_CHECK_HEADERS([sys/sysctl.h],,,
@@ -27,7 +27,7 @@ AC_DEFUN([gl_PREREQ_NPROC],
      #endif
     ])
 
-  AC_CHECK_FUNCS([sched_getaffinity_np pstat_getdynamic sysmp sysctl])
+  AC_CHECK_FUNCS([sched_getaffinity_np pstat_getdynamic sysctl])
   gl_CHECK_FUNCS_ANDROID([sched_getaffinity], [[#include <sched.h>]])
 
   dnl Test whether sched_getaffinity has the expected declaration.