From: Nick Clifton <nickc@sourceware.org>
To: bfd-cvs@sourceware.org
Subject: [binutils-gdb] Fix snafu in previous delta for elf32-csky.c
Date: Tue, 17 Jan 2023 12:55:53 +0000 (GMT) [thread overview]
Message-ID: <20230117125553.28EBB3858D28@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=13023445a33e246aa3e221ed746935f5bcb0372d
commit 13023445a33e246aa3e221ed746935f5bcb0372d
Author: Nick Clifton <nickc@redhat.com>
Date: Tue Jan 17 12:55:33 2023 +0000
Fix snafu in previous delta for elf32-csky.c
Diff:
---
bfd/elf32-csky.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
index 3f4277b71db..76567c722bb 100644
--- a/bfd/elf32-csky.c
+++ b/bfd/elf32-csky.c
@@ -2864,7 +2864,6 @@ elf32_csky_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
bfd *obfd = info->output_bfd;
obj_attribute *in_attr;
obj_attribute *out_attr;
- obj_attribute tattr;
csky_arch_for_merge *old_arch = NULL;
csky_arch_for_merge *new_arch = NULL;
int i;
@@ -3064,8 +3063,8 @@ csky_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
sec_name = get_elf_backend_data (ibfd)->obj_attrs_section;
if (bfd_get_section_by_name (ibfd, sec_name) == NULL
- || (new_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK) !=
- old_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK)))
+ || ((new_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK)) !=
+ (old_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK))))
{
/* Input BFDs have no ".csky.attribute" section. */
new_arch = csky_find_arch_with_eflag (new_flags & CSKY_ARCH_MASK);
reply other threads:[~2023-01-17 12:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230117125553.28EBB3858D28@sourceware.org \
--to=nickc@sourceware.org \
--cc=bfd-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).