From patchwork Fri Dec 25 11:11:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 10129 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 31336 invoked by alias); 25 Dec 2015 11:11:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 31317 invoked by uid 89); 25 Dec 2015 11:11:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=1207, 12016 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 25 Dec 2015 11:11:15 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 5BC6E33BE19 for ; Fri, 25 Dec 2015 11:11:13 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH 1/3] sim: cris: set up sane default path to rvdummy [committed] Date: Fri, 25 Dec 2015 06:11:10 -0500 Message-Id: <1451041872-21276-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Much like we autodetect the path to the run program when there is none set explicitly, do the same for the rvdummy program. Otherwise the default make check fails to execute the helper properly. --- sim/testsuite/sim/cris/ChangeLog | 4 ++++ sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/sim/cris/ChangeLog index 3304f22..22fb88a 100644 --- a/sim/testsuite/sim/cris/ChangeLog +++ b/sim/testsuite/sim/cris/ChangeLog @@ -1,3 +1,7 @@ +2015-12-25 Mike Frysinger + + * hw/rv-n-cris/rvc.exp (rvdummy): Set up sane default. + 2012-03-24 Mike Frysinger * c/clone5.c: Update output to ignore decoded signal string. diff --git a/sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp index 2b792da..1c172af 100644 --- a/sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp +++ b/sim/testsuite/sim/cris/hw/rv-n-cris/rvc.exp @@ -120,7 +120,16 @@ if [istarget cris*-*-*] { set saved_global_sim_options $global_sim_options set saved_global_ld_options $global_ld_options - set rvdummy "[file dirname [board_info target sim]]/rvdummy" + + # See the logic in sim-defs.exp for more details. + set sim [board_info target sim] + if [string equal "" $sim] { + global objdir + global arch + set rvdummy "$objdir/../$arch/rvdummy" + } else { + set rvdummy "[file dirname [board_info target sim]]/rvdummy" + } # All machines we test and the corresponding assembler option. # We'll only ever test v10 and higher here.