mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
49e4877c54
I tried building gdb with G++ 4.7 and CXX="g++ -std=gnu+11", and that tripped on a build error: In file included from build-gnulib/import/stdio.h:53:0, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20: build-gnulib/import/stddef.h:104:3: error: conflicting declaration ‘typedef union max_align_t max_align_t’ In file included from build-gnulib/import/stddef.h:55:0, from build-gnulib/import/stdio.h:53, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/common/common-defs.h:31, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/defs.h:28, from /home/pedro/gdb/mygit/cxx-convertion/src/gdb/armobsd-tdep.c:20: /opt/gcc-4.7/lib/gcc/x86_64-unknown-linux-gnu/4.7.4/include/stddef.h:426:3: error: ‘max_align_t’ has a previous declaration as ‘typedef struct max_align_t max_align_t’ Updating gnulib to current master fixes it, since it brings in this fix: http://lists.gnu.org/archive/html/bug-gnulib/2016-04/msg00000.html Our last update was in August 2015. This doesn't bring in much added baggage, it's mostly bug fixes. It pulled in the "limits-h" module as automatic dependency, and given that looks potentially useful I added it to the set of modules we require. Tested on x86_64 Fedora 23, with g++ 4.7 and g++ 5.3, native and gdbserver. gdb/ChangeLog: 2016-10-18 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 2692e23a48e21f6daa029e8af9f1a143b7532f47. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile: Update. * gnulib/import/alloca: Update. * gnulib/import/basename-lgpl: Update. * gnulib/import/canonicalize-lgpl: Update. * gnulib/import/config: Update. * gnulib/import/dirent: Update. * gnulib/import/dirfd: Update. * gnulib/import/dirname-lgpl: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/flexmember.h: Update. * gnulib/import/float+.h: Update. * gnulib/import/float: Update. * gnulib/import/float: Update. * gnulib/import/fnmatch: Update. * gnulib/import/fnmatch: Update. * gnulib/import/fnmatch_loop: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp: Update. * gnulib/import/frexpl: Update. * gnulib/import/gettimeofday: Update. * gnulib/import/hard-locale: Update. * gnulib/import/hard-locale.h: Update. * gnulib/import/inttypes: Update. * gnulib/import/isnan: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl: Update. * gnulib/import/itold: Update. * gnulib/import/limits: Update. * gnulib/import/localcharset: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat: Update. * gnulib/import/m4/00gnulib: Update. * gnulib/import/m4/absolute-header: Update. * gnulib/import/m4/alloca: Update. * gnulib/import/m4/canonicalize: Update. * gnulib/import/m4/codeset: Update. * gnulib/import/m4/configmake: Update. * gnulib/import/m4/dirent_h: Update. * gnulib/import/m4/dirfd: Update. * gnulib/import/m4/dirname: Update. * gnulib/import/m4/double-slash-root: Update. * gnulib/import/m4/eealloc: Update. * gnulib/import/m4/errno_h: Update. * gnulib/import/m4/exponentd: Update. * gnulib/import/m4/exponentl: Update. * gnulib/import/m4/extensions: Update. * gnulib/import/m4/extern-inline: Update. * gnulib/import/m4/fcntl-o: Update. * gnulib/import/m4/flexmember: Update. * gnulib/import/m4/float_h: Update. * gnulib/import/m4/fnmatch: Update. * gnulib/import/m4/fpieee: Update. * gnulib/import/m4/frexp: Update. * gnulib/import/m4/frexpl: Update. * gnulib/import/m4/gettimeofday: Update. * gnulib/import/m4/glibc21: Update. * gnulib/import/m4/gnulib-cache: Update. * gnulib/import/m4/gnulib-common: Update. * gnulib/import/m4/gnulib-comp: Update. * gnulib/import/m4/gnulib-tool: Update. * gnulib/import/m4/hard-locale: Update. * gnulib/import/m4/include_next: Update. * gnulib/import/m4/inttypes-pri: Update. * gnulib/import/m4/inttypes: Update. * gnulib/import/m4/isnand: Update. * gnulib/import/m4/isnanl: Update. * gnulib/import/m4/largefile: Update. * gnulib/import/m4/limits-h: Update. * gnulib/import/m4/localcharset: Update. * gnulib/import/m4/locale-fr: Update. * gnulib/import/m4/locale-ja: Update. * gnulib/import/m4/locale-zh: Update. * gnulib/import/m4/longlong: Update. * gnulib/import/m4/lstat: Update. * gnulib/import/m4/malloc: Update. * gnulib/import/m4/malloca: Update. * gnulib/import/m4/math_h: Update. * gnulib/import/m4/mbrtowc: Update. * gnulib/import/m4/mbsinit: Update. * gnulib/import/m4/mbsrtowcs: Update. * gnulib/import/m4/mbstate_t: Update. * gnulib/import/m4/memchr: Update. * gnulib/import/m4/memmem: Update. * gnulib/import/m4/mmap-anon: Update. * gnulib/import/m4/multiarch: Update. * gnulib/import/m4/nocrash: Update. * gnulib/import/m4/off_t: Update. * gnulib/import/m4/pathmax: Update. * gnulib/import/m4/rawmemchr: Update. * gnulib/import/m4/readlink: Update. * gnulib/import/m4/rename: Update. * gnulib/import/m4/rmdir: Update. * gnulib/import/m4/signal_h: Update. * gnulib/import/m4/ssize_t: Update. * gnulib/import/m4/stat: Update. * gnulib/import/m4/stdbool: Update. * gnulib/import/m4/stddef_h: Update. * gnulib/import/m4/stdint: Update. * gnulib/import/m4/stdio_h: Update. * gnulib/import/m4/stdlib_h: Update. * gnulib/import/m4/strchrnul: Update. * gnulib/import/m4/string_h: Update. * gnulib/import/m4/strstr: Update. * gnulib/import/m4/strtok_r: Update. * gnulib/import/m4/sys_socket_h: Update. * gnulib/import/m4/sys_stat_h: Update. * gnulib/import/m4/sys_time_h: Update. * gnulib/import/m4/sys_types_h: Update. * gnulib/import/m4/time_h: Update. * gnulib/import/m4/unistd_h: Update. * gnulib/import/m4/warn-on-use: Update. * gnulib/import/m4/wchar_h: Update. * gnulib/import/m4/wchar_t: Update. * gnulib/import/m4/wctype_h: Update. * gnulib/import/m4/wint_t: Update. * gnulib/import/malloc: Update. * gnulib/import/malloca: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math: Update. * gnulib/import/math: Update. * gnulib/import/mbrtowc: Update. * gnulib/import/mbsinit: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state: Update. * gnulib/import/mbsrtowcs: Update. * gnulib/import/memchr: Update. * gnulib/import/memmem: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/rawmemchr: Update. * gnulib/import/readlink: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename: Update. * gnulib/import/rmdir: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/signal: Update. * gnulib/import/stat: Update. * gnulib/import/stdbool: Update. * gnulib/import/stddef: Update. * gnulib/import/stdint: Update. * gnulib/import/stdio: Update. * gnulib/import/stdlib: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/strchrnul: Update. * gnulib/import/streq.h: Update. * gnulib/import/string: Update. * gnulib/import/stripslash: Update. * gnulib/import/strnlen1: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr: Update. * gnulib/import/strtok_r: Update. * gnulib/import/sys_stat: Update. * gnulib/import/sys_time: Update. * gnulib/import/sys_types: Update. * gnulib/import/time: Update. * gnulib/import/unistd: Update. * gnulib/import/unistd: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar: Update. * gnulib/import/wctype: Update. * gnulib/import/flexmember.h: New file. * gnulib/import/hard-locale.c: New file. * gnulib/import/hard-locale.h: New file. * gnulib/import/limits.in.h: New file. * gnulib/import/m4/flexmember.m4: New file. * gnulib/import/m4/hard-locale.m4: New file. * gnulib/import/m4/limits-h.m4: New file.
157 lines
5.9 KiB
Plaintext
157 lines
5.9 KiB
Plaintext
# Check for fnmatch - serial 9. -*- coding: utf-8 -*-
|
|
|
|
# Copyright (C) 2000-2007, 2009-2016 Free Software Foundation, Inc.
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
# Autoconf defines AC_FUNC_FNMATCH, but that is obsolescent.
|
|
# New applications should use the macros below instead.
|
|
|
|
# Request a POSIX compliant fnmatch function.
|
|
AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
|
|
[
|
|
m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX])
|
|
|
|
dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
|
|
dnl This is only needed if gl_fnmatch_required = GNU. It would be possible
|
|
dnl to avoid this dependency for gl_FUNC_FNMATCH_POSIX by putting
|
|
dnl gl_FUNC_FNMATCH_GNU into a separate .m4 file.
|
|
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
|
|
|
|
FNMATCH_H=
|
|
gl_fnmatch_required_lowercase=`
|
|
echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]'
|
|
`
|
|
gl_fnmatch_cache_var="gl_cv_func_fnmatch_${gl_fnmatch_required_lowercase}"
|
|
AC_CACHE_CHECK([for working $gl_fnmatch_required fnmatch],
|
|
[$gl_fnmatch_cache_var],
|
|
[dnl Some versions of Solaris, SCO, and the GNU C Library
|
|
dnl have a broken or incompatible fnmatch.
|
|
dnl So we run a test program. If we are cross-compiling, take no chance.
|
|
dnl Thanks to John Oleynick, François Pinard, and Paul Eggert for this
|
|
dnl test.
|
|
if test $gl_fnmatch_required = GNU; then
|
|
gl_fnmatch_gnu_start=
|
|
gl_fnmatch_gnu_end=
|
|
else
|
|
gl_fnmatch_gnu_start='#if 0'
|
|
gl_fnmatch_gnu_end='#endif'
|
|
fi
|
|
AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <fnmatch.h>
|
|
static int
|
|
y (char const *pattern, char const *string, int flags)
|
|
{
|
|
return fnmatch (pattern, string, flags) == 0;
|
|
}
|
|
static int
|
|
n (char const *pattern, char const *string, int flags)
|
|
{
|
|
return fnmatch (pattern, string, flags) == FNM_NOMATCH;
|
|
}
|
|
]],
|
|
[[char const *Apat = 'A' < '\\\\' ? "[A-\\\\\\\\]" : "[\\\\\\\\-A]";
|
|
char const *apat = 'a' < '\\\\' ? "[a-\\\\\\\\]" : "[\\\\\\\\-a]";
|
|
static char const A_1[] = { 'A' - 1, 0 };
|
|
static char const A01[] = { 'A' + 1, 0 };
|
|
static char const a_1[] = { 'a' - 1, 0 };
|
|
static char const a01[] = { 'a' + 1, 0 };
|
|
static char const bs_1[] = { '\\\\' - 1, 0 };
|
|
static char const bs01[] = { '\\\\' + 1, 0 };
|
|
int result = 0;
|
|
if (!n ("a*", "", 0))
|
|
return 1;
|
|
if (!y ("a*", "abc", 0))
|
|
return 1;
|
|
if (!y ("[/b", "[/b", 0)) /*"]]"*/ /* glibc Bugzilla bug 12378 */
|
|
return 1;
|
|
if (!n ("d*/*1", "d/s/1", FNM_PATHNAME))
|
|
return 2;
|
|
if (!y ("a\\\\bc", "abc", 0))
|
|
return 3;
|
|
if (!n ("a\\\\bc", "abc", FNM_NOESCAPE))
|
|
return 3;
|
|
if (!y ("*x", ".x", 0))
|
|
return 4;
|
|
if (!n ("*x", ".x", FNM_PERIOD))
|
|
return 4;
|
|
if (!y (Apat, "\\\\", 0))
|
|
return 5;
|
|
if (!y (Apat, "A", 0))
|
|
return 5;
|
|
if (!y (apat, "\\\\", 0))
|
|
return 5;
|
|
if (!y (apat, "a", 0))
|
|
return 5;
|
|
if (!(n (Apat, A_1, 0) == ('A' < '\\\\')))
|
|
return 5;
|
|
if (!(n (apat, a_1, 0) == ('a' < '\\\\')))
|
|
return 5;
|
|
if (!(y (Apat, A01, 0) == ('A' < '\\\\')))
|
|
return 5;
|
|
if (!(y (apat, a01, 0) == ('a' < '\\\\')))
|
|
return 5;
|
|
if (!(y (Apat, bs_1, 0) == ('A' < '\\\\')))
|
|
return 5;
|
|
if (!(y (apat, bs_1, 0) == ('a' < '\\\\')))
|
|
return 5;
|
|
if (!(n (Apat, bs01, 0) == ('A' < '\\\\')))
|
|
return 5;
|
|
if (!(n (apat, bs01, 0) == ('a' < '\\\\')))
|
|
return 5;
|
|
$gl_fnmatch_gnu_start
|
|
if (!y ("xxXX", "xXxX", FNM_CASEFOLD))
|
|
result |= 8;
|
|
if (!y ("a++(x|yy)b", "a+xyyyyxb", FNM_EXTMATCH))
|
|
result |= 16;
|
|
if (!n ("d*/*1", "d/s/1", FNM_FILE_NAME))
|
|
result |= 32;
|
|
if (!y ("*", "x", FNM_FILE_NAME | FNM_LEADING_DIR))
|
|
result |= 64;
|
|
if (!y ("x*", "x/y/z", FNM_FILE_NAME | FNM_LEADING_DIR))
|
|
result |= 64;
|
|
if (!y ("*c*", "c/x", FNM_FILE_NAME | FNM_LEADING_DIR))
|
|
result |= 64;
|
|
$gl_fnmatch_gnu_end
|
|
return result;
|
|
]])],
|
|
[eval "$gl_fnmatch_cache_var=yes"],
|
|
[eval "$gl_fnmatch_cache_var=no"],
|
|
[eval "$gl_fnmatch_cache_var=\"guessing no\""])
|
|
])
|
|
eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\""
|
|
if test "$gl_fnmatch_result" = yes; then
|
|
dnl Not strictly necessary. Only to avoid spurious leftover files if people
|
|
dnl don't do "make distclean".
|
|
rm -f "$gl_source_base/fnmatch.h"
|
|
else
|
|
FNMATCH_H=fnmatch.h
|
|
fi
|
|
AC_SUBST([FNMATCH_H])
|
|
AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
|
|
])
|
|
|
|
# Request a POSIX compliant fnmatch function with GNU extensions.
|
|
AC_DEFUN([gl_FUNC_FNMATCH_GNU],
|
|
[
|
|
m4_divert_text([INIT_PREPARE], [gl_fnmatch_required=GNU])
|
|
|
|
AC_REQUIRE([gl_FUNC_FNMATCH_POSIX])
|
|
])
|
|
|
|
AC_DEFUN([gl_PREREQ_FNMATCH],
|
|
[
|
|
dnl We must choose a different name for our function, since on ELF systems
|
|
dnl a broken fnmatch() in libc.so would override our fnmatch() if it is
|
|
dnl compiled into a shared library.
|
|
AC_DEFINE_UNQUOTED([fnmatch], [${gl_fnmatch_required_lowercase}_fnmatch],
|
|
[Define to a replacement function name for fnmatch().])
|
|
dnl Prerequisites of lib/fnmatch.c.
|
|
AC_REQUIRE([AC_TYPE_MBSTATE_T])
|
|
AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
|
|
AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
|
|
AC_CHECK_HEADERS_ONCE([wctype.h])
|
|
])
|