@@ -1464,17 +1464,26 @@ const RISCVCPUMultiExtConfig riscv_cpu_extensions[] = {
MULTI_EXT_CFG_BOOL("zihintntl", ext_zihintntl, true),
MULTI_EXT_CFG_BOOL("zihintpause", ext_zihintpause, true),
MULTI_EXT_CFG_BOOL("zacas", ext_zacas, false),
+ MULTI_EXT_CFG_BOOL("zaamo", ext_zaamo, false),
+ MULTI_EXT_CFG_BOOL("zalrsc", ext_zalrsc, false),
MULTI_EXT_CFG_BOOL("zawrs", ext_zawrs, true),
MULTI_EXT_CFG_BOOL("zfa", ext_zfa, true),
+ MULTI_EXT_CFG_BOOL("zfbfmin", ext_zfbfmin, false),
MULTI_EXT_CFG_BOOL("zfh", ext_zfh, false),
MULTI_EXT_CFG_BOOL("zfhmin", ext_zfhmin, false),
MULTI_EXT_CFG_BOOL("zve32f", ext_zve32f, false),
MULTI_EXT_CFG_BOOL("zve64f", ext_zve64f, false),
MULTI_EXT_CFG_BOOL("zve64d", ext_zve64d, false),
+ MULTI_EXT_CFG_BOOL("zvfbfmin", ext_zvfbfmin, false),
+ MULTI_EXT_CFG_BOOL("zvfbfwma", ext_zvfbfwma, false),
+ MULTI_EXT_CFG_BOOL("zvfh", ext_zvfh, false),
+ MULTI_EXT_CFG_BOOL("zvfhmin", ext_zvfhmin, false),
MULTI_EXT_CFG_BOOL("sstc", ext_sstc, true),
+ MULTI_EXT_CFG_BOOL("smaia", ext_smaia, false),
MULTI_EXT_CFG_BOOL("smepmp", ext_smepmp, false),
MULTI_EXT_CFG_BOOL("smstateen", ext_smstateen, false),
+ MULTI_EXT_CFG_BOOL("ssaia", ext_ssaia, false),
MULTI_EXT_CFG_BOOL("svade", ext_svade, false),
MULTI_EXT_CFG_BOOL("svadu", ext_svadu, true),
MULTI_EXT_CFG_BOOL("svinval", ext_svinval, false),
@@ -1563,19 +1572,6 @@ const RISCVCPUMultiExtConfig riscv_cpu_vendor_exts[] = {
/* These are experimental so mark with 'x-' */
const RISCVCPUMultiExtConfig riscv_cpu_experimental_exts[] = {
- MULTI_EXT_CFG_BOOL("x-smaia", ext_smaia, false),
- MULTI_EXT_CFG_BOOL("x-ssaia", ext_ssaia, false),
-
- MULTI_EXT_CFG_BOOL("x-zaamo", ext_zaamo, false),
- MULTI_EXT_CFG_BOOL("x-zalrsc", ext_zalrsc, false),
-
- MULTI_EXT_CFG_BOOL("x-zvfh", ext_zvfh, false),
- MULTI_EXT_CFG_BOOL("x-zvfhmin", ext_zvfhmin, false),
-
- MULTI_EXT_CFG_BOOL("x-zfbfmin", ext_zfbfmin, false),
- MULTI_EXT_CFG_BOOL("x-zvfbfmin", ext_zvfbfmin, false),
- MULTI_EXT_CFG_BOOL("x-zvfbfwma", ext_zvfbfwma, false),
-
DEFINE_PROP_END_OF_LIST(),
};