[commit] gnulib update [Re: Branching time + 1 week]

Jan Kratochvil
2012-06-24T09:14:00Z

On Fri, 22 Jun 2012 22:30:48 +0200, Joel Brobecker wrote:
> > Also before checking-in [patch 2/2] I am going to update gnulib files as
> > [obv] to separate gnulib update vs. gnulib addition of fnmatch-gnu module.
> > I could add fnmatch-gnu from a several months old gnulib snapshot but that
> > sems incorrect to me. gnulib update also seems safe enough to me (WDYT?).
>
> I would imagine that it's fairly safe, but we are about branch,
> so we have little time to find any possible regression that might
> be introduced by the update. If we are going to do the gnulib
> update, let's do it right away.

Done.

No regressions on {x86_64,x86_64-m32,i686}-fedorarawhide-linux-gnu.

Jan

http://sourceware.org/ml/gdb-cvs/2012-06/msg00174.html

--- src/gdb/ChangeLog 2012/06/24 07:28:06 1.14393
+++ src/gdb/ChangeLog 2012/06/24 09:12:31 1.14394
@@ -1,3 +1,15 @@
+2012-06-24 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ Update gnulib to GIT commit a39f53ccb70a613e647e1019fb4c63645220267e.
+ * gnulib/config.in: Regenerate.
+ * gnulib/configure: Likewise.
+ * gnulib/import/m4/extensions.m4: Update it.
+ * gnulib/import/m4/gnulib-common.m4: Likewise.
+ * gnulib/import/m4/memmem.m4: Likewise.
+ * gnulib/import/m4/mmap-anon.m4: Likewise.
+ * gnulib/import/m4/multiarch.m4: Likewise.
+ * gnulib/import/stdint.in.h: Likewise.
+
2012-06-24 Yao Qi <yao@codesourcery.com>

* corefile.c (write_memory_with_notification): New.
--- src/gdb/gnulib/config.in 2012/04/19 19:34:51 1.1
+++ src/gdb/gnulib/config.in 2012/06/24 09:12:32 1.2
@@ -218,7 +218,8 @@
#undef _MINIX

/* The _Noreturn keyword of C11. */
-#ifndef _Noreturn
+#if ! (defined _Noreturn \
+ || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|| 0x5110 <= __SUNPRO_C)
# define _Noreturn __attribute__ ((__noreturn__))
@@ -244,7 +245,7 @@
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on MacOS X. */
+/* Enable general extensions on Mac OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
@@ -269,7 +270,7 @@
/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
- __APPLE__ && __MACH__ test for MacOS X.
+ __APPLE__ && __MACH__ test for Mac OS X.
__APPLE_CC__ tests for the Apple compiler and its version.
__STDC_VERSION__ tests for the C99 mode. */
#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
--- src/gdb/gnulib/configure 2012/04/19 19:34:51 1.1
+++ src/gdb/gnulib/configure 2012/06/24 09:12:32 1.2
@@ -6099,12 +6099,12 @@

#include <sys/mman.h>
#ifdef MAP_ANONYMOUS
- I cant identify this map
+ I cannot identify this map
#endif

_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "I cant identify this map" >/dev/null 2>&1; then :
+ $EGREP "I cannot identify this map" >/dev/null 2>&1; then :
gl_have_mmap_anonymous=yes
fi
rm -f conftest*
@@ -6115,12 +6115,12 @@

#include <sys/mman.h>
#ifdef MAP_ANON
- I cant identify this map
+ I cannot identify this map
#endif

_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "I cant identify this map" >/dev/null 2>&1; then :
+ $EGREP "I cannot identify this map" >/dev/null 2>&1; then :

$as_echo "#define MAP_ANONYMOUS MAP_ANON" >>confdefs.h

@@ -6315,7 +6315,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Lucky user" >/dev/null 2>&1; then :
- gl_cv_func_memmem_works_always=yes
+ gl_cv_func_memmem_works_always="guessing yes"
else
gl_cv_func_memmem_works_always="guessing no"
fi
@@ -6363,9 +6363,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memmem_works_always" >&5
$as_echo "$gl_cv_func_memmem_works_always" >&6; }
- if test "$gl_cv_func_memmem_works_always" != yes; then
- REPLACE_MEMMEM=1
- fi
+ case "$gl_cv_func_memmem_works_always" in
+ *yes) ;;
+ *)
+ REPLACE_MEMMEM=1
+ ;;
+ esac
fi
:

@@ -6912,7 +6915,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Lucky user" >/dev/null 2>&1; then :
- gl_cv_func_memmem_works_fast=yes
+ gl_cv_func_memmem_works_fast="guessing yes"
else
gl_cv_func_memmem_works_fast="guessing no"
fi
@@ -6970,9 +6973,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memmem_works_fast" >&5
$as_echo "$gl_cv_func_memmem_works_fast" >&6; }
- if test "$gl_cv_func_memmem_works_fast" != yes; then
- REPLACE_MEMMEM=1
- fi
+ case "$gl_cv_func_memmem_works_fast" in
+ *yes) ;;
+ *)
+ REPLACE_MEMMEM=1
+ ;;
+ esac
fi

if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then
@@ -7046,7 +7052,7 @@
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "Lucky user" >/dev/null 2>&1; then :
- gl_cv_func_memmem_works_always=yes
+ gl_cv_func_memmem_works_always="guessing yes"
else
gl_cv_func_memmem_works_always="guessing no"
fi
@@ -7094,9 +7100,12 @@
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_memmem_works_always" >&5
$as_echo "$gl_cv_func_memmem_works_always" >&6; }
- if test "$gl_cv_func_memmem_works_always" != yes; then
- REPLACE_MEMMEM=1
- fi
+ case "$gl_cv_func_memmem_works_always" in
+ *yes) ;;
+ *)
+ REPLACE_MEMMEM=1
+ ;;
+ esac
fi
:

--- src/gdb/gnulib/import/stdint.in.h 2012/04/19 15:27:49 1.1
+++ src/gdb/gnulib/import/stdint.in.h 2012/06/24 09:12:32 1.2
@@ -83,14 +83,15 @@
/* <sys/types.h> defines some of the stdint.h types as well, on glibc,
IRIX 6.5, and OpenBSD 3.8 (via <machine/types.h>).
AIX 5.2 <sys/types.h> isn't needed and causes troubles.
- MacOS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
+ Mac OS X 10.4.6 <sys/types.h> includes <stdint.h> (which is us), but
relies on the system <stdint.h> definitions, so include
<sys/types.h> after @NEXT_STDINT_H@. */
#if @HAVE_SYS_TYPES_H@ && ! defined _AIX
# include <sys/types.h>
#endif

-/* Get LONG_MIN, LONG_MAX, ULONG_MAX. */
+/* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
+ LONG_MIN, LONG_MAX, ULONG_MAX. */
#include <limits.h>

#if @HAVE_INTTYPES_H@
@@ -246,8 +247,9 @@

/* Here we assume a standard architecture where the hardware integer
types have 8, 16, 32, optionally 64 bits. Therefore the fastN_t types
- are taken from the same list of types. Assume that 'long int'
- is fast enough for all narrower integers. */
+ are taken from the same list of types. The following code normally
+ uses types consistent with glibc, as that lessens the chance of
+ incompatibility with older GNU hosts. */

#undef int_fast8_t
#undef uint_fast8_t
@@ -257,12 +259,21 @@
#undef uint_fast32_t
#undef int_fast64_t
#undef uint_fast64_t
-typedef long int gl_int_fast8_t;
-typedef unsigned long int gl_uint_fast8_t;
-typedef long int gl_int_fast16_t;
-typedef unsigned long int gl_uint_fast16_t;
+typedef signed char gl_int_fast8_t;
+typedef unsigned char gl_uint_fast8_t;
+
+#ifdef __sun
+/* Define types compatible with SunOS 5.10, so that code compiled under
+ earlier SunOS versions works with code compiled under SunOS 5.10. */
+typedef int gl_int_fast32_t;
+typedef unsigned int gl_uint_fast32_t;
+#else
typedef long int gl_int_fast32_t;
typedef unsigned long int gl_uint_fast32_t;
+#endif
+typedef gl_int_fast32_t gl_int_fast16_t;
+typedef gl_uint_fast32_t gl_uint_fast16_t;
+
#define int_fast8_t gl_int_fast8_t
#define uint_fast8_t gl_uint_fast8_t
#define int_fast16_t gl_int_fast16_t
@@ -418,23 +429,29 @@
#undef INT_FAST8_MIN
#undef INT_FAST8_MAX
#undef UINT_FAST8_MAX
-#define INT_FAST8_MIN LONG_MIN
-#define INT_FAST8_MAX LONG_MAX
-#define UINT_FAST8_MAX ULONG_MAX
+#define INT_FAST8_MIN SCHAR_MIN
+#define INT_FAST8_MAX SCHAR_MAX
+#define UINT_FAST8_MAX UCHAR_MAX

#undef INT_FAST16_MIN
#undef INT_FAST16_MAX
#undef UINT_FAST16_MAX
-#define INT_FAST16_MIN LONG_MIN
-#define INT_FAST16_MAX LONG_MAX
-#define UINT_FAST16_MAX ULONG_MAX
+#define INT_FAST16_MIN INT_FAST32_MIN
+#define INT_FAST16_MAX INT_FAST32_MAX
+#define UINT_FAST16_MAX UINT_FAST32_MAX

#undef INT_FAST32_MIN
#undef INT_FAST32_MAX
#undef UINT_FAST32_MAX
-#define INT_FAST32_MIN LONG_MIN
-#define INT_FAST32_MAX LONG_MAX
-#define UINT_FAST32_MAX ULONG_MAX
+#ifdef __sun
+# define INT_FAST32_MIN INT_MIN
+# define INT_FAST32_MAX INT_MAX
+# define UINT_FAST32_MAX UINT_MAX
+#else
+# define INT_FAST32_MIN LONG_MIN
+# define INT_FAST32_MAX LONG_MAX
+# define UINT_FAST32_MAX ULONG_MAX
+#endif

#undef INT_FAST64_MIN
#undef INT_FAST64_MAX
--- src/gdb/gnulib/import/m4/extensions.m4 2012/04/19 15:27:51 1.1
+++ src/gdb/gnulib/import/m4/extensions.m4 2012/06/24 09:12:33 1.2
@@ -1,4 +1,4 @@
-# serial 11 -*- Autoconf -*-
+# serial 12 -*- Autoconf -*-
# Enable extensions on systems that normally disable them.

# Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -67,7 +67,7 @@
#ifndef _ALL_SOURCE
# undef _ALL_SOURCE
#endif
-/* Enable general extensions on MacOS X. */
+/* Enable general extensions on Mac OS X. */
#ifndef _DARWIN_C_SOURCE
# undef _DARWIN_C_SOURCE
#endif
--- src/gdb/gnulib/import/m4/gnulib-common.m4 2012/04/19 15:27:51 1.1
+++ src/gdb/gnulib/import/m4/gnulib-common.m4 2012/06/24 09:12:33 1.2
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 32
+# gnulib-common.m4 serial 33
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,8 @@
AC_DEFUN([gl_COMMON_BODY], [
AH_VERBATIM([_Noreturn],
[/* The _Noreturn keyword of C11. */
-#ifndef _Noreturn
+#if ! (defined _Noreturn \
+ || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
|| 0x5110 <= __SUNPRO_C)
# define _Noreturn __attribute__ ((__noreturn__))
@@ -29,7 +30,7 @@
[/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
- __APPLE__ && __MACH__ test for MacOS X.
+ __APPLE__ && __MACH__ test for Mac OS X.
__APPLE_CC__ tests for the Apple compiler and its version.
__STDC_VERSION__ tests for the C99 mode. */
#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
--- src/gdb/gnulib/import/m4/memmem.m4 2012/04/19 15:27:51 1.1
+++ src/gdb/gnulib/import/m4/memmem.m4 2012/06/24 09:12:33 1.2
@@ -1,4 +1,4 @@
-# memmem.m4 serial 23
+# memmem.m4 serial 24
dnl Copyright (C) 2002-2004, 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -67,13 +67,16 @@
Lucky user
#endif
],
- [gl_cv_func_memmem_works_always=yes],
+ [gl_cv_func_memmem_works_always="guessing yes"],
[gl_cv_func_memmem_works_always="guessing no"])
])
])
- if test "$gl_cv_func_memmem_works_always" != yes; then
- REPLACE_MEMMEM=1
- fi
+ case "$gl_cv_func_memmem_works_always" in
+ *yes) ;;
+ *)
+ REPLACE_MEMMEM=1
+ ;;
+ esac
fi
gl_PREREQ_MEMMEM
]) # gl_FUNC_MEMMEM_SIMPLE
@@ -131,13 +134,16 @@
#endif
#endif
],
- [gl_cv_func_memmem_works_fast=yes],
+ [gl_cv_func_memmem_works_fast="guessing yes"],
[gl_cv_func_memmem_works_fast="guessing no"])
])
])
- if test "$gl_cv_func_memmem_works_fast" != yes; then
- REPLACE_MEMMEM=1
- fi
+ case "$gl_cv_func_memmem_works_fast" in
+ *yes) ;;
+ *)
+ REPLACE_MEMMEM=1
+ ;;
+ esac
fi
]) # gl_FUNC_MEMMEM

--- src/gdb/gnulib/import/m4/mmap-anon.m4 2012/04/19 15:27:51 1.1
+++ src/gdb/gnulib/import/m4/mmap-anon.m4 2012/06/24 09:12:33 1.2
@@ -1,4 +1,4 @@
-# mmap-anon.m4 serial 9
+# mmap-anon.m4 serial 10
dnl Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@
# - On Linux, AIX, OSF/1, Solaris, Cygwin, Interix, Haiku, both MAP_ANONYMOUS
# and MAP_ANON exist and have the same value.
# - On HP-UX, only MAP_ANONYMOUS exists.
-# - On MacOS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
+# - On Mac OS X, FreeBSD, NetBSD, OpenBSD, only MAP_ANON exists.
# - On IRIX, neither exists, and a file descriptor opened to /dev/zero must be
# used.

@@ -27,18 +27,18 @@
gl_have_mmap_anonymous=no
if test $gl_have_mmap = yes; then
AC_MSG_CHECKING([for MAP_ANONYMOUS])
- AC_EGREP_CPP([I cant identify this map], [
+ AC_EGREP_CPP([I cannot identify this map], [
#include <sys/mman.h>
#ifdef MAP_ANONYMOUS
- I cant identify this map
+ I cannot identify this map
#endif
],
[gl_have_mmap_anonymous=yes])
if test $gl_have_mmap_anonymous != yes; then
- AC_EGREP_CPP([I cant identify this map], [
+ AC_EGREP_CPP([I cannot identify this map], [
#include <sys/mman.h>
#ifdef MAP_ANON
- I cant identify this map
+ I cannot identify this map
#endif
],
[AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON],
--- src/gdb/gnulib/import/m4/multiarch.m4 2012/04/19 15:27:51 1.1
+++ src/gdb/gnulib/import/m4/multiarch.m4 2012/06/24 09:12:33 1.2
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 6
+# multiarch.m4 serial 7
dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,7 @@

# Determine whether the compiler is or may be producing universal binaries.
#
-# On MacOS X 10.5 and later systems, the user can create libraries and
+# On Mac OS X 10.5 and later systems, the user can create libraries and
# executables that work on multiple system types--known as "fat" or
# "universal" binaries--by specifying multiple '-arch' options to the
# compiler but only a single '-arch' option to the preprocessor. Like