Commit e08302ee authored by Andre Przywara's avatar Andre Przywara Committed by Will Deacon
Browse files

kselftest/arm64: build BTI tests in output directory 



The arm64 BTI selftests are currently built in the source directory,
then the generated binaries are copied to the output directory.
This leaves the object files around in a potentially otherwise pristine
source tree, tainting it for out-of-tree kernel builds.

Prepend $(OUTPUT) to every reference to an object file in the Makefile,
and remove the extra handling and copying. This puts all generated files
under the output directory.

Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230815145931.2522557-1-andre.przywara@arm.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 46862da1

tools/testing/selftests/arm64/bti/Makefile

+20 −25
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


TEST_GEN_PROGS := btitest nobtitest



PROGS := $(patsubst %,gen/%,$(TEST_GEN_PROGS))



# These tests are built as freestanding binaries since otherwise BTI

# support in ld.so is required which is not currently widespread; when

# it is available it will still be useful to test this separately as the
@@ -18,44 +16,41 @@ CFLAGS_COMMON = -ffreestanding -Wall -Wextra $(CFLAGS) 
BTI_CC_COMMAND = $(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -c -o $@ $<

NOBTI_CC_COMMAND = $(CC) $(CFLAGS_NOBTI) $(CFLAGS_COMMON) -c -o $@ $<



%-bti.o: %.c

$(OUTPUT)/%-bti.o: %.c

	$(BTI_CC_COMMAND)



%-bti.o: %.S

$(OUTPUT)/%-bti.o: %.S

	$(BTI_CC_COMMAND)



%-nobti.o: %.c

$(OUTPUT)/%-nobti.o: %.c

	$(NOBTI_CC_COMMAND)



%-nobti.o: %.S

$(OUTPUT)/%-nobti.o: %.S

	$(NOBTI_CC_COMMAND)



BTI_OBJS =                                      \

	test-bti.o                           \

	signal-bti.o                            \

	start-bti.o                             \

	syscall-bti.o                           \

	system-bti.o                            \

	teststubs-bti.o                         \

	trampoline-bti.o

gen/btitest: $(BTI_OBJS)

	$(OUTPUT)/test-bti.o                    \

	$(OUTPUT)/signal-bti.o                  \

	$(OUTPUT)/start-bti.o                   \

	$(OUTPUT)/syscall-bti.o                 \

	$(OUTPUT)/system-bti.o                  \

	$(OUTPUT)/teststubs-bti.o               \

	$(OUTPUT)/trampoline-bti.o

$(OUTPUT)/btitest: $(BTI_OBJS)

	$(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -static -o $@ $^



NOBTI_OBJS =                                    \

	test-nobti.o                         \

	signal-nobti.o                          \

	start-nobti.o                           \

	syscall-nobti.o                         \

	system-nobti.o                          \

	teststubs-nobti.o                       \

	trampoline-nobti.o

gen/nobtitest: $(NOBTI_OBJS)

	$(OUTPUT)/test-nobti.o                  \

	$(OUTPUT)/signal-nobti.o                \

	$(OUTPUT)/start-nobti.o                 \

	$(OUTPUT)/syscall-nobti.o               \

	$(OUTPUT)/system-nobti.o                \

	$(OUTPUT)/teststubs-nobti.o             \

	$(OUTPUT)/trampoline-nobti.o

$(OUTPUT)/nobtitest: $(NOBTI_OBJS)

	$(CC) $(CFLAGS_BTI) $(CFLAGS_COMMON) -nostdlib -static -o $@ $^



# Including KSFT lib.mk here will also mangle the TEST_GEN_PROGS list

# to account for any OUTPUT target-dirs optionally provided by

# the toplevel makefile

include ../../lib.mk
 


$(TEST_GEN_PROGS): $(PROGS)

	cp $(PROGS) $(OUTPUT)/

tools/testing/selftests/arm64/bti/gen/.gitignore

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
btitest

nobtitest