mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-30 12:44:10 +08:00
c0c3707ff4
This patch allows us to remove a workaround in common-defs.h due to the gnulib fix in: https://lists.gnu.org/archive/html/bug-gnulib/2019-11/msg00024.html All of GDB's local Gnulib patches were already fixed upstream per their descriptions, so this patch removes them all. The problem listed here: https://sourceware.org/ml/gdb-patches/2019-08/msg00553.html was probably partially fixed by moving gnulib to the toplevel; for the remainder, I am setting MAKEOVERRIDES to empty in gnulib/Makefile.am. See also the comment there (it fixes an issue with compilers that don't use C99/C11 by default such as GCC 4.8.5, the default on Centos 7). gdb/ChangeLog: 2019-12-16 Christian Biesinger <cbiesinger@google.com> * gdbsupport/common-defs.h: Remove workaround for a gnulib bug (we no longer need to include time.h before pathmax.h) gnulib/ChangeLog: 2019-12-16 Christian Biesinger <cbiesinger@google.com> * Makefile.am: Set MAKEOVERRIDES. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * config.in: Regenerate. * configure: Regenerate. * import/Makefile.am: Update. * import/Makefile.in: Regenerate. * import/_Noreturn.h: New file. * import/alloca.c (i00afunc): Update. * import/alloca.in.h (if): Update. * import/arg-nonnull.h: Rename from import/extra/snippet/arg-nonnull.h. * import/arpa_inet.in.h (if): Update. * import/assure.h: Update. * import/at-func.c: Update. * import/basename-lgpl.c: Update. * import/canonicalize-lgpl.c (if): Update. * import/c++defs.h: Rename from import/extra/snippet/c++defs.h. * import/cdefs.h: New file. * import/chdir-long.c: Update. * import/chdir-long.h: Update. * import/cloexec.c: Update. * import/cloexec.h: Update. * import/close.c: Update. * import/closedir.c: Update. * import/config.charset: Remove. * import/dirent-private.h: Update. * import/dirent.in.h: Update. * import/dirfd.c: Update. * import/dirname-lgpl.c: Update. * import/dirname.h (base_name): Update. * import/dosname.h (if): Update. * import/dup-safer-flag.c: New file. * import/dup-safer.c: Update. * import/dup.c: Update. * import/dup2.c (if): Update. (dup2_nothrow): Update. (ms_windows_dup2): Update. * import/errno.in.h (if): Update. (elif): Update. * import/error.c (if): Update. (strerror_r): Update. (program_name): Update. (error): Update. (error_at_line): Update. * import/error.h: Update. * import/exitfail.c: Update. * import/exitfail.h: Update. * import/extra/config.rpath: Update. * import/extra/snippet/_Noreturn.h: Remove. * import/extra/update-copyright: Update. * import/fchdir.c: Update. * import/fcntl.c (rpl_fcntl): Update. (INCL_DOS): Update. (if): Update. (rpl_fcntl_DUPFD): Update. (rpl_fcntl_DUPFD_CLOEXEC): Update. (klibc_fcntl): Update. (fcntl): Update. (have_dupfd_cloexec): Update. * import/fcntl.in.h (if): Update. (creat): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (O_CLOEXEC): Update. (GNULIB_defined_O_CLOEXEC): Update. * import/fd-hook.c: Update. * import/fd-hook.h: Update. * import/fd-safer-flag.c: New file. * import/fd-safer.c: Update. * import/fdopendir.c: Update. * import/filename.h: Update. * import/filenamecat-lgpl.c (longest_relative_suffix): Update. (mfile_name_concat): Update. * import/filenamecat.h: Update. * import/flexmember.h: Update. * import/float+.h: Update. * import/float.c: Update. * import/float.in.h (LDBL_MIN): Update. * import/fnmatch.c (__builtin_expect): Update. (FALLTHROUGH): Update. * import/fnmatch.in.h (_FNMATCH_H): Update. (_): Update. (fnmatch): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/fnmatch_loop.c (FCT): Update. (EXT): Update. * import/fpucw.h (GET_FPUCW): Update. (SET_FPUCW): Update. * import/frexp.c: Update. * import/frexpl.c: Update. * import/fstat.c (stat): Update. (fstat): Update. (WINDOWS_NATIVE): Update. (fstat_nothrow): Update. (WIN32_LEAN_AND_MEAN): Update. * import/fstatat.c (normal_fstatat): Update. (rpl_fstatat): Update. * import/getcwd-lgpl.c (rpl_getcwd): Update. * import/getcwd.c (getcwd_nothrow): Update. (getcwd_system): Update. (__getcwd): Update. * import/getdtablesize.c (if): Update. (_setmaxstdio): Update. (_setmaxstdio_nothrow): Update. (getdtablesize): Update. * import/getlogin_r.c (if): Update. (getlogin_r): Update. * import/getprogname.c (getprogname): Update. * import/getprogname.h: Update. * import/gettext.h (if): Update. * import/gettimeofday.c (WINDOWS_NATIVE): Update. (localtime): Update. (GetProcAddress): Update. (gmtime): Update. (void): Update. (struct tm): Update. (rpl_localtime): Update. (initialize): Update. (rpl_gmtime): Update. (tzset): Update. (rpl_tzset): Update. * import/glob-libc.h (_Restrict_): Update. (__size_t): Update. (__need_size_t): Update. (glob): Update. (globfree): Update. (__REDIRECT_NTH): Update. (glob64): Update. (globfree64): Update. (glob_pattern_p): Update. * import/glob.c (POSIX): Update. (if): Update. (__set_errno): Update. (getpwnam_r): Update. (__lstat64): Update. (FLEXIBLE_ARRAY_MEMBER): Update. (__glob_pattern_p): Update. (GETPW_R_SIZE_MAX): Update. (GET_LOGIN_NAME_MAX): Update. (DT_UNKNOWN): Update. (DT_DIR): Update. (DT_LNK): Update. (D_TYPE_TO_RESULT): Update. (readdir_result_might_be_symlink): Update. (readdir_result_might_be_dir): Update. (readdir_result_type): Update. (D_INO_TO_RESULT): Update. (READDIR_RESULT_INITIALIZER): Update. (attribute_hidden): Update. (__attribute_noinline__): Update. (__builtin_expect): Update. (__glibc_unlikely): Update. (__has_builtin): Update. (__glob_pattern_type): Update. (is_dir): Update. (glob): Update. (globfree): Update. (libc_hidden_def): Update. (DIRSEP_CHAR): Update. (prefix_array): Update. (weak_alias): Update. (link_exists2_p): Update. (link_exists_p): Update. (glob_in_dir): Update. (GLOBNAMES_MEMBERS): Update. * import/glob.in.h (_GL_GLOB_H): Update. (_): Update. (__BEGIN_DECLS): Update. (__END_DECLS): Update. (_Restrict_): Update. (__THROW): Update. (__THROWNL): Update. (__size_t): Update. (__USE_GNU): Update. (glob): Update. (globfree): Update. (glob_pattern_p): Update. (__glob_pattern_p): Update. (__GLOB_GNULIB): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_WARN_ON_USE): Update. * import/glob_internal.h: New file. * import/glob_pattern_p.c: New file. * import/globfree.c: New file. * import/glthread/lock.c (glthread_rwlock_init_for_glibc): Update. (glthread_rwlock_rdlock_multithreaded): Update. (glthread_once_call): Update. (glthread_once_multithreaded): Update. (glthread_once_singlethreaded): Update. (glthread_recursive_lock_init_multithreaded): Update. (glthread_recursive_lock_lock_multithreaded): Update. (glthread_recursive_lock_unlock_multithreaded): Update. (glthread_recursive_lock_destroy_multithreaded): Update. (glthread_lock_init_func): Update. (glthread_lock_lock_func): Update. (glthread_lock_unlock_func): Update. (glthread_lock_destroy_func): Update. (gl_waitqueue_t): Update. (gl_waitqueue_init): Update. (gl_waitqueue_add): Update. (gl_waitqueue_notify_first): Update. (gl_waitqueue_notify_all): Update. (glthread_rwlock_init_func): Update. (glthread_rwlock_rdlock_func): Update. (glthread_rwlock_wrlock_func): Update. (glthread_rwlock_unlock_func): Update. (glthread_rwlock_destroy_func): Update. (glthread_recursive_lock_init_func): Update. (glthread_recursive_lock_lock_func): Update. (glthread_recursive_lock_unlock_func): Update. (glthread_recursive_lock_destroy_func): Update. (glthread_once_func): Update. * import/glthread/lock.h (c11_threads_in_use): Update. (pthread_in_use): Update. (gl_rwlock_initializer): Update. (glthread_rwlock_init): Update. (glthread_rwlock_init_for_glibc): Update. (pth_in_use): Update. (gl_lock_define): Update. (gl_lock_define_initialized): Update. (gl_lock_initializer): Update. (glthread_lock_init): Update. (glthread_lock_lock): Update. (glthread_lock_unlock): Update. (glthread_lock_destroy): Update. (gl_rwlock_define): Update. (gl_rwlock_define_initialized): Update. (glthread_rwlock_rdlock): Update. (glthread_rwlock_wrlock): Update. (glthread_rwlock_unlock): Update. (glthread_rwlock_destroy): Update. (gl_recursive_lock_define): Update. (gl_recursive_lock_define_initialized): Update. (gl_recursive_lock_initializer): Update. (glthread_recursive_lock_init): Update. (glthread_recursive_lock_lock): Update. (glthread_recursive_lock_unlock): Update. (glthread_recursive_lock_destroy): Update. (gl_once_define): Update. (glthread_once): Update. (glthread_once_multithreaded): Update. (glthread_once_singlethreaded): Update. (thread_in_use): Update. (glthread_recursive_lock_init_multithreaded): Update. (glthread_recursive_lock_lock_multithreaded): Update. (glthread_recursive_lock_unlock_multithreaded): Update. (glthread_recursive_lock_destroy_multithreaded): Update. (glthread_lock_init_func): Update. (glthread_lock_lock_func): Update. (glthread_lock_unlock_func): Update. (glthread_lock_destroy_func): Update. (glthread_rwlock_init_func): Update. (glthread_rwlock_rdlock_func): Update. (glthread_rwlock_wrlock_func): Update. (glthread_rwlock_unlock_func): Update. (glthread_rwlock_destroy_func): Update. (glthread_recursive_lock_init_func): Update. (glthread_recursive_lock_lock_func): Update. (glthread_recursive_lock_unlock_func): Update. (glthread_recursive_lock_destroy_func): Update. (glthread_once_func): Update. * import/glthread/threadlib.c: Update. * import/hard-locale.c: Update. * import/hard-locale.h: Update. * import/inet_ntop.c: Update. * import/intprops.h (__has_builtin): Update. (_GL_INT_CONVERT): Update. (_GL_INT_NEGATE_CONVERT): Update. (verify): Update. (_GL_HAS_BUILTIN_OVERFLOW): Update. (_GL_HAS_BUILTIN_ADD_OVERFLOW): Update. (_GL_HAS_BUILTIN_OVERFLOW_P): Update. (_GL_HAS_BUILTIN_MUL_OVERFLOW): Update. (_GL_BINARY_OP_OVERFLOW): Update. (INT_ADD_WRAPV): Update. (INT_SUBTRACT_WRAPV): Update. (INT_MULTIPLY_WRAPV): Update. (_GL_INT_OP_WRAPV): Update. (_GL_INT_OP_WRAPV_SMALLISH): Update. (_GL_INT_OP_WRAPV_LONGISH): Update. (_GL_INT_OP_CALC): Update. (_GL_INT_OP_CALC1): Update. (_GL_INT_OP_WRAPV_VIA_UNSIGNED): Update. (_GL_INT_ADD_RANGE_OVERFLOW): Update. (_GL_INT_SUBTRACT_RANGE_OVERFLOW): Update. (_GL_INT_MULTIPLY_RANGE_OVERFLOW): Update. * import/inttypes.in.h (if): Update. * import/isnan.c: Update. * import/isnand-nolibm.h: Update. * import/isnand.c: Update. * import/isnanl-nolibm.h: Update. * import/isnanl.c: Update. * import/itold.c: Update. * import/libc-config.h: New file. * import/limits.in.h (LLONG_MIN): Update. (LLONG_MAX): Update. (ULLONG_MAX): Update. (WORD_BIT): Update. (LONG_BIT): Update. * import/localcharset.c (setlocale): Update. (relocate): Update. (O_NOFOLLOW): Update. (ISSLASH): Update. (DIRECTORY_SEPARATOR): Update. (getc): Update. (volatile): Update. (get_charset_aliases): Update. (struct table_entry): Update. (alias_table_defined): Update. (locale_table_defined): Update. (locale_charset): Update. (if): Update. * import/localcharset.h: Update. * import/localtime-buffer.c: New file. * import/localtime-buffer.h: New file. * import/lstat.c (rpl_lstat): Update. * import/m4/00gnulib.m4: Update. * import/m4/__inline.m4: New file. * import/m4/absolute-header.m4: Update. * import/m4/alloca.m4: Update. * import/m4/arpa_inet_h.m4: Update. * import/m4/builtin-expect.m4: New file. * import/m4/canonicalize.m4: Update. * import/m4/chdir-long.m4: Update. * import/m4/close.m4: Update. * import/m4/closedir.m4: Update. * import/m4/codeset.m4: Update. * import/m4/configmake.m4: Remove. * import/m4/d-ino.m4: Update. * import/m4/d-type.m4: Update. * import/m4/dirent_h.m4: Update. * import/m4/dirfd.m4: Update. * import/m4/dirname.m4: Update. * import/m4/double-slash-root.m4: Update. * import/m4/dup.m4: Update. * import/m4/dup2.m4: Update. * import/m4/eealloc.m4: Update. * import/m4/environ.m4: Update. * import/m4/errno_h.m4: Update. * import/m4/error.m4: Update. * import/m4/exponentd.m4: Update. * import/m4/exponentl.m4: Update. * import/m4/extensions.m4: Update. * import/m4/extern-inline.m4: Update. * import/m4/fchdir.m4: Update. * import/m4/fcntl-o.m4: Update. * import/m4/fcntl.m4: Update. * import/m4/fcntl_h.m4: Update. * import/m4/fdopendir.m4: Update. * import/m4/filenamecat.m4: Update. * import/m4/flexmember.m4: Update. * import/m4/float_h.m4: Update. * import/m4/fnmatch.m4: Update. * import/m4/fnmatch_h.m4: New file. * import/m4/fpieee.m4: Update. * import/m4/frexp.m4: Update. * import/m4/frexpl.m4: Update. * import/m4/fstat.m4: Update. * import/m4/fstatat.m4: Update. * import/m4/getcwd-abort-bug.m4: Update. * import/m4/getcwd-path-max.m4: Update. * import/m4/getcwd.m4: Update. * import/m4/getdtablesize.m4: Update. * import/m4/getlogin.m4: New file. * import/m4/getlogin_r.m4: Update. * import/m4/getpagesize.m4: New file. * import/m4/getprogname.m4: Update. * import/m4/gettimeofday.m4: Update. * import/m4/glibc21.m4: Remove. * import/m4/glob.m4: Update. * import/m4/glob_h.m4: New file. * import/m4/gnulib-cache.m4: Update. * import/m4/gnulib-common.m4: Update. * import/m4/gnulib-comp.m4: Update. * import/m4/gnulib-tool.m4: Update. * import/m4/hard-locale.m4: Remove. * import/m4/host-cpu-c-abi.m4: New file. * import/m4/include_next.m4: Update. * import/m4/inet_ntop.m4: Update. * import/m4/inttypes-pri.m4: Update. * import/m4/inttypes.m4: Update. * import/m4/isnand.m4: Update. * import/m4/isnanl.m4: Update. * import/m4/largefile.m4: Update. * import/m4/lib-ld.m4: Update. * import/m4/lib-link.m4: Update. * import/m4/lib-prefix.m4: Update. * import/m4/limits-h.m4: Update. * import/m4/localcharset.m4: Update. * import/m4/locale-fr.m4: Update. * import/m4/locale-ja.m4: Update. * import/m4/locale-zh.m4: Update. * import/m4/localtime-buffer.m4: New file. * import/m4/lock.m4: Update. * import/m4/longlong.m4: Update. * import/m4/lstat.m4: Update. * import/m4/malloc.m4: Update. * import/m4/malloca.m4: Update. * import/m4/math_h.m4: Update. * import/m4/mbrtowc.m4: Update. * import/m4/mbsinit.m4: Update. * import/m4/mbsrtowcs.m4: Update. * import/m4/mbstate_t.m4: Update. * import/m4/memchr.m4: Update. * import/m4/memmem.m4: Update. * import/m4/mempcpy.m4: Update. * import/m4/memrchr.m4: Update. * import/m4/mkdir.m4: Update. * import/m4/mkdtemp.m4: Update. * import/m4/mkostemp.m4: Update. * import/m4/mmap-anon.m4: Update. * import/m4/mode_t.m4: Update. * import/m4/msvc-inval.m4: Update. * import/m4/msvc-nothrow.m4: Update. * import/m4/multiarch.m4: Update. * import/m4/netinet_in_h.m4: Update. * import/m4/nocrash.m4: Update. * import/m4/off_t.m4: Update. * import/m4/onceonly.m4: Remove. * import/m4/open-cloexec.m4: New file. * import/m4/open-slash.m4: New file. * import/m4/open.m4: Update. * import/m4/openat.m4: Update. * import/m4/opendir.m4: Update. * import/m4/pathmax.m4: Update. * import/m4/pthread_rwlock_rdlock.m4: New file. * import/m4/rawmemchr.m4: Update. * import/m4/readdir.m4: Update. * import/m4/readlink.m4: Update. * import/m4/realloc.m4: Update. * import/m4/rename.m4: Update. * import/m4/rewinddir.m4: Update. * import/m4/rmdir.m4: Update. * import/m4/save-cwd.m4: Update. * import/m4/secure_getenv.m4: Remove. * import/m4/setenv.m4: Update. * import/m4/signal_h.m4: Update. * import/m4/socklen.m4: Update. * import/m4/sockpfaf.m4: Update. * import/m4/ssize_t.m4: Update. * import/m4/stat-time.m4: New file. * import/m4/stat.m4: Update. * import/m4/std-gnu11.m4: New file. * import/m4/stdalign.m4: Update. * import/m4/stdbool.m4: Update. * import/m4/stddef_h.m4: Update. * import/m4/stdint.m4: Update. * import/m4/stdio_h.m4: Update. * import/m4/stdlib_h.m4: Update. * import/m4/strchrnul.m4: Update. * import/m4/strdup.m4: Update. * import/m4/strerror.m4: Update. * import/m4/strerror_r.m4: Update. * import/m4/string_h.m4: Update. * import/m4/strstr.m4: Update. * import/m4/strtok_r.m4: Update. * import/m4/sys_socket_h.m4: Update. * import/m4/sys_stat_h.m4: Update. * import/m4/sys_time_h.m4: Update. * import/m4/sys_types_h.m4: Update. * import/m4/sys_uio_h.m4: Update. * import/m4/tempname.m4: Update. * import/m4/threadlib.m4: Update. * import/m4/time_h.m4: Update. * import/m4/time_r.m4: Update. * import/m4/unistd-safer.m4: Update. * import/m4/unistd_h.m4: Update. * import/m4/warn-on-use.m4: Update. * import/m4/wchar_h.m4: Update. * import/m4/wchar_t.m4: Update. * import/m4/wctype_h.m4: Update. * import/m4/wint_t.m4: Update. * import/malloc.c: Update. * import/malloc/scratch_buffer.h: New file. * import/malloc/scratch_buffer_grow.c: New file. * import/malloc/scratch_buffer_grow_preserve.c: New file. * import/malloc/scratch_buffer_set_array_size.c: New file. * import/malloca.c (MAGIC_NUMBER): Update. (MAGIC_SIZE): Update. (struct preliminary_header): Update. (HEADER_SIZE): Update. (union header): Update. (verify): Update. (HASH_TABLE_SIZE): Update. (freea): Update. * import/malloca.h (malloca): Update. (nmalloca): Update. * import/malloca.valgrind: Remove. * import/math.in.h (_GL_MATH_CXX_REAL_FLOATING_DECL_2): Update. (func): Update. (rpl_func): Update. (f): Update. (d): Update. (l): Update. (_GL_WARN_ON_USE): Update. (_GL_WARN_ON_USE_ATTRIBUTE): Update. (FP_ILOGB0): Update. (FP_ILOGBNAN): Update. (acosf): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (asinf): Update. (atanf): Update. (atan2f): Update. (cosf): Update. (coshf): Update. (expf): Update. (expl): Update. (expm1l): Update. (ilogbl): Update. (rintl): Update. (sinf): Update. (sinhf): Update. (sqrtf): Update. (tanf): Update. (tanhf): Update. (isfinite): Update. (isinf): Update. (isnan): Update. (GNULIB_defined_signbit): Update. (signbit): Update. * import/mbrtowc.c (FALLTHROUGH): Update. (locale_enc): Update. (locale_enc_cached): Update. (gl_lock_define_initialized): Update. (mbrtowc): Update. * import/mbsinit.c (if): Update. (mbsinit): Update. * import/mbsrtowcs-impl.h: Update. * import/mbsrtowcs-state.c: Update. * import/mbsrtowcs.c: Update. * import/memchr.c: Update. * import/memchr.valgrind: Update. * import/memmem.c (__builtin_expect): Update. * import/mempcpy.c: Update. * import/memrchr.c (__memrchr): Update. * import/mkdir.c (if): Update. * import/mkdtemp.c: Update. * import/mkostemp.c: Update. * import/msvc-inval.c: Update. * import/msvc-inval.h: Update. * import/msvc-nothrow.c: Update. * import/msvc-nothrow.h (if): Update. * import/netinet_in.in.h: Update. * import/open.c (open): Update. (if): Update. * import/openat-die.c: Update. * import/openat-priv.h: Update. * import/openat-proc.c: Update. * import/openat.c (rpl_openat): Update. * import/openat.h: Update. * import/opendir.c: Update. * import/pathmax.h (if): Update. * import/pipe-safer.c: Update. * import/rawmemchr.c: Update. * import/rawmemchr.valgrind: Update. * import/readdir.c (readdir): Update. * import/readlink.c: Update. * import/realloc.c: Update. * import/ref-add.sin: Remove. * import/ref-del.sin: Remove. * import/rename.c (if): Update. * import/rewinddir.c: Update. * import/rmdir.c: Update. * import/same-inode.h (SAME_INODE): Update. * import/save-cwd.c (save_cwd): Update. * import/save-cwd.h: Update. * import/scratch_buffer.h: New file. * import/secure_getenv.c: Remove. * import/setenv.c: Update. * import/signal.in.h: Update. * import/stat-time.c: New file. * import/stat-time.h: New file. * import/stat-w32.c: New file. * import/stat-w32.h: New file. * import/stat.c (if): Update. (stat): Update. (REPLACE_FUNC_STAT_DIR): Update. (WINDOWS_NATIVE): Update. (WIN32_LEAN_AND_MEAN): Update. (is_unc_root): Update. (rpl_stat): Update. * import/stdalign.in.h (elif): Update. * import/stdbool.in.h: Update. * import/stddef.in.h (_GL_STDDEF_ALIGNAS): Update. (max_align_t): Update. (GNULIB_defined_max_align_t): Update. * import/stdint.in.h (WINT_MIN): Update. (WINT_MAX): Update. (_STDINT_MIN): Update. (_STDINT_UNSIGNED_MIN): Update. (_STDINT_SIGNED_MIN): Update. (PTRDIFF_MIN): Update. (SIG_ATOMIC_MIN): Update. (WCHAR_MIN): Update. * import/stdio.in.h (if): Update. * import/stdlib.in.h (if): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_SYS): Update. (random): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (srandom): Update. (initstate): Update. (setstate): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (GNULIB_defined_strtod_function): Update. (strtold): Update. (GNULIB_defined_strtold_function): Update. * import/str-two-way.h: Update. * import/strchrnul.c: Update. * import/strchrnul.valgrind: Update. * import/strdup.c: Update. * import/streq.h: Update. * import/strerror-override.c: Update. * import/strerror-override.h: Update. * import/strerror.c (strerror): Update. * import/strerror_r.c (safe_copy): Update. * import/string.in.h (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/stripslash.c: Update. * import/strnlen1.c: Update. * import/strnlen1.h: Update. * import/strstr.c (__builtin_expect): Update. * import/strtok_r.c: Update. * import/sys_socket.in.h (CMSG_SPACE): Update. (CMSG_LEN): Update. (struct sockaddr_storage): Update. (SO_REUSEPORT): Update. (_GL_WARN_ON_USE): Update. * import/sys_stat.in.h (if): Update. (stat): Update. (struct stat): Update. (st_atime): Update. (st_mtime): Update. (st_ctime): Update. (_GL_WINDOWS_STAT_TIMESPEC): Update. (GNULIB_defined_struct_stat): Update. (_S_IFBLK): Update. (_S_IFLNK): Update. (_S_IFSOCK): Update. (fstat): Update. (fstatat): Update. (lstat): Update. (stat64): Update. (_stat64): Update. (_stat32i64): Update. (_stati64): Update. (_stat32): Update. (_stat64i32): Update. * import/sys_time.in.h: Update. * import/sys_types.in.h (dev_t): Update. (GNULIB_defined_dev_t): Update. (ino_t): Update. (GNULIB_defined_ino_t): Update. (_GL_WINDOWS_STAT_INODES): Update. (if): Update. * import/sys_uio.in.h: Update. * import/tempname.c (__secure_getenv): Update. (try_nocreate): Update. * import/tempname.h: Update. * import/time.in.h (tzset): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (ctime): Update. (strftime): Update. * import/time_r.c: Update. * import/unistd--.h: Update. * import/unistd-safer.h: Update. * import/unistd.in.h (if): Update. (elif): Update. (__need_getopt): Update. (access): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_SYS): Update. (__declspec): Update. (_GL_WARN_ON_USE_ATTRIBUTE): Update. (faccessat): Update. (getpass): Update. (truncate): Update. * import/unsetenv.c: Update. * import/verify.h (if): Update. (_GL_HAVE__STATIC_ASSERT): Update. (_GL_HAVE_STATIC_ASSERT): Update. (_GL_HAVE__STATIC_ASSERT1): Update. (_GL_HAVE_STATIC_ASSERT1): Update. (_GL_VERIFY): Update. (_Static_assert): Update. (_GL_HAS_BUILTIN_TRAP): Update. (_GL_HAS_BUILTIN_UNREACHABLE): Update. (verify_true): Update. (verify): Update. (__has_builtin): Update. (elif): Update. (assume): Update. * import/warn-on-use.h: Rename from import/extra/snippet/warn-on-use.h. * import/wchar.in.h (if): Update. (wcsftime): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/wctype.in.h (rpl_iswalnum): Update. (rpl_iswalpha): Update. (rpl_iswblank): Update. (rpl_iswcntrl): Update. (rpl_iswdigit): Update. (rpl_iswgraph): Update. (rpl_iswlower): Update. (rpl_iswprint): Update. (rpl_iswpunct): Update. (rpl_iswspace): Update. (rpl_iswupper): Update. (rpl_iswxdigit): Update. (rpl_towlower): Update. (rpl_towupper): Update. (iswalnum): Update. (iswalpha): Update. (iswblank): Update. (iswcntrl): Update. (iswdigit): Update. (iswgraph): Update. (iswlower): Update. (iswprint): Update. (iswpunct): Update. (iswspace): Update. (iswupper): Update. (iswxdigit): Update. (towlower): Update. (towupper): Update. * import/windows-initguard.h: New file. * import/windows-mutex.c: New file. * import/windows-mutex.h: New file. * import/windows-once.c: New file. * import/windows-once.h: New file. * import/windows-recmutex.c: New file. * import/windows-recmutex.h: New file. * import/windows-rwlock.c: New file. * import/windows-rwlock.h: New file. * import/xalloc-oversized.h: New file. * patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch: Remove. * patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch: Remove. * patches/0003-Fix-glob-c-Coverity-issues.patch: Remove. * update-gnulib.sh: Update to latest gnulib and don't apply patches anymore. Also updates the patch -p flag to the current directory structure in case patches are needed again in the future. Change-Id: I9c2b07a3046baecfb664e21b2644353ea888dbfa
585 lines
26 KiB
C
585 lines
26 KiB
C
/* intprops.h -- properties of integer types
|
|
|
|
Copyright (C) 2001-2019 Free Software Foundation, Inc.
|
|
|
|
This program is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published
|
|
by the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
|
|
|
/* Written by Paul Eggert. */
|
|
|
|
#ifndef _GL_INTPROPS_H
|
|
#define _GL_INTPROPS_H
|
|
|
|
#include <limits.h>
|
|
|
|
/* Return a value with the common real type of E and V and the value of V.
|
|
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. */
|
|
|
|
/* True if the arithmetic type T is an integer type. bool counts as
|
|
an integer. */
|
|
#define TYPE_IS_INTEGER(t) ((t) 1.5 == 1)
|
|
|
|
/* True if the real type T is signed. */
|
|
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
|
|
|
|
/* Return 1 if the real expression E, after promotion, has a
|
|
signed or floating type. Do not evaluate E. */
|
|
#define EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
|
|
|
|
|
|
/* Minimum and maximum values for integer types and expressions. */
|
|
|
|
/* The width in bits of the integer type or expression T.
|
|
Do not evaluate T.
|
|
Padding bits are not supported; this is checked at compile-time below. */
|
|
#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
|
|
|
|
/* The maximum and minimum values for the integer type T. */
|
|
#define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
|
|
#define TYPE_MAXIMUM(t) \
|
|
((t) (! TYPE_SIGNED (t) \
|
|
? (t) -1 \
|
|
: ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
|
|
|
|
/* The maximum and minimum values for the type of the expression E,
|
|
after integer promotion. E is not evaluated. */
|
|
#define _GL_INT_MINIMUM(e) \
|
|
(EXPR_SIGNED (e) \
|
|
? ~ _GL_SIGNED_INT_MAXIMUM (e) \
|
|
: _GL_INT_CONVERT (e, 0))
|
|
#define _GL_INT_MAXIMUM(e) \
|
|
(EXPR_SIGNED (e) \
|
|
? _GL_SIGNED_INT_MAXIMUM (e) \
|
|
: _GL_INT_NEGATE_CONVERT (e, 1))
|
|
#define _GL_SIGNED_INT_MAXIMUM(e) \
|
|
(((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
|
|
|
|
/* Work around OpenVMS incompatibility with C99. */
|
|
#if !defined LLONG_MAX && defined __INT64_MAX
|
|
# define LLONG_MAX __INT64_MAX
|
|
# define LLONG_MIN __INT64_MIN
|
|
#endif
|
|
|
|
/* This include file assumes that signed types are two's complement without
|
|
padding bits; the above macros have undefined behavior otherwise.
|
|
If this is a problem for you, please let us know how to fix it for your host.
|
|
This assumption is tested by the intprops-tests module. */
|
|
|
|
/* 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__ \
|
|
|| (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
|
|
|| (0x5110 <= __SUNPRO_C && !__STDC__))
|
|
# define _GL_HAVE___TYPEOF__ 1
|
|
#else
|
|
# define _GL_HAVE___TYPEOF__ 0
|
|
#endif
|
|
|
|
/* Return 1 if the integer type or expression T might be signed. Return 0
|
|
if it is definitely unsigned. This macro does not evaluate its argument,
|
|
and expands to an integer constant expression. */
|
|
#if _GL_HAVE___TYPEOF__
|
|
# define _GL_SIGNED_TYPE_OR_EXPR(t) TYPE_SIGNED (__typeof__ (t))
|
|
#else
|
|
# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
|
|
#endif
|
|
|
|
/* Bound on length of the string representing an unsigned integer
|
|
value representable in B bits. log10 (2.0) < 146/485. The
|
|
smallest value of B where this bound is not tight is 2621. */
|
|
#define INT_BITS_STRLEN_BOUND(b) (((b) * 146 + 484) / 485)
|
|
|
|
/* Bound on length of the string representing an integer type or expression T.
|
|
Subtract 1 for the sign bit if T is signed, and then add 1 more for
|
|
a minus sign if needed.
|
|
|
|
Because _GL_SIGNED_TYPE_OR_EXPR sometimes returns 1 when its argument is
|
|
unsigned, this macro may overestimate the true bound by one byte when
|
|
applied to unsigned types of size 2, 4, 16, ... bytes. */
|
|
#define INT_STRLEN_BOUND(t) \
|
|
(INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
|
|
+ _GL_SIGNED_TYPE_OR_EXPR (t))
|
|
|
|
/* Bound on buffer size needed to represent an integer type or expression T,
|
|
including the terminating null. */
|
|
#define INT_BUFSIZE_BOUND(t) (INT_STRLEN_BOUND (t) + 1)
|
|
|
|
|
|
/* Range overflow checks.
|
|
|
|
The INT_<op>_RANGE_OVERFLOW macros return 1 if the corresponding C
|
|
operators might not yield numerically correct answers due to
|
|
arithmetic overflow. They do not rely on undefined or
|
|
implementation-defined behavior. Their implementations are simple
|
|
and straightforward, but they are a bit harder to use than the
|
|
INT_<op>_OVERFLOW macros described below.
|
|
|
|
Example usage:
|
|
|
|
long int i = ...;
|
|
long int j = ...;
|
|
if (INT_MULTIPLY_RANGE_OVERFLOW (i, j, LONG_MIN, LONG_MAX))
|
|
printf ("multiply would overflow");
|
|
else
|
|
printf ("product is %ld", i * j);
|
|
|
|
Restrictions on *_RANGE_OVERFLOW macros:
|
|
|
|
These macros do not check for all possible numerical problems or
|
|
undefined or unspecified behavior: they do not check for division
|
|
by zero, for bad shift counts, or for shifting negative numbers.
|
|
|
|
These macros may evaluate their arguments zero or multiple times,
|
|
so the arguments should not have side effects. The arithmetic
|
|
arguments (including the MIN and MAX arguments) must be of the same
|
|
integer type after the usual arithmetic conversions, and the type
|
|
must have minimum value MIN and maximum MAX. Unsigned types should
|
|
use a zero MIN of the proper type.
|
|
|
|
These macros are tuned for constant MIN and MAX. For commutative
|
|
operations such as A + B, they are also tuned for constant B. */
|
|
|
|
/* Return 1 if A + B would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. */
|
|
#define INT_ADD_RANGE_OVERFLOW(a, b, min, max) \
|
|
((b) < 0 \
|
|
? (a) < (min) - (b) \
|
|
: (max) - (b) < (a))
|
|
|
|
/* Return 1 if A - B would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. */
|
|
#define INT_SUBTRACT_RANGE_OVERFLOW(a, b, min, max) \
|
|
((b) < 0 \
|
|
? (max) + (b) < (a) \
|
|
: (a) < (min) + (b))
|
|
|
|
/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. */
|
|
#define INT_NEGATE_RANGE_OVERFLOW(a, min, max) \
|
|
((min) < 0 \
|
|
? (a) < - (max) \
|
|
: 0 < (a))
|
|
|
|
/* Return 1 if A * B would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. Avoid && and || as they tickle
|
|
bugs in Sun C 5.11 2010/08/13 and other compilers; see
|
|
<https://lists.gnu.org/r/bug-gnulib/2011-05/msg00401.html>. */
|
|
#define INT_MULTIPLY_RANGE_OVERFLOW(a, b, min, max) \
|
|
((b) < 0 \
|
|
? ((a) < 0 \
|
|
? (a) < (max) / (b) \
|
|
: (b) == -1 \
|
|
? 0 \
|
|
: (min) / (b) < (a)) \
|
|
: (b) == 0 \
|
|
? 0 \
|
|
: ((a) < 0 \
|
|
? (a) < (min) / (b) \
|
|
: (max) / (b) < (a)))
|
|
|
|
/* Return 1 if A / B would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. Do not check for division by zero. */
|
|
#define INT_DIVIDE_RANGE_OVERFLOW(a, b, min, max) \
|
|
((min) < 0 && (b) == -1 && (a) < - (max))
|
|
|
|
/* Return 1 if A % B would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. Do not check for division by zero.
|
|
Mathematically, % should never overflow, but on x86-like hosts
|
|
INT_MIN % -1 traps, and the C standard permits this, so treat this
|
|
as an overflow too. */
|
|
#define INT_REMAINDER_RANGE_OVERFLOW(a, b, min, max) \
|
|
INT_DIVIDE_RANGE_OVERFLOW (a, b, min, max)
|
|
|
|
/* Return 1 if A << B would overflow in [MIN,MAX] arithmetic.
|
|
See above for restrictions. Here, MIN and MAX are for A only, and B need
|
|
not be of the same type as the other arguments. The C standard says that
|
|
behavior is undefined for shifts unless 0 <= B < wordwidth, and that when
|
|
A is negative then A << B has undefined behavior and A >> B has
|
|
implementation-defined behavior, but do not check these other
|
|
restrictions. */
|
|
#define INT_LEFT_SHIFT_RANGE_OVERFLOW(a, b, min, max) \
|
|
((a) < 0 \
|
|
? (a) < (min) >> (b) \
|
|
: (max) >> (b) < (a))
|
|
|
|
/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow
|
|
(A, B, P) work when P is non-null. */
|
|
#if 5 <= __GNUC__ && !defined __ICC
|
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1
|
|
#elif defined __has_builtin
|
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow)
|
|
#else
|
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0
|
|
#endif
|
|
|
|
/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */
|
|
#ifdef __clang__
|
|
/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>. */
|
|
# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0
|
|
#else
|
|
# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW
|
|
#endif
|
|
|
|
/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for
|
|
__builtin_mul_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
|
|
*_RANGE_OVERFLOW macros, except that they do not assume that operands
|
|
(e.g., A and B) have the same type as MIN and MAX. Instead, they assume
|
|
that the result (e.g., A + B) has that type. */
|
|
#if _GL_HAS_BUILTIN_OVERFLOW_P
|
|
# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
__builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
|
|
# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
|
|
__builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
|
|
# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
|
|
__builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
|
|
#else
|
|
# define _GL_ADD_OVERFLOW(a, b, min, max) \
|
|
((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max) \
|
|
: (a) < 0 ? (b) <= (a) + (b) \
|
|
: (b) < 0 ? (a) <= (a) + (b) \
|
|
: (a) + (b) < (b))
|
|
# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
|
|
((min) < 0 ? INT_SUBTRACT_RANGE_OVERFLOW (a, b, min, max) \
|
|
: (a) < 0 ? 1 \
|
|
: (b) < 0 ? (a) - (b) <= (a) \
|
|
: (a) < (b))
|
|
# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
|
|
(((min) == 0 && (((a) < 0 && 0 < (b)) || ((b) < 0 && 0 < (a)))) \
|
|
|| 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) \
|
|
: (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) \
|
|
: (a) < 0 ? (a) % (b) != ((max) - (b) + 1) % (b) \
|
|
: (b) < 0 && ! _GL_UNSIGNED_NEG_MULTIPLE (a, b, max))
|
|
|
|
/* Return a nonzero value if A is a mathematical multiple of B, where
|
|
A is unsigned, B is negative, and MAX is the maximum value of A's
|
|
type. A's type must be the same as (A % B)'s type. Normally (A %
|
|
-B == 0) suffices, but things get tricky if -B would overflow. */
|
|
#define _GL_UNSIGNED_NEG_MULTIPLE(a, b, max) \
|
|
(((b) < -_GL_SIGNED_INT_MAXIMUM (b) \
|
|
? (_GL_SIGNED_INT_MAXIMUM (b) == (max) \
|
|
? (a) \
|
|
: (a) % (_GL_INT_CONVERT (a, _GL_SIGNED_INT_MAXIMUM (b)) + 1)) \
|
|
: (a) % - (b)) \
|
|
== 0)
|
|
|
|
/* Check for integer overflow, and report low order bits of answer.
|
|
|
|
The INT_<op>_OVERFLOW macros return 1 if the corresponding C operators
|
|
might not yield numerically correct answers due to arithmetic overflow.
|
|
The INT_<op>_WRAPV macros compute the low-order bits of the sum,
|
|
difference, and product of two C integers, and return 1 if these
|
|
low-order bits are not numerically correct.
|
|
These macros work correctly on all known practical hosts, and do not rely
|
|
on undefined behavior due to signed arithmetic overflow.
|
|
|
|
Example usage, assuming A and B are long int:
|
|
|
|
if (INT_MULTIPLY_OVERFLOW (a, b))
|
|
printf ("result would overflow\n");
|
|
else
|
|
printf ("result is %ld (no overflow)\n", a * b);
|
|
|
|
Example usage with WRAPV flavor:
|
|
|
|
long int result;
|
|
bool overflow = INT_MULTIPLY_WRAPV (a, b, &result);
|
|
printf ("result is %ld (%s)\n", result,
|
|
overflow ? "after overflow" : "no overflow");
|
|
|
|
Restrictions on these macros:
|
|
|
|
These macros do not check for all possible numerical problems or
|
|
undefined or unspecified behavior: they do not check for division
|
|
by zero, for bad shift counts, or for shifting negative numbers.
|
|
|
|
These macros may evaluate their arguments zero or multiple times, so the
|
|
arguments should not have side effects.
|
|
|
|
The WRAPV macros are not constant expressions. They support only
|
|
+, binary -, and *. Because the WRAPV macros convert the result,
|
|
they report overflow in different circumstances than the OVERFLOW
|
|
macros do.
|
|
|
|
These macros are tuned for their last input argument being a constant.
|
|
|
|
Return 1 if the integer expressions A * B, A - B, -A, A * B, A / B,
|
|
A % B, and A << B would overflow, respectively. */
|
|
|
|
#define INT_ADD_OVERFLOW(a, b) \
|
|
_GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
|
|
#define INT_SUBTRACT_OVERFLOW(a, b) \
|
|
_GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
|
|
#if _GL_HAS_BUILTIN_OVERFLOW_P
|
|
# define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
|
|
#else
|
|
# define INT_NEGATE_OVERFLOW(a) \
|
|
INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
|
|
#endif
|
|
#define INT_MULTIPLY_OVERFLOW(a, b) \
|
|
_GL_BINARY_OP_OVERFLOW (a, b, _GL_MULTIPLY_OVERFLOW)
|
|
#define INT_DIVIDE_OVERFLOW(a, b) \
|
|
_GL_BINARY_OP_OVERFLOW (a, b, _GL_DIVIDE_OVERFLOW)
|
|
#define INT_REMAINDER_OVERFLOW(a, b) \
|
|
_GL_BINARY_OP_OVERFLOW (a, b, _GL_REMAINDER_OVERFLOW)
|
|
#define INT_LEFT_SHIFT_OVERFLOW(a, b) \
|
|
INT_LEFT_SHIFT_RANGE_OVERFLOW (a, b, \
|
|
_GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
|
|
|
|
/* Return 1 if the expression A <op> B would overflow,
|
|
where OP_RESULT_OVERFLOW (A, B, MIN, MAX) does the actual test,
|
|
assuming MIN and MAX are the minimum and maximum for the result type.
|
|
Arguments should be free of side effects. */
|
|
#define _GL_BINARY_OP_OVERFLOW(a, b, op_result_overflow) \
|
|
op_result_overflow (a, b, \
|
|
_GL_INT_MINIMUM (_GL_INT_CONVERT (a, b)), \
|
|
_GL_INT_MAXIMUM (_GL_INT_CONVERT (a, b)))
|
|
|
|
/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
|
|
Return 1 if the result overflows. See above for restrictions. */
|
|
#if _GL_HAS_BUILTIN_ADD_OVERFLOW
|
|
# define INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r)
|
|
# define INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r)
|
|
#else
|
|
# define INT_ADD_WRAPV(a, b, r) \
|
|
_GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW)
|
|
# define INT_SUBTRACT_WRAPV(a, b, r) \
|
|
_GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW)
|
|
#endif
|
|
#if _GL_HAS_BUILTIN_MUL_OVERFLOW
|
|
# if (9 < __GNUC__ + (3 <= __GNUC_MINOR__) \
|
|
|| (__GNUC__ == 8 && 4 <= __GNUC_MINOR__))
|
|
# define INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r)
|
|
# else
|
|
/* Work around GCC bug 91450. */
|
|
# define INT_MULTIPLY_WRAPV(a, b, r) \
|
|
((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && EXPR_SIGNED (a) && EXPR_SIGNED (b) \
|
|
&& _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \
|
|
? ((void) __builtin_mul_overflow (a, b, r), 1) \
|
|
: __builtin_mul_overflow (a, b, r))
|
|
# endif
|
|
#else
|
|
# define INT_MULTIPLY_WRAPV(a, b, r) \
|
|
_GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW)
|
|
#endif
|
|
|
|
/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See:
|
|
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
|
|
https://llvm.org/bugs/show_bug.cgi?id=25390
|
|
For now, assume all versions of GCC-like compilers generate bogus
|
|
warnings for _Generic. This matters only for compilers that
|
|
lack relevant builtins. */
|
|
#if __GNUC__
|
|
# define _GL__GENERIC_BOGUS 1
|
|
#else
|
|
# define _GL__GENERIC_BOGUS 0
|
|
#endif
|
|
|
|
/* Store the low-order bits of A <op> B into *R, where OP specifies
|
|
the operation and OVERFLOW the overflow predicate. Return 1 if the
|
|
result overflows. See above for restrictions. */
|
|
#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
|
|
# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \
|
|
(_Generic \
|
|
(*(r), \
|
|
signed char: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
signed char, SCHAR_MIN, SCHAR_MAX), \
|
|
unsigned char: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
unsigned char, 0, UCHAR_MAX), \
|
|
short int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
short int, SHRT_MIN, SHRT_MAX), \
|
|
unsigned short int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
unsigned short int, 0, USHRT_MAX), \
|
|
int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
int, INT_MIN, INT_MAX), \
|
|
unsigned int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
unsigned int, 0, UINT_MAX), \
|
|
long int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
long int, LONG_MIN, LONG_MAX), \
|
|
unsigned long int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
unsigned long int, 0, ULONG_MAX), \
|
|
long long int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
|
long long int, LLONG_MIN, LLONG_MAX), \
|
|
unsigned long long int: \
|
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
|
unsigned long long int, 0, ULLONG_MAX)))
|
|
#else
|
|
/* Store the low-order bits of A <op> B into *R, where OP specifies
|
|
the operation and OVERFLOW the overflow predicate. If *R is
|
|
signed, its type is ST with bounds SMIN..SMAX; otherwise its type
|
|
is UT with bounds U..UMAX. ST and UT are narrower than int.
|
|
Return 1 if the result overflows. See above for restrictions. */
|
|
# if _GL_HAVE___TYPEOF__
|
|
# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
|
|
(TYPE_SIGNED (__typeof__ (*(r))) \
|
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \
|
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax))
|
|
# else
|
|
# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
|
|
(overflow (a, b, smin, smax) \
|
|
? (overflow (a, b, 0, umax) \
|
|
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \
|
|
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \
|
|
: (overflow (a, b, 0, umax) \
|
|
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \
|
|
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0)))
|
|
# endif
|
|
|
|
# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \
|
|
(sizeof *(r) == sizeof (signed char) \
|
|
? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
|
|
signed char, SCHAR_MIN, SCHAR_MAX, \
|
|
unsigned char, UCHAR_MAX) \
|
|
: sizeof *(r) == sizeof (short int) \
|
|
? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
|
|
short int, SHRT_MIN, SHRT_MAX, \
|
|
unsigned short int, USHRT_MAX) \
|
|
: sizeof *(r) == sizeof (int) \
|
|
? (EXPR_SIGNED (*(r)) \
|
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
int, INT_MIN, INT_MAX) \
|
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
|
unsigned int, 0, UINT_MAX)) \
|
|
: _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow))
|
|
# ifdef LLONG_MAX
|
|
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
|
(sizeof *(r) == sizeof (long int) \
|
|
? (EXPR_SIGNED (*(r)) \
|
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
long int, LONG_MIN, LONG_MAX) \
|
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
unsigned long int, 0, ULONG_MAX)) \
|
|
: (EXPR_SIGNED (*(r)) \
|
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
|
long long int, LLONG_MIN, LLONG_MAX) \
|
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
|
unsigned long long int, 0, ULLONG_MAX)))
|
|
# else
|
|
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
|
(EXPR_SIGNED (*(r)) \
|
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
long int, LONG_MIN, LONG_MAX) \
|
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
|
unsigned long int, 0, ULONG_MAX))
|
|
# endif
|
|
#endif
|
|
|
|
/* Store the low-order bits of A <op> B into *R, where the operation
|
|
is given by OP. Use the unsigned type UT for calculation to avoid
|
|
overflow problems. *R's type is T, with extrema TMIN and TMAX.
|
|
T must be a signed integer type. Return 1 if the result overflows. */
|
|
#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
|
|
(overflow (a, b, tmin, tmax) \
|
|
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
|
|
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
|
|
|
|
/* Return the low-order bits of A <op> B, where the operation is given
|
|
by OP. Use the unsigned type UT for calculation to avoid undefined
|
|
behavior on signed integer overflow, and convert the result to type T.
|
|
UT is at least as wide as T and is no narrower than unsigned int,
|
|
T is two's complement, and there is no padding or trap representations.
|
|
Assume that converting UT to T yields the low-order bits, as is
|
|
done in all known two's-complement C compilers. E.g., see:
|
|
https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
|
|
|
|
According to the C standard, converting UT to T yields an
|
|
implementation-defined result or signal for values outside T's
|
|
range. However, code that works around this theoretical problem
|
|
runs afoul of a compiler bug in Oracle Studio 12.3 x86. See:
|
|
https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html
|
|
As the compiler bug is real, don't try to work around the
|
|
theoretical problem. */
|
|
|
|
#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
|
|
((t) ((ut) (a) op (ut) (b)))
|
|
|
|
/* Return true if the numeric values A + B, A - B, A * B fall outside
|
|
the range TMIN..TMAX. Arguments should be integer expressions
|
|
without side effects. TMIN should be signed and nonpositive.
|
|
TMAX should be positive, and should be signed unless TMIN is zero. */
|
|
#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \
|
|
((b) < 0 \
|
|
? (((tmin) \
|
|
? ((EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \
|
|
&& (a) < (tmin) - (b)) \
|
|
: (a) <= -1 - (b)) \
|
|
|| ((EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \
|
|
: (a) < 0 \
|
|
? (((tmin) \
|
|
? ((EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \
|
|
&& (b) < (tmin) - (a)) \
|
|
: (b) <= -1 - (a)) \
|
|
|| ((EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \
|
|
&& (tmax) < (a) + (b))) \
|
|
: (tmax) < (b) || (tmax) - (b) < (a))
|
|
#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \
|
|
(((a) < 0) == ((b) < 0) \
|
|
? ((a) < (b) \
|
|
? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \
|
|
: (tmax) < (a) - (b)) \
|
|
: (a) < 0 \
|
|
? ((!EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \
|
|
|| (a) - (tmin) < (b)) \
|
|
: ((! (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
|
|
&& EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \
|
|
&& (tmax) <= -1 - (b)) \
|
|
|| (tmax) + (b) < (a)))
|
|
#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \
|
|
((b) < 0 \
|
|
? ((a) < 0 \
|
|
? (EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
|
|
? (a) < (tmax) / (b) \
|
|
: ((INT_NEGATE_OVERFLOW (b) \
|
|
? _GL_INT_CONVERT (b, tmax) >> (TYPE_WIDTH (b) - 1) \
|
|
: (tmax) / -(b)) \
|
|
<= -1 - (a))) \
|
|
: INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \
|
|
? (EXPR_SIGNED (a) \
|
|
? 0 < (a) + (tmin) \
|
|
: 0 < (a) && -1 - (tmin) < (a) - 1) \
|
|
: (tmin) / (b) < (a)) \
|
|
: (b) == 0 \
|
|
? 0 \
|
|
: ((a) < 0 \
|
|
? (INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \
|
|
? (EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \
|
|
: (tmin) / (a) < (b)) \
|
|
: (tmax) / (b) < (a)))
|
|
|
|
#endif /* _GL_INTPROPS_H */
|