On mainline/development, also link GDBserver with -lmcheck.
This factors --enable-libmcheck related bits from GDB's configure.ac and makes GDBserver use them too. Specifically, the 'development' global is moved to a separate script to it can be sourced by both GDB and GDBserver, and the --enable-libmcheck/--disable-libmcheck bits proper are moved to a new m4 file. I started out by defining 'development' in the m4 file, but in the end decided against it, as a separate script has the advantage that changing it in release branches does not require regenerating configure, unlike today. I had also started out by making the new GDB_AC_LIBMCHECK itself handle the yes/no default fallback depending on release/developement, but since I had split out 'development' to a separate script, and, GDB needs the python checks anyway (hence we'd need to do the python checks in gdb's configure.ac, and pass in a 'default lmcheck yes/no' parameter to GDB_AC_LIBMCHECK anyway), I ended up keeping GDB_AC_LIBMCHECK isolated from the 'development' global. IOW, it's the caller's business to handle it. Tested on x86_64 Fedora 17. Built GDB and GDBserver with and without --enable-libmcheck, and observed --enable-libmcheck overrides the disablement of -lmcheck caused by python supporting threads, and that GDBserver links with -lmcheck when expected. Also observed that changing the 'development' global, and issuing "make" triggers a relink, and '-lmcheck' is included or not from the link accordingly. gdb/ 2013-07-03 Pedro Alves <palves@redhat.com> * Makefile.in (config.status): Depend on development.sh. (aclocal_m4_deps): Add libmcheck.m4. * acinclude.m4: Include libmcheck.m4. * configure.ac: Source development.sh instead of setting 'development' here. --enable-libmcheck/--disable-libmcheck code factored out to GDB_AC_LIBMCHECK. Run it. * development.sh: New file. * libmcheck.m4: New file. * configure: Regenerate. gdb/gdbserver/ 2013-07-03 Pedro Alves <palves@redhat.com> * Makefile.in (config.status): Depend on development.sh. * acinclude.m4: Include libmcheck.m4. * configure: Regenerate.
This commit is contained in:
parent
5295321caf
commit
17ef446eed
12 changed files with 216 additions and 56 deletions
|
@ -23,10 +23,8 @@ AC_INIT(main.c)
|
|||
AC_CONFIG_HEADER(config.h:config.in)
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Provide more thorough testing by -lmcheck.
|
||||
# Set it to 'true' for development snapshots, 'false' for releases or
|
||||
# pre-releases.
|
||||
development=true
|
||||
# Set the 'development' global.
|
||||
. $srcdir/development.sh
|
||||
|
||||
AC_PROG_CC
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
@ -1052,34 +1050,22 @@ AC_SUBST(PYTHON_CFLAGS)
|
|||
AC_SUBST(PYTHON_CPPFLAGS)
|
||||
AC_SUBST(PYTHON_LIBS)
|
||||
|
||||
# Provide a --enable-libmcheck/--disable-libmcheck set of options
|
||||
# allowing a user to enable this option even when building releases,
|
||||
# or to disable it when building a snapshot.
|
||||
AC_ARG_ENABLE(libmcheck,
|
||||
AS_HELP_STRING([--enable-libmcheck],
|
||||
[Try building GDB with -lmcheck if available]),
|
||||
[case "${enableval}" in
|
||||
yes | y) ENABLE_LIBMCHECK="yes" ;;
|
||||
no | n) ENABLE_LIBMCHECK="no" ;;
|
||||
*) AC_MSG_ERROR(bad value ${enableval} for --enable-libmcheck) ;;
|
||||
esac])
|
||||
|
||||
# Enable -lmcheck by default (it provides cheap-enough memory mangling),
|
||||
# but turn it off if Python is enabled with threads, since -lmcheck is
|
||||
# not thread safe (http://sourceware.org/bugzilla/show_bug.cgi?id=9939),
|
||||
# and for releases.
|
||||
if test -z "${ENABLE_LIBMCHECK}" \
|
||||
-a \( "${have_libpython}" = "no" \
|
||||
-o "${python_has_threads}" = "no" \) \
|
||||
&& $development; then
|
||||
ENABLE_LIBMCHECK=yes
|
||||
if test \( "${have_libpython}" = "no" -o "${python_has_threads}" = "no" \) \
|
||||
&& $development; then
|
||||
libmcheck_default=yes
|
||||
else
|
||||
libmcheck_default=no
|
||||
fi
|
||||
GDB_AC_LIBMCHECK(${libmcheck_default})
|
||||
|
||||
if test "$ENABLE_LIBMCHECK" = "yes" ; then
|
||||
if test "${have_libpython}" != "no" -a "${python_has_threads}" = "yes" ; then
|
||||
AC_MSG_WARN(--enable-libmcheck may lead to spurious crashes if threads are used in python)
|
||||
fi
|
||||
AC_CHECK_LIB(mcheck, main)
|
||||
if test "$ENABLE_LIBMCHECK" = "yes" \
|
||||
-a "${have_libpython}" != "no" \
|
||||
-a "${python_has_threads}" = "yes" ; then
|
||||
AC_MSG_WARN(--enable-libmcheck may lead to spurious crashes if threads are used in python)
|
||||
fi
|
||||
|
||||
# ------------------------- #
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue