mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/tcg: clean-up VPATH/TESTS for i386

Browse Source 
Since we only run build the multiarch tests and we use a fully
resolved path for the crt object we don't need the wildcard or VPATH
messing about.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2019-06-04 16:30:05 +01:00
parent fcf112317c
commit 2736b5cbee
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/tcg/i386/Makefile.softmmu-target
View File

@ -8,15 +8,10 @@
I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system
X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system
# Set search path for all sources
VPATH+=$(I386_SYSTEM_SRC)
# These objects provide the basic boot code and helper functions for all tests # These objects provide the basic boot code and helper functions for all tests
CRT_OBJS=boot.o CRT_OBJS=boot.o
X86_TEST_SRCS=$(wildcard $(I386_SYSTEM_SRC)/*.c)
X86_TESTS = $(patsubst $(I386_SYSTEM_SRC)/%.c, %, $(X86_TEST_SRCS))
ifeq ($(TARGET_X86_64), y) ifeq ($(TARGET_X86_64), y)
CRT_PATH=$(X64_SYSTEM_SRC) CRT_PATH=$(X64_SYSTEM_SRC)
LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld
@ -26,12 +21,12 @@ CRT_PATH=$(I386_SYSTEM_SRC)
CFLAGS+=-m32 CFLAGS+=-m32
LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld
LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386
# FIXME: move to common once x86_64 is bootstrapped
TESTS+=$(X86_TESTS) $(MULTIARCH_TESTS)
endif endif
CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC)
LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc
TESTS+=$(MULTIARCH_TESTS)
# building head blobs # building head blobs
.PRECIOUS: $(CRT_OBJS) .PRECIOUS: $(CRT_OBJS)