| Message ID | 20220516182213.727589-1-broonie@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9f93c2e0cda49a558c981a57fc4a7f8d143ced93 |
| Headers | show |
| Series | [v2] kselftest/arm64: Explicitly build no BTI tests with BTI disabled | expand |
On Mon, 16 May 2022 19:22:13 +0100, Mark Brown wrote: > In case a distribution enables branch protection by default do as we do for > the main kernel and explicitly disable branch protection when building the > test case for having BTI disabled to ensure it doesn't get turned on by the > toolchain defaults. > > Applied to arm64 (for-next/kselftest), thanks! [1/1] kselftest/arm64: Explicitly build no BTI tests with BTI disabled https://git.kernel.org/arm64/c/9f93c2e0cda4
diff --git a/tools/testing/selftests/arm64/bti/Makefile b/tools/testing/selftests/arm64/bti/Makefile index 73e013c082a6..25c66e622b86 100644 --- a/tools/testing/selftests/arm64/bti/Makefile +++ b/tools/testing/selftests/arm64/bti/Makefile @@ -10,7 +10,7 @@ PROGS := $(patsubst %,gen/%,$(TEST_GEN_PROGS)) # cases for statically linked and dynamically lined binaries are # slightly different. -CFLAGS_NOBTI = -DBTI=0 +CFLAGS_NOBTI = -mbranch-protection=none -DBTI=0 CFLAGS_BTI = -mbranch-protection=standard -DBTI=1 CFLAGS_COMMON = -ffreestanding -Wall -Wextra $(CFLAGS)
In case a distribution enables branch protection by default do as we do for the main kernel and explicitly disable branch protection when building the test case for having BTI disabled to ensure it doesn't get turned on by the toolchain defaults. Signed-off-by: Mark Brown <broonie@kernel.org> --- v2: - Rebase on -next tools/testing/selftests/arm64/bti/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)