From patchwork Sat May 4 15:04:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 1931353 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kitware.com header.i=@kitware.com header.a=rsa-sha256 header.s=google header.b=SMUBhBDC; 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 4VWrZX5j32z23ts for ; Sun, 5 May 2024 01:05:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 898263844033 for ; Sat, 4 May 2024 15:05:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by sourceware.org (Postfix) with ESMTPS id B32633858C53 for ; Sat, 4 May 2024 15:04:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B32633858C53 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org B32633858C53 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::82b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835101; cv=none; b=cVY8CNeRvSS9qLDgaF8Jdnv/uzvcUmP6utijX+VXeqZ0kYZEw+RghvEAEPgQfycKqnxo8VCc2kzpT9Mx615B9xA2/s41JrIm7alnwngxxGg7Vyd4Vc7+NTyarvKOPAuLuZOsWNJB/kBTZWGqVJHWPrbiC8lIdZurdQJdKsRxOuU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835101; c=relaxed/simple; bh=+P1XAUwKUSmkwgEjHovHin11f9JfuDYb6bQqD9h+9Dk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cmg+PKvN7IFqb5BPsfXDCi7ew6vttXi1YydYlTM4W9dTgUoK/Zfkr5TcB+ZXYayMLWnE0r0lil//TP1Z4eKtinPfpfEIEAgTlQK1bdybKBd3svB4i8YTxtDpUAj5EIc6Sx3X5VsKaGrCicDVneQgyvmHCdvXWGEfpHwt1AigaQQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qt1-x82b.google.com with SMTP id d75a77b69052e-43a317135a5so4355791cf.0 for ; Sat, 04 May 2024 08:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; t=1714835099; x=1715439899; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iMq82vx738qxpVjIfSbTtkYBomlUa//FRW4zuobphbM=; b=SMUBhBDCXcIJwB51wFIMroky5u2SigNeH6gOxEobtBw3x0KKpP6I/Z+xiPRyarhDZo kJCUn+yPCSbqDTHmX5p3xPxH4z3aHbNFtxbhaP8BFiA/48JX/BAAqjJEgfuDXIq50AVN sc7+894ygUuyQp4FdNL5Z8UCtJreH5z5gtp8U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714835099; x=1715439899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iMq82vx738qxpVjIfSbTtkYBomlUa//FRW4zuobphbM=; b=F7lSnYnCgf+uJ8REX0t9CGsTXLM1t82+7bNIwnxk9Sp9bvbt0D9xacsEbELolzDLPt V7+BdUfurLaSMcgMLXpMeZH3tFKbRlBWBAylTFOWYi3sl2qv3++pk2uAPcQLrlb2HGXR LKPXLmL0BNwe+EYlg6TCL+LiYB42ACIYGvDNzQo5e8yid9qACDj/c2YQDb/+syLNOmXq 7A8/j+gEbwSN0YaVVC5Ss6wVVGN2FjTYeCbStjRxGwq+rNvmQCEaQzxrn7CtDHEoohTK LHdpxrfb42WKZnJHlJe9ljARG4BY8IUA5uwyz2aqC2p1laD9wF4g++T4oN59l2h4DUBb 5SXA== X-Gm-Message-State: AOJu0Yy1BPBvZahNYnmgkROSS9I4s3fOHdEz5YTy7a04Rszyr2O9y0u5 CA68eR+o2hgHwkPTZwNx2Js50irq/k/ThlWMUlN7YjW/5uzO7ZZmfRvtKyrQbldyozEeWhpCBYE = X-Google-Smtp-Source: AGHT+IGt8576F2j69MQNz+D69IuPF4p74ymlgobb2i2O+13DLyawBTGYwRQuEHFIpTEHAtx15pZI2A== X-Received: by 2002:a05:622a:4e96:b0:43a:ccb4:ea5e with SMTP id dj22-20020a05622a4e9600b0043accb4ea5emr14622943qtb.6.1714835098887; Sat, 04 May 2024 08:04:58 -0700 (PDT) Received: from localhost (syn-142-105-146-128.res.spectrum.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id hc17-20020a05622a2a1100b00437b4048972sm2908798qtb.18.2024.05.04.08.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 May 2024 08:04:58 -0700 (PDT) From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: Brad King , Roland Illig , Ben Boeckel Subject: [PATCH 1/4] libcpp/mkdeps: fix indentation Date: Sat, 4 May 2024 11:04:43 -0400 Message-ID: <20240504150446.473575-2-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240504150446.473575-1-ben.boeckel@kitware.com> References: <20240504150446.473575-1-ben.boeckel@kitware.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 Fixes: 024f135a1e9 (p1689r5: initial support, 2023-09-01) Reported-by: Roland Illig libcpp/ * mkdeps.cc (fdeps_add_target): Fix indentation. Signed-off-by: Ben Boeckel --- libcpp/mkdeps.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libcpp/mkdeps.cc b/libcpp/mkdeps.cc index 4cf0cf09178..8762ead4c34 100644 --- a/libcpp/mkdeps.cc +++ b/libcpp/mkdeps.cc @@ -307,11 +307,12 @@ fdeps_add_target (struct mkdeps *d, const char *o, bool is_primary) { o = apply_vpath (d, o); if (is_primary) - { - if (d->primary_output) - d->fdeps_targets.push (d->primary_output); - d->primary_output = xstrdup (o); - } else + { + if (d->primary_output) + d->fdeps_targets.push (d->primary_output); + d->primary_output = xstrdup (o); + } + else d->fdeps_targets.push (xstrdup (o)); } From patchwork Sat May 4 15:04:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 1931358 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kitware.com header.i=@kitware.com header.a=rsa-sha256 header.s=google header.b=TtwVLVVi; 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 4VWrbg02Ngz1ybC for ; Sun, 5 May 2024 01:06:22 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 30A23386F449 for ; Sat, 4 May 2024 15:06:21 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by sourceware.org (Postfix) with ESMTPS id 9B30C3858C53 for ; Sat, 4 May 2024 15:05:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9B30C3858C53 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9B30C3858C53 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::734 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835108; cv=none; b=SvODuh1IMlL11VOaFUMEfl68zunHigy7gvOSoIxw8snFhHKLKruZlllVrXlWfFaGiOD6f5o8rQSwAmOBT7zMWirv2Jffv79x7G+yGRcMIbUhCrrBNR/j3UbIEOoW3VWpiA8lYvgwXZ2d8cjZ0NrEBCDnroJHt2msGIWotxKK5Kg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835108; c=relaxed/simple; bh=Zp4gRoAGmgP3HxM16ON7EfkdXAmfvOgQwswAnyS8mIQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=f0/QqI6hMBkuwjpzVb4f1gNXjkmeODjDoE60Xit3q1BEOepLFjYTs5tHtzzbTPH3Pq/iTSB1qKBs70cn9QfJjMPDH6MfrhR6Yo/B6Sib1qG2Ls+d+mFmYBmQWeQvoLO2PjwjPothVj4bCIbxMX7xrDkxCKDCUQlAuDwn71coX8I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-79291d441fbso12268285a.0 for ; Sat, 04 May 2024 08:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; t=1714835106; x=1715439906; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xEv/lx3w+b7eT4YBsileFo/bR2G75SmFyXuyD9KNM98=; b=TtwVLVViMcRp1FYQKr1sBnbiW+MjkPUVT2R2gBT3dPqRwZj1l33HUHt8zisrxWD07Z i3d5ijWQMxRXxef9cIjMMjN9W/mZST8M7dHEYj2BQ4TH/tFfFAhTfTQFqDoLdjFXGok2 ZbP6zCVCi0A+Mza3FxLe7Ay9QMDuklAmBdq+I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714835106; x=1715439906; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xEv/lx3w+b7eT4YBsileFo/bR2G75SmFyXuyD9KNM98=; b=ls/fD6ZZ5zZXE5XbrQWZkD6RzevvyCmlWdqew+wUhYbBWM6MPqXDagYDakHJmkD8fK siQHp6d7oVT9F3Lbl6r4WLk0zv+eSrq0cgZ29H+f76JW2dijfzvzejy+GoqROerEUbhu OSd3iWK8Rx20wJ9Ah4eunOx543GVAOtZerJvUJA8hyuzvXHA7KxBA/uSvL+Enh6ui925 l2ojhgNF2ufsAhkLufKRUgJgTYHBGRu5NKOOUG64ZuC14I8Cyumh62HDfAcKcAi0fity ivamzBy1VQP2qbJ+VF9azLPN3Bj9L4yLRQuOH3CU6YcDuQAJmBVCHpE9APFJytwnwD5D 9Mig== X-Gm-Message-State: AOJu0YxSsKPnoL3Q6s4EWjdCJENEHngYxP3kh5KFQtLDnJcPwu8SWSEv 3Qg6PvZCXFTbHbAzAObFIyU7JLAA3KsdCfCY5PAeR/Ap03gS1YTPuT1acjLEmSN7fkTaLnpOHkg = X-Google-Smtp-Source: AGHT+IF/E9sj8vzM+1GN1+1RZlktxOU2POoctoLQXyAEk0eSdYcEWnz7r4xtIkXIP8m+RZhkxzHiDQ== X-Received: by 2002:a05:620a:2489:b0:790:7d78:1c0f with SMTP id i9-20020a05620a248900b007907d781c0fmr7219535qkn.8.1714835105903; Sat, 04 May 2024 08:05:05 -0700 (PDT) Received: from localhost (syn-142-105-146-128.res.spectrum.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id vz8-20020a05620a494800b0078ef8c994bcsm2200033qkn.105.2024.05.04.08.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 May 2024 08:05:05 -0700 (PDT) From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: Brad King , Roland Illig , Ben Boeckel Subject: [PATCH 2/4] libcpp/init: remove unnecessary `struct` keyword Date: Sat, 4 May 2024 11:04:44 -0400 Message-ID: <20240504150446.473575-3-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240504150446.473575-1-ben.boeckel@kitware.com> References: <20240504150446.473575-1-ben.boeckel@kitware.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 The initial P1689 patches were written in 2019 and ended up having code move around over time ended up introducing a `struct` keyword to the implementation of `cpp_finish`. Remove it to match the rest of the file and its declaration in the header. Fixes: 024f135a1e9 (p1689r5: initial support, 2023-09-01) Reported-by: Roland Illig libcpp/ * init.cc (cpp_finish): Remove unnecessary `struct` keyword. Signed-off-by: Ben Boeckel --- libcpp/init.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcpp/init.cc b/libcpp/init.cc index 54fc9236d38..cbd22249b04 100644 --- a/libcpp/init.cc +++ b/libcpp/init.cc @@ -862,7 +862,7 @@ read_original_directory (cpp_reader *pfile) Maybe it should also reset state, such that you could call cpp_start_read with a new filename to restart processing. */ void -cpp_finish (struct cpp_reader *pfile, FILE *deps_stream, FILE *fdeps_stream) +cpp_finish (cpp_reader *pfile, FILE *deps_stream, FILE *fdeps_stream) { /* Warn about unused macros before popping the final buffer. */ if (CPP_OPTION (pfile, warn_unused_macros)) From patchwork Sat May 4 15:04:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 1931354 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kitware.com header.i=@kitware.com header.a=rsa-sha256 header.s=google header.b=Q6+NhPg9; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4VWrZh6j8Gz1ybC for ; Sun, 5 May 2024 01:05:32 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3E5333870860 for ; Sat, 4 May 2024 15:05:31 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by sourceware.org (Postfix) with ESMTPS id AA7C6386F427 for ; Sat, 4 May 2024 15:05:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AA7C6386F427 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AA7C6386F427 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::734 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835109; cv=none; b=AkoxaxKg7lviX3FBy+A7oRc/g9kACwLgkiDbTB2HB86lV9TFysRTAybcbgqVyHCd0jK9jtTZxdzES4+mL464vnm7zAMAIwVe7sQwK6q2wFYWE8IPNfKCM2LzZYKZwqgPJvzvjVMRR28mHAePyY4nwoFlvyMOWKu7xraEHQ77gGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835109; c=relaxed/simple; bh=EAPMA84Ulr/vt1iYjr8EkFhmSbVcyLIZlIxRAU/ziSY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=EZt0mFePI4yo6iq8yDUDEA+7zn6Qt/MEA610rD1QpPLsNrnf6WyupHWwUOurTBY4rJ7+lX0KcFqsfEJWRPWXYmuAX0ws9ajJBSpQMsubL/1rlDF37eGTrodMbAEIetLm4p4laekL5eRX/wS919frZ9LkFnnG1fahSOp0wfwORmI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-7928c8379f6so36233085a.3 for ; Sat, 04 May 2024 08:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; t=1714835108; x=1715439908; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CcgP5mVwQ8iQ/w8ucNJGsSABh25incmzb1SK4Bd891g=; b=Q6+NhPg96kD5XAzeSq3EHCVBHnKJMQawJE3N6RLPz26UnE+V3yP+lo10DDQMoVwcei KbKoJcQr+kH1GMuSuXg9UM5cCTVAMJPmLY/H7O7FCS4A9p0AwmeLYQJUtBFwMG5k78s/ 8Dl0cv/+YNWHofOeR3Zzj4GxnWKocgmgDe0R4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714835108; x=1715439908; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CcgP5mVwQ8iQ/w8ucNJGsSABh25incmzb1SK4Bd891g=; b=jNT0ikKIEAhsdp9yxv9XmXiUJ0x7h6uNzUd8PaqKUJQGt/wgFO35+8iMB2h4/GhZHx piG7+rQxHgz6t3/nhuT3nXSrB0I7wyRBsCLyDKG1dInnC9N9rrJzHC9txDYKzbVBhODW fmBqTdIsN36sh8AQaNvRU3NUMPaSaAdZrRK1YW+zcbMPa62tNimLGC0bFly7f9Hb+SUe Sdy4nLDUAGnULD83L1FsOpNKk2+VvPJf4fIO8vzVl9oQtmDjeS1TG0vOtu2NMFffYz3G 7F/5iu3SSOPDy2vrNGKqlzuhTmjUogTXQ+0jGljjKkOjE8D3Im0F+r2i/01Zm1ZiGmEr 5O8Q== X-Gm-Message-State: AOJu0Yyc52nvNun3wHVhAHG0VQrGogfOHNDLQPYodUk3dk0bCuz3nMn9 0Hak2pYAy7gWfSkV4raRAjLBdwp4xu+OgCkvOvDZ+l4Axb6zxfTRhyQ1/piBtWAuIYn7btG/Aw8 = X-Google-Smtp-Source: AGHT+IGFZH0aciJXr+43ShI9O+zKfXgRbSYD4qcDYJX5QF3fH6GWQAMpHUBMkONpgDZ9QhE6qtS0bw== X-Received: by 2002:a05:620a:60c8:b0:78d:6b42:6c17 with SMTP id dy8-20020a05620a60c800b0078d6b426c17mr4870086qkb.76.1714835107974; Sat, 04 May 2024 08:05:07 -0700 (PDT) Received: from localhost (syn-142-105-146-128.res.spectrum.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id q2-20020a05620a038200b0078d670115fcsm2200614qkm.51.2024.05.04.08.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 May 2024 08:05:07 -0700 (PDT) From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: Brad King , Roland Illig , Ben Boeckel Subject: [PATCH 3/4] gcc/c-family/c-opts: fix quoting for `-fdeps-format=` error message Date: Sat, 4 May 2024 11:04:45 -0400 Message-ID: <20240504150446.473575-4-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240504150446.473575-1-ben.boeckel@kitware.com> References: <20240504150446.473575-1-ben.boeckel@kitware.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 Fixes: 024f135a1e9 (p1689r5: initial support, 2023-09-01) Reported-by: Roland Illig gcc/c-family/ * c-opts.cc (c_common_handle_option): Fix quoting in `-fdeps-format=` unrecognized parameter error message. Signed-off-by: Ben Boeckel --- gcc/c-family/c-opts.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/c-family/c-opts.cc b/gcc/c-family/c-opts.cc index be3058dca63..4a164ad0c0b 100644 --- a/gcc/c-family/c-opts.cc +++ b/gcc/c-family/c-opts.cc @@ -370,7 +370,7 @@ c_common_handle_option (size_t scode, const char *arg, HOST_WIDE_INT value, if (!strcmp (arg, "p1689r5")) cpp_opts->deps.fdeps_format = FDEPS_FMT_P1689R5; else - error ("%<-fdeps-format=%> unknown format %<%s%>", arg); + error ("%<-fdeps-format=%> unknown format %q", arg); break; case OPT_fdeps_file_: From patchwork Sat May 4 15:04:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Boeckel X-Patchwork-Id: 1931355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kitware.com header.i=@kitware.com header.a=rsa-sha256 header.s=google header.b=haQDChPJ; 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 4VWrZl1LGRz1ybC for ; Sun, 5 May 2024 01:05:35 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 58FBE386F440 for ; Sat, 4 May 2024 15:05:33 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qk1-x729.google.com (mail-qk1-x729.google.com [IPv6:2607:f8b0:4864:20::729]) by sourceware.org (Postfix) with ESMTPS id 49FF33844052 for ; Sat, 4 May 2024 15:05:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 49FF33844052 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=kitware.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kitware.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 49FF33844052 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::729 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835112; cv=none; b=MwU6khAiSEaL6R/qurDs+KL4GrR/RZiJvbv49gay9rYXLD6p07u9dMCPOiaOpS3qofCw/Iqj6LoQor+OwLTXH3Y9GCz42PcgW+vYXkhTBL1ZOkYbpeNHAfEqL4yK1DCL/3z8aW+Jh9W1cyolTrWawekm5C4+2dHOK88BtmNCDFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714835112; c=relaxed/simple; bh=WvyXeMW1+/IhuMNZgnAXIgxHm51OQzbuB3uSzQA02gI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GNiYzPs+yTezqubSih6V0YgyX1/yut2942OFSSzFluCyqvWC9JVelf+2mYAUMbhrtGf9a1IYmUD7GAMnvyN29WjhZrs8KROIJCnW3WXJlkwscEXJphTEx2vi+uFHDlCtpNXH/SKYN4meyseQ2i5xhULCXwWFNZDFPvSt9ED/fIU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-79291d441fbso12277485a.0 for ; Sat, 04 May 2024 08:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kitware.com; s=google; t=1714835110; x=1715439910; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UZuF5H9ylLASEN8YswjboVpVfBdMMXyPhzLhwciMaMA=; b=haQDChPJhhaLvZ+ftFfmOO99X8XH478l5X8GW5DSxppZOKiRKRS7SVOYOP0KQLXs/R w8ndrt8AkgnzFAtH9T3ZJiNxESi1e3O+UhP1ujw/jX21EGb/6akSgbU6ouw9m+UJi5LW alr8AfHxZGgLn95gjbXkzXh5fVDNISPH3iWnQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714835110; x=1715439910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UZuF5H9ylLASEN8YswjboVpVfBdMMXyPhzLhwciMaMA=; b=m32LO9VmHu8hIzE6AggC82LKOagTGV2YUMqyTptowrWek4ebhT+1noVY5FEOdj/lr0 n4v/Q9ZBb1YhAm/WVfu5h+WhPpDPEZAwtOjvowFlbkBAudGmd/2evXDG/OgjcvlL2AIs pl/2gdxASaneo5IM0wTwGvcYFXVap1FnDtmgG/9ENzSGWiff0s8x1yr7wC5ilteATK0/ a00f+TXSX9PPdMoh2GG9Iex+s5ZVhi+caXbe7Tf57Ce7e/pTxcye7lRRNfm+ryykgc6O jB9SxgGcz3vqLimoky1LBZ9laMtMPBuhVC0Wo+afpebHiY2BHo+9n8viterefGr37o9T QM7A== X-Gm-Message-State: AOJu0Yz3NfvYi5R6s6t65ke9MRS13rFpYSFBAR5fZrTWgJwmYb2nJuwP wAENdW9K151iAnwlT6WPnbZGejg397DpTqnpwaZrg1Uc0UBy34BuNyCe7Tbl+9i6ddKaIfgE39s = X-Google-Smtp-Source: AGHT+IEJyLgKoG8o/we+IDWJxfmoiYgUdApzVq82XHAz68Ox8Pc4knk9ySDIoEfQiho9NfmU8+YEzA== X-Received: by 2002:a05:6214:1cc8:b0:6a0:6304:53fa with SMTP id g8-20020a0562141cc800b006a0630453famr5719285qvd.7.1714835110624; Sat, 04 May 2024 08:05:10 -0700 (PDT) Received: from localhost (syn-142-105-146-128.res.spectrum.com. [142.105.146.128]) by smtp.gmail.com with ESMTPSA id z5-20020a0ce605000000b006a0f8595c08sm2212644qvm.32.2024.05.04.08.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 May 2024 08:05:10 -0700 (PDT) From: Ben Boeckel To: gcc-patches@gcc.gnu.org Cc: Brad King , Roland Illig , Ben Boeckel Subject: [PATCH 4/4] gcc/c-family/c.opt: clarify `-fdeps-*` flag documentation Date: Sat, 4 May 2024 11:04:46 -0400 Message-ID: <20240504150446.473575-5-ben.boeckel@kitware.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240504150446.473575-1-ben.boeckel@kitware.com> References: <20240504150446.473575-1-ben.boeckel@kitware.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, 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 Move the only supported value (as of today) to the flag name itself. Also reword to clarify that the `-fdeps-file=` file will be written to. Fixes: 024f135a1e9 (p1689r5: initial support, 2023-09-01) Reported-by: Roland Illig gcc/c-family/ * c.opt: Clarify `-fdeps-*` documentation. Signed-off-by: Ben Boeckel --- gcc/c-family/c.opt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 56cccf2a67b..fa82eebb518 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -256,13 +256,13 @@ MT C ObjC C++ ObjC++ Joined Separate MissingArgError(missing makefile target after %qs) -MT Add a target that does not require quoting. -fdeps-format= +fdeps-format=p1689r5 C ObjC C++ ObjC++ NoDriverArg Joined MissingArgError(missing format after %qs) -Structured format for output dependency information. Supported (\"p1689r5\"). +Structured format for output dependency information. fdeps-file= C ObjC C++ ObjC++ NoDriverArg Joined MissingArgError(missing output path after %qs) -File for output dependency information. +File to write dependency information to. fdeps-target= C ObjC C++ ObjC++ NoDriverArg Joined MissingArgError(missing path after %qs)