From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2124) id 28EBB3858D28; Tue, 17 Jan 2023 12:55:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 28EBB3858D28 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Nick Clifton To: bfd-cvs@sourceware.org Subject: [binutils-gdb] Fix snafu in previous delta for elf32-csky.c X-Act-Checkin: binutils-gdb X-Git-Author: Nick Clifton X-Git-Refname: refs/heads/master X-Git-Oldrev: fd1b3e0e8dbf5313bededeab9c9c4ed2da5a0693 X-Git-Newrev: 13023445a33e246aa3e221ed746935f5bcb0372d Message-Id: <20230117125553.28EBB3858D28@sourceware.org> Date: Tue, 17 Jan 2023 12:55:53 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jan 2023 12:55:53 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D13023445a33e= 246aa3e221ed746935f5bcb0372d commit 13023445a33e246aa3e221ed746935f5bcb0372d Author: Nick Clifton 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_li= nk_info *info) bfd *obfd =3D info->output_bfd; obj_attribute *in_attr; obj_attribute *out_attr; - obj_attribute tattr; csky_arch_for_merge *old_arch =3D NULL; csky_arch_for_merge *new_arch =3D NULL; int i; @@ -3064,8 +3063,8 @@ csky_elf_merge_private_bfd_data (bfd *ibfd, struct bf= d_link_info *info) sec_name =3D get_elf_backend_data (ibfd)->obj_attrs_section; =20 if (bfd_get_section_by_name (ibfd, sec_name) =3D=3D NULL - || (new_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK) !=3D - old_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK))) + || ((new_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK)) !=3D + (old_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK)))) { /* Input BFDs have no ".csky.attribute" section. */ new_arch =3D csky_find_arch_with_eflag (new_flags & CSKY_ARCH_MASK);