mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-12 12:16:04 +08:00
b318629fe7
Update the gnulib import to fixes these issues:
- GDB build with clang + glibc < 2.33.
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=d6a07b4dc21b3118727743142c678858df442853
https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00072.html
With glibc < 2.33, gnulib (since relatively recently) enables a
replacement for free (see gnulib/import/m4/free.m4). In that path,
clang shows this error:
make[2]: Entering directory '/home/smarchi/build/binutils-gdb-clang/gdbsupport'
CXX agent.o
In file included from /home/smarchi/src/binutils-gdb/gdbsupport/agent.cc:20:
In file included from /home/smarchi/src/binutils-gdb/gdbsupport/common-defs.h:95:
../gnulib/import/string.h:636:19: error: exception specification in declaration does not match previous declaration
_GL_EXTERN_C void free (void *) throw ();
^
../gnulib/import/stdlib.h:737:17: note: expanded from macro 'free'
# define free rpl_free
^
../gnulib/import/stdlib.h:739:1: note: previous declaration is here
_GL_FUNCDECL_RPL (free, void, (void *ptr));
^
../gnulib/import/sys/select.h:251:23: note: expanded from macro '_GL_FUNCDECL_RPL'
_GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
^
<scratch space>:139:1: note: expanded from here
rpl_free
^
The gnulib commit mentioned fixes the exception specification of `free`.
- GDB build on RHEL 7:
CC libgnu_a-openat-proc.o
In file included from /usr/include/string.h:633,
from ./string.h:41,
from ../../../binutils-gdb/gnulib/import/openat-proc.c:30:
./string.h:1105:1: error: expected identifier or '(' before '__extension__'
1105 | _GL_FUNCDECL_SYS (strndup, char *,
| ^~~~~~~~~~~~~~~~
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=84863a1c4dc8cca8fb0f6f670f67779cdd2d543b
https://lists.gnu.org/archive/html/bug-gnulib/2022-04/msg00075.html
Change-Id: Ibd51302feece6f385d0c53e0d08921b5d95e2776
130 lines
4.2 KiB
Plaintext
130 lines
4.2 KiB
Plaintext
# glob.m4 serial 26
|
|
dnl Copyright (C) 2005-2007, 2009-2022 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.
|
|
|
|
# The glob module assumes you want GNU glob, with glob_pattern_p etc,
|
|
# rather than vanilla POSIX glob. This means your code should
|
|
# always include <glob.h> for the glob prototypes.
|
|
|
|
AC_DEFUN([gl_GLOB],
|
|
[
|
|
AC_REQUIRE([gl_GLOB_H])
|
|
|
|
AC_CHECK_FUNCS_ONCE([glob glob_pattern_p])
|
|
if test $ac_cv_func_glob = no; then
|
|
HAVE_GLOB=0
|
|
else
|
|
|
|
AC_CACHE_CHECK([for GNU glob interface version 1 or 2],
|
|
[gl_cv_gnu_glob_interface_version_1_2],
|
|
[ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
|
|
[[#include <gnu-versions.h>
|
|
char a[_GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 ? 1 : -1];]])],
|
|
[gl_cv_gnu_glob_interface_version_1_2=yes],
|
|
[gl_cv_gnu_glob_interface_version_1_2=no])])
|
|
if test "$gl_cv_gnu_glob_interface_version_1_2" = "no"; then
|
|
REPLACE_GLOB=1
|
|
fi
|
|
|
|
if test $REPLACE_GLOB = 0; then
|
|
AC_CACHE_CHECK([whether glob lists broken symlinks],
|
|
[gl_cv_glob_lists_symlinks],
|
|
[if test $cross_compiling != yes; then
|
|
if ln -s conf-doesntexist conf$$-globtest 2>/dev/null; then
|
|
gl_cv_glob_lists_symlinks=maybe
|
|
else
|
|
# If we can't make a symlink, then we cannot test this issue. Be
|
|
# pessimistic about this.
|
|
gl_cv_glob_lists_symlinks=no
|
|
fi
|
|
if test $gl_cv_glob_lists_symlinks = maybe; then
|
|
AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <stddef.h>
|
|
#include <glob.h>]],
|
|
[[glob_t found;
|
|
if (glob ("conf*-globtest", 0, NULL, &found) == GLOB_NOMATCH)
|
|
return 1;
|
|
globfree (&found);
|
|
]])],
|
|
[gl_cv_glob_lists_symlinks=yes],
|
|
[gl_cv_glob_lists_symlinks=no],
|
|
[dnl We don't get here.
|
|
:
|
|
])
|
|
fi
|
|
rm -f conf$$-globtest
|
|
else
|
|
gl_cv_glob_lists_symlinks="$gl_cross_guess_normal"
|
|
fi
|
|
])
|
|
case "$gl_cv_glob_lists_symlinks" in
|
|
*yes) ;;
|
|
*) REPLACE_GLOB=1 ;;
|
|
esac
|
|
fi
|
|
|
|
if test $REPLACE_GLOB = 0; then
|
|
AC_CACHE_CHECK([whether glob NOTDIR*/ omits symlink to nondir],
|
|
[gl_cv_glob_omit_nondir_symlinks],
|
|
[if test $cross_compiling != yes; then
|
|
if ln -s conf$$-file conf$$-globtest 2>/dev/null && touch conf$$-file
|
|
then
|
|
gl_cv_glob_omit_nondir_symlinks=maybe
|
|
else
|
|
# If we can't make a symlink, then we cannot test this issue. Be
|
|
# pessimistic about this.
|
|
gl_cv_glob_omit_nondir_symlinks=no
|
|
fi
|
|
if test $gl_cv_glob_omit_nondir_symlinks = maybe; then
|
|
AC_RUN_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <stddef.h>
|
|
#include <glob.h>]],
|
|
[[glob_t found;
|
|
if (glob ("conf*-globtest/", 0, NULL, &found) != GLOB_NOMATCH)
|
|
return 1;
|
|
globfree (&found);
|
|
]])],
|
|
[gl_cv_glob_omit_nondir_symlinks=yes],
|
|
[gl_cv_glob_omit_nondir_symlinks=no],
|
|
[dnl We don't get here.
|
|
:
|
|
])
|
|
fi
|
|
rm -f conf$$-file conf$$-globtest
|
|
else
|
|
gl_cv_glob_omit_nondir_symlinks="$gl_cross_guess_normal"
|
|
fi
|
|
])
|
|
case "$gl_cv_glob_omit_nondir_symlinks" in
|
|
*yes) ;;
|
|
*) REPLACE_GLOB=1 ;;
|
|
esac
|
|
fi
|
|
|
|
fi
|
|
|
|
if test $ac_cv_func_glob_pattern_p = no; then
|
|
HAVE_GLOB_PATTERN_P=0
|
|
else
|
|
if test $REPLACE_GLOB = 1; then
|
|
REPLACE_GLOB_PATTERN_P=1
|
|
fi
|
|
fi
|
|
|
|
if test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1; then
|
|
gl_REPLACE_GLOB_H
|
|
fi
|
|
])
|
|
|
|
# Prerequisites of lib/glob.c and lib/globfree.c.
|
|
AC_DEFUN([gl_PREREQ_GLOB],
|
|
[
|
|
AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])
|
|
AC_CHECK_HEADERS_ONCE([unistd.h])
|
|
AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])
|
|
])
|