From: Bruno Haible Date: Wed, 10 Sep 2025 21:08:42 +0000 (+0200) Subject: intprops, stdckdint-h: Remove support for IRIX. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1790ef25d81983d1d25a77d452c0080345df459b;p=thirdparty%2Fgnulib.git 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 78e5e6eed9..bd34519c2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2025-09-10 Bruno Haible + 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 ab1a94f86d..2609803094 100644 --- 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 - . */ -#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 2f9fa0a022..72e866ff5b 100644 --- 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))