Commit e332938e authored by GONG, Ruiqi's avatar GONG, Ruiqi Committed by Steven Rostedt (Google)
Browse files

samples: ftrace: Replace bti assembly with hint for older compiler 

When cross-building the arm64 kernel with allmodconfig using GCC 9.4,
the following error occurs on multiple files under samples/ftrace/:

/tmp/ccPC1ODs.s: Assembler messages:
/tmp/ccPC1ODs.s:8: Error: selected processor does not support `bti c'

Fix this issue by replacing `bti c` with `hint 34`, which is compatible
for the older compiler.

Link: https://lore.kernel.org/linux-trace-kernel/20230820111509.1470826-1-gongruiqi@huaweicloud.com



Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Florent Revest <revest@chromium.org>
Fixes: 8c3526fb ("arm64: ftrace: Add direct call trampoline samples support")
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarGONG, Ruiqi <gongruiqi1@huawei.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent c2489bb7

samples/ftrace/ftrace-direct-modify.c

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ asm ( 
"	.type		my_tramp1, @function\n"

"	.globl		my_tramp1\n"

"   my_tramp1:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #16\n"

"	stp	x9, x30, [sp]\n"

"	bl	my_direct_func1\n"
@@ -117,7 +117,7 @@ asm ( 
"	.type		my_tramp2, @function\n"

"	.globl		my_tramp2\n"

"   my_tramp2:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #16\n"

"	stp	x9, x30, [sp]\n"

"	bl	my_direct_func2\n"

samples/ftrace/ftrace-direct-multi-modify.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ asm ( 
"	.type		my_tramp1, @function\n"

"	.globl		my_tramp1\n"

"   my_tramp1:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #32\n"

"	stp	x9, x30, [sp]\n"

"	str	x0, [sp, #16]\n"
@@ -127,7 +127,7 @@ asm ( 
"	.type		my_tramp2, @function\n"

"	.globl		my_tramp2\n"

"   my_tramp2:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #32\n"

"	stp	x9, x30, [sp]\n"

"	str	x0, [sp, #16]\n"

samples/ftrace/ftrace-direct-multi.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ asm ( 
"	.type		my_tramp, @function\n"

"	.globl		my_tramp\n"

"   my_tramp:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #32\n"

"	stp	x9, x30, [sp]\n"

"	str	x0, [sp, #16]\n"

samples/ftrace/ftrace-direct-too.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ asm ( 
"	.type		my_tramp, @function\n"

"	.globl		my_tramp\n"

"   my_tramp:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #48\n"

"	stp	x9, x30, [sp]\n"

"	stp	x0, x1, [sp, #16]\n"

samples/ftrace/ftrace-direct.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ asm ( 
"	.type		my_tramp, @function\n"

"	.globl		my_tramp\n"

"   my_tramp:"

"	bti	c\n"

"	hint	34\n" // bti	c

"	sub	sp, sp, #32\n"

"	stp	x9, x30, [sp]\n"

"	str	x0, [sp, #16]\n"