From fed040c6a50399617d8265cbddc7fd21b3f134ef Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Thu, 2 Apr 2015 13:38:29 +0100 Subject: [PATCH] Make the default sysroot be "target:" This commit makes GDB default to a sysroot of "target:". One testcase needed updating as a result of this change. gdb/ChangeLog: * main.c (captured_main): Set gdb_sysroot to "target:" if not otherwise set. gdb/testsuite/ChangeLog: * gdb.base/break-probes.exp: Cope with "target:" sysroot. --- gdb/ChangeLog | 5 +++++ gdb/main.c | 6 ++++++ gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/break-probes.exp | 4 ++++ 4 files changed, 19 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 27c68284bd..dd27cd8b15 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-04-02 Gary Benson + + * main.c (captured_main): Set gdb_sysroot to "target:" + if not otherwise set. + 2015-04-02 Gary Benson * exec.c (exec_file_attach): Support "target:" filenames. diff --git a/gdb/main.c b/gdb/main.c index 72b8714eb0..8f276b4473 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -548,6 +548,12 @@ captured_main (void *data) gdb_sysroot = relocate_gdb_directory (TARGET_SYSTEM_ROOT, TARGET_SYSTEM_ROOT_RELOCATABLE); + if (gdb_sysroot == NULL || *gdb_sysroot == '\0') + { + xfree (gdb_sysroot); + gdb_sysroot = xstrdup (TARGET_SYSROOT_PREFIX); + } + debug_file_directory = relocate_gdb_directory (DEBUGDIR, DEBUGDIR_RELOCATABLE); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0b6bbcaf25..491743f519 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-04-02 Gary Benson + + * gdb.base/break-probes.exp: Cope with "target:" sysroot. + 2015-04-01 Sasha Smundak * gdb.python/py-unwind-maint.c: New file. diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp index 1591c336e3..00ca458387 100644 --- a/gdb/testsuite/gdb.base/break-probes.exp +++ b/gdb/testsuite/gdb.base/break-probes.exp @@ -66,6 +66,10 @@ if { $using_probes } { } } + # GDB strips "target:" from the start of filenames + # when operating on the local filesystem + regsub "^target:" "$sysroot" "(target:)?" sysroot + # Run til it loads our library set test "run til our library loads" set not_loaded_library 1 -- 2.34.1