From patchwork Tue Apr 21 11:51:05 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 133462 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 264C94BA2E24 for ; Tue, 21 Apr 2026 11:51:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 264C94BA2E24 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=google header.b=UjyMYfOV X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by sourceware.org (Postfix) with ESMTPS id CD71F4BA2E2F for ; Tue, 21 Apr 2026 11:51:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CD71F4BA2E2F Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CD71F4BA2E2F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776772268; cv=none; b=P2f1wgCw7QrlbaDpF9l4DNTTAYfoGXEM55BTU05ykWV1Kk3jIlE3Mg1N2XI0RNlyBR8KGjlzgKqq9AebLsCDeeGaDu+NaqvkuY3K959XXisacwNNy9n/O658YA+/X2bnZVTSEctuu+/FhcHXPQ2rv0DkoTkkBn6V4NMOMGc1BsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1776772268; c=relaxed/simple; bh=nv92S6KSJ53z9vQk+MPFhxtT8vkelk13koo54Loenyo=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:From:To; b=N5gDJK6tWmfg/WYjIMxAc0cE7Zzs6mmoSrR+u1syTnhIHb5sD6KFDA/H0JXyQ9FDL75x0CIIviNYMLrdDoCFZCVRCkeRG8EHzKDsACZe6bpvkA7O/a5cTTuRIw19/LpiGSouGr3OQM2/5oao4E1MpTkBoc1D3zdElXYlang32Zg= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD71F4BA2E2F Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-43cf7683a28so2819906f8f.2 for ; Tue, 21 Apr 2026 04:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776772267; x=1777377067; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=6bMi/jXZej3lL8UqQUazqxPKO7J1DkYYh/S/EUvS3bM=; b=UjyMYfOVplwFhwUQl7se6f+EAimujl0WwIujSZlhHv3fbCbcfysmozBTAPqp4cUGCj uBmM/X21stL5h+szqjbHBqYJotLk1YC0VFVBsTKx969yXTFrvUF9p1SYkxuRPifyHN5o TCdiFXfLJqEE3mqLdAabW5etTYaP38TR+5ctZHfl4pQbEnTSvbooMU4xmyLp5jQPAyvE LH088UpVzcv8gqxSe0TQYxHszndaXTcLO02NZqTH6tIwSCiithBJgphNhOXo6ZKLfhkj C4sWvvu+4A8T7C+E9NflpgTSNYsxXREWdTQ9Oa0cYUricVU59rhETZNG2leu57UEJV+W BIOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776772267; x=1777377067; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=6bMi/jXZej3lL8UqQUazqxPKO7J1DkYYh/S/EUvS3bM=; b=BZEcygOZtgUZuF1j5UyJRSZx7bySlaT10LLpSocI294Z9kZWiEpjGzwPMeWymOxuts WEYzi9arwmMoJtJR035MueYQfSd4ajY8tXuMCjRjRewQUdQo0nT6rRUfW6rtiCPUf84o PQaKJZHjHhNmiEoC1lmgV+ihTpcGxQU2V+amIN3FVkVrwhbVNPsMjrH91bU20jKADUu/ OBwWAro2J6NHfkQKrepg9Yqs/JwMhtuArU0kEy58lq433xEgtPYOjYDUS8RG7k+MTeld kmyWmYd29sfnpxKebX6MQuO25UadPI/3eBWr7ksa2sgIr3tolMkWNSdPWgxhtmlJaMzD zOuA== X-Gm-Message-State: AOJu0YwJx45v7L4Ui1HrKQe6Fsa2593+Dk6PzbTtaFvWX5MfIWghBQN1 1qgk9ijYPkE6PydRU2rzx7LSpvknQ7ixEgLPGcHCmA9vX9gZ07Ebj4rXMdV4btTx+clWIE94zWj U1uOQGQ== X-Gm-Gg: AeBDieuRJf7bUJTcrNF4G58lsuqdo7UUF/JHVKIdJSYvpAofl/2cb0rDdZxvuOz3TKx IxTdiROfty2u4n8QoY6Z7yAQAvLe+Bd9tbYkC1QSX76dHpDVv3ivGB7ZN6tb9MMeVHSY8KLdaXl 1jSlUza7rxDvLtpUTx7TOozMhzWNYtf5iS/vMCVEf/qM4gu7mgk1dkqVlCHZn3jii4I4JZdDt5/ coW+rsitBcO0BFVxqVTQ8sDDzOmvcpsETbXgNui4hhK/g3DTSZExWSHGJi6HN1wlhtrKbC0SYOj 6tJVL1mXk8Pta94uimfvuucMEqiGjKqi1JTd4WQ54fL49hdTzMWsn4pisJEZ0pX1j27eDAATew8 nQkmVpatM7H1Ddhq1/8TWBixu1VL7ETHr6Pv6HeeZ/sIooNMj+nZkdnyy6nFcW90t/+qRcbRUtl UTfn2ltemRGlO0eNNIwbfrE2Qv9/vnhPA/i4NOp05wETkvAZ7kLNoQXb2m33bFJhvkfx3/FTUiN ARsP2hnm6TnEnpalj4BL7T06g== X-Received: by 2002:adf:fd4c:0:b0:43f:e414:4c6a with SMTP id ffacd0b85a97d-43fe4144cabmr16731569f8f.0.1776772266648; Tue, 21 Apr 2026 04:51:06 -0700 (PDT) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4e4d5b1sm40707762f8f.30.2026.04.21.04.51.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 21 Apr 2026 04:51:06 -0700 (PDT) Message-ID: <2a36b6b0-3b92-4b92-8da1-3a03bd4ba221@suse.com> Date: Tue, 21 Apr 2026 13:51:05 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 06/19] bfd/RISC-V: correct grammar of conflict diagnostics From: Jan Beulich To: Binutils Cc: Palmer Dabbelt , Andrew Waterman , Jim Wilson , Nelson Chu References: <620231e0-67d0-4bd0-b593-38f32b01a6d8@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <620231e0-67d0-4bd0-b593-38f32b01a6d8@suse.com> X-Spam-Status: No, score=-3016.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces~patchwork=sourceware.org@sourceware.org --- The extensions mentioned in the diagnostics can also be irritating, as one may not have enabled the specific one(s) mentioned. At the example of Zfinx, if only F was mentioned in the latter part of the message, that would at least be self-consistent. Furthermore the wording (particularly for uses in gas) suggests that the extension mentioned first is what was enabled last. Alternative, less suggestive wording may be "A and B conflict with one another". The usage in gas has another related issue, though: Subsets are added before checking for conflicts, hence e.g. for Z*inx the FPR form insns are then causing errors, irrespective of the order of .option directives (i.e. no matter which extensions were successfully enabled). Question is whether this infrastructure is actually well suited for use by gas. --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -2245,14 +2245,14 @@ riscv_parse_check_conflicts (riscv_parse && riscv_lookup_subset (rps->subset_list, "f", &subset)) { rps->error_handler - (_("`zfinx' is conflict with the `f/d/q/zfh/zfhmin' extension")); + (_("`zfinx' conflicts with the `f/d/q/zfh/zfhmin' extension")); no_conflict = false; } if (riscv_lookup_subset (rps->subset_list, "xtheadvector", &subset) && riscv_lookup_subset (rps->subset_list, "zve32x", &subset)) { rps->error_handler - (_("`xtheadvector' is conflict with the `v/zve32x' extension")); + (_("`xtheadvector' conflicts with the `v/zve32x' extension")); no_conflict = false; } if (riscv_lookup_subset (rps->subset_list, "zclsd", &subset) @@ -2261,7 +2261,7 @@ riscv_parse_check_conflicts (riscv_parse || riscv_lookup_subset (rps->subset_list, "zcf", &subset))) { rps->error_handler - (_("`zclsd' is conflict with the `c+f'/ `zcf' extension")); + (_("`zclsd' conflicts with the `c+f'/`zcf' extension")); no_conflict = false; } if (riscv_lookup_subset (rps->subset_list, "ssnpm", &subset) && xlen != 64) --- a/gas/testsuite/gas/riscv/x-thead-vector-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-vector-fail.l @@ -1,2 +1,2 @@ Assembler messages: -Error: `xtheadvector' is conflict with the `v/zve32x' extension +Error: `xtheadvector' conflicts with the `v/zve32x' extension