Commit aaa2ebc5 authored by Andreas Färber's avatar Andreas Färber Committed by Max Filippov
Browse files

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



Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent a00817cc

configure

+3 −2
Original line number Diff line number Diff line
@@ -4502,13 +4502,14 @@ if [ "$dtc_internal" = "yes" ]; then 
fi



# 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 roms/seabios roms/vgabios"

DIRS="$DIRS qapi-generated"

FILES="Makefile tests/tcg/Makefile qdict-test-data.txt"

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/spapr-rtas/Makefile"

FILES="$FILES pc-bios/s390-ccw/Makefile"

tests/tcg/xtensa/Makefile

+11 −9
Original line number Diff line number Diff line 
-include ../../config-host.mak

-include ../../../config-host.mak



CROSS=xtensa-dc232b-elf-



ifndef XT

SIM = qemu-system-xtensa

SIM = ../../../xtensa-softmmu/qemu-system-xtensa

SIMFLAGS = -M sim -cpu dc232b -nographic -semihosting $(EXTFLAGS) -kernel

SIMDEBUG = -s -S

else
@@ -13,10 +13,12 @@ SIMDEBUG = --gdbserve=0 
endif



CC      = $(CROSS)gcc

AS      = $(CROSS)gcc -x assembler

AS      = $(CROSS)gcc -x assembler-with-cpp

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
@@ -53,13 +55,13 @@ TESTCASES += test_windowed.tst 


all: build



%.o: $(SRC_PATH)/tests/xtensa/%.c

	$(CC) $(CFLAGS) -c $< -o $@

%.o: $(XTENSA_SRC_PATH)/%.c

	$(CC) -I$(XTENSA_SRC_PATH) $(CFLAGS) -c $< -o $@



%.o: $(SRC_PATH)/tests/xtensa/%.S

	$(AS) $(ASFLAGS) -c $< -o $@

%.o: $(XTENSA_SRC_PATH)/%.S

	$(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 $@



build: $(TESTCASES)