From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by sourceware.org (Postfix) with ESMTPS id 454D73858408 for ; Tue, 28 Sep 2021 11:41:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 454D73858408 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sifive.com Received: by mail-pj1-x1031.google.com with SMTP id mi2-20020a17090b4b4200b0019f1349df1dso1414386pjb.0 for ; Tue, 28 Sep 2021 04:41:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rplcLn3LK5z50E9TMrWsvdDtIGcGrlm1z5wwHhfyhyg=; b=M4b9nJ+3nEmapMUSi2emjzXv5ej3Bar0/5nWC394BjXis5kUtomcsWhX1C1yBsodiA hxSj+3Sfl9qO4NF5J36xbsKnvJoBEoQRVeKL8i+UVQfQ4kc9ypZLdYGWhw4vHogTQmId xg6KEO+IRQ7ePXm/WoJgHRdt1g4UpDyzsA9QCiWaenE5pRmaoMGt/+fRBZI8n83iiZpj BRe+igdxkDoF6aZ0JzDSH4o6IF3LGt+iA5WPRaVKqHi3DHQ2cg2nHv32U3KeR+YJwtbS 9QjT8yG/zcXowDVpag48dDhzltMdEgv8Hez+ZdJokDYv0mgKvf2kW9QimpgkiJ+Y5VvF W5jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rplcLn3LK5z50E9TMrWsvdDtIGcGrlm1z5wwHhfyhyg=; b=oirh73EsX98jSk/+pBMSAyeRVyrLoLTlLIHAaWJJFZmBc1eWC4JxFwUX48l9ogjwrj RSzS6DnmEHqwQGb4lnXca5d/mVCkr1SQPhoUez6W4NHmN5vL1OgvzmPUg/2cftuzmKK2 5PYoiaCUFoOPvKUcIfu+Z/JLui8Qb85QmjEtASMIF/qQiqx/aCG2MX2ut7DmvSz5Zffz qZLDWDLjrirVvNWOHCHfraHQ0tyG5Yfm4xiYgBcLejQSdk+9JoudQDfNo+BqF9j3dGeT 5w1iBf32MtBnZXslXuFcHBVr9+wUt0se5SWcED0DZ4tElJ5hPf+hHXQXP5Bd5lNS+uFi kEJg== X-Gm-Message-State: AOAM531SvVHD/9wcf15THxMMb41KQizKeZJjmBw3Tw8S5lNQu9rDXkXL Ibe9+4GeSsumfCwUJJq+x2UJgERlU4cDEw== X-Google-Smtp-Source: ABdhPJwNvuF43FdPYopZCjvqJdQIsH1cAf1rTsmKa3OPH+r6l1+y20vic5enUVP61IZaRwCHlG14Cw== X-Received: by 2002:a17:90b:3882:: with SMTP id mu2mr4952292pjb.193.1632829301296; Tue, 28 Sep 2021 04:41:41 -0700 (PDT) Received: from gamma00.internal.sifive.com ([64.62.193.194]) by smtp.gmail.com with ESMTPSA id q16sm18870710pfh.16.2021.09.28.04.41.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Sep 2021 04:41:41 -0700 (PDT) From: Nelson Chu To: binutils@sourceware.org, jimw@sifive.com, kito.cheng@sifive.com Cc: nelson.chu@sifive.com, Cooper Qu Subject: [committed 2/2] RISC-V: Fix wrong version number when arch contains 'p'. Date: Tue, 28 Sep 2021 04:41:38 -0700 Message-Id: <20210928114138.2049-2-nelson.chu@sifive.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210928114138.2049-1-nelson.chu@sifive.com> References: <20210928114138.2049-1-nelson.chu@sifive.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Sep 2021 11:41:43 -0000 From: Cooper Qu When specify a default version for p extension in riscv_supported_std_ext[](elfxx-riscv.c) and assembling with -march=rv32imacp, the c extension's version in attribute will become 0p0, the expectation is 2p0. TODO: Remember to add testcase when we have supported standrad p in the future. bfd/ PR gas/28372 * elfxx-riscv.c (riscv_parsing_subset_version): Break if p represent the 'p' extension. Change-Id: Ia4e0cf26f3d7d07acaee8cefd86707ecac663a59 --- bfd/elfxx-riscv.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index c3d019c03a6..044cc63d09e 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1536,13 +1536,9 @@ riscv_parsing_subset_version (const char *p, { np = *(p + 1); + /* Might be beginning of `p` extension. */ if (!ISDIGIT (np)) - { - /* Might be beginning of `p` extension. */ - *major_version = version; - *minor_version = 0; - return p; - } + break; *major_version = version; major_p = false; -- 2.30.2