From patchwork Sat Jul 6 19:36:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 257298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3EC0D2C009C for ; Sun, 7 Jul 2013 05:38:34 +1000 (EST) Received: from localhost ([::1]:39138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvYJT-00046K-DR for incoming@patchwork.ozlabs.org; Sat, 06 Jul 2013 15:38:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvYJ6-00044w-Hx for qemu-devel@nongnu.org; Sat, 06 Jul 2013 15:38:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UvYJ4-0006ns-AC for qemu-devel@nongnu.org; Sat, 06 Jul 2013 15:38:08 -0400 Received: from mail-la0-x235.google.com ([2a00:1450:4010:c03::235]:47832) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UvYJ3-0006nW-VH for qemu-devel@nongnu.org; Sat, 06 Jul 2013 15:38:06 -0400 Received: by mail-la0-f53.google.com with SMTP id fs12so2803896lab.26 for ; Sat, 06 Jul 2013 12:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=qE/2KHEzrV6z7hJbfVtR+lj3Hz1cHvMa3sYKnRtawgQ=; b=fIJI9tXBdtLkLtRbw0zY1u9qSWaikauvjsRj2wVRfFbheNuheJoChxpbLL17JhRYeb /zHGstT1lcBvHel9D+jRsrhM44B37SK2Fn5vKvwtNo3m++wndBGoxWSs0ADVPbGBHS+W jt2XOsE7txxWQ7yuLgKpUWF4bSImrM65uUqKrM1Bm267YMlkU7fnNsO0h4g1yhn2Q1qQ 8jP3JZg7l+oH4pSIKL8M9ELs27QZofaiVCGD7bVbgLZtHXma0IRyBSHZGbwS3AFnVRSQ vrfy2LofEeSNns23V/SQxRqeoxrhexj0at9db9as0vK6YFZI/3Ir/IsjCT27eT62EC2r zuXg== X-Received: by 10.112.140.231 with SMTP id rj7mr8024736lbb.16.1373139484961; Sat, 06 Jul 2013 12:38:04 -0700 (PDT) Received: from octofox.metropolis ([188.134.19.124]) by mx.google.com with ESMTPSA id rx1sm4885513lbb.0.2013.07.06.12.38.03 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 06 Jul 2013 12:38:04 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Sat, 6 Jul 2013 23:36:48 +0400 Message-Id: <1373139408-4760-1-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 1.8.1.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::235 Cc: Max Filippov , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH] tests/tcg/xtensa: Fix out-of-tree build X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber Signed-off-by: Andreas Färber Signed-off-by: Max Filippov --- configure | 5 +++-- tests/tcg/xtensa/Makefile | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 0e0adde..7b60efd 100755 --- a/configure +++ b/configure @@ -4469,13 +4469,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" diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile index 002fd87..dacafe0 100644 --- a/tests/tcg/xtensa/Makefile +++ b/tests/tcg/xtensa/Makefile @@ -1,9 +1,9 @@ --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 @@ -52,13 +54,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)