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

tests/tcg/xtensa: Fix out-of-tree build

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Andreas Färber 2013-07-06 20:41:37 +02:00 committed by Max Filippov
parent a00817cc4c
commit aaa2ebc567
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -4502,13 +4502,14 @@ if [ "$dtc_internal" = "yes" ]; then
fi fi
# 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 tests/tcg/lm32 tests/libqos" DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/tcg/xtensa"
DIRS="$DIRS tests/libqos"
DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"
DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS qapi-generated" DIRS="$DIRS qapi-generated"
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 po/Makefile" FILES="$FILES tests/tcg/lm32/Makefile tests/tcg/xtensa/Makefile po/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 pc-bios/s390-ccw/Makefile" FILES="$FILES pc-bios/s390-ccw/Makefile"

20
tests/tcg/xtensa/Makefile
View File

@ -1,9 +1,9 @@
-include ../../config-host.mak -include ../../../config-host.mak
CROSS=xtensa-dc232b-elf- CROSS=xtensa-dc232b-elf-
ifndef XT ifndef XT
SIM = qemu-system-xtensa SIM = ../../../xtensa-softmmu/qemu-system-xtensa
SIMFLAGS = -M sim -cpu dc232b -nographic -semihosting $(EXTFLAGS) -kernel SIMFLAGS = -M sim -cpu dc232b -nographic -semihosting $(EXTFLAGS) -kernel
SIMDEBUG = -s -S SIMDEBUG = -s -S
else else
@ -13,10 +13,12 @@ SIMDEBUG = --gdbserve=0
endif endif
CC = $(CROSS)gcc CC = $(CROSS)gcc
AS = $(CROSS)gcc -x assembler AS = $(CROSS)gcc -x assembler-with-cpp
LD = $(CROSS)ld LD = $(CROSS)ld
LDFLAGS = -Tlinker.ld XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa
LDFLAGS = -T$(XTENSA_SRC_PATH)/linker.ld
CRT = crt.o vectors.o CRT = crt.o vectors.o
@ -53,13 +55,13 @@ TESTCASES += test_windowed.tst
all: build all: build
%.o: $(SRC_PATH)/tests/xtensa/%.c %.o: $(XTENSA_SRC_PATH)/%.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) -I$(XTENSA_SRC_PATH) $(CFLAGS) -c $< -o $@
%.o: $(SRC_PATH)/tests/xtensa/%.S %.o: $(XTENSA_SRC_PATH)/%.S
$(AS) $(ASFLAGS) -c $< -o $@ $(AS) -Wa,-I,$(XTENSA_SRC_PATH) $(ASFLAGS) -c $< -o $@
%.tst: %.o macros.inc $(CRT) Makefile %.tst: %.o $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile
$(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@ $(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@
build: $(TESTCASES) build: $(TESTCASES)