Commit 66cde337 authored by John Hubbard's avatar John Hubbard Committed by Shuah Khan
Browse files

selftests/vDSO: remove duplicate compiler invocations from Makefile 



The Makefile open-codes compiler invocations that ../lib.mk already
provides.

Avoid this by using a Make feature that allows setting per-target
variables, which in this case are: CFLAGS and LDFLAGS. This approach
generates the exact same compiler invocations as before, but removes all
of the code duplication, along with the quirky mangled variable names.
So now the Makefile is smaller, less unusual, and easier to read.

The new dependencies are listed after including lib.mk, in order to
let lib.mk provide the first target ("all:"), and are grouped together
with their respective source file dependencies, for visual clarity.

Signed-off-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent bb2a605d

tools/testing/selftests/vDSO/Makefile

+5 −9
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ endif 
TEST_GEN_PROGS += vdso_test_correctness



CFLAGS := -std=gnu99

CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector

LDFLAGS_vdso_test_correctness := -ldl



ifeq ($(CONFIG_X86_32),y)

LDLIBS += -lgcc_s

endif
@@ -23,12 +22,9 @@ $(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c 
$(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c

$(OUTPUT)/vdso_test_abi: parse_vdso.c vdso_test_abi.c

$(OUTPUT)/vdso_test_clock_getres: vdso_test_clock_getres.c



$(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c

	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \

		vdso_standalone_test_x86.c parse_vdso.c \

		-o $@

$(OUTPUT)/vdso_standalone_test_x86: CFLAGS +=-nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector



$(OUTPUT)/vdso_test_correctness: vdso_test_correctness.c

	$(CC) $(CFLAGS) \

		vdso_test_correctness.c \

		-o $@ \

		$(LDFLAGS_vdso_test_correctness)
 
$(OUTPUT)/vdso_test_correctness: LDFLAGS += -ldl