From patchwork Wed Mar 30 13:31:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 8696311 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 763F7C0553 for ; Wed, 30 Mar 2016 13:32:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0F6D020382 for ; Wed, 30 Mar 2016 13:32:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35E562037E for ; Wed, 30 Mar 2016 13:31:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753685AbcC3Nb4 (ORCPT ); Wed, 30 Mar 2016 09:31:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36196 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752459AbcC3Nbz (ORCPT ); Wed, 30 Mar 2016 09:31:55 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id C9A8B7209A; Wed, 30 Mar 2016 13:31:54 +0000 (UTC) Received: from thh440s.str.redhat.com. (dhcp-192-192.str.redhat.com [10.33.192.192]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2UDVrCi012250; Wed, 30 Mar 2016 09:31:54 -0400 From: Thomas Huth To: kvm@vger.kernel.org Cc: kvm-ppc@vger.kernel.org Subject: [kvm-unit-tests PATCH] powerpc: Fix parallel build Date: Wed, 30 Mar 2016 15:31:53 +0200 Message-Id: <1459344713-20394-1-git-send-email-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 30 Mar 2016 13:31:54 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP kvm-unit-tests can currently not be build in parallel for powerpc. For example with "make -j4", I get: In file included from lib/asm/../../powerpc/asm/ppc_asm.h:4:0, from lib/asm/ppc_asm.h:1, from lib/powerpc/setup.c:19: lib/asm/asm-offsets.h:1:35: fatal error: generated/asm-offsets.h: No such file or directory Fix it by adding a proper dependency to the Makefile (cstart64.S needs this generated header file), and by removing an unnecessary include-statement in lib/powerpc/setup.c. Signed-off-by: Thomas Huth --- lib/powerpc/setup.c | 1 - powerpc/Makefile.common | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c index e3cf952..353c7d4 100644 --- a/lib/powerpc/setup.c +++ b/lib/powerpc/setup.c @@ -16,7 +16,6 @@ #include #include #include -#include #include extern unsigned long stacktop; diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index 4ffb829..4449aec 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -68,6 +68,8 @@ generated_files = $(asm-offsets) test_cases: $(generated_files) $(tests-common) $(tests) +$(cstart.o): $(asm-offsets) + $(TEST_DIR)/selftest.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/selftest.o $(TEST_DIR)/spapr_hcall.elf: $(cstart.o) $(reloc.o) $(TEST_DIR)/spapr_hcall.o