There are certain places where the code uses .set mips32 or .set mips64 or .set arch=r4000. In preparation of MIPS R6 support, and in order to use as less #ifdefs as possible, we define new macros to set similar annotations for MIPS R6 Signed-off-by: Markos Chandras <markos.chandras@xxxxxxxxxx> --- arch/mips/include/asm/asm.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/mips/include/asm/asm.h b/arch/mips/include/asm/asm.h index 7c26b28bf252..bb857a87ccd1 100644 --- a/arch/mips/include/asm/asm.h +++ b/arch/mips/include/asm/asm.h @@ -342,6 +342,19 @@ symbol = value #define LONGLOG 3 #endif +#ifdef CONFIG_CPU_MIPSR6 +#define MIPS_ISA_LEVEL_RAW mips64r6 +#define MIPS_ISA_LEVEL "mips64r6" +#define MIPS_ISA_ARCH_LEVEL_RAW MIPS_ISA_LEVEL_RAW +#define MIPS_ISA_ARCH_LEVEL MIPS_ISA_LEVEL +#else +/* MIPS64 is a superset of MIPS32 */ +#define MIPS_ISA_LEVEL_RAW mips64 +#define MIPS_ISA_LEVEL "mips64" +#define MIPS_ISA_ARCH_LEVEL_RAW arch=r4000 +#define MIPS_ISA_ARCH_LEVEL "arch=r4000" +#endif /* CONFIG_CPU_MIPSR6 */ + /* * How to add/sub/load/store/shift pointers. */ -- 2.2.1
