[kvm-unit-tests PATCH 1/2] arm/arm64: Makefile cleanup

Andrew Jones
2016-05-09T14:01:14Z

This does the same cleanup as 'x86: Makefile refine'

Signed-off-by: Andrew Jones <drjones@redhat.com>
---
arm/Makefile.common | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arm/Makefile.common b/arm/Makefile.common
index 9a2d61fc88a27..51d2cf1690cae 100644
--- a/arm/Makefile.common
+++ b/arm/Makefile.common
@@ -24,6 +24,9 @@ CFLAGS += -Wextra
CFLAGS += -O2
CFLAGS += -I lib -I lib/libfdt

+# We want to keep intermediate files: %.elf and %.o
+.PRECIOUS: %.elf %.o
+
asm-offsets = lib/$(ARCH)/asm-offsets.h
include scripts/asm-offsets.mak

@@ -48,7 +51,7 @@ start_addr := $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offset) )))

FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) $(libeabi)
%.elf: LDFLAGS = $(CFLAGS) -nostdlib
-%.elf: %.o $(FLATLIBS) arm/flat.lds
+%.elf: %.o $(FLATLIBS) arm/flat.lds $(cstart.o)
$(CC) $(LDFLAGS) -o $@ \
-Wl,-T,arm/flat.lds,--build-id=none,-Ttext=$(start_addr) \
$(filter %.o, $^) $(FLATLIBS)
@@ -69,7 +72,4 @@ generated_files = $(asm-offsets)

test_cases: $(generated_files) $(tests-common) $(tests)

-$(TEST_DIR)/selftest.elf: $(cstart.o) $(TEST_DIR)/selftest.o
-$(TEST_DIR)/spinlock-test.elf: $(cstart.o) $(TEST_DIR)/spinlock-test.o
-
$(TEST_DIR)/selftest.o $(cstart.o): $(asm-offsets)
--
2.4.11