From patchwork Wed Jan 31 11:59:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 85080 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0B7F73858038 for ; Wed, 31 Jan 2024 12:00:06 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D56783858D20 for ; Wed, 31 Jan 2024 11:59:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D56783858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D56783858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706702375; cv=none; b=Db3glM7uLC4iINFeDsEffzPIq+ZRhqffu/ImAmX4mlINS8Xkp/8Vp7EQlnQtkpydC7p/Xj5pj0IdE8iNWiG6G32KyBWXnknDzUAiOrFwbxopfXjlzVCdJnKo3Iq5iY1Ss8rGsqzj9VW6zpuWvCOjGUF/sNvCmNhVC5Z7NXp6ZYs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706702375; c=relaxed/simple; bh=YmGfQsCWJTBAWA1oPnk95O7/u3SP0tA+Jd8s3lHq10U=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=VLD6+mEM1ngzFUwgZrHlyMAwAUkfdauY1iTBMhr8j1w8PwBfirAKOPDe4BjbjbxGWGKAwllzBzboG6WKplFhIOECRA/L2YKBjxckMl2dEANGTc/rpv1ShwJFstdY4oLcD9OqQ6tistfhLDt3lcxV2At8pycEuk2VQRUPNpgYehs= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706702373; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=+XbFVmJZJUPTQSCu3O9Zy/1kPTzFh1Rna2msOk/AD6U=; b=Ss1Cs7k6BZJwKZs9L/pE70+fBtFp73fb6wRPCERbgYkS+PG8vT+9n0cG/9nYzElojbmHzL qGbN61d/rGeZZiqGni2x4Rii33/De8XaLviRvgpoSfO9SZtKL7j5YRBgC4gWQ0JQjixrdp b1nnHQFfYv3BV/2WvIW+gZT7NfdcGYE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-W4YsJmIbPPeIfS9n5r82mw-1; Wed, 31 Jan 2024 06:59:32 -0500 X-MC-Unique: W4YsJmIbPPeIfS9n5r82mw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D7289185A782; Wed, 31 Jan 2024 11:59:31 +0000 (UTC) Received: from tucnak.zalov.cz (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A9CCC0FDF1; Wed, 31 Jan 2024 11:59:31 +0000 (UTC) Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.17.1/8.17.1) with ESMTPS id 40VBxSQZ286576 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 31 Jan 2024 12:59:29 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.17.1/8.17.1/Submit) id 40VBxRRM286575; Wed, 31 Jan 2024 12:59:27 +0100 Date: Wed, 31 Jan 2024 12:59:27 +0100 From: Jakub Jelinek To: iain@sandoe.co.uk Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] libgcc: Fix up i386/t-heap-trampoline [PR113403] Message-ID: References: <20240128140733.94198-1-iain@sandoe.co.uk> <20240128140733.94198-2-iain@sandoe.co.uk> MIME-Version: 1.0 In-Reply-To: <20240128140733.94198-2-iain@sandoe.co.uk> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Jakub Jelinek Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org 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 > # . > > -LIB2ADD += $(srcdir)/config/aarch64/heap-trampoline.c > +LIB2ADDEH += $(srcdir)/config/aarch64/heap-trampoline.c > +LIB2ADDEHSHARED += $(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 > # . > > -LIB2ADD += $(srcdir)/config/i386/heap-trampoline.c > +LIB2ADDEH += $(srcdir)/config/i386/heap-trampoline.c > +LIB2ADDEHSHARED += $(srcdir)/config/aarch64/heap-trampoline.c 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' 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. 2024-01-31 Jakub Jelinek * config/i386/t-heap-trampoline: Add to LIB2ADDEHSHARED i386/heap-trampoline.c rather than aarch64/heap-trampoline.c. Jakub --- libgcc/config/i386/t-heap-trampoline.jj 2024-01-31 10:46:36.491743132 +0100 +++ libgcc/config/i386/t-heap-trampoline 2024-01-31 12:55:59.779101625 +0100 @@ -17,4 +17,4 @@ # . LIB2ADDEH += $(srcdir)/config/i386/heap-trampoline.c -LIB2ADDEHSHARED += $(srcdir)/config/aarch64/heap-trampoline.c +LIB2ADDEHSHARED += $(srcdir)/config/i386/heap-trampoline.c