Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e525e48 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

MIPS: Apply `.insn' to fixup labels throughout 



Fix the issue with the ISA bit being lost in fixups that jump to labels
placed just before a section switch.  Such a switch leads to the ISA bit
being lost, because GAS concludes there is no code that follows and
therefore the label refers to data.  Use the `.insn' pseudo-op to
convince the tool this is not the case.

This lack of label annotation leads to microMIPS compilation errors
like:

mips-linux-gnu-ld: arch/mips/built-in.o: .fixup+0x3b8: Unsupported jump between ISA modes; consider recompiling with interlinking enabled.
mips-linux-gnu-ld: final link failed: Bad value

Signed-off-by: default avatarMaciej W. Rozycki <macro@codesourcery.com>
Signed-off-by: default avatarSteven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/8483/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b0984c43

arch/mips/include/asm/futex.h

+4 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
		"	beqzl	$1, 1b				\n"	\

		__WEAK_LLSC_MB						\

		"3:						\n"	\

		"	.insn					\n"	\

		"	.set	pop				\n"	\

		"	.set	mips0				\n"	\

		"	.section .fixup,\"ax\"			\n"	\
@@ -61,6 +62,7 @@ 
		"	beqz	$1, 1b				\n"	\

		__WEAK_LLSC_MB						\

		"3:						\n"	\

		"	.insn					\n"	\

		"	.set	pop				\n"	\

		"	.set	mips0				\n"	\

		"	.section .fixup,\"ax\"			\n"	\
@@ -162,6 +164,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
		"	beqzl	$1, 1b					\n"

		__WEAK_LLSC_MB

		"3:							\n"

		"	.insn						\n"

		"	.set	pop					\n"

		"	.section .fixup,\"ax\"				\n"

		"4:	li	%0, %6					\n"
@@ -190,6 +193,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
		"	beqz	$1, 1b					\n"

		__WEAK_LLSC_MB

		"3:							\n"

		"	.insn						\n"

		"	.set	pop					\n"

		"	.section .fixup,\"ax\"				\n"

		"4:	li	%0, %6					\n"

arch/mips/include/asm/paccess.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct __large_pstruct { unsigned long buf[100]; }; 
	"1:\t" insn "\t%1,%2\n\t"					\

	"move\t%0,$0\n"							\

	"2:\n\t"							\

	".insn\n\t"							\

	".section\t.fixup,\"ax\"\n"					\

	"3:\tli\t%0,%3\n\t"						\

	"move\t%1,$0\n\t"						\
@@ -94,6 +95,7 @@ extern void __get_dbe_unknown(void); 
	"1:\t" insn "\t%1,%2\n\t"					\

	"move\t%0,$0\n"							\

	"2:\n\t"							\

	".insn\n\t"							\

	".section\t.fixup,\"ax\"\n"					\

	"3:\tli\t%0,%3\n\t"						\

	"j\t2b\n\t"							\

arch/mips/kernel/syscall.c

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) 
		"2:	sc	%[tmp], (%[addr])			\n"

		"	beqzl	%[tmp], 1b				\n"

		"3:							\n"

		"	.insn						\n"

		"	.section .fixup,\"ax\"				\n"

		"4:	li	%[err], %[efault]			\n"

		"	j	3b					\n"
@@ -142,6 +143,7 @@ static inline int mips_atomic_set(unsigned long addr, unsigned long new) 
		"2:	sc	%[tmp], (%[addr])			\n"

		"	bnez	%[tmp], 4f				\n"

		"3:							\n"

		"	.insn						\n"

		"	.subsection 2					\n"

		"4:	b	1b					\n"

		"	.previous					\n"