From 13023445a33e246aa3e221ed746935f5bcb0372d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 17 Jan 2023 12:55:33 +0000 Subject: [PATCH] Fix snafu in previous delta for elf32-csky.c --- 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); -- 2.30.2