Menu
▾
▴
[Valgrind-developers] [valgrind] Add --with-gdbscripts-dir=PATH configure option
|
From: Mark W. <ma...@so...> - 2023-05-19 14:09:14
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=e3602b3eec0696b183722ea21da14588cf205c74 commit e3602b3eec0696b183722ea21da14588cf205c74 Author: Mark Wielaard <ma...@kl...> Date: Sun May 14 23:34:05 2023 +0200 Add --with-gdbscripts-dir=PATH configure option Currently the gdb valgrind scripts are installed under VG_LIBDIR which is normally pkglibexecdir which is likely not in the default gdb safe-path (a list of directories from which it is safe to auto-load files). So users will have to add the directory to their .gdbinit file. This patch adds a --with-gdbscripts-dir=PATH configure option that sets VG_GDBSCRIPTS_DIR to the given PATH (${libexecdir}/valgrind if not given). A user can also configure --without-gdbscripts-dir to disable adding a .debug_gdb_scripts section to the vgpreload library and installing the valgrind-monitor python scripts completely. Use VG_GDBSCRIPTS_DIR as gdbscriptsdir to install the valgrind-monitor python files and pass it with CPPFLAGS when building vg_preloaded.c and vgdb.c to use instead of VG_LIBDIR. https://bugs.kde.org/show_bug.cgi?id=469768 Diff: --- NEWS | 8 ++++++++ configure.ac | 17 +++++++++++++++++ coregrind/Makefile.am | 20 +++++++++++++++----- coregrind/vg_preloaded.c | 4 +++- coregrind/vgdb.c | 9 +++++++-- 5 files changed, 50 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 87bfae5960..ea9fc7c868 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,13 @@ AMD64/macOS 10.13 and nanoMIPS/Linux. * ==================== CORE CHANGES =================== +* A new configure option --with-gdbscripts-dir lets you install + the gdb valgrind python monitor scripts in a specific location. + For example an distro could use it to install the scripts in a + safe load location --with-gdbscripts-dir=%{_datadir}/gdb/auto-load + It is also possible to configure --without-gdb-scripts-dir so no + .debug_gdb_scripts section is added to the vgpreload library and + no valgrind-monitor python scripts are installed at all. * ================== PLATFORM CHANGES ================= @@ -29,6 +36,7 @@ are not entered into bugzilla tend to get forgotten about or ignored. 460192 Add epoll_pwait2 469049 link failure on ppc64 (big endian) valgrind 3.20 469146 massif --ignore-fn does not ignore inlined functions +469768 Make it possible to install gdb scripts in a different location To see details of a given bug, visit https://bugs.kde.org/show_bug.cgi?id=XXXXXX diff --git a/configure.ac b/configure.ac index 15fbf5ea20..0cf84a1c00 100755 --- a/configure.ac +++ b/configure.ac @@ -1198,6 +1198,23 @@ AC_MSG_RESULT([$xcodedir]) AC_DEFINE_UNQUOTED(XCODE_DIR, "$xcodedir", [xcode sdk include directory]) AC_SUBST(XCODE_DIR, [$xcodedir])]) +#---------------------------------------------------------------------------- +# Where to install gdb scripts, defaults to VG_LIBDIR (pkglibexecdir) +#---------------------------------------------------------------------------- +AC_MSG_CHECKING([where gdb scripts are installed]) +AC_ARG_WITH(gdbscripts-dir, + [ --with-gdbscripts-dir=PATH Specify path to install gdb scripts], + [gdbscriptsdir=${withval}], + [gdbscriptsdir=${libexecdir}/valgrind]) +AC_MSG_RESULT([$gdbscriptsdir]) +if test "x$gdbscriptsdir" != "xno"; then + AC_SUBST(VG_GDBSCRIPTS_DIR, [$gdbscriptsdir]) + AM_CONDITIONAL(GDBSCRIPTS, true) +else + AC_SUBST(VG_GDBSCRIPTS_DIR, []) + AM_CONDITIONAL(GDBSCRIPTS, false) +fi + #---------------------------------------------------------------------------- # Libc and suppressions #---------------------------------------------------------------------------- diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am index 553211782f..8a7f753a6e 100644 --- a/coregrind/Makefile.am +++ b/coregrind/Makefile.am @@ -101,7 +101,7 @@ if VGCONF_OS_IS_FREEBSD vgdb_SOURCES += vgdb-invoker-freebsd.c endif -vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI) +vgdb_CPPFLAGS = $(AM_CPPFLAGS_PRI) $(GDB_SCRIPTS_DIR) vgdb_CFLAGS = $(AM_CFLAGS_PRI) $(LTO_CFLAGS) vgdb_CCASFLAGS = $(AM_CCASFLAGS_PRI) vgdb_LDFLAGS = $(AM_CFLAGS_PRI) @LIB_UBSAN@ @@ -624,9 +624,15 @@ if VGCONF_OS_IS_DARWIN noinst_DSYMS = $(noinst_PROGRAMS) endif +if GDBSCRIPTS + GDB_SCRIPTS_DIR=-DVG_GDBSCRIPTS_DIR="\"@VG_GDBSCRIPTS_DIR@\"" +else + GDB_SCRIPTS_DIR= +endif + vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) + $(AM_CPPFLAGS_@VGCONF_PLATFORM_PRI_CAPS@) $(GDB_SCRIPTS_DIR) vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_CFLAGS = \ $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_PRI_CAPS@) vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ @@ -634,7 +640,7 @@ vgpreload_core_@VGCONF_ARCH_PRI@_@VGCONF_OS@_so_LDFLAGS = \ if VGCONF_HAVE_PLATFORM_SEC vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_SOURCES = vg_preloaded.c vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CPPFLAGS = \ - $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) + $(AM_CPPFLAGS_@VGCONF_PLATFORM_SEC_CAPS@) $(GDBSCRIPTS_DIR) vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_CFLAGS = \ $(AM_CFLAGS_PSO_@VGCONF_PLATFORM_SEC_CAPS@) vgpreload_core_@VGCONF_ARCH_SEC@_@VGCONF_OS@_so_LDFLAGS = \ @@ -766,8 +772,12 @@ GDBSERVER_XML_FILES = \ # so as to make sure these get copied into the install tree vglibdir = $(pkglibexecdir) vglib_DATA = $(GDBSERVER_XML_FILES) -vglib_DATA += m_gdbserver/valgrind-monitor.py -vglib_DATA += m_gdbserver/valgrind-monitor-def.py + +if GDBSCRIPTS +gdbscriptsdir = @VG_GDBSCRIPTS_DIR@ +gdbscripts_DATA = m_gdbserver/valgrind-monitor.py +gdbscripts_DATA += m_gdbserver/valgrind-monitor-def.py +endif # so as to make sure these get copied into the tarball EXTRA_DIST += $(GDBSERVER_XML_FILES) diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c index d6e05898c9..86f6ac5a26 100644 --- a/coregrind/vg_preloaded.c +++ b/coregrind/vg_preloaded.c @@ -61,7 +61,9 @@ .popsection \n\ "); -DEFINE_GDB_PY_SCRIPT(VG_LIBDIR "/valgrind-monitor.py") +#ifdef VG_GDBSCRIPTS_DIR +DEFINE_GDB_PY_SCRIPT(VG_GDBSCRIPTS_DIR "/valgrind-monitor.py") +#endif #endif #if defined(VGO_linux) || defined(VGO_solaris) || defined(VGO_freebsd) diff --git a/coregrind/vgdb.c b/coregrind/vgdb.c index 8ec4240770..56a969de78 100644 --- a/coregrind/vgdb.c +++ b/coregrind/vgdb.c @@ -1982,10 +1982,15 @@ void usage(void) " -d arg tells to show debug info. Multiple -d args for more debug info\n" "\n" " -h --help shows this message\n" +#ifdef VG_GDBSCRIPTS_DIR " The GDB python code defining GDB front end valgrind commands is:\n %s\n" +#endif " To get help from the Valgrind gdbserver, use vgdb help\n" -"\n", vgdb_prefix_default(), VG_LIBDIR "/valgrind-monitor.py" - ); +"\n", vgdb_prefix_default() +#ifdef VG_GDBSCRIPTS_DIR + , VG_GDBSCRIPTS_DIR "/valgrind-monitor.py" +#endif + ); invoker_restrictions_msg(); } |
