mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Update from Gnulib by running admin/merge-gnulib
The following changes were made by hand, so that admin/merge-gnulib could succeed instead of failing because the diff didn’t match. * admin/gnulib-patches/lib/getloadavg.c.diff: Remove, as it is no longer needed now that recent Gnulib has been merged. * admin/merge-gnulib (GNULIB_TOOL_FLAGS): Remove the --local-dir="$src"admin/gnulib-patches option, as it is no longer needed either.
This commit is contained in:
parent
322ed637b4
commit
c9c6abfa81
14 changed files with 141 additions and 52 deletions
|
|
@ -1,5 +1,5 @@
|
|||
# gnulib-common.m4
|
||||
# serial 109
|
||||
# serial 110
|
||||
dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -117,6 +117,9 @@ AC_DEFUN([gl_COMMON_BODY], [
|
|||
# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
|
||||
# else
|
||||
# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
|
||||
/* The following lines list the first GCC version that supports the attribute.
|
||||
Although the lines are not used in GCC 5 and later (as GCC 5 introduced
|
||||
__has_attribute support), list GCC versions 5+ anyway for completeness. */
|
||||
# define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3)
|
||||
# define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2)
|
||||
# define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3)
|
||||
|
|
@ -137,14 +140,15 @@ AC_DEFUN([gl_COMMON_BODY], [
|
|||
# endif
|
||||
# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1)
|
||||
# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3)
|
||||
# define _GL_ATTR_nonnull_if_nonzero _GL_GNUC_PREREQ (15, 1)
|
||||
# define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0)
|
||||
# define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3)
|
||||
# define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7)
|
||||
# define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96)
|
||||
# define _GL_ATTR_reproducible 0 /* not yet supported, as of GCC 14 */
|
||||
# define _GL_ATTR_reproducible _GL_GNUC_PREREQ (15, 1)
|
||||
# define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9)
|
||||
# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0)
|
||||
# define _GL_ATTR_unsequenced 0 /* not yet supported, as of GCC 14 */
|
||||
# define _GL_ATTR_unsequenced _GL_GNUC_PREREQ (15, 1)
|
||||
# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7)
|
||||
# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4)
|
||||
# endif
|
||||
|
|
@ -681,6 +685,17 @@ AC_DEFUN([gl_COMMON_BODY], [
|
|||
# endif
|
||||
#endif
|
||||
|
||||
/* _GL_ATTRIBUTE_NONNULL_IF_NONZERO (NP, NI) declares that the argument NP
|
||||
(a pointer) must not be NULL if the argument NI (an integer) is != 0. */
|
||||
/* Applies to: functions. */
|
||||
#ifndef _GL_ATTRIBUTE_NONNULL_IF_NONZERO
|
||||
# if _GL_HAS_ATTRIBUTE (nonnull_if_nonzero)
|
||||
# define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni) __attribute__ ((__nonnull_if_nonzero__ (np, ni)))
|
||||
# else
|
||||
# define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is
|
||||
not meant to be NUL-terminated. */
|
||||
/* Applies to: struct/union members and variables that are arrays of element
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
|
|||
# export LC_ALL=C && comm -3 \
|
||||
# <((sed -n 's/^ *\(-[^ 0-9][^ ]*\).*/\1/p' manywarnings.m4; \
|
||||
# awk '/^[^#]/ {print $1}' ../build-aux/gcc-warning.spec) | sort) \
|
||||
# <(LC_ALL=C gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort)
|
||||
# <(gcc --help=warnings | sed -n 's/^ \(-[^ ]*\) .*/\1/p' | sort)
|
||||
|
||||
$1=
|
||||
for gl_manywarn_item in -fanalyzer -fstrict-flex-arrays \
|
||||
|
|
@ -106,7 +106,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)],
|
|||
-Wbad-function-cast \
|
||||
-Wcast-align=strict \
|
||||
-Wdate-time \
|
||||
-Wdisabled-optimization \
|
||||
-Wdouble-promotion \
|
||||
-Wduplicated-branches \
|
||||
-Wduplicated-cond \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# stddef_h.m4
|
||||
# serial 19
|
||||
# serial 21
|
||||
dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
|
|
@ -91,12 +91,14 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
|
|||
fi
|
||||
|
||||
dnl https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870
|
||||
dnl affects GCC 13 and 14.
|
||||
dnl affects GCC 13.3 and 14.2.
|
||||
AC_CACHE_CHECK([whether <stddef.h> is idempotent],
|
||||
[gl_cv_stddef_idempotent],
|
||||
[AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
||||
[[
|
||||
#if __GNUC__ == 13 || __GNUC__ == 14
|
||||
#if \
|
||||
((__GNUC__ == 13 && __GNUC_MINOR__ <= 3) \
|
||||
|| (__GNUC__ == 14 && __GNUC_MINOR__ <= 2))
|
||||
#error "bug 114870 is present"
|
||||
#endif
|
||||
]])],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue