csky gcc-4.5 build fix

gcc-4.5 warns about missing csky_cpus struct initialisers.  Fix that
by providing everything in the init macros and the zero sentinel,
rather than just a single {0} as allowed by C99.
This commit is contained in:
Alan Modra
2025-06-10 18:33:04 +09:30
parent a9671a290d
commit a9e9e4ac91

View File

@@ -632,102 +632,120 @@ struct csky_cpu_info
#define CSKY_FEATURES_DEF_NULL() \
{{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_e(isa_e) \
{FEATURE_DSP_EXT(isa_e), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_t(isa_t) \
{FEATURE_TRUST(isa_t), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_f(isa_f) \
{FEATURE_FLOAT(isa_f), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_v(isa_v) \
{FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_ef(isa_e, isa_f) \
{FEATURE_DSP_EXT(isa_e), \
FEATURE_FLOAT(isa_f), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_jt(isa_j, isa_t) \
{FEATURE_JAVA(isa_j), \
FEATURE_TRUST(isa_t), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_efht(isa_e, isa_f, isa_h, isa_t) \
{FEATURE_DSP_EXT(isa_e), \
FEATURE_FLOAT(isa_f), \
FEATURE_SHIELD(isa_h), \
FEATURE_TRUST(isa_t), \
{0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_efv(isa_e, isa_f, isa_v) \
{FEATURE_DSP_EXT(isa_e), \
FEATURE_FLOAT(isa_f), \
FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_eft(isa_e, isa_f, isa_t) \
{FEATURE_DSP_EXT(isa_e), \
FEATURE_FLOAT(isa_f), \
FEATURE_TRUST(isa_t), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_d(isa_d) \
{FEATURE_DSP(isa_d), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{FEATURE_DSP(isa_d), \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_df(isa_d, isa_f) \
{FEATURE_DSP(isa_d), \
FEATURE_FLOAT(isa_f), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{FEATURE_DSP(isa_d), \
FEATURE_FLOAT(isa_f), \
{0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_ft(isa_f, isa_t) \
{FEATURE_FLOAT(isa_f), \
FEATURE_TRUST(isa_t), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_tv(isa_t, isa_v) \
{FEATURE_TRUST(isa_t), \
FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_fv(isa_f, isa_v) \
{FEATURE_FLOAT(isa_f), \
FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_dft(isa_d, isa_f, isa_t) \
{FEATURE_DSP(isa_d), \
FEATURE_FLOAT(isa_f), \
FEATURE_TRUST(isa_t), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_dfv(isa_d, isa_f, isa_v) \
{FEATURE_DSP(isa_d), \
FEATURE_FLOAT(isa_f), \
FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_ftv(isa_f, isa_t, isa_v) \
{FEATURE_FLOAT(isa_f), \
FEATURE_TRUST(isa_t), \
FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_FEATURES_DEF_eftv(isa_e, isa_f, isa_t, isa_v) \
{FEATURE_DSP_EXT(isa_e), \
FEATURE_FLOAT(isa_f), \
FEATURE_TRUST(isa_t), \
FEATURE_VDSP(isa_v), \
{0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_CPU_REVERISON_r0p0(isa) \
@@ -740,13 +758,15 @@ struct csky_cpu_info
{3, 0, isa}
#define CSKY_CPU_REVERISON_RESERVED() \
{{0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}, {0}}
{{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
#define CSKY_CPU_REVERISON_R3(isa1, isa2, isa3) \
{CSKY_CPU_REVERISON_r1p0(isa1), \
CSKY_CPU_REVERISON_r2p0(isa2), \
CSKY_CPU_REVERISON_r3p0(isa3), \
{0}, {0}, {0}, {0}, {0}, {0}, {0}}
{0,0,0}, {0,0,0}, \
{0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}, {0,0,0}}
/* CSKY cpus table. */
const struct csky_cpu_info csky_cpus[] =
@@ -936,7 +956,11 @@ const struct csky_cpu_info csky_cpus[] =
/* Start of private CPUs. */
/* End of private CPUs. */
{NULL},
{NULL,
0,
0,
CSKY_FEATURES_DEF_NULL(),
CSKY_CPU_REVERISON_RESERVED()}
};
int md_short_jump_size = 2;