From patchwork Fri Apr 7 06:58:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 9668841 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 82C0E602B3 for ; Fri, 7 Apr 2017 06:59:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 715B7285D2 for ; Fri, 7 Apr 2017 06:59:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65DE1285EC; Fri, 7 Apr 2017 06:59:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 639B8285D2 for ; Fri, 7 Apr 2017 06:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=S8Vvju+JEaQ5qiBi0t2SPou2AzN/cbxOkB+qhubO3q0=; b=nSK9F0jEd7RpGzeloyQ2YudxZc owKt4BxGLPTtLK+TvZ48HYHdZicPZvQnZlWDbQKusiBZD3vZH6AzI5a5AYcNtMaUZZut4dBTFx3z8 eaQWuxdusWI309PgSnc+g8YHVcoMyCgO8EnTQ2oHm6jTA5r+pjQrjVpiEbW7GQ9jP3hcjeFPmpunh LJa/Ni/Q+bxflND+dl3W0goE5RWcZmUEqV++oOqzdMHyA8UKEPLpE5dpw/VpbCYhYNnBxp5s+K3V1 27GVIDw+y+BJeBSCH5ffpu0DGM5ETiZYuslguRs+5lYRT4rHTojpjDOJKqdzmlyAZGbSyytFyoNiO wn5sBcPQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cwNrN-00059A-6u; Fri, 07 Apr 2017 06:59:05 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cwNrL-000590-GF for linux-arm-kernel@bombadil.infradead.org; Fri, 07 Apr 2017 06:59:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=S3ZfQGDA2mb9zOTWy1pBbINjV2cN94QiqDtxxOJB9Dg=; b=i2WzWjwa4n7vhOqBc/vaZagRd OWRAR0lmJvIg9BXnsOEErJ9s3gBihARnoytm6h2PSlLfAthM11Nk/uP10c/EYyWOSOp+ZckkEl9yv K9Xa7hRSJh18NUV+ufqoDWrOxzNhj/D78Xppu9xs8w08PQal1LhWjP3sn+wpFDhS5rf+jhBpSG7je c9qUdhl7OwLroT4OJlYefpuMPyoNilLU+i7yoliZiqfalCwomFX0GBQl1vOFVoUw9BTDUOObsRuUT UEpb9smAVNcQRWXxSNcOX/c4KYoEE967lhiULU5ojmZfdCe8oEUJ6Q91ey4QNzE0ZqP6FO11OKdAs ckrx0D8GQ==; Received: from mx1.redhat.com ([209.132.183.28]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cwNrJ-0001B7-Pe for linux-arm-kernel@lists.infradead.org; Fri, 07 Apr 2017 06:59:02 +0000 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF59719CF24; Fri, 7 Apr 2017 06:58:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AF59719CF24 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=thuth@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AF59719CF24 Received: from thh440s.redhat.com (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED35718966; Fri, 7 Apr 2017 06:58:11 +0000 (UTC) From: Thomas Huth To: alex.bennee@linaro.org, pbonzini@redhat.com, rkrcmar@redhat.com Subject: [RFC kvm-unit-tests PATCH 9/8] Makefiles: Fix up the powerpc build include and link paths Date: Fri, 7 Apr 2017 08:58:10 +0200 Message-Id: <1491548290-11401-1-git-send-email-thuth@redhat.com> In-Reply-To: <20170406190727.5624-9-alex.bennee@linaro.org> References: <20170406190727.5624-9-alex.bennee@linaro.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 07 Apr 2017 06:58:14 +0000 (UTC) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170407_025901_913853_F1CCD61E X-CRM114-Status: GOOD ( 11.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: drjones@redhat.com, kvm@vger.kernel.org, marc.zyngier@arm.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The changes for out-of-tree builds are here pretty much the same as for the ARM Makefile.common. Signed-off-by: Thomas Huth --- powerpc/Makefile.common | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index e536ffe..1fbcafb 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -12,7 +12,10 @@ tests-common = \ $(TEST_DIR)/tm.elf \ $(TEST_DIR)/sprs.elf -tests-all = $(tests-common) $(tests) +scripts-common += $(TEST_DIR)/run +scripts-common += $(TEST_DIR)/unittests.cfg + +tests-all = $(tests-common) $(tests) $(scripts_common) all: $(TEST_DIR)/boot_rom.bin $(tests-all) ################################################################## @@ -21,14 +24,14 @@ CFLAGS += -std=gnu99 CFLAGS += -ffreestanding CFLAGS += -Wextra CFLAGS += -O2 -CFLAGS += -I lib -I lib/libfdt +CFLAGS += -I $(SRCDIR)/lib -I $(SRCDIR)/lib/libfdt -I lib CFLAGS += -Wa,-mregnames # We want to keep intermediate files .PRECIOUS: %.o asm-offsets = lib/$(ARCH)/asm-offsets.h -include scripts/asm-offsets.mak +include $(SRCDIR)/scripts/asm-offsets.mak cflatobjs += lib/util.o cflatobjs += lib/alloc.o @@ -44,10 +47,11 @@ cflatobjs += lib/powerpc/smp.o FLATLIBS = $(libcflat) $(LIBFDT_archive) %.elf: CFLAGS += $(arch_CFLAGS) %.elf: LDFLAGS = $(arch_LDFLAGS) -nostdlib -pie -n -%.elf: %.o $(FLATLIBS) powerpc/flat.lds $(cstart.o) $(reloc.o) - $(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) lib/auxinfo.c -DPROGNAME=\"$@\" +%.elf: %.o $(FLATLIBS) $(SRCDIR)/powerpc/flat.lds $(cstart.o) $(reloc.o) + $(CC) $(CFLAGS) -c -o $(@:.elf=.aux.o) $(SRCDIR)/lib/auxinfo.c \ + -DPROGNAME=\"$@\" $(LD) $(LDFLAGS) -o $@ \ - -T powerpc/flat.lds --build-id=none \ + -T $(SRCDIR)/powerpc/flat.lds --build-id=none \ $(filter %.o, $^) $(FLATLIBS) $(@:.elf=.aux.o) $(RM) $(@:.elf=.aux.o) @echo -n Checking $@ for unsupported reloc types...