From a512b375766eeea98a8c0dc7b5de49dd9d6a1d1b Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Tue, 18 Dec 2012 06:00:55 +0000 Subject: [PATCH] Update gnulib to current HEAD. gdb/ChangeLog: * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 8d5bd1402003bd0153984b138735adf537d960b0. * gnulib/aclocal.m4, configure, config.in: Regenerate. * gnulib/import/m4/extern-inline.m4: Import. * gnulib/import/wctype-h.c: Import. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wctype.in.h: Update. --- gdb/ChangeLog | 20 +++ gdb/gnulib/aclocal.m4 | 1 + gdb/gnulib/config.in | 58 ++++++++- gdb/gnulib/configure | 96 +++++--------- gdb/gnulib/import/Makefile.am | 1 + gdb/gnulib/import/Makefile.in | 8 +- gdb/gnulib/import/alloca.in.h | 7 + gdb/gnulib/import/extra/snippet/warn-on-use.h | 2 +- gdb/gnulib/import/localcharset.c | 7 + gdb/gnulib/import/m4/extern-inline.m4 | 62 +++++++++ gdb/gnulib/import/m4/fcntl-o.m4 | 13 +- gdb/gnulib/import/m4/gnulib-cache.m4 | 2 +- gdb/gnulib/import/m4/gnulib-comp.m4 | 120 +++++++++--------- gdb/gnulib/import/m4/wctype_h.m4 | 4 +- gdb/gnulib/import/stdbool.in.h | 51 +++++--- gdb/gnulib/import/verify.h | 6 +- gdb/gnulib/import/wctype-h.c | 4 + gdb/gnulib/import/wctype.in.h | 38 +++--- gdb/gnulib/update-gnulib.sh | 2 +- 19 files changed, 330 insertions(+), 172 deletions(-) create mode 100644 gdb/gnulib/import/m4/extern-inline.m4 create mode 100644 gdb/gnulib/import/wctype-h.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 00e03624ac..b84c753cfb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,23 @@ +2012-12-18 Joel Brobecker + + * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to + 8d5bd1402003bd0153984b138735adf537d960b0. + * gnulib/aclocal.m4, configure, config.in: Regenerate. + * gnulib/import/m4/extern-inline.m4: Import. + * gnulib/import/wctype-h.c: Import. + * gnulib/import/Makefile.am: Update. + * gnulib/import/Makefile.in: Update. + * gnulib/import/alloca.in.h: Update. + * gnulib/import/extra/snippet/warn-on-use.h: Update. + * gnulib/import/localcharset.c: Update. + * gnulib/import/m4/fcntl-o.m4: Update. + * gnulib/import/m4/gnulib-cache.m4: Update. + * gnulib/import/m4/gnulib-comp.m4: Update. + * gnulib/import/m4/wctype_h.m4: Update. + * gnulib/import/stdbool.in.h: Update. + * gnulib/import/verify.h: Update. + * gnulib/import/wctype.in.h: Update. + 2012-12-18 Joel Brobecker * gnulib/update-gnulib.sh: Add call to autoheader. diff --git a/gdb/gnulib/aclocal.m4 b/gdb/gnulib/aclocal.m4 index ead4506144..f19993c58b 100644 --- a/gdb/gnulib/aclocal.m4 +++ b/gdb/gnulib/aclocal.m4 @@ -1017,6 +1017,7 @@ m4_include([import/m4/alloca.m4]) m4_include([import/m4/codeset.m4]) m4_include([import/m4/configmake.m4]) m4_include([import/m4/extensions.m4]) +m4_include([import/m4/extern-inline.m4]) m4_include([import/m4/fcntl-o.m4]) m4_include([import/m4/fnmatch.m4]) m4_include([import/m4/glibc21.m4]) diff --git a/gdb/gnulib/config.in b/gdb/gnulib/config.in index 7d97b4bd2e..34a71a0917 100644 --- a/gdb/gnulib/config.in +++ b/gdb/gnulib/config.in @@ -528,15 +528,61 @@ #endif -/* Define to a replacement function name for fnmatch(). */ -#undef fnmatch +/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. + _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. + _GL_INLINE_HEADER_BEGIN contains useful stuff to put + in an include file, before uses of _GL_INLINE. + It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, + when FOO is an inline function in the header; see + . + _GL_INLINE_HEADER_END contains useful stuff to put + in the same include file, after uses of _GL_INLINE. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + . + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +# if __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +# else +# define _GL_INLINE extern inline +# endif +# define _GL_EXTERN_INLINE extern +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline +#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END #endif +/* Define to a replacement function name for fnmatch(). */ +#undef fnmatch + /* 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__. diff --git a/gdb/gnulib/configure b/gdb/gnulib/configure index 9de03a0b69..d9809cc2a2 100644 --- a/gdb/gnulib/configure +++ b/gdb/gnulib/configure @@ -4290,6 +4290,7 @@ fi # Code from module configmake: # Code from module extensions: + # Code from module extern-inline: # Code from module fnmatch: # Code from module fnmatch-gnu: # Code from module include_next: @@ -5126,6 +5127,9 @@ fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5 $as_echo_n "checking for mbstate_t... " >&6; } if test "${ac_cv_type_mbstate_t+set}" = set; then : @@ -6586,7 +6590,18 @@ main () #if HAVE_SYMLINK { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0) + if (symlink ("/dev/null", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } + if (unlink (sym) != 0 || symlink (".", sym) != 0) result |= 2; else { @@ -8181,48 +8196,6 @@ $as_echo "#define HAVE_WINT_T 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_c_inline=no -for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __cplusplus -typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break -done - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } - -case $ac_cv_c_inline in - inline | yes) ;; - *) - case $ac_cv_c_inline in - no) ac_val=;; - *) ac_val=$ac_cv_c_inline;; - esac - cat >>confdefs.h <<_ACEOF -#ifndef __cplusplus -#define inline $ac_val -#endif -_ACEOF - ;; -esac - if false; then GL_COND_LIBTOOL_TRUE= @@ -8343,6 +8316,7 @@ fi + FNMATCH_H= gl_fnmatch_required_lowercase=` echo $gl_fnmatch_required | LC_ALL=C tr '[A-Z]' '[a-z]' @@ -8479,7 +8453,7 @@ else fi -if test -n "$FNMATCH_H"; then + if test -n "$FNMATCH_H"; then @@ -8545,13 +8519,13 @@ _ACEOF -fi + fi -if test -n "$FNMATCH_H"; then + if test -n "$FNMATCH_H"; then @@ -8617,7 +8591,7 @@ _ACEOF -fi + fi @@ -8885,7 +8859,7 @@ $as_echo "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" @@ -9468,7 +9442,7 @@ $as_echo "#define MBRTOWC_NUL_RETVAL_BUG 1" >>confdefs.h fi fi -if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then @@ -9482,7 +9456,7 @@ if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then : -fi + fi @@ -9709,7 +9683,7 @@ _ACEOF fi fi -if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then @@ -9723,7 +9697,7 @@ if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then : -fi + fi @@ -10063,7 +10037,7 @@ $as_echo "$gl_cv_func_mbsrtowcs_works" >&6; } fi fi -if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then @@ -10087,7 +10061,7 @@ if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then : -fi + fi @@ -10104,7 +10078,7 @@ $as_echo "#define GNULIB_TEST_MBSRTOWCS 1" >>confdefs.h -if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then @@ -10129,7 +10103,7 @@ fi done -fi + fi @@ -10240,7 +10214,7 @@ $as_echo "$gl_cv_func_memmem_works_fast" >&6; } esac fi -if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then + if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then @@ -10251,7 +10225,7 @@ if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then gl_LIBOBJS="$gl_LIBOBJS memmem.$ac_objext" -fi + fi @@ -10368,7 +10342,7 @@ $as_echo "$gl_cv_func_memmem_works_always" >&6; } fi : -if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then + if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then @@ -10379,7 +10353,7 @@ if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then gl_LIBOBJS="$gl_LIBOBJS memmem.$ac_objext" -fi + fi @@ -10716,8 +10690,6 @@ fi - - if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 else diff --git a/gdb/gnulib/import/Makefile.am b/gdb/gnulib/import/Makefile.am index 12c1c93ebf..efa828f5ea 100644 --- a/gdb/gnulib/import/Makefile.am +++ b/gdb/gnulib/import/Makefile.am @@ -739,6 +739,7 @@ EXTRA_DIST += wchar.in.h ## begin gnulib module wctype-h BUILT_SOURCES += wctype.h +libgnu_a_SOURCES += wctype-h.c # We need the following in order to create when the system # doesn't have one that works with the given compiler. diff --git a/gdb/gnulib/import/Makefile.in b/gdb/gnulib/import/Makefile.in index 514380ba8b..7b396c1080 100644 --- a/gdb/gnulib/import/Makefile.in +++ b/gdb/gnulib/import/Makefile.in @@ -68,6 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/import/m4/00gnulib.m4 \ $(top_srcdir)/import/m4/codeset.m4 \ $(top_srcdir)/import/m4/configmake.m4 \ $(top_srcdir)/import/m4/extensions.m4 \ + $(top_srcdir)/import/m4/extern-inline.m4 \ $(top_srcdir)/import/m4/fcntl-o.m4 \ $(top_srcdir)/import/m4/fnmatch.m4 \ $(top_srcdir)/import/m4/glibc21.m4 \ @@ -108,7 +109,8 @@ CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = -am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) strnlen1.$(OBJEXT) +am_libgnu_a_OBJECTS = localcharset.$(OBJEXT) strnlen1.$(OBJEXT) \ + wctype-h.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -565,7 +567,8 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = AM_CPPFLAGS = AM_CFLAGS = -libgnu_a_SOURCES = localcharset.h localcharset.c strnlen1.h strnlen1.c +libgnu_a_SOURCES = localcharset.h localcharset.c strnlen1.h strnlen1.c \ + wctype-h.c libgnu_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ EXTRA_libgnu_a_SOURCES = alloca.c fnmatch.c fnmatch_loop.c mbrtowc.c \ @@ -645,6 +648,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memmem.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/gdb/gnulib/import/alloca.in.h b/gdb/gnulib/import/alloca.in.h index e94eb68c3c..d20f4b8f1c 100644 --- a/gdb/gnulib/import/alloca.in.h +++ b/gdb/gnulib/import/alloca.in.h @@ -44,6 +44,13 @@ # define alloca _alloca # elif defined __DECC && defined __VMS # define alloca __ALLOCA +# elif defined __TANDEM && defined _TNS_E_TARGET +# ifdef __cplusplus +extern "C" +# endif +void *_alloca (unsigned short); +# pragma intrinsic (_alloca) +# define alloca _alloca # else # include # ifdef __cplusplus diff --git a/gdb/gnulib/import/extra/snippet/warn-on-use.h b/gdb/gnulib/import/extra/snippet/warn-on-use.h index d4cb94f352..51e69bbd9b 100644 --- a/gdb/gnulib/import/extra/snippet/warn-on-use.h +++ b/gdb/gnulib/import/extra/snippet/warn-on-use.h @@ -55,7 +55,7 @@ rather than issue the nice warning, but the end result of informing the developer about their portability problem is still achieved): #if HAVE_RAW_DECL_ENVIRON - static inline char ***rpl_environ (void) { return &environ; } + static char ***rpl_environ (void) { return &environ; } _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); # undef environ # define environ (*rpl_environ ()) diff --git a/gdb/gnulib/import/localcharset.c b/gdb/gnulib/import/localcharset.c index b5ee2d6fef..8d16c87a76 100644 --- a/gdb/gnulib/import/localcharset.c +++ b/gdb/gnulib/import/localcharset.c @@ -542,5 +542,12 @@ locale_charset (void) if (codeset[0] == '\0') codeset = "ASCII"; +#ifdef DARWIN7 + /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8" + (the default codeset) does not work when MB_CUR_MAX is 1. */ + if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX <= 1) + codeset = "ASCII"; +#endif + return codeset; } diff --git a/gdb/gnulib/import/m4/extern-inline.m4 b/gdb/gnulib/import/m4/extern-inline.m4 new file mode 100644 index 0000000000..0a9fc9a75b --- /dev/null +++ b/gdb/gnulib/import/m4/extern-inline.m4 @@ -0,0 +1,62 @@ +dnl 'extern inline' a la ISO C99. + +dnl Copyright 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, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_EXTERN_INLINE], +[ + AH_VERBATIM([extern_inline], +[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. + _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. + _GL_INLINE_HEADER_BEGIN contains useful stuff to put + in an include file, before uses of _GL_INLINE. + It suppresses GCC's bogus "no previous prototype for 'FOO'" diagnostic, + when FOO is an inline function in the header; see + . + _GL_INLINE_HEADER_END contains useful stuff to put + in the same include file, after uses of _GL_INLINE. + + Suppress the use of extern inline on Apple's platforms, + as Libc-825.25 (2012-09-19) is incompatible with it; see + . + Perhaps Apple will fix this some day. */ +#if ((__GNUC__ \ + ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ + : 199901L <= __STDC_VERSION__) \ + && !defined __APPLE__) +# define _GL_INLINE inline +# define _GL_EXTERN_INLINE extern inline +#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__ +# if __GNUC_GNU_INLINE__ + /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ +# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) +# else +# define _GL_INLINE extern inline +# endif +# define _GL_EXTERN_INLINE extern +#else +# define _GL_INLINE static _GL_UNUSED +# define _GL_EXTERN_INLINE static _GL_UNUSED +#endif + +#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ +# define _GL_INLINE_HEADER_CONST_PRAGMA +# else +# define _GL_INLINE_HEADER_CONST_PRAGMA \ + _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"") +# endif +# define _GL_INLINE_HEADER_BEGIN \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \ + _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \ + _GL_INLINE_HEADER_CONST_PRAGMA +# define _GL_INLINE_HEADER_END \ + _Pragma ("GCC diagnostic pop") +#else +# define _GL_INLINE_HEADER_BEGIN +# define _GL_INLINE_HEADER_END +#endif]) +]) diff --git a/gdb/gnulib/import/m4/fcntl-o.m4 b/gdb/gnulib/import/m4/fcntl-o.m4 index 9862741f39..740e78b681 100644 --- a/gdb/gnulib/import/m4/fcntl-o.m4 +++ b/gdb/gnulib/import/m4/fcntl-o.m4 @@ -50,7 +50,18 @@ AC_DEFUN([gl_FCNTL_O_FLAGS], #if HAVE_SYMLINK { static char const sym[] = "conftest.sym"; - if (symlink (".", sym) != 0) + if (symlink ("/dev/null", sym) != 0) + result |= 2; + else + { + int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0); + if (fd >= 0) + { + close (fd); + result |= 4; + } + } + if (unlink (sym) != 0 || symlink (".", sym) != 0) result |= 2; else { diff --git a/gdb/gnulib/import/m4/gnulib-cache.m4 b/gdb/gnulib/import/m4/gnulib-cache.m4 index 895c571548..22e679661b 100644 --- a/gdb/gnulib/import/m4/gnulib-cache.m4 +++ b/gdb/gnulib/import/m4/gnulib-cache.m4 @@ -47,5 +47,5 @@ gl_LIB([libgnu]) gl_MAKEFILE_NAME([]) gl_MACRO_PREFIX([gl]) gl_PO_DOMAIN([]) -gl_WITNESS_C_DOMAIN([]) +gl_WITNESS_C_MACRO([]) gl_VC_FILES([false]) diff --git a/gdb/gnulib/import/m4/gnulib-comp.m4 b/gdb/gnulib/import/m4/gnulib-comp.m4 index 954ea2143f..6d0b35bcd2 100644 --- a/gdb/gnulib/import/m4/gnulib-comp.m4 +++ b/gdb/gnulib/import/m4/gnulib-comp.m4 @@ -43,6 +43,7 @@ AC_DEFUN([gl_EARLY], # Code from module configmake: # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + # Code from module extern-inline: # Code from module fnmatch: # Code from module fnmatch-gnu: # Code from module include_next: @@ -87,64 +88,65 @@ AC_DEFUN([gl_INIT], m4_pushdef([gl_LIBSOURCES_DIR], []) gl_COMMON gl_source_base='import' -gl_FUNC_ALLOCA -gl_CONFIGMAKE_PREP -gl_FUNC_FNMATCH_POSIX -if test -n "$FNMATCH_H"; then - AC_LIBOBJ([fnmatch]) - gl_PREREQ_FNMATCH -fi -gl_FUNC_FNMATCH_GNU -if test -n "$FNMATCH_H"; then - AC_LIBOBJ([fnmatch]) - gl_PREREQ_FNMATCH -fi -gl_INTTYPES_H -gl_INTTYPES_INCOMPLETE -gl_LOCALCHARSET -LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" -AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) -gl_FUNC_MBRTOWC -if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then - AC_LIBOBJ([mbrtowc]) - gl_PREREQ_MBRTOWC -fi -gl_WCHAR_MODULE_INDICATOR([mbrtowc]) -gl_FUNC_MBSINIT -if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - AC_LIBOBJ([mbsinit]) - gl_PREREQ_MBSINIT -fi -gl_WCHAR_MODULE_INDICATOR([mbsinit]) -gl_FUNC_MBSRTOWCS -if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then - AC_LIBOBJ([mbsrtowcs]) - AC_LIBOBJ([mbsrtowcs-state]) - gl_PREREQ_MBSRTOWCS -fi -gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) -gl_FUNC_MEMCHR -if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then - AC_LIBOBJ([memchr]) - gl_PREREQ_MEMCHR -fi -gl_STRING_MODULE_INDICATOR([memchr]) -gl_FUNC_MEMMEM -if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then - AC_LIBOBJ([memmem]) -fi -gl_FUNC_MEMMEM_SIMPLE -if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then - AC_LIBOBJ([memmem]) -fi -gl_STRING_MODULE_INDICATOR([memmem]) -gl_MULTIARCH -AM_STDBOOL_H -gl_STDDEF_H -gl_STDINT_H -gl_HEADER_STRING_H -gl_WCHAR_H -gl_WCTYPE_H + gl_FUNC_ALLOCA + gl_CONFIGMAKE_PREP + AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FUNC_FNMATCH_POSIX + if test -n "$FNMATCH_H"; then + AC_LIBOBJ([fnmatch]) + gl_PREREQ_FNMATCH + fi + gl_FUNC_FNMATCH_GNU + if test -n "$FNMATCH_H"; then + AC_LIBOBJ([fnmatch]) + gl_PREREQ_FNMATCH + fi + gl_INTTYPES_H + gl_INTTYPES_INCOMPLETE + gl_LOCALCHARSET + LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\"" + AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT]) + gl_FUNC_MBRTOWC + if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then + AC_LIBOBJ([mbrtowc]) + gl_PREREQ_MBRTOWC + fi + gl_WCHAR_MODULE_INDICATOR([mbrtowc]) + gl_FUNC_MBSINIT + if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then + AC_LIBOBJ([mbsinit]) + gl_PREREQ_MBSINIT + fi + gl_WCHAR_MODULE_INDICATOR([mbsinit]) + gl_FUNC_MBSRTOWCS + if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + AC_LIBOBJ([mbsrtowcs]) + AC_LIBOBJ([mbsrtowcs-state]) + gl_PREREQ_MBSRTOWCS + fi + gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) + gl_FUNC_MEMCHR + if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + AC_LIBOBJ([memchr]) + gl_PREREQ_MEMCHR + fi + gl_STRING_MODULE_INDICATOR([memchr]) + gl_FUNC_MEMMEM + if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then + AC_LIBOBJ([memmem]) + fi + gl_FUNC_MEMMEM_SIMPLE + if test $HAVE_MEMMEM = 0 || test $REPLACE_MEMMEM = 1; then + AC_LIBOBJ([memmem]) + fi + gl_STRING_MODULE_INDICATOR([memmem]) + gl_MULTIARCH + AM_STDBOOL_H + gl_STDDEF_H + gl_STDINT_H + gl_HEADER_STRING_H + gl_WCHAR_H + gl_WCTYPE_H # End of code from modules m4_ifval(gl_LIBSOURCES_LIST, [ m4_syscmd([test ! -d ]m4_defn([gl_LIBSOURCES_DIR])[ || @@ -318,12 +320,14 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strnlen1.h lib/verify.h lib/wchar.in.h + lib/wctype-h.c lib/wctype.in.h m4/00gnulib.m4 m4/alloca.m4 m4/codeset.m4 m4/configmake.m4 m4/extensions.m4 + m4/extern-inline.m4 m4/fcntl-o.m4 m4/fnmatch.m4 m4/glibc21.m4 diff --git a/gdb/gnulib/import/m4/wctype_h.m4 b/gdb/gnulib/import/m4/wctype_h.m4 index 4b19f643d0..885e6fcb21 100644 --- a/gdb/gnulib/import/m4/wctype_h.m4 +++ b/gdb/gnulib/import/m4/wctype_h.m4 @@ -1,4 +1,4 @@ -# wctype_h.m4 serial 17 +# wctype_h.m4 serial 18 dnl A placeholder for ISO C99 , for platforms that lack it. @@ -22,8 +22,6 @@ AC_DEFUN([gl_WCTYPE_H], fi AC_SUBST([HAVE_ISWCNTRL]) - AC_REQUIRE([AC_C_INLINE]) - AC_REQUIRE([gt_TYPE_WINT_T]) if test $gt_cv_c_wint_t = yes; then HAVE_WINT_T=1 diff --git a/gdb/gnulib/import/stdbool.in.h b/gdb/gnulib/import/stdbool.in.h index ed1f9aa488..1f8caee4f2 100644 --- a/gdb/gnulib/import/stdbool.in.h +++ b/gdb/gnulib/import/stdbool.in.h @@ -66,24 +66,19 @@ # undef true #endif -/* For the sake of symbolic names in gdb, we define true and false as - enum constants, not only as macros. - It is tempting to write - typedef enum { false = 0, true = 1 } _Bool; - so that gdb prints values of type 'bool' symbolically. But if we do - this, values of type '_Bool' may promote to 'int' or 'unsigned int' - (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' - (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the - enum; this ensures that '_Bool' promotes to 'int'. */ -#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__) +#ifdef __cplusplus +# define _Bool bool +# define bool bool +#else +# if defined __BEOS__ && !defined __HAIKU__ /* A compiler known to have 'bool'. */ /* If the compiler already has both 'bool' and '_Bool', we can assume they are the same types. */ -# if !@HAVE__BOOL@ +# if !@HAVE__BOOL@ typedef bool _Bool; -# endif -#else -# if !defined __GNUC__ +# endif +# else +# if !defined __GNUC__ /* If @HAVE__BOOL@: Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when the built-in _Bool type is used. See @@ -103,19 +98,35 @@ typedef bool _Bool; "Invalid enumerator. (badenum)" with HP-UX cc on Tru64. The only benefit of the enum, debuggability, is not important with these compilers. So use 'signed char' and no enum. */ -# define _Bool signed char -# else +# define _Bool signed char +# else /* With this compiler, trust the _Bool type if the compiler has it. */ -# if !@HAVE__BOOL@ +# if !@HAVE__BOOL@ + /* For the sake of symbolic names in gdb, define true and false as + enum constants, not only as macros. + It is tempting to write + typedef enum { false = 0, true = 1 } _Bool; + so that gdb prints values of type 'bool' symbolically. But then + values of type '_Bool' might promote to 'int' or 'unsigned int' + (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int' + (see ISO C 99 6.3.1.1.(2)). So add a negative value to the + enum; this ensures that '_Bool' promotes to 'int'. */ typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool; +# endif # endif # endif +# define bool _Bool #endif -#define bool _Bool /* The other macros must be usable in preprocessor directives. */ -#define false 0 -#define true 1 +#ifdef __cplusplus +# define false false +# define true true +#else +# define false 0 +# define true 1 +#endif + #define __bool_true_false_are_defined 1 #endif /* _GL_STDBOOL_H */ diff --git a/gdb/gnulib/import/verify.h b/gdb/gnulib/import/verify.h index cef14ad157..0c320b19ad 100644 --- a/gdb/gnulib/import/verify.h +++ b/gdb/gnulib/import/verify.h @@ -125,7 +125,7 @@ extern int (*dummy (void)) [sizeof (struct {...})]; * GCC warns about duplicate declarations of the dummy function if - -Wredundant_decls is used. GCC 4.3 and later have a builtin + -Wredundant-decls is used. GCC 4.3 and later have a builtin __COUNTER__ macro that can let us generate unique identifiers for each dummy function, to suppress this warning. @@ -133,6 +133,10 @@ which do not support _Static_assert, also do not warn about the last declaration mentioned above. + * GCC warns if -Wnested-externs is enabled and verify() is used + within a function body; but inside a function, you can always + arrange to use verify_expr() instead. + * In C++, any struct definition inside sizeof is invalid. Use a template type to work around the problem. */ diff --git a/gdb/gnulib/import/wctype-h.c b/gdb/gnulib/import/wctype-h.c new file mode 100644 index 0000000000..bb5f847e33 --- /dev/null +++ b/gdb/gnulib/import/wctype-h.c @@ -0,0 +1,4 @@ +/* Normally this would be wctype.c, but that name's already taken. */ +#include +#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE +#include "wctype.h" diff --git a/gdb/gnulib/import/wctype.in.h b/gdb/gnulib/import/wctype.in.h index aa018b17db..3c98fa3e63 100644 --- a/gdb/gnulib/import/wctype.in.h +++ b/gdb/gnulib/import/wctype.in.h @@ -54,6 +54,11 @@ #ifndef _@GUARD_PREFIX@_WCTYPE_H #define _@GUARD_PREFIX@_WCTYPE_H +_GL_INLINE_HEADER_BEGIN +#ifndef _GL_WCTYPE_INLINE +# define _GL_WCTYPE_INLINE _GL_INLINE +#endif + /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */ @@ -148,7 +153,7 @@ typedef unsigned int rpl_wint_t; # endif # endif -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalnum # else @@ -160,7 +165,7 @@ iswalnum || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswalpha # else @@ -171,7 +176,7 @@ iswalpha return (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswblank # else @@ -182,7 +187,7 @@ iswblank return wc == ' ' || wc == '\t'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswcntrl # else @@ -193,7 +198,7 @@ iswcntrl return (wc & ~0x1f) == 0 || wc == 0x7f; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswdigit # else @@ -204,7 +209,7 @@ iswdigit return wc >= '0' && wc <= '9'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswgraph # else @@ -215,7 +220,7 @@ iswgraph return wc >= '!' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswlower # else @@ -226,7 +231,7 @@ iswlower return wc >= 'a' && wc <= 'z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswprint # else @@ -237,7 +242,7 @@ iswprint return wc >= ' ' && wc <= '~'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswpunct # else @@ -250,7 +255,7 @@ iswpunct || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z'))); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswspace # else @@ -262,7 +267,7 @@ iswspace || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r'); } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswupper # else @@ -273,7 +278,7 @@ iswupper return wc >= 'A' && wc <= 'Z'; } -static inline int +_GL_WCTYPE_INLINE int # if @REPLACE_ISWCNTRL@ rpl_iswxdigit # else @@ -285,7 +290,7 @@ iswxdigit || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towlower # else @@ -296,7 +301,7 @@ towlower return (wc >= 'A' && wc <= 'Z' ? wc - 'A' + 'a' : wc); } -static inline wint_t +_GL_WCTYPE_INLINE wint_t # if @REPLACE_TOWLOWER@ rpl_towupper # else @@ -336,7 +341,7 @@ _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc)); result register. We need to fix this by adding a zero-extend from wchar_t to wint_t after the call. */ -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towlower (wint_t wc) { return (wint_t) (wchar_t) towlower (wc); @@ -345,7 +350,7 @@ rpl_towlower (wint_t wc) # define towlower rpl_towlower # endif -static inline wint_t +_GL_WCTYPE_INLINE wint_t rpl_towupper (wint_t wc) { return (wint_t) (wchar_t) towupper (wc); @@ -493,6 +498,7 @@ _GL_WARN_ON_USE (towctrans, "towctrans is unportable - " # endif #endif +_GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_WCTYPE_H */ #endif /* _@GUARD_PREFIX@_WCTYPE_H */ diff --git a/gdb/gnulib/update-gnulib.sh b/gdb/gnulib/update-gnulib.sh index 87218ca774..a99bad8197 100644 --- a/gdb/gnulib/update-gnulib.sh +++ b/gdb/gnulib/update-gnulib.sh @@ -32,7 +32,7 @@ IMPORTED_GNULIB_MODULES="fnmatch-gnu inttypes memmem update-copyright" # The gnulib commit ID to use for the update. -GNULIB_COMMIT_SHA1="a39f53ccb70a613e647e1019fb4c63645220267e" +GNULIB_COMMIT_SHA1="8d5bd1402003bd0153984b138735adf537d960b0" # The expected version number for the various auto tools we will # use after the import. -- 2.34.1