From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by sourceware.org (Postfix) with ESMTPS id 7F6BB3844010 for ; Thu, 20 Aug 2020 06:34:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7F6BB3844010 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nelson.chu@sifive.com Received: by mail-pg1-x543.google.com with SMTP id g33so678368pgb.4 for ; Wed, 19 Aug 2020 23:34:50 -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; bh=TFpShvBhtlVEOsXWWSCLkO3d37BcpLqZ95V6EPw3WTE=; b=ipxIudI63Cvlf2GiWPy0aDjoXkRg9jv96fSboh4rWVYLCH04E/1iOQJebq0ry2uKDe ofqaz3gcih9ByY7wtWu1be0BGFjPOIkZnKl+4KxQLYrKpnkVRxKn40ndFocTwz3m9jR6 ybxaSlTjYUM3e3oUprQgeFDIzzS4eHRuHO+nw2wfYlAzflkjM715tecUh3TVzvZGffos 3Zp8fZbWYfiqlsCWEBERS91aNbFVRZtI+Y2Be4SWNFOJXItv/depKClt1+rvC/hxiPji ZAMR5NJcmzjWKzrwGWAtBXwJjeH5etpp+VbmPIqFH2m9sE8hAZ9VX1lZfNfkZCp09BTk xbuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TFpShvBhtlVEOsXWWSCLkO3d37BcpLqZ95V6EPw3WTE=; b=gSpChguFeKAtmMsoUNj652aVURqqToc9qdlIb9Yy2uzlgnBYSf4toWLAPpjU1OxXvj wjTKZQ4wYKShxkyOkfSY7kBJjp0InKbhChdnHl+s98XkPIvAz7xuSQgGjB9DvJErq02V sNr1NqMTYIJjM1TaDvW6CgbNOC3zC25LFRJFeBFMmC7nwHbekFUFbykTu31mXptWSOyZ yuL9LOAc70p6t8F8Vx+G0SmHrdtrziCW81mYdXt3nZngi+yQAlCpejHSiCFKdbYylXzK zdWhWUeLfED5WVbCbUhOw3GswDyhLs7yKk86MWlsMrpA6R4iAFvumLzyBkySYVsd1Obr 5DtA== X-Gm-Message-State: AOAM533WnNIvk2pvTbrCedY3l1vhCPCBs+CYwKbEQuYbPsB6dvFxkvAN vX00zkJX1s4meEvNTp4lNEZZlec8Vy7CySkJ X-Google-Smtp-Source: ABdhPJxatF0d3I50q7lhczeNQpBU1pMB6AUQeELWo0WzDU2uJnwBgL3beuT0OsdYFamV/U+Ff00jDA== X-Received: by 2002:a63:e04c:: with SMTP id n12mr1391075pgj.388.1597905289254; Wed, 19 Aug 2020 23:34:49 -0700 (PDT) Received: from gamma05.internal.sifive.com ([64.62.193.194]) by smtp.gmail.com with ESMTPSA id o38sm1245632pgb.38.2020.08.19.23.34.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2020 23:34:48 -0700 (PDT) From: Nelson Chu To: binutils@sourceware.org Cc: jimw@sifive.com, kito.cheng@sifive.com, nelson.chu@sifive.com Subject: [PATCH 3/3] RISC-V: Minor cleanup and typos when merging priv spec attributes. Date: Wed, 19 Aug 2020 23:34:42 -0700 Message-Id: <1597905282-22927-4-git-send-email-nelson.chu@sifive.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1597905282-22927-1-git-send-email-nelson.chu@sifive.com> References: <1597905282-22927-1-git-send-email-nelson.chu@sifive.com> X-Spam-Status: No, score=-11.4 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.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Thu, 20 Aug 2020 06:34:52 -0000 bfd/ * elfnn-riscv.c (riscv_merge_attributes): Fix comment typos. ld/ * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d: Remove the useless `warnings` keywords. * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d: Likewise. * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d: Likewise. * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d: Likewise. * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d: Likewise. * testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d: Likewise. --- bfd/elfnn-riscv.c | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d | 4 ++-- ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index 513785e..5fc08fe 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -3046,7 +3046,7 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info) out_attr[Tag_b].i, out_attr[Tag_c].i); - /* The priv spec v1.9.1 can be linked with other spec + /* The priv spec v1.9.1 can not be linked with other spec versions since the conflicts. We plan to drop the v1.9.1 in a year or two, so this confict should be removed in the future. */ @@ -3058,7 +3058,7 @@ riscv_merge_attributes (bfd *ibfd, struct bfd_link_info *info) "linked with other spec versions.")); } - /* Update the output priv attributes to the newest. */ + /* Update the output priv spec to the newest one. */ if (in_priv_spec > out_priv_spec) { out_attr[Tag_a].i = in_attr[Tag_a].i; diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d index 0d5d6dc..007eaa3 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-01.d @@ -2,8 +2,8 @@ #source: attr-merge-priv-spec-c.s #as: #ld: -r -#warning: .*warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. +#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d index f0f75b2..6707cee 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-02.d @@ -2,8 +2,8 @@ #source: attr-merge-priv-spec-a.s #as: #ld: -r -#warning: .*warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. +#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d index af51552..7679fbf 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-03.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-c.s #as: #ld: -r -#warning: .*warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. +#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d index 2328807..ee37ce1 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-04.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-c.s #as: #ld: -r -#warning: .*warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#warning: .*use privilege spec version 1.11.0 but the output use version 1.9.1. +#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d index cabaab6..c5fafad 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-05.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-a.s #as: #ld: -r -#warning: .*warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. +#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. #readelf: -A Attribute Section: riscv diff --git a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d index e774748..7251be0 100644 --- a/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d +++ b/ld/testsuite/ld-riscv-elf/attr-merge-priv-spec-failed-06.d @@ -3,8 +3,8 @@ #source: attr-merge-priv-spec-a.s #as: #ld: -r -#warning: .*warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. -#warning: .*warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. +#warning: .*use privilege spec version 1.9.1 but the output use version 1.11.0. +#warning: .*privilege spec version 1.9.1 can not be linked with other spec versions. #readelf: -A Attribute Section: riscv -- 2.7.4