From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp002.apm-internet.net (smtp002.apm-internet.net [85.119.248.221]) by sourceware.org (Postfix) with ESMTPS id 77D56385802B for ; Thu, 1 Feb 2024 19:58:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 77D56385802B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sandoe.co.uk ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 77D56385802B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=85.119.248.221 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706817513; cv=none; b=nNtA11nol5teD27jYTPEnWaGYq5UyJxCYbGSL98+qraLqNXS1qyEn43sb8icpFA5lrEQY56KfDs7JlaC32pftc1royY3fLcKSuwiIMnX06+b1qVBUwnE0pTXk/5rG3QEypKoMXwOxvpw4hTHVBs/17iYe0Uzjbb1GHkzoV9z1b0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706817513; c=relaxed/simple; bh=ZblXPvp6wPpar0F90Yr6O4VYzn6fAd+Cg7jogoAH2PM=; h=Mime-Version:Subject:From:Date:Message-Id:To; b=apl85tmdOkbVqSClbpxgvL3u24sVk+YPulC/T2vIk2/9FgnatJKQFi9SgGBUAbvGBIP5tkPOTjHxU0UGnp+5k3tYJl8ftG8hIpBt8UaS148qZjGWvrCamp/y8+50kHl13OQkg4b9o+S0e7kbXkizpO3BF4/6jZf57g5Xos9nSdM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: (qmail 62524 invoked from network); 1 Feb 2024 19:58:29 -0000 X-APM-Out-ID: 17068175096252 X-APM-Authkey: 257869/1(257869/1) 5 Received: from unknown (HELO smtpclient.apple) (81.138.1.83) by smtp002.apm-internet.net with SMTP; 1 Feb 2024 19:58:29 -0000 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: [PATCH] libgcc: Fix up i386/t-heap-trampoline [PR113403] From: Iain Sandoe In-Reply-To: Date: Thu, 1 Feb 2024 19:58:29 +0000 Cc: GCC Patches Content-Transfer-Encoding: quoted-printable Message-Id: <905A5FDE-5244-49B6-8D1A-0D2647B2E116@sandoe.co.uk> References: <20240128140733.94198-1-iain@sandoe.co.uk> <20240128140733.94198-2-iain@sandoe.co.uk> To: Jakub Jelinek X-Mailer: Apple Mail (2.3696.120.41.1.4) X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,KAM_COUK,KAM_DMARC_STATUS,KAM_SHORT,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: > On 1 Feb 2024, at 08:22, Jakub Jelinek wrote: >=20 > On Wed, Jan 31, 2024 at 12:59:27PM +0100, Jakub Jelinek wrote: >> On Sun, Jan 28, 2024 at 02:07:32PM +0000, Iain Sandoe wrote: >>> --- a/libgcc/config/aarch64/t-heap-trampoline >>> +++ b/libgcc/config/aarch64/t-heap-trampoline >>> @@ -16,4 +16,5 @@ >>> # along with GCC; see the file COPYING3. If not see >>> # . >>>=20 >>> -LIB2ADD +=3D $(srcdir)/config/aarch64/heap-trampoline.c >>> +LIB2ADDEH +=3D $(srcdir)/config/aarch64/heap-trampoline.c >>> +LIB2ADDEHSHARED +=3D $(srcdir)/config/aarch64/heap-trampoline.c >>> --- a/libgcc/config/i386/t-heap-trampoline >>> +++ b/libgcc/config/i386/t-heap-trampoline >>> @@ -16,4 +16,5 @@ >>> # along with GCC; see the file COPYING3. If not see >>> # . >>>=20 >>> -LIB2ADD +=3D $(srcdir)/config/i386/heap-trampoline.c >>> +LIB2ADDEH +=3D $(srcdir)/config/i386/heap-trampoline.c >>> +LIB2ADDEHSHARED +=3D $(srcdir)/config/aarch64/heap-trampoline.c >>=20 >> I'm seeing >> ../../../libgcc/shared-object.mk:14: warning: overriding recipe for = target 'heap-trampoline.o' >> ../../../libgcc/shared-object.mk:14: warning: ignoring old recipe for = target 'heap-trampoline.o' >> ../../../libgcc/shared-object.mk:17: warning: overriding recipe for = target 'heap-trampoline_s.o' >> ../../../libgcc/shared-object.mk:17: warning: ignoring old recipe for = target 'heap-trampoline_s.o' >>=20 >> Shouldn't we go with following patch? >> I can test it on x86_64-linux and i686-linux, but can't test it e.g. = on >> Darwin easily. >>=20 >> 2024-01-31 Jakub Jelinek >>=20 >> * config/i386/t-heap-trampoline: Add to LIB2ADDEHSHARED >> i386/heap-trampoline.c rather than aarch64/heap-trampoline.c. >=20 > Bootstrapped/regtested on x86_64-linux and i686-linux successfully. Thanks, looks silly pasto that somehow managed to survive default = testing options. Tested x86_64-darwin (along with the warning suppression patch) and tested for ftrampoline-impl=3D{heap,stack} and {static,shared}-libgcc. thanks Iain