From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 37153 invoked by alias); 20 Mar 2015 16:57:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 37095 invoked by uid 89); 20 Mar 2015 16:57:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 20 Mar 2015 16:57:36 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 3197CB598F for ; Fri, 20 Mar 2015 16:48:13 +0000 (UTC) Received: from blade.nx (ovpn-116-93.ams2.redhat.com [10.36.116.93]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t2KGmCUc007321 for ; Fri, 20 Mar 2015 12:48:12 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id B60F126410E for ; Fri, 20 Mar 2015 16:48:10 +0000 (GMT) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 8/9] Make the default sysroot be "target:" Date: Fri, 20 Mar 2015 16:57:00 -0000 Message-Id: <1426870087-32654-9-git-send-email-gbenson@redhat.com> In-Reply-To: <1426870087-32654-1-git-send-email-gbenson@redhat.com> References: <1426870087-32654-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes X-SW-Source: 2015-03/txt/msg00653.txt.bz2 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 | 2 +- 4 files changed, 16 insertions(+), 1 deletions(-) diff --git a/gdb/main.c b/gdb/main.c index 72b8714..8f276b4 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/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp index 1591c33..d4d756f 100644 --- a/gdb/testsuite/gdb.base/break-probes.exp +++ b/gdb/testsuite/gdb.base/break-probes.exp @@ -72,7 +72,7 @@ if { $using_probes } { while { $not_loaded_library } { set not_loaded_library 0 gdb_test_multiple "c" $test { - -re "Inferior loaded $sysroot$binfile_lib\\M.*$gdb_prompt $" { + -re "Inferior loaded ($sysroot)?$binfile_lib\\M.*$gdb_prompt $" { pass $test } -re "Stopped due to shared library event\\M.*$gdb_prompt $" { -- 1.7.1