From 740ce35025a5a37d78b0ee2a363c35534eaa1a2a Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann Date: Fri, 2 Jun 2023 22:39:54 +0200 Subject: [PATCH] gdb/configure.ac: Add option --with-additional-debug-dirs If you want to install GDB in a custom prefix, have it look for debug info in that prefix but also in the distro's default location (typically, /usr/lib/debug) and run the GDB testsuite before doing "make install", you have a bit of a problem: Configuring GDB with '--prefix=$PREFIX' sets the GDB 'debug-file-directory' parameter to $PREFIX/lib/debug. Unfortunately this precludes GDB from looking for distro-installed debug info in /usr/lib/debug. For regular GDB use you could set debug-file-directory to $PREFIX:/usr/lib/debug in $PREFIX/etc/gdbinit so that GDB will look in both places, but if you want to run the testsuite then that doesn't help because in that case GDB runs with the '-nx' option. There's the configure option '--with-separate-debug-dir' to set the default value for 'debug-file-directory', but it accepts only one directory and not a list. I considered modifying it to accept a list, but it's not obvious how to do that because its value is also used by BFD, as well as processed for "relocatability". I thought it was simpler to add a new option to specify a list of additional directories that will be appended to the debug-file-directory setting. Reviewed-By: Eli Zaretskii Approved-By: Tom Tromey --- gdb/NEWS | 8 ++++++++ gdb/config.in | 3 +++ gdb/configure | 19 +++++++++++++++++-- gdb/configure.ac | 8 ++++++++ gdb/doc/gdb.texinfo | 6 ++++-- gdb/main.c | 5 +++++ gdb/top.c | 6 ++++++ 7 files changed, 51 insertions(+), 4 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index fc4c7c01661..c371a9f3bff 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -124,6 +124,14 @@ 'inferior' keyword with either the 'thread' or 'task' keywords when creating a breakpoint. +* Configure changes + +--additional-debug-dirs=PATHs + + Provide a colon-separated list of additional directories to search for + separate debug info. These directories are added to the default value of + the 'debug-file-directory' GDB parameter. + * New commands set debug breakpoint on|off diff --git a/gdb/config.in b/gdb/config.in index f67d3029d82..e17245156d8 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* Additional directories to look for separate debug info. */ +#undef ADDITIONAL_DEBUG_DIRS + /* Directories from which to load auto-loaded scripts. */ #undef AUTO_LOAD_DIR diff --git a/gdb/configure b/gdb/configure index 2d07e0cb596..1cbc356cb96 100755 --- a/gdb/configure +++ b/gdb/configure @@ -906,6 +906,7 @@ enable_fast_install with_gnu_ld enable_libtool_lock with_separate_debug_dir +with_additional_debug_dirs with_gdb_datadir with_relocated_sources with_auto_load_dir @@ -1660,6 +1661,9 @@ Optional Packages: --with-separate-debug-dir=PATH look for global separate debug info in this path [LIBDIR/debug] + --with-additional-debug-dirs=PATHs + colon-separated list of additional directories to + search for separate debug info --with-gdb-datadir=PATH look for global separate data files in this path [DATADIR/gdb] --with-relocated-sources=PATH @@ -11479,7 +11483,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11482 "configure" +#line 11486 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11585,7 +11589,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11588 "configure" +#line 11592 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17886,6 +17890,17 @@ _ACEOF + +# Check whether --with-additional-debug-dirs was given. +if test "${with_additional_debug_dirs+set}" = set; then : + withval=$with_additional_debug_dirs; +cat >>confdefs.h <<_ACEOF +#define ADDITIONAL_DEBUG_DIRS "${withval}" +_ACEOF + +fi + + # We can't pass paths as command line arguments. # Mingw32 tries to be clever and will convert the paths for us. # For example -DBINDIR="/usr/local/bin" passed on the command line may get diff --git a/gdb/configure.ac b/gdb/configure.ac index 97c6bf0ed5f..0264199b948 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -119,6 +119,14 @@ GDB_AC_WITH_DIR(DEBUGDIR, separate-debug-dir, [look for global separate debug info in this path @<:@LIBDIR/debug@:>@], [${libdir}/debug]) +AC_ARG_WITH(additional-debug-dirs, + AS_HELP_STRING([--with-additional-debug-dirs=PATHs], + [colon-separated list of additional directories to + search for separate debug info]), + [AC_DEFINE_UNQUOTED(ADDITIONAL_DEBUG_DIRS, "${withval}", + Additional directories to look for separate + debug info.)]) + # We can't pass paths as command line arguments. # Mingw32 tries to be clever and will convert the paths for us. # For example -DBINDIR="/usr/local/bin" passed on the command line may get diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index d254650e6d7..4932e49b758 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -22275,8 +22275,10 @@ file from @code{debuginfod} servers. @anchor{debug-file-directory} Global debugging info directories default to what is set by @value{GDBN} -configure option @option{--with-separate-debug-dir}. During @value{GDBN} run -you can also set the global debugging info directories, and view the list +configure option @option{--with-separate-debug-dir} and augmented by the +colon-separated list of directories provided via @value{GDBN} configure +option @option{--additional-debug-dirs}. During @value{GDBN} run you can +also set the global debugging info directories, and view the list @value{GDBN} is currently using. @table @code diff --git a/gdb/main.c b/gdb/main.c index 8a1c2690100..2da39f89a90 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -718,6 +718,11 @@ captured_main_1 (struct captured_main_args *context) debug_file_directory = relocate_gdb_directory (DEBUGDIR, DEBUGDIR_RELOCATABLE); +#ifdef ADDITIONAL_DEBUG_DIRS + debug_file_directory = (debug_file_directory + DIRNAME_SEPARATOR + + ADDITIONAL_DEBUG_DIRS); +#endif + gdb_datadir = relocate_gdb_directory (GDB_DATADIR, GDB_DATADIR_RELOCATABLE); diff --git a/gdb/top.c b/gdb/top.c index cbe14b01046..5028440b671 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -1587,6 +1587,12 @@ This GDB was configured as follows:\n\ --with-separate-debug-dir=%s%s\n\ "), DEBUGDIR, DEBUGDIR_RELOCATABLE ? " (relocatable)" : ""); +#ifdef ADDITIONAL_DEBUG_DIRS + gdb_printf (stream, _ ("\ + --with-additional-debug-dirs=%s\n\ +"), ADDITIONAL_DEBUG_DIRS); +#endif + if (TARGET_SYSTEM_ROOT[0]) gdb_printf (stream, _("\ --with-sysroot=%s%s\n\ -- 2.30.2