Skip to content

Fix multilib error with Xtheadfmv instructions. #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pz9115 wants to merge 2 commits into
base: revyos-gcc10.4-thead-2.8.0-dev
Choose a base branch
from
Open

Fix multilib error with Xtheadfmv instructions. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62e013a
Disabled to derive AB through default arch
majin2020 Apr 1, 2024
7416bae
RISC-V: Update 'zvamo' extension name.
pz9115 Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions gcc/common/config/riscv/riscv-common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
{"zifencei", ISA_SPEC_CLASS_20190608, 2, 0},

{"zfh", ISA_SPEC_CLASS_NONE, 1, 0},
{"zvamo", ISA_SPEC_CLASS_NONE, 0, 7},
{"zvlsseg", ISA_SPEC_CLASS_NONE, 0, 7},

{"zve32x", ISA_SPEC_CLASS_NONE, 1, 0},
{"zve32f", ISA_SPEC_CLASS_NONE, 1, 0},
Expand All @@ -190,8 +188,6 @@ static const struct riscv_ext_version riscv_ext_version_table[] =
{"zvfbfwma", ISA_SPEC_CLASS_NONE, 0, 8},

{"zfa", ISA_SPEC_CLASS_NONE, 0, 1},
{"zvamo", ISA_SPEC_CLASS_NONE, 1, 0},
{"zvlsseg", ISA_SPEC_CLASS_NONE, 1, 0},

{"xtheadc", ISA_SPEC_CLASS_NONE, 2, 0},
{"xtheade", ISA_SPEC_CLASS_NONE, 2, 0},
Expand Down Expand Up @@ -942,12 +938,8 @@ riscv_subset_list::thead_specific_work ()

if ((implied_subset = lookup ("v", 0, 7)))
{
if (!lookup ("zvamo"))
add ("zvamo", implied_subset->major_version,
implied_subset->minor_version,
implied_subset->explicit_version_p, false);
if (!lookup ("zvlsseg"))
add ("zvlsseg", implied_subset->major_version,
if (!lookup ("xtheadzvamo"))
add ("xtheadzvamo", implied_subset->major_version,
implied_subset->minor_version,
implied_subset->explicit_version_p, false);
}
Expand Down
8 changes: 4 additions & 4 deletions gcc/config/riscv/riscv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ extern const char *riscv_get_arch_spec_path (int argc, const char **argv);
{"tune", "%{!mtune=*:" \
" %{!mcpu=*:-mtune=%(VALUE)}" \
" %{mcpu=*:-mtune=%:riscv_default_mtune(%* %(VALUE))}}" }, \
{"arch", "%{!march=*:" \
" %{!mcpu=*:-march=%(VALUE)}" \
" %{mcpu=*:%:riscv_expand_arch_from_cpu(%* %(VALUE))}}" }, \
{"abi", "%{!mabi=*:" \
" %{!march=*:" \
" %{!mcpu=*:-mabi=%(VALUE)}" \
" %{mcpu=*:%:riscv_expand_abi_from_cpu(%* %(VALUE))}}" \
" %{march=*:%:riscv_expand_abi_from_arch(%*)}}" }
" %{march=*:%:riscv_expand_abi_from_arch(%*)}}" }, \
{"arch", "%{!march=*:" \
" %{!mcpu=*:-march=%(VALUE)}" \
" %{mcpu=*:%:riscv_expand_arch_from_cpu(%* %(VALUE))}}" }

#ifdef IN_LIBGCC2
#undef TARGET_64BIT
Expand Down