mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-18 12:24:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

config/debuginfod.m4: Add check for libdebuginfod 0.188

Browse Source 
Add check for libdebuginfod 0.188 in AC_DEBUGINFOD and if found
define macro HAVE_LIBDEBUGINFOD_FIND_SECTION.

This macro indicates support for downloading ELF sections from
debuginfod servers.
This commit is contained in:
Aaron Merey 2023-09-27 15:11:13 -04:00
parent 4befded43f
commit 28bc495137
5 changed files with 232 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
binutils/config.in
View File

@ -94,6 +94,9 @@
/* Define to 1 if debuginfod is enabled. */
#undef HAVE_LIBDEBUGINFOD
/* Define to 1 if debuginfod section downloading is supported. */
#undef HAVE_LIBDEBUGINFOD_FIND_SECTION
/* Define if mbstate_t exists in wchar.h. */
#undef HAVE_MBSTATE_T

108
binutils/configure vendored
View File

@ -11809,7 +11809,13 @@ $as_echo "no" >&6; }
fi
fi
# Handle optional debuginfod support
# Handle optional debuginfod support as well as optional section
# downloading support.
#
# Define HAVE_LIBDEBUGINFOD if libdebuginfod is found with version >= 0.179.
#
# Define HAVE_LIBDEBUGINFOD_FIND_SECTION if libdebuginfod is found with
# version >= 0.188.
# Check whether --with-debuginfod was given.
if test "${with_debuginfod+set}" = set; then :
@ -11825,6 +11831,106 @@ $as_echo "$with_debuginfod" >&6; }
if test "x$with_debuginfod" != xno; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdebuginfod >= 0.188" >&5
$as_echo_n "checking for libdebuginfod >= 0.188... " >&6; }
if test -n "$DEBUGINFOD_CFLAGS"; then
pkg_cv_DEBUGINFOD_CFLAGS="$DEBUGINFOD_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdebuginfod >= 0.188\""; } >&5
($PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.188") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DEBUGINFOD_CFLAGS=`$PKG_CONFIG --cflags "libdebuginfod >= 0.188" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$DEBUGINFOD_LIBS"; then
pkg_cv_DEBUGINFOD_LIBS="$DEBUGINFOD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdebuginfod >= 0.188\""; } >&5
($PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.188") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DEBUGINFOD_LIBS=`$PKG_CONFIG --libs "libdebuginfod >= 0.188" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = no; then
pkg_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
else
pkg_failed=yes
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$pkg_save_LDFLAGS
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
DEBUGINFOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdebuginfod >= 0.188" 2>&1`
else
DEBUGINFOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdebuginfod >= 0.188" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DEBUGINFOD_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdebuginfod is missing or some features may be unavailable." >&5
$as_echo "$as_me: WARNING: libdebuginfod is missing or some features may be unavailable." >&2;}
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdebuginfod is missing or some features may be unavailable." >&5
$as_echo "$as_me: WARNING: libdebuginfod is missing or some features may be unavailable." >&2;}
else
DEBUGINFOD_CFLAGS=$pkg_cv_DEBUGINFOD_CFLAGS
DEBUGINFOD_LIBS=$pkg_cv_DEBUGINFOD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define HAVE_LIBDEBUGINFOD_FIND_SECTION 1" >>confdefs.h
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdebuginfod >= 0.179" >&5
$as_echo_n "checking for libdebuginfod >= 0.179... " >&6; }

13
config/debuginfod.m4
View File

@ -7,7 +7,13 @@ dnl the same distribution terms as the rest of that program.
AC_DEFUN([AC_DEBUGINFOD],
[
# Handle optional debuginfod support
# Handle optional debuginfod support as well as optional section
# downloading support.
#
# Define HAVE_LIBDEBUGINFOD if libdebuginfod is found with version >= 0.179.
#
# Define HAVE_LIBDEBUGINFOD_FIND_SECTION if libdebuginfod is found with
# version >= 0.188.
AC_ARG_WITH([debuginfod],
AC_HELP_STRING([--with-debuginfod], [Enable debuginfo lookups with debuginfod (auto/yes/no)]),
[], [with_debuginfod=auto])
@ -15,6 +21,11 @@ AC_MSG_CHECKING([whether to use debuginfod])
AC_MSG_RESULT([$with_debuginfod])
if test "x$with_debuginfod" != xno; then
PKG_CHECK_MODULES([DEBUGINFOD], [libdebuginfod >= 0.188],
[AC_DEFINE([HAVE_LIBDEBUGINFOD_FIND_SECTION], [1],
[Define to 1 if debuginfod section downloading is supported.])],
[AC_MSG_WARN([libdebuginfod is missing or some features may be unavailable.])])
PKG_CHECK_MODULES([DEBUGINFOD], [libdebuginfod >= 0.179],
[AC_DEFINE([HAVE_LIBDEBUGINFOD], [1], [Define to 1 if debuginfod is enabled.])],
[if test "x$with_debuginfod" = xyes; then

3
gdb/config.in
View File

@ -244,6 +244,9 @@
/* Define to 1 if debuginfod is enabled. */
#undef HAVE_LIBDEBUGINFOD
/* Define to 1 if debuginfod section downloading is supported. */
#undef HAVE_LIBDEBUGINFOD_FIND_SECTION
/* Define if you have the expat library. */
#undef HAVE_LIBEXPAT

108
gdb/configure vendored
View File

@ -18405,7 +18405,13 @@ esac
# Handle optional debuginfod support
# Handle optional debuginfod support
# Handle optional debuginfod support as well as optional section
# downloading support.
#
# Define HAVE_LIBDEBUGINFOD if libdebuginfod is found with version >= 0.179.
#
# Define HAVE_LIBDEBUGINFOD_FIND_SECTION if libdebuginfod is found with
# version >= 0.188.
# Check whether --with-debuginfod was given.
if test "${with_debuginfod+set}" = set; then :
@ -18421,6 +18427,106 @@ $as_echo "$with_debuginfod" >&6; }
if test "x$with_debuginfod" != xno; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdebuginfod >= 0.188" >&5
$as_echo_n "checking for libdebuginfod >= 0.188... " >&6; }
if test -n "$DEBUGINFOD_CFLAGS"; then
pkg_cv_DEBUGINFOD_CFLAGS="$DEBUGINFOD_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdebuginfod >= 0.188\""; } >&5
($PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.188") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DEBUGINFOD_CFLAGS=`$PKG_CONFIG --cflags "libdebuginfod >= 0.188" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$DEBUGINFOD_LIBS"; then
pkg_cv_DEBUGINFOD_LIBS="$DEBUGINFOD_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdebuginfod >= 0.188\""; } >&5
($PKG_CONFIG --exists --print-errors "libdebuginfod >= 0.188") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_DEBUGINFOD_LIBS=`$PKG_CONFIG --libs "libdebuginfod >= 0.188" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = no; then
pkg_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
else
pkg_failed=yes
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$pkg_save_LDFLAGS
fi
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
DEBUGINFOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdebuginfod >= 0.188" 2>&1`
else
DEBUGINFOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdebuginfod >= 0.188" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DEBUGINFOD_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdebuginfod is missing or some features may be unavailable." >&5
$as_echo "$as_me: WARNING: libdebuginfod is missing or some features may be unavailable." >&2;}
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libdebuginfod is missing or some features may be unavailable." >&5
$as_echo "$as_me: WARNING: libdebuginfod is missing or some features may be unavailable." >&2;}
else
DEBUGINFOD_CFLAGS=$pkg_cv_DEBUGINFOD_CFLAGS
DEBUGINFOD_LIBS=$pkg_cv_DEBUGINFOD_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define HAVE_LIBDEBUGINFOD_FIND_SECTION 1" >>confdefs.h
fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdebuginfod >= 0.179" >&5
$as_echo_n "checking for libdebuginfod >= 0.179... " >&6; }