From c4ba8f15e35fc2af99366c1c608d5a37a4ff6859 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 10 Aug 2020 19:44:24 +0200 Subject: [PATCH] Revert autoupdate's revert. * config/srclist.txt: Mark intprops.h as needing sync with glibc. --- ChangeLog | 5 +++++ config/srclist.txt | 2 +- lib/intprops.h | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d249d37740..19b964ac29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-08-10 Bruno Haible + + Revert autoupdate's revert. + * config/srclist.txt: Mark intprops.h as needing sync with glibc. + 2020-08-09 Bruno Haible string: Fix build error in C++ mode with clang (regression from today). diff --git a/config/srclist.txt b/config/srclist.txt index 429cb949e7..679bc2a46d 100644 --- a/config/srclist.txt +++ b/config/srclist.txt @@ -53,7 +53,7 @@ $LIBCSRC include/scratch_buffer.h lib/malloc $LIBCSRC malloc/scratch_buffer_grow.c lib/malloc $LIBCSRC malloc/scratch_buffer_grow_preserve.c lib/malloc $LIBCSRC malloc/scratch_buffer_set_array_size.c lib/malloc -$LIBCSRC include/intprops.h lib +#$LIBCSRC include/intprops.h lib $LIBCSRC posix/regcomp.c lib $LIBCSRC posix/regex.c lib $LIBCSRC posix/regex.h lib diff --git a/lib/intprops.h b/lib/intprops.h index 6de65b067d..2ab1b6ff6a 100644 --- a/lib/intprops.h +++ b/lib/intprops.h @@ -86,6 +86,7 @@ /* Does the __typeof__ keyword work? This could be done by 'configure', but for now it's easier to do it by hand. */ #if (2 <= __GNUC__ \ + || (4 <= __clang_major__) \ || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \ || (0x5110 <= __SUNPRO_C && !__STDC__)) # define _GL_HAVE___TYPEOF__ 1 @@ -239,7 +240,7 @@ #endif /* True if __builtin_add_overflow_p (A, B, C) works, and similarly for - __builtin_mul_overflow_p and __builtin_mul_overflow_p. */ + __builtin_sub_overflow_p and __builtin_mul_overflow_p. */ #define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) /* The _GL*_OVERFLOW macros have the same restrictions as the -- 2.39.5