From patchwork Mon Aug 5 08:45:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 1968959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=eWp17jyA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wcqm56JB8z1yZb for ; Mon, 5 Aug 2024 18:46:12 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 76C193858289 for ; Mon, 5 Aug 2024 08:46:10 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id E5091385841E for ; Mon, 5 Aug 2024 08:45:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E5091385841E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=baylibre.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E5091385841E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::432 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722847535; cv=none; b=Nbl8All9CS3eMVvuLfQGraXdpnA36u+dVYnuRNw6cqMSz0RGBRYvBghXAAM7jre4/1Dvn+EA493Yz4yNF6CZmxdOQ4P5xctDx18n7onRnDzdx5kVeawkxwjq+0a3+gLoUolgzchXXk5eRj6JHQ7L0oxildT7HI3uT6s7jpW/SMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722847535; c=relaxed/simple; bh=ExJ9vi51CSdy83mp0HQBdSI+1NxaBf3b9SaPNBoAZYI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=I2Bc51SwjO3iA4iiQf8R95OSE8bNPsr4SZFlOO+Yrynuc97P/cQGX1OOXw7GoWTK7UhbxXh8YXQw67tDyH37f557w5T4JAQD3430o67fI2fnPp8hr8J0mTnKYjNpbBF9FFmWe5HO9ZyNywCTKaeeQNoDIX7UHB+xXELmRR/IBm0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-36887ca3da2so4974447f8f.2 for ; Mon, 05 Aug 2024 01:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1722847518; x=1723452318; darn=gcc.gnu.org; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:to:from:from:to:cc:subject:date:message-id:reply-to; bh=Q3YGcLlue0RuThNvNqZurQF0IEqDQHFmJgfA1Dq11OY=; b=eWp17jyAEAfP/RHlCZd1LIEItIa+/LfzZAVxqi5Vc95DYwhjF/uInYNEbFSe350dVD w3rjTUKa+tTvYh6Kt/bxysXM58+jELfvXGdLAJWZ5dFP+q6mTjNWpnYx9PqH/G1d/lPa WLTph659ZiYy4Bq/YDvADih1uOgkXD8rUfFZVE0St8occZEQRCnkh6NAyDCoK11/5rBW iC4ZF1V/VntspaMOPEGO+3QHTeF2eTXb2vNoNAbIZ0RfZN9eH9+zlPS7JMRTfa2PxxfS lsHmlXopcPQOgMOyLy5qO7zpmYxf7BeMox/VwwrcQHUv5Otz6EEmcbWeBqHX0vEevqSa 8i/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722847518; x=1723452318; h=mime-version:message-id:date:user-agent:references:in-reply-to :subject:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Q3YGcLlue0RuThNvNqZurQF0IEqDQHFmJgfA1Dq11OY=; b=c/kV7mNzAUdOrll1vHcGyKQZ3N9GxVr/XjtGMhlma75XOSXW1OTxJMp0T2Bo/LpX4h aiJ+sp/SxDSv1j1sWwpGJPpwmCP6KPFYx6FXPn0gfAzBBBwYswUlHWJB6+mETAUU2krq mTaVbbqosW7V51KdrVikHCx535nPvjGhLdGnbEjlOnloWfbK5Zo/MygGb19xs7s6wLMe wI+60XQgWNvW72a8dpm9p+p9QQAAnR7Hsq+hfCVfZc7MJFBxQJQU/FNpjgcUQqMe7sNV hoIZnA/oeTZqFn8v+lkdUHyJDG0uxu8kM5XtqkfyNe8fEyNvscU8a/DV5eptoOYmz2Rb cVSg== X-Forwarded-Encrypted: i=1; AJvYcCWyX9gcNJZZpBnehP4qSThoGPki6Bk80cM9m1c/Y0spUxuSZk5J5Ww8hTsJL2QJcizc1xyGsscJvzNZKAQZp9Kg8Rcx8xf8vA== X-Gm-Message-State: AOJu0YyFIQch4TOOkGbrc2UnAj4BOQCobhV/NIVUXuCf8P9RHh7RYZEO Kz1Lve3FOZv6AvuET5UDH531KeYshiTAjPLBlYnyncs0nkygQF06YOST2hp3GWo= X-Google-Smtp-Source: AGHT+IGWCmkP5JDvm11f1Mfm0ht87jK7aMGq/GFRMCbI1YyYKQgJm7nR7aFo68VSUDnCR3ayJirrLg== X-Received: by 2002:a5d:6903:0:b0:36b:b1cc:a095 with SMTP id ffacd0b85a97d-36bbc109610mr6684998f8f.21.1722847518308; Mon, 05 Aug 2024 01:45:18 -0700 (PDT) Received: from euler.schwinge.ddns.net (p200300c8b733b9005e8fc6f38b6af531.dip0.t-ipconnect.de. [2003:c8:b733:b900:5e8f:c6f3:8b6a:f531]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36bbd0597a7sm9119203f8f.75.2024.08.05.01.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Aug 2024 01:45:17 -0700 (PDT) From: Thomas Schwinge To: Arthur Cohen , gcc-patches@gcc.gnu.org, gcc-rust@gcc.gnu.org Subject: Inline 'gcc/rust/Make-lang.in:RUST_LIBDEPS' (was: [PATCH 006/125] gccrs: Add 'gcc/rust/Make-lang.in:LIBFORMAT_PARSER') In-Reply-To: <20240801145809.366388-8-arthur.cohen@embecosm.com> References: <20240801145809.366388-2-arthur.cohen@embecosm.com> <20240801145809.366388-8-arthur.cohen@embecosm.com> User-Agent: Notmuch/0.30+8~g47a4bad (https://notmuchmail.org) Emacs/29.4 (x86_64-pc-linux-gnu) Date: Mon, 05 Aug 2024 10:45:15 +0200 Message-ID: <87frrjicis.fsf@euler.schwinge.ddns.net> MIME-Version: 1.0 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, 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 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: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org Hi! On 2024-08-01T16:56:02+0200, Arthur Cohen wrote: > --- a/gcc/rust/Make-lang.in > +++ b/gcc/rust/Make-lang.in > @@ -212,6 +212,9 @@ RUST_ALL_OBJS = $(GRS_OBJS) $(RUST_TARGET_OBJS) > rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o > > LIBPROC_MACRO_INTERNAL = ../libgrust/libproc_macro_internal/libproc_macro_internal.a > +LIBFORMAT_PARSER = rust/libformat_parser.a > + > +RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) > > > RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) That must've been a mis-merge; my GCC/Rust master branch original of this commit (as part of "Move 'libformat_parser' build into the GCC build directory, and into libgrust") didn't include a bogus second definition of 'RUST_LIBDEPS'. I've pushed to trunk branch commit aab9f33ed1f1b92444a82eb3ea5cab1048593791 "Inline 'gcc/rust/Make-lang.in:RUST_LIBDEPS'", see attached -- this commit apparently had been omitted from the 2024-08-01 upstream submission. Grüße Thomas From aab9f33ed1f1b92444a82eb3ea5cab1048593791 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 28 Feb 2024 23:06:25 +0100 Subject: [PATCH] Inline 'gcc/rust/Make-lang.in:RUST_LIBDEPS' ..., also fixing up an apparently mis-merged commit 2340894554334a310b891a1d9e9d5e3f502357ac "gccrs: Add 'gcc/rust/Make-lang.in:LIBFORMAT_PARSER'", which was adding a bogus second definition of 'RUST_LIBDEPS'. gcc/rust/ * Make-lang.in (RUST_LIBDEPS): Inline into all users. --- gcc/rust/Make-lang.in | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in index c3be5f9d81b..aed9a998c80 100644 --- a/gcc/rust/Make-lang.in +++ b/gcc/rust/Make-lang.in @@ -226,13 +226,8 @@ rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o LIBPROC_MACRO_INTERNAL = ../libgrust/libproc_macro_internal/libproc_macro_internal.a LIBFORMAT_PARSER = ../libgrust/libformat_parser/debug/liblibformat_parser.a -RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) - - -RUST_LIBDEPS = $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) - # The compiler itself is called crab1 -crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev) +crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBDEPS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) $(rust.prev) @$(call LINK_PROGRESS,$(INDEX.rust),start) +$(LLINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) $(CRAB1_LIBS) $(LIBPROC_MACRO_INTERNAL) $(LIBFORMAT_PARSER) $(BACKENDLIBS) -- 2.34.1