]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
hwint: Fix up preprocessor conditions for GCC_PRISZ/fmt_size_t
authorJakub Jelinek <jakub@redhat.com>
Tue, 13 Feb 2024 09:32:01 +0000 (10:32 +0100)
committerJakub Jelinek <jakub@redhat.com>
Tue, 13 Feb 2024 09:32:01 +0000 (10:32 +0100)
Using unsigned long long int for fmt_size_t and "ll" for GCC_PRISZ
as broke the gengtype on i686-linux before the libiberty fix is certainly
unexpected.  size_t is there unsigned int, so expected fmt_size_t is
unsigned int (or some other 32-bit type).

The problem was that I was comparing SIZE_MAX against signed maxima,
but SIZE_MAX is unsigned maximum.

2024-02-13  Jakub Jelinek  <jakub@redhat.com>

* hwint.h (GCC_PRISZ, fmt_size_t): Fix preprocessor conditions,
instead of comparing SIZE_MAX against INT_MAX and LONG_MAX compare
it against UINT_MAX and ULONG_MAX.

gcc/hwint.h

index e070e7d8dc22643fd19f280d998d5f268907a008..25a94bedef1c590c9766cbe7278c85c7b0aba059 100644 (file)
@@ -120,10 +120,10 @@ typedef HOST_WIDE_INT __gcc_host_wide_int__;
    So, instead of doing fprintf ("%zu\n", sizeof (x) * y); use
    fprintf (HOST_SIZE_T_PRINT_UNSIGNED "\n",
            (fmt_size_t) (sizeof (x) * y));  */
-#if SIZE_MAX <= INT_MAX
+#if SIZE_MAX <= UINT_MAX
 # define GCC_PRISZ ""
 # define fmt_size_t unsigned int
-#elif SIZE_MAX <= LONG_MAX
+#elif SIZE_MAX <= ULONG_MAX
 # define GCC_PRISZ HOST_LONG_FORMAT
 # define fmt_size_t unsigned long int
 #else