From: Xianmiao Qu <cooper.qu@linux.alibaba.com>
To: binutils@sourceware.org, lifang_xia@linux.alibaba.com
Subject: [PATCH] C-SKY: Fix machine flag.
Date: Fri, 13 Jan 2023 20:54:54 +0800 [thread overview]
Message-ID: <20230113125454.75744-1-cooper.qu@linux.alibaba.com> (raw)
bfd/
* elf32-csky.c (elf32_csky_merge_attributes): Don't save
and restore the ARCH attribute, it will actually clear
the ARCH attribute.
(csky_elf_merge_private_bfd_data): Store the machine flag
correctly.
---
bfd/elf32-csky.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
diff --git a/bfd/elf32-csky.c b/bfd/elf32-csky.c
index 7e03a3bc44d..7c2bd5dd8c0 100644
--- a/bfd/elf32-csky.c
+++ b/bfd/elf32-csky.c
@@ -2892,16 +2892,8 @@ elf32_csky_merge_attributes (bfd *ibfd, struct bfd_link_info *info)
/* This is the first object. Copy the attributes. */
out_attr = elf_known_obj_attributes_proc (obfd);
- /* If Tag_CSKY_CPU_NAME is already set, save it. */
- memcpy (&tattr, &out_attr[Tag_CSKY_ARCH_NAME], sizeof (tattr));
-
_bfd_elf_copy_obj_attributes (ibfd, obfd);
- out_attr = elf_known_obj_attributes_proc (obfd);
-
- /* Restore Tag_CSKY_CPU_NAME. */
- memcpy (&out_attr[Tag_CSKY_ARCH_NAME], &tattr, sizeof (tattr));
-
/* Use the Tag_null value to indicate the attributes have been
initialized. */
out_attr[0].i = 1;
@@ -3067,11 +3059,12 @@ csky_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
out_attr = elf_known_obj_attributes_proc (obfd);
/* the flags like"e , f ,g ..." , we take collection. */
- newest_flag = (old_flags & (~CSKY_ARCH_MASK))
- | (new_flags & (~CSKY_ARCH_MASK));
+ newest_flag = old_flags | new_flags;
sec_name = get_elf_backend_data (ibfd)->obj_attrs_section;
- if (bfd_get_section_by_name (ibfd, sec_name) == NULL)
+ 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)))
{
/* Input BFDs have no ".csky.attribute" section. */
new_arch = csky_find_arch_with_eflag (new_flags & CSKY_ARCH_MASK);
@@ -3110,9 +3103,6 @@ csky_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
out_attr[Tag_CSKY_ARCH_NAME].s =
_bfd_elf_attr_strdup (obfd, newest_arch->name);
}
- else
- newest_flag |= ((new_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK))
- | (old_flags & (CSKY_ARCH_MASK | CSKY_ABI_MASK)));
}
else
{
--
2.17.1
next reply other threads:[~2023-01-13 12:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-13 12:54 Xianmiao Qu [this message]
2023-01-17 11:49 ` Nick Clifton
2023-01-17 12:53 ` Mark Wielaard
2023-01-17 12:57 ` Nick Clifton
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=20230113125454.75744-1-cooper.qu@linux.alibaba.com \
--to=cooper.qu@linux.alibaba.com \
--cc=binutils@sourceware.org \
--cc=lifang_xia@linux.alibaba.com \
/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).