From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <prvs=52548b5e4e=yvan.roux@foss.st.com>
Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106])
	by sourceware.org (Postfix) with ESMTPS id 2085D3856DFC;
	Mon, 12 Sep 2022 15:55:35 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2085D3856DFC
Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=foss.st.com
Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=foss.st.com
Received: from pps.filterd (m0241204.ppops.net [127.0.0.1])
	by mx07-00178001.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 28CDrsCW026853;
	Mon, 12 Sep 2022 17:55:32 +0200
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=date : from : to :
 subject : message-id : references : mime-version : content-type :
 content-transfer-encoding : in-reply-to; s=selector1;
 bh=b/G6FIIDF9f788SqeNHLmvxy6ovUGbjR9rxX2bEuBAw=;
 b=uVGONTeGuA5pZJ1DXcLrbSMx8pyKEHbZYfGFSje6EGp0dR1pnkMHIYbX7Q+PP8efvJql
 toYL8MRgF4uk1O4WyreQyKLB5VrW6XZIS3mAxUmO/h6csmdD5OuPwZKmcTnDARLUIRkS
 eJf2R+oqviHYdjEFTz+gOiFYh76zzQbrfAvlBYd+sz7gUkVUQs0Im67DyNP28PZ6Fh/i
 SeFAwwLAxndgk3DEwURlIBlMt7TQpPqQkEwQQ89mkbSUNgp2zwtubhiZ01/0lItm85QA
 kCwPyqshGJHtG5I4gBKn2Lv/xpmcm3+2e+x41MfGlVBjQBSHKKlwaRYQCy8ufb0o0kip 3Q== 
Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35])
	by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3jgjwv3726-1
	(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
	Mon, 12 Sep 2022 17:55:32 +0200
Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20])
	by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id BED0210002A;
	Mon, 12 Sep 2022 17:55:28 +0200 (CEST)
Received: from Webmail-eu.st.com (eqndag1node5.st.com [10.75.129.134])
	by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id B454523C697;
	Mon, 12 Sep 2022 17:55:28 +0200 (CEST)
Received: from gnbcxd0114.gnb.st.com (10.75.127.46) by EQNDAG1NODE5.st.com
 (10.75.129.134) with Microsoft SMTP Server (version=TLS1_2,
 cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2375.31; Mon, 12 Sep
 2022 17:55:28 +0200
Date: Mon, 12 Sep 2022 17:55:27 +0200
From: Yvan Roux <yvan.roux@foss.st.com>
To: <gcc-patches@gcc.gnu.org>,
        =?utf-8?B?VG9yYmrDtnJu?= SVENSSON
	<torbjorn.svensson@foss.st.com>,
        <aoliva@gcc.gnu.org>, <richard.sandiford@arm.com>
Subject: Re: [PATCH] testsuite: gluefile file need to be prefixed
Message-ID: <20220912155527.GA11462@gnbcxd0114.gnb.st.com>
References: <20220909130313.2562293-1-torbjorn.svensson@foss.st.com>
 <mpth71c7qm3.fsf@arm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <mpth71c7qm3.fsf@arm.com>
User-Agent: Mutt/1.9.4 (2018-02-28)
X-Originating-IP: [10.75.127.46]
X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To EQNDAG1NODE5.st.com
 (10.75.129.134)
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1
 definitions=2022-09-12_11,2022-09-12_02,2022-06-22_01
X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org
List-Id: <gcc-patches.gcc.gnu.org>


Hi Richard,

On Mon, Sep 12, 2022 at 12:56:52PM +0100, Richard Sandiford via Gcc-patches wrote:
> Torbjörn SVENSSON via Gcc-patches <gcc-patches@gcc.gnu.org> writes:
> > PR/95720
> > When the status wrapper is used, the gluefile need to be prefixed with
> > -Wl, in order for the test cases to have the dump files with the
> > expected names.
> >
> > gcc/testsuite/ChangeLog:
> >
> >         * gcc/testsuite/lib/g++.exp: Moved gluefile block to after
> >           flags have been prefixed for the target_compile call.
> >         * gcc/testsuite/lib/gcc.exp: Likewise.
> >         * gcc/testsuite/lib/wrapper.exp: Reset adjusted state flag.
> 
> I agree this looks right, but I'm curious how you ended up with the
> behaviour seen in comment 16.  I thought having:
> 
>     if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
> 	lappend options "libs=${gluefile}"
> 	lappend options "ldflags=${wrap_flags}"
>     }
> 
> before the dg-additional-files-options/gcc_adjusted_linker_flags would
> lead to the gluefile missing a "-Wl," first time round.  How is it that
> the gluefile still gets the "-Wl," and the -T misses it instead?

The issue is that dg-additional-files-options/gcc_adjusted_linker_flags
add the "-Wl," prefix to the content of the global variable <gluefile>
and not to the one of <option>, thus if this chunk of code is placed
beforei, <options> is already populated with "libs=$gluefile" and lacks
the prefix.  Notice that this is the case only for the first test
compiled in a tested .exp file, the next ones will have the adjusted
gluefile content.

For -T, this is another issue not covered by this patch, it is not
handled by <gcc_adjust_linker_flags_list> like "-Xlinker" thus a "-Wl,"
prefix is placed between -T and the linker file, we'll send another
patch to fix that issue.

Thanks,
Yvan

> Thanks,
> Richard
> 
> > Co-Authored-By: Yvan ROUX <yvan.roux@foss.st.com>
> > Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
> > ---
> >  gcc/testsuite/lib/g++.exp     | 10 +++++-----
> >  gcc/testsuite/lib/gcc.exp     | 21 +++++++++++----------
> >  gcc/testsuite/lib/wrapper.exp |  7 ++++++-
> >  3 files changed, 22 insertions(+), 16 deletions(-)
> >
> > diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
> > index 24ef068b239..16e61fb4ad4 100644
> > --- a/gcc/testsuite/lib/g++.exp
> > +++ b/gcc/testsuite/lib/g++.exp
> > @@ -303,11 +303,6 @@ proc g++_target_compile { source dest type options } {
> >      global flags_to_postpone
> >      global board_info
> >  
> > -    if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
> > -	lappend options "libs=${gluefile}"
> > -	lappend options "ldflags=${wrap_flags}"
> > -    }
> > -
> >      global TEST_EXTRA_LIBS
> >      if [info exists TEST_EXTRA_LIBS] {
> >  	lappend options "ldflags=$TEST_EXTRA_LIBS"
> > @@ -333,6 +328,11 @@ proc g++_target_compile { source dest type options } {
> >  
> >      set options [dg-additional-files-options $options $source]
> >  
> > +    if { [target_info needs_status_wrapper] != "" && [info exists gluefile] } {
> > +	lappend options "libs=${gluefile}"
> > +	lappend options "ldflags=${wrap_flags}"
> > +    }
> > +
> >      set result [target_compile $source $dest $type $options]
> >  
> >      if {[board_info $tboard exists multilib_flags]} {
> > diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp
> > index 1b25ebec4cf..2f145d0fdf4 100644
> > --- a/gcc/testsuite/lib/gcc.exp
> > +++ b/gcc/testsuite/lib/gcc.exp
> > @@ -129,16 +129,6 @@ proc gcc_target_compile { source dest type options } {
> >      global flags_to_postpone
> >      global board_info
> >  
> > -    if {[target_info needs_status_wrapper] != "" && \
> > -	    [target_info needs_status_wrapper] != "0" && \
> > -	    [info exists gluefile] } {
> > -	lappend options "libs=${gluefile}"
> > -	lappend options "ldflags=$wrap_flags"
> > -	if { $type == "executable" } {
> > -	    set options [concat "{additional_flags=-dumpbase \"\"}" $options]
> > -	}
> > -    }
> > -
> >      global TEST_EXTRA_LIBS
> >      if [info exists TEST_EXTRA_LIBS] {
> >  	lappend options "ldflags=$TEST_EXTRA_LIBS"
> > @@ -170,6 +160,17 @@ proc gcc_target_compile { source dest type options } {
> >      lappend options "timeout=[timeout_value]"
> >      lappend options "compiler=$GCC_UNDER_TEST"
> >      set options [dg-additional-files-options $options $source]
> > +
> > +    if {[target_info needs_status_wrapper] != "" && \
> > +	    [target_info needs_status_wrapper] != "0" && \
> > +	    [info exists gluefile] } {
> > +	lappend options "libs=${gluefile}"
> > +	lappend options "ldflags=$wrap_flags"
> > +	if { $type == "executable" } {
> > +	    set options [concat "{additional_flags=-dumpbase \"\"}" $options]
> > +	}
> > +    }
> > +
> >      set return_val [target_compile $source $dest $type $options]
> >  
> >      if {[board_info $tboard exists multilib_flags]} {
> > diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
> > index 5a601b269da..4a7d56941fc 100644
> > --- a/gcc/testsuite/lib/wrapper.exp
> > +++ b/gcc/testsuite/lib/wrapper.exp
> > @@ -22,7 +22,7 @@
> >  # the compiler when compiling FILENAME.
> >  
> >  proc ${tool}_maybe_build_wrapper { filename args } {
> > -    global gluefile wrap_flags
> > +    global gluefile wrap_flags gcc_adjusted_linker_flags
> >  
> >      if { [target_info needs_status_wrapper] != "" \
> >   	 && [target_info needs_status_wrapper] != "0" \
> > @@ -43,6 +43,11 @@ proc ${tool}_maybe_build_wrapper { filename args } {
> >  	if { $result != "" } {
> >  	    set gluefile [lindex $result 0]
> >  	    set wrap_flags [lindex $result 1]
> > +
> > +	    # Reset the cached state of the adjusted flags
> > +	    if { [info exists gcc_adjusted_linker_flags] } {
> > +		set gcc_adjusted_linker_flags 0
> > +	    }
> >  	}
> >      }
> >  }

-- 
Y.