From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id CFFE13858D33 for ; Wed, 22 Feb 2023 15:51:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CFFE13858D33 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.97,319,1669104000"; d="scan'208";a="99134507" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 22 Feb 2023 07:51:11 -0800 IronPort-SDR: adc5xTa65ZHiKTUTJtTxyi2Ra+UjzEZKsijg9lxRvYyTGoUEyhiizHjUpQ1JO50HJbmugg/ein F1enRcoOTPD+1QXIPaIB8n2tzllL1s2wDB/edAxQ30C2ZdaBxsNCrprnGeiCD7AGzhboiMTS0z V0LypqauJYV/OKLfTr1sxxDzT/DUWKI8gZzd5fz9MmlWj8Twk0Io8si+9nEfbgK2O4Hk1Y0Ix3 gPy0fwwXPG7Qv71tgfHNYo6J3NGkRVuhjyUPy1GZ8kWkfNKq87gYLkZ7iEAVPEOo2Ki9oeIV1Z 5yg= From: Thomas Schwinge To: Yash Shinde , Khem Raj CC: , , Subject: Re: [PATCH] Share work directories In-Reply-To: <20230222121904.4087522-1-Yash.Shinde@windriver.com> References: <20230222121904.4087522-1-Yash.Shinde@windriver.com> User-Agent: Notmuch/0.29.3+94~g74c3f1b (https://notmuchmail.org) Emacs/28.2 (x86_64-pc-linux-gnu) Date: Wed, 22 Feb 2023 16:51:01 +0100 Message-ID: <87sfex66my.fsf@euler.schwinge.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-15.mgc.mentorg.com (139.181.222.15) To svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,TXREP 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: Hi! On 2023-02-22T04:19:04-0800, Yash Shinde wrote: > From: Khem Raj > > Fix configure and Makefile files to read the defaults.h and t-oe from bui= ld directory, > so that the source can be shared between gcc-cross-initial, gcc-cross-int= ermediate, gcc-cross, gcc-runtime, > and also the sdk build which use a separate build directory compared to s= ource directory. > > While compiling gcc-crosssdk-initial-x86_64 on some host, there is > occasionally failure that test the existance of default.h doesn't work, This is about '[source-gcc]/gcc/defaults.h', right? Why should that ever fail to test that it exists? > the reason is tm_include_list=3D'** defaults.h' rather than tm_include_li= st=3D'** ./defaults.h'. > So we add the test condition for this situation. I'm sorry, I understand neither your failure mode, nor your proposed changes. Please provide more context? Gr=C3=BC=C3=9Fe Thomas > gcc/ChangeLog: > > * configure > * configure.ac > * mkconfig.sh > > Signed-off-by: Khem Raj > Signed-off-by: Hongxu Jia > --- > gcc/configure | 4 ++-- > gcc/configure.ac | 4 ++-- > gcc/mkconfig.sh | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/gcc/configure b/gcc/configure > index 254f9b6c943..ff2a3e26049 100755 > --- a/gcc/configure > +++ b/gcc/configure > @@ -13471,8 +13471,8 @@ for f in $tm_file; do > tm_include_list=3D"${tm_include_list} $f" > ;; > defaults.h ) > - tm_file_list=3D"${tm_file_list} \$(srcdir)/$f" > - tm_include_list=3D"${tm_include_list} $f" > + tm_file_list=3D"${tm_file_list} ./$f" > + tm_include_list=3D"${tm_include_list} ./$f" > ;; > * ) > tm_file_list=3D"${tm_file_list} \$(srcdir)/config/$f" > diff --git a/gcc/configure.ac b/gcc/configure.ac > index 62bc908b991..d36830cf2fb 100644 > --- a/gcc/configure.ac > +++ b/gcc/configure.ac > @@ -2336,8 +2336,8 @@ for f in $tm_file; do > tm_include_list=3D"${tm_include_list} $f" > ;; > defaults.h ) > - tm_file_list=3D"${tm_file_list} \$(srcdir)/$f" > - tm_include_list=3D"${tm_include_list} $f" > + tm_file_list=3D"${tm_file_list} ./$f" > + tm_include_list=3D"${tm_include_list} ./$f" > ;; > * ) > tm_file_list=3D"${tm_file_list} \$(srcdir)/config/$f" > diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh > index 054ede89647..3b2c2b9df37 100644 > --- a/gcc/mkconfig.sh > +++ b/gcc/mkconfig.sh > @@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then > if [ $# -ge 1 ]; then > echo '#ifdef IN_GCC' >> ${output}T > for file in "$@"; do > - if test x"$file" =3D x"defaults.h"; then > + if test x"$file" =3D x"./defaults.h" -o x"$file" =3D x"defaults= .h"; then > postpone_defaults_h=3D"yes" > else > echo "# include \"$file\"" >> ${output}T > @@ -106,7 +106,7 @@ esac > > # If we postponed including defaults.h, add the #include now. > if test x"$postpone_defaults_h" =3D x"yes"; then > - echo "# include \"defaults.h\"" >> ${output}T > + echo "# include \"./defaults.h\"" >> ${output}T > fi > > # Add multiple inclusion protection guard, part two. > -- > 2.39.0 ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstra=C3=9Fe 201= , 80634 M=C3=BCnchen; Gesellschaft mit beschr=C3=A4nkter Haftung; Gesch=C3= =A4ftsf=C3=BChrer: Thomas Heurung, Frank Th=C3=BCrauf; Sitz der Gesellschaf= t: M=C3=BCnchen; Registergericht M=C3=BCnchen, HRB 106955