From patchwork Tue Mar 19 15:45:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 31907 Received: (qmail 92956 invoked by alias); 19 Mar 2019 15:45:44 -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 92880 invoked by uid 89); 19 Mar 2019 15:45:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: =?ISO-8859-1?Q?No, score=-23.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, MIME_BASE64_BLANKS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=6258, That=e2, UD:gdb.exp, gdbexp?= X-HELO: EUR02-HE1-obe.outbound.protection.outlook.com Received: from mail-eopbgr10075.outbound.protection.outlook.com (HELO EUR02-HE1-obe.outbound.protection.outlook.com) (40.107.1.75) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 19 Mar 2019 15:45:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector1-arm-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tASbAHrJpE9A2BZrsy5FpvxtoFns5xgYJQvRS20fuIQ=; b=IS9/jE25d4SU+i1KdL5gy3nbwG8UJ/uR9jrFsQU2tmZnsmYxdvx5JqQrWNnrUOXnNWC/d7HSzIE6j9XS1B3GD5oOp9h0JlUXSaK1GMCGqtO9s0OhX2u9a56YPsxT76bEV9WcSkR87ua1peq1wNqSnH4ysXtPL7zqGdgoAUhAkWg= Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com (10.172.227.22) by DB6PR0802MB2454.eurprd08.prod.outlook.com (10.172.250.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.14; Tue, 19 Mar 2019 15:45:36 +0000 Received: from DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::e974:35a7:c83c:e5b7]) by DB6PR0802MB2133.eurprd08.prod.outlook.com ([fe80::e974:35a7:c83c:e5b7%3]) with mapi id 15.20.1709.015; Tue, 19 Mar 2019 15:45:36 +0000 From: Alan Hayward To: Simon Marchi CC: "gdb-patches@sourceware.org" , nd Subject: Re: [PATCH] Testsuite: Ensure pie is disabled on some tests Date: Tue, 19 Mar 2019 15:45:36 +0000 Message-ID: <260313A3-D685-4306-8DE1-080D51BAE0BE@arm.com> References: <20190306102006.99150-1-alan.hayward@arm.com> <696945e9-4942-5285-0bb4-0bf899606f0a@simark.ca> In-Reply-To: <696945e9-4942-5285-0bb4-0bf899606f0a@simark.ca> authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 Content-ID: MIME-Version: 1.0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-IsSubscribed: yes > On 19 Mar 2019, at 13:47, Simon Marchi wrote: > > On 2019-03-06 5:20 a.m., Alan Hayward wrote: >> Recent versions of Ubuntu and Debian default GCC to enable pie. >> In dump.exp, pie will causes addresses to be out of range for IHEX. >> In break-interp.exp, pie is explicitly set for some tests and assumed >> to be disabled for the remainder. >> Ensure pie is disabled for these tests when required. >> gdb/testsuite/ChangeLog: >> 2019-03-06 Alan Hayward >> * gdb.base/break-interp.exp: Ensure pie is disabled. >> * gdb.base/dump.exp: Likewise. > > Hi Alan, > > The "nopie" flag to gdb_compile has been introduced recently for this, could you use that instead? See commit 6e8b1ab2fd4c ("Fix various tests to use -no-pie linker flag when needed”). Aha! That’s exactly what I needed. In my mind, we should have a “pie” flag too. I’ll add this in too. > >> --- >> gdb/testsuite/gdb.base/break-interp.exp | 4 ++++ >> gdb/testsuite/gdb.base/dump.exp | 4 ++++ >> 2 files changed, 8 insertions(+) >> diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp >> index f85e8a650a..409c31e568 100644 >> --- a/gdb/testsuite/gdb.base/break-interp.exp >> +++ b/gdb/testsuite/gdb.base/break-interp.exp >> @@ -627,6 +627,10 @@ foreach ldprelink {NO YES} { >> if {$binpie != "NO"} { >> lappend opts {additional_flags=-fPIE} >> lappend opts {ldflags=-pie} >> + } else { >> + # Recent Debian/Ubuntu defaults PIE enabled. Ensure it is disabled. >> + lappend opts {additional_flags=-no-pie} >> + lappend opts {ldflags=-no-pie} >> } > > I believe it won't be necessary here to change CFLAGS (which additional_flags does), only ldflags, to make the final executable a non-PIE. Anyway, you'll probably end up using the "nopie" gdb_compile flag. Agreed. > >> set dir ${exec}.d >> diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp >> index 44b0988b80..b2d7ef938a 100644 >> --- a/gdb/testsuite/gdb.base/dump.exp >> +++ b/gdb/testsuite/gdb.base/dump.exp >> @@ -36,6 +36,10 @@ if {[istarget "spu*-*-*"]} then { >> set is64bitonly "yes" >> } >> +# Ensure -pie is disabled as this breaks IHEX tests. > > Can you just precise how it breaks the IHEX tests, as you did in the commit message (it causes the addresses to be out of range for that format)? Done. > > This patch is ok with those fixed, thanks! > Updated. I would have pushed this new version - but - I’m a little unsure about adding the additional board flags. Pie option adds both flag and ldflag versions to make sure it gets the cases where we’re just compiling to objects. This version ok? 2019-03-19 Alan Hayward * README: Add pie options. * gdb.base/break-interp.exp: Ensure pie is disabled. * gdb.base/dump.exp: Likewise. * lib/gdb.exp (gdb_compile): Add pie option. diff --git a/gdb/testsuite/README b/gdb/testsuite/README index b5e75b9a79..25381cdf04 100644 --- a/gdb/testsuite/README +++ b/gdb/testsuite/README @@ -482,6 +482,16 @@ gdb,no_thread_names The target doesn't support thread names. +gdb,pie_flag + + The flag required to force the compiler to produce position-independent + executables. + +gdb,ldpie_flag + + The flag required to force the linker to produce position-independent + executables. + gdb,nopie_flag The flag required to force the compiler to produce non-position-independent diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index f85e8a650a..8bb853c041 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -625,8 +625,10 @@ foreach ldprelink {NO YES} { lappend opts {debug} } if {$binpie != "NO"} { - lappend opts {additional_flags=-fPIE} - lappend opts {ldflags=-pie} + lappend opts {pie} + } else { + # Recent Debian/Ubuntu defaults to PIE enabled. Ensure it is disabled. + lappend opts {nopie} } set dir ${exec}.d diff --git a/gdb/testsuite/gdb.base/dump.exp b/gdb/testsuite/gdb.base/dump.exp index 44b0988b80..56dcafd4cb 100644 --- a/gdb/testsuite/gdb.base/dump.exp +++ b/gdb/testsuite/gdb.base/dump.exp @@ -36,6 +36,10 @@ if {[istarget "spu*-*-*"]} then { set is64bitonly "yes" } +# Recent Debian/Ubuntu defaults to PIE enabled. Ensure it is disabled as this +# causes addresses to be out of range for IHEX. +lappend options {nopie} + if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable ${options}] != "" } { untested "failed to compile" return -1 diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index f13f909c34..259865f5fd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3461,6 +3461,7 @@ set gdb_saved_set_unbuffered_mode_obj "" # dynamically load libraries at runtime. For example, on Linux, this adds # -ldl so that the test can use dlopen. # - nowarnings: Inhibit all compiler warnings. +# - pie: Force creation of PIE executables. # - nopie: Prevent creation of PIE executables. # # And here are some of the not too obscure options understood by DejaGnu that @@ -3599,8 +3600,27 @@ proc gdb_compile {source dest type options} { set options [lreplace $options $nowarnings $nowarnings $flag] } - # Replace the "nopie" option with the appropriate additional_flags - # to disable PIE executables. + # Replace the "pie" option with the appropriate flags to enable PIE + # executables. + set pie [lsearch -exact $options pie] + if {$pie != -1} { + if [target_info exists gdb,pie_flag] { + set flag "additional_flags=[target_info gdb,pie_flag]" + } else { + set flag "additional_flags=-fpie" + } + set options [lreplace $options $pie $pie $flag] + + if [target_info exists gdb,ldpie_flag] { + set flag "ldflags=[target_info gdb,ldpie_flag]" + } else { + set flag "ldflags=-pie" + } + lappend options "$flag" + } + + # Replace the "nopie" option with the appropriate flags to disable PIE + # executables. set nopie [lsearch -exact $options nopie] if {$nopie != -1} { if [target_info exists gdb,nopie_flag] {