tests: fix out-of-tree building for lm32 target

Signed-off-by: Michael Walle <michael@walle.cc>
This commit is contained in:
Michael Walle 2012-03-31 19:53:51 +02:00
parent b7c8e15a14
commit 927b241d66
2 changed files with 11 additions and 6 deletions

4
configure vendored
View File

@ -3876,7 +3876,8 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak
done # for target in $targets done # for target in $targets
# build tree in object directory in case the source is not in the current directory # build tree in object directory in case the source is not in the current directory
DIRS="tests tests/tcg tests/tcg/cris slirp audio block net pc-bios/optionrom" DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32"
DIRS="$DIRS slirp audio block net pc-bios/optionrom"
DIRS="$DIRS pc-bios/spapr-rtas" DIRS="$DIRS pc-bios/spapr-rtas"
DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS fsdev ui usb" DIRS="$DIRS fsdev ui usb"
@ -3884,6 +3885,7 @@ DIRS="$DIRS qapi qapi-generated"
DIRS="$DIRS qga trace qom" DIRS="$DIRS qga trace qom"
FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"
FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit"
FILES="$FILES tests/tcg/lm32/Makefile"
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps"
FILES="$FILES pc-bios/spapr-rtas/Makefile" FILES="$FILES pc-bios/spapr-rtas/Makefile"
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"

View File

@ -1,4 +1,4 @@
-include ../../config-host.mak -include ../../../config-host.mak
CROSS=lm32-elf- CROSS=lm32-elf-
@ -12,7 +12,10 @@ SIZE = $(CROSS)size
LD = $(CC) LD = $(CC)
OBJCOPY = $(CROSS)objcopy OBJCOPY = $(CROSS)objcopy
LDFLAGS = -Tlinker.ld TSRC_PATH = $(SRC_PATH)/tests/tcg/lm32
LDFLAGS = -T$(TSRC_PATH)/linker.ld
ASFLAGS += -Wa,-I,$(TSRC_PATH)/
CRT = crt.o CRT = crt.o
TESTCASES += test_add.tst TESTCASES += test_add.tst
@ -82,13 +85,13 @@ TESTCASES += test_xori.tst
all: build all: build
%.o: $(SRC_PATH)/tests/lm32/%.c %.o: $(TSRC_PATH)/%.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
%.o: $(SRC_PATH)/tests/lm32/%.S %.o: $(TSRC_PATH)/%.S
$(AS) $(ASFLAGS) -c $< -o $@ $(AS) $(ASFLAGS) -c $< -o $@
%.tst: %.o macros.inc $(CRT) %.tst: %.o $(TSRC_PATH)/macros.inc $(CRT)
$(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@ $(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@
build: $(CRT) $(TESTCASES) build: $(CRT) $(TESTCASES)