intprops, stdckdint-h: Remove support for IRIX.

* lib/intprops-internal.h (_GL_INT_NEGATE_CONVERT): Remove macro.
(_GL_EXPR_SIGNED, _GL_INT_MAXIMUM): Use _GL_INT_CONVERT instead.
* lib/intprops.h (_GL_DIVIDE_OVERFLOW, _GL_REMAINDER_OVERFLOW):
Likewise.

diff --git a/ChangeLog b/ChangeLog
index 78e5e6eed98e32dadc2f01a5b47808280e973d84..bd34519c2c448bd3cee6b77f3fe4d81e756ff1e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+       intprops, stdckdint-h: Remove support for IRIX.
+       * lib/intprops-internal.h (_GL_INT_NEGATE_CONVERT): Remove macro.
+       (_GL_EXPR_SIGNED, _GL_INT_MAXIMUM): Use _GL_INT_CONVERT instead.
+       * lib/intprops.h (_GL_DIVIDE_OVERFLOW, _GL_REMAINDER_OVERFLOW):
+       Likewise.
+
        getprogname: Remove support for IRIX.
        * lib/getprogname.c: Remove code for IRIX.
        * modules/getprogname (Depends-on): Likewise.

diff --git a/lib/intprops-internal.h b/lib/intprops-internal.h
index ab1a94f86df30245ef788fa4eadce21f743cfd24..2609803094ba7820bbdb5ca786fa9b46b92dba1f 100644 (file)
--- a/lib/intprops-internal.h
+++ b/lib/intprops-internal.h
@@ -29,10 +29,6 @@
    Do not evaluate E.  */
 #define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v))
 
-/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
-   <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>.  */
-#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v))
-
 /* The extra casts in the following macros work around compiler bugs,
    e.g., in Cray C 5.0.3.0.  */
 
@@ -41,7 +37,7 @@
 
 /* Return 1 if the real expression E, after promotion, has a
    signed or floating type.  Do not evaluate E.  */
-#define _GL_EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
+#define _GL_EXPR_SIGNED(e) (_GL_INT_CONVERT (e, -1) < 0)
 
 
 /* Minimum and maximum values for integer types and expressions.  */
@@ -60,7 +56,7 @@
 #define _GL_INT_MAXIMUM(e)                                              \
   (_GL_EXPR_SIGNED (e)                                                  \
    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
-   : _GL_INT_NEGATE_CONVERT (e, 1))
+   : _GL_INT_CONVERT (e, -1))
 #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
   (((_GL_INT_CONVERT (e, 1) << (_GL_TYPE_WIDTH (+ (e)) - 2)) - 1) * 2 + 1)
 

diff --git a/lib/intprops.h b/lib/intprops.h
index 2f9fa0a0222b68177d16ffee18c9c4a1809e25cd..72e866ff5bd8cb2a6887635c599c6b4208b4c0ab 100644 (file)
--- a/lib/intprops.h
+++ b/lib/intprops.h
@@ -205,11 +205,11 @@
     || INT_MULTIPLY_RANGE_OVERFLOW (a, b, min, max))
 #endif
 #define _GL_DIVIDE_OVERFLOW(a, b, min, max)                             \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
+  ((min) < 0 ? (b) == _GL_INT_CONVERT (min, -1) && (a) < - (max)        \
    : (a) < 0 ? (b) <= (a) + (b) - 1                                     \
    : (b) < 0 && (a) + (b) <= (a))
 #define _GL_REMAINDER_OVERFLOW(a, b, min, max)                          \
-  ((min) < 0 ? (b) == _GL_INT_NEGATE_CONVERT (min, 1) && (a) < - (max)  \
+  ((min) < 0 ? (b) == _GL_INT_CONVERT (min, -1) && (a) < - (max)        \
    : (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b)                     \
    : (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))