From patchwork Tue Sep 10 08:43:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173454 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5509209ilq; Tue, 10 Sep 2019 01:56:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8/Qb+bqtpIhggFb8spm53WqubYBQYPBKXFPagcN2cb2upo9y3E/bY0wuA7B2vdq30ohEn X-Received: by 2002:aed:2f42:: with SMTP id l60mr27058359qtd.315.1568105786078; Tue, 10 Sep 2019 01:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105786; cv=none; d=google.com; s=arc-20160816; b=bjz01tkD4YwTcSKsK0BO7Dg685HNvJ1MajdlCKod2+Yvjmtbt0/PnfkGGWCAbFW8sE wLNNExTpmeNbYfOwprOutn+xb1XqTHWzofIP1yuYuTtGQ6IsbSr5upSe9g8rxWRr3a5c JuwaDKwJ1r9RdM8HkbCrkhJ+PbdyG7JLhGtzts+tdufyFKFmqC2vL+xOlWXrWGPFbR43 NEDFlOpkikhCtXUbk0w5w5T8BHriUZ7x0sdQXy59wUVNXYVYkVCItD0fQOZuy74WstWn I+c3PEKChIcL0tvj8x10ZF/yUVZLQt7ECsisUsUiyy/y5aoWIPD6lHiU2N4zot/dakmA SPxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=PUVyEpIm8xDvUjx6imvtRp1EhVGxflCktIw84etrgf0=; b=MpIO1+HKlwCiSUxR0U3Vn99N0Dc60qqVKev3iCAoHsgPCMrAYt8Lw++3lksWY9lrEg +foHXeE0ONCPtegqR6ipSWfIlauHvfxiecdEhF3y82uk57LO93UBRgda7dh3g34Qn3P5 yrTxEFR2OfgS/42O50XXT1sIJXEm5nrbz1YRNN/g66ucy+AtClauYq+SYKmo7jMpzPcs winL7Tp9htRCtgZPZiuPoMDpIVzTBXtMahhmTkqwp448sDo1kKkMNU600c+Z2TT9ps2I 5+t+oRqxNzvLGz33fpSp+vxUHu0gb7fNNXHwgu6S6kLHciHFjBZexAAi4VmyTEdpyacA 5IYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=asDMx+rv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v1si12743812qtb.287.2019.09.10.01.56.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:56:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=asDMx+rv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bwn-0006TO-3T for patch@linaro.org; Tue, 10 Sep 2019 04:56:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35834) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkl-0003Mb-6f for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkj-0006KK-Qj for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:59 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:32985) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkj-0006Ir-9Z for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: by mail-wr1-x435.google.com with SMTP id u16so18412070wrr.0 for ; Tue, 10 Sep 2019 01:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PUVyEpIm8xDvUjx6imvtRp1EhVGxflCktIw84etrgf0=; b=asDMx+rvf67LLEacPQF3cMJeUBogR6PQcI1iVWdneklvW0OcrX+/9Cy4YUIucVkphp DDwjhcHo0umI+5HvWq/KzFooRL1JclR8Vb6HMNJ7PT+eEfq3zTzwrGmdCxnXo7jai0LJ Dexq+FWbcFfWosT5ERXKao/HPkTBxdFtSczWlhERi+Su4hxinD8FCgXHMon1duMUJFO2 E9g40jL07/fxYVehj2ttT6kayOUn+naC0MEUAf5EH/clHvRKeuPWOJFVmpTEyDue22Q2 Gg/ADBot+Wf3M2Y8Z1klSF2+1TcvaKqqTfa7nMVKwgQ8J8hRwH/AQY3CCd/pUS4h3JUV DL4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PUVyEpIm8xDvUjx6imvtRp1EhVGxflCktIw84etrgf0=; b=cKhyZFGnP0f7VwEimPII7nm0aBHsliN19iw3M8ScsTrQkHZ8T2/kV1St7MIQYW0fPc 2M9vnm1mu5lebXtDblQvi3zFUKlFpyd9hg1kNgxcG8BFZyB/loMWDNcHQzVA2LrNUXH9 NnfAOMz2V/quW++uWpBVYm5rKVY69vtRgSy1csZ2jNCOun4zRWBvNmuKC4HLeAhLbU8H aBXKZycn7OSijH7+r0iId+vBqZcjCEq/KxaRYEru01aN5W+rARMLyKYgJcxDp7fRu7Hx tRrCIuKGAy5/zWWpg2YxWijr9Fmlno1L8Jya0BFHm1q66+Ha+Rg8zNHFLEEeaTir7uu8 w1fA== X-Gm-Message-State: APjAAAUl+92JiNGfNNM9XGmVkhmPri0q84P+wgNqbx2lvg2S+37hgxAT x1areup5ZbS+ca4JCQIKsdD1vA== X-Received: by 2002:a5d:568c:: with SMTP id f12mr25080280wrv.248.1568105036125; Tue, 10 Sep 2019 01:43:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o19sm23334877wro.50.2019.09.10.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 17E9D1FF96; Tue, 10 Sep 2019 09:43:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:11 +0100 Message-Id: <20190910084349.28817-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PULL 07/45] tests/tcg: use EXTRA_CFLAGS everywhere X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , qemu-devel@nongnu.org, Max Filippov , "open list:ARM TCG CPUs" , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini For i386 specifically, this allows using the host GCC to compile the i386 tests. But, it should really be done for all targets, unless we want to pass $(EXTRA_CFLAGS) directly as part of $(CC). Signed-off-by: Paolo Bonzini Message-Id: <20190807143523.15917-2-pbonzini@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/Makefile.softmmu-target index 2e560e4d08e..4c4aaf61dd3 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -22,11 +22,11 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc .PRECIOUS: $(CRT_OBJS) %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) memory: CFLAGS+=-DCHECK_UNALIGNED=1 diff --git a/tests/tcg/alpha/Makefile.softmmu-target b/tests/tcg/alpha/Makefile.softmmu-target index 3c0f34cc692..09193a62d68 100644 --- a/tests/tcg/alpha/Makefile.softmmu-target +++ b/tests/tcg/alpha/Makefile.softmmu-target @@ -22,11 +22,11 @@ LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc .PRECIOUS: $(CRT_OBJS) %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -x assembler-with-cpp -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -x assembler-with-cpp -c $< -o $@ # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) memory: CFLAGS+=-DCHECK_UNALIGNED=0 diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target index 49d48d8a1c3..2deb06e6e46 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -18,7 +18,7 @@ CFLAGS+=-Wl,--build-id=none -x assembler-with-cpp LDFLAGS+=-nostdlib -N -static %: %.S %.ld - $(CC) $(CFLAGS) $(ASFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld + $(CC) $(CFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld # Specific Test Rules diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index 0a4364868ce..cee342017e5 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -32,11 +32,11 @@ TESTS+=$(MULTIARCH_TESTS) .PRECIOUS: $(CRT_OBJS) %.o: $(CRT_PATH)/%.S - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ # Build and link the tests %: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) - $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) memory: CFLAGS+=-DCHECK_UNALIGNED=1 diff --git a/tests/tcg/minilib/Makefile.target b/tests/tcg/minilib/Makefile.target index 3ed8077d0f9..c821d2806a9 100644 --- a/tests/tcg/minilib/Makefile.target +++ b/tests/tcg/minilib/Makefile.target @@ -18,4 +18,4 @@ MINILIB_INC=-isystem $(SYSTEM_MINILIB_SRC) .PRECIOUS: $(MINILIB_OBJS) %.o: $(SYSTEM_MINILIB_SRC)/%.c - $(CC) $(CFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target index 8212d96b81d..9530cac2ad9 100644 --- a/tests/tcg/xtensa/Makefile.softmmu-target +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -34,9 +34,9 @@ $(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target # special rule for common blobs %.o: %.S - $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) -c $< -o $@ + $(CC) $(XTENSA_INC) $($*_ASFLAGS) $(ASFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ %: %.S - $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + $(CC) $(XTENSA_INC) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) endif