From: Jan Beulich <jbeulich@suse.com>
To: Binutils <binutils@sourceware.org>
Subject: [PATCH 1/4] RISC-V/gas: drop riscv_subsets static variable
Date: Fri, 30 Sep 2022 13:59:04 +0200 [thread overview]
Message-ID: <c10321f9-d289-ef84-d263-bc278fb3d31b@suse.com> (raw)
In-Reply-To: <eeb84f0c-b482-99a3-03e8-87a92789eedb@suse.com>
It's fully redundant with the subset_list member of riscv_rps_as.
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -265,11 +265,10 @@ riscv_set_tso (void)
elf_flags |= EF_RISCV_TSO;
}
-/* This linked list records all enabled extensions, which are parsed from
- the architecture string. The architecture string can be set by the
- -march option, the elf architecture attributes, and the --with-arch
- configure option. */
-static riscv_subset_list_t *riscv_subsets = NULL;
+/* The linked list hanging off of .subsets_list records all enabled extensions,
+ which are parsed from the architecture string. The architecture string can
+ be set by the -march option, the elf architecture attributes, and the
+ --with-arch configure option. */
static riscv_parse_subset_t riscv_rps_as =
{
NULL, /* subset_list, we will set it later once
@@ -302,14 +301,13 @@ riscv_set_arch (const char *s)
return;
}
- if (riscv_subsets == NULL)
+ if (riscv_rps_as.subset_list == NULL)
{
- riscv_subsets = XNEW (riscv_subset_list_t);
- riscv_subsets->head = NULL;
- riscv_subsets->tail = NULL;
- riscv_rps_as.subset_list = riscv_subsets;
+ riscv_rps_as.subset_list = XNEW (riscv_subset_list_t);
+ riscv_rps_as.subset_list->head = NULL;
+ riscv_rps_as.subset_list->tail = NULL;
}
- riscv_release_subset_list (riscv_subsets);
+ riscv_release_subset_list (riscv_rps_as.subset_list);
riscv_parse_subset (&riscv_rps_as, s);
riscv_set_rvc (false);
@@ -3986,10 +3984,9 @@ s_riscv_option (int x ATTRIBUTE_UNUSED)
s = XNEW (struct riscv_option_stack);
s->next = riscv_opts_stack;
s->options = riscv_opts;
- s->subset_list = riscv_subsets;
+ s->subset_list = riscv_rps_as.subset_list;
riscv_opts_stack = s;
- riscv_subsets = riscv_copy_subset_list (s->subset_list);
- riscv_rps_as.subset_list = riscv_subsets;
+ riscv_rps_as.subset_list = riscv_copy_subset_list (s->subset_list);
}
else if (strcmp (name, "pop") == 0)
{
@@ -4000,11 +3997,10 @@ s_riscv_option (int x ATTRIBUTE_UNUSED)
as_bad (_(".option pop with no .option push"));
else
{
- riscv_subset_list_t *release_subsets = riscv_subsets;
+ riscv_subset_list_t *release_subsets = riscv_rps_as.subset_list;
riscv_opts_stack = s->next;
riscv_opts = s->options;
- riscv_subsets = s->subset_list;
- riscv_rps_as.subset_list = riscv_subsets;
+ riscv_rps_as.subset_list = s->subset_list;
riscv_release_subset_list (release_subsets);
free (s);
}
@@ -4502,7 +4498,7 @@ riscv_write_out_attrs (void)
unsigned int i;
/* Re-write architecture elf attribute. */
- arch_str = riscv_arch_str (xlen, riscv_subsets);
+ arch_str = riscv_arch_str (xlen, riscv_rps_as.subset_list);
bfd_elf_add_proc_attr_string (stdoutput, Tag_RISCV_arch, arch_str);
xfree ((void *) arch_str);
next prev parent reply other threads:[~2022-09-30 11:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 11:57 [PATCH 0/4] RISC-V/gas: assorted adjustments Jan Beulich
2022-09-30 11:59 ` Jan Beulich [this message]
2022-09-30 11:59 ` [PATCH 2/4] RISC-V/gas: drop stray call to install_insn() Jan Beulich
2022-09-30 11:59 ` [PATCH 3/4] RISC-V/gas: don't open-code insn_length() Jan Beulich
2022-09-30 12:00 ` [PATCH 4/4] RISC-V/gas: allow generating up to 176-bit instructions with .insn Jan Beulich
2022-09-30 14:39 ` [PATCH 0/4] RISC-V/gas: assorted adjustments Nelson Chu
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=c10321f9-d289-ef84-d263-bc278fb3d31b@suse.com \
--to=jbeulich@suse.com \
--cc=binutils@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).