From patchwork Tue Jul 20 11:40:55 2021 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: 481499 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5052284jao; Tue, 20 Jul 2021 04:59:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOekzJChR9MZPjGX7NFVxfDW7ygUeV7NYVyPDEfGmDu2Hrf4dzE3rdA9iOOuheom9N0rMt X-Received: by 2002:a25:5502:: with SMTP id j2mr37705937ybb.363.1626782368662; Tue, 20 Jul 2021 04:59:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626782368; cv=none; d=google.com; s=arc-20160816; b=H16gYLuTyDYIgrOHMsAfwy4exT+ayVLSy3fldDe4k0SUPqDH8v/RQHLkWfeTMjWtZP eXjeMwKMhtLyx7Kh2s+ysBg/Gp2wDSHGVwy0HXRADQOwUagZz7yC6wPPPia652JwliuC NfsTj4ZsF+OLLVpNsIG3f0qli7PVQfzxiIa3bpb9Rgg4OrcHtf4Vv6PX1E+PYJDJveo/ vVwCszAwYmE/CVsRWar4kjGibt3mNH/PUi6tsx7L6n6TogM8+gjDu9/pWABmU5SwEv14 KmdrzrxY1rmSHSbS9+y3MuFOAspslWHzFzfik/7jygpyQRJF+COPIU6gae0YC/O2Kmxt 3qYw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=wkNQQ20XngujXOPbEcV2yi1EM3N0Z3ZePdpIQQkCKpc=; b=qO7vZfBjo+7PCZy2fGnsucLwBAruvuxrryX/pYw48vTJIm5ZXb7LF45EqB4pGxPAat xXIHkmLBQFL31j1xB8Ht9dWKztnm7CCLK3JhQXSiaQtqrojPAKrbeHMiXvM7/iB6H/RS pjYNI+fZ9eU1mGc/jp4ewxEKCJ0rJAtdU4T5ohEtvWRZeteuCu6JMlUCiHPgT8MxpME6 kh9VMsQGh72XkQRUjOJiikcNUd4LwhWtqFXNvSPosYPMgydQ1TPf2EOg27YAcdWGWwly Aqy25mfBrtoRVfvAbL+g9ME898zv/C7bpRhK/jysA2k+eemcJ284AShF79lFsiBE5FGE sW3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hKDBLUKM; 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 x135si25230949ybg.279.2021.07.20.04.59.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 04:59:28 -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=hKDBLUKM; 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]:43730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5oPI-0001tH-0V for patch@linaro.org; Tue, 20 Jul 2021 07:59:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5o7S-0005M8-GJ for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:02 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:35570) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5o7Q-0008Ce-PI for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:02 -0400 Received: by mail-wr1-x434.google.com with SMTP id m2so25679847wrq.2 for ; Tue, 20 Jul 2021 04:41:00 -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=wkNQQ20XngujXOPbEcV2yi1EM3N0Z3ZePdpIQQkCKpc=; b=hKDBLUKMgsYsdYp+PFvbYslYu3CkZ2bJLCVGyAk3DGPvoJuGr4YdBpWc2jBH4QT7lZ wR7H14bzvzvNSj/4EjtYJWb4J+b0FFeKcLppeaYnaE80Gc6/oJsDuQHD+/Aay5cloBse q1UAqLwDpRL/qoomhcsHPzp6g1ElKsr+EgrOi9kuOMK6vPTO2vKEqwPtREdy6yKGZvFL x1qZJXawzt7hBSAwQnEA4f/xhD0/AomOvBAP+h3TcStQhkECjILysK/MnxE8nTSEpefM Hrx/Juwy3cymmZRERTbYfBoveKwp/ZXOcsamFTbX1UHaM7/1qjsXXGkY7zmZdkSKyB/J qJlQ== 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=wkNQQ20XngujXOPbEcV2yi1EM3N0Z3ZePdpIQQkCKpc=; b=TWZ7YpmTL+iCT3DYHBfIFcaPv5y2I20qZPZ/RobIXBqdvf0X0X/XAj9wap9enEm+0F IqL+ORIQXzTQgUe8f0JVDX7vGWOX19xd1c5pQ+2zmZIouIBlEuUFBfCXu4V8pogHzhEQ Cpc+mN59M3lyxe3RSlfmODrzQP2Ij0vNWQjxDjg1s3b2CUmdDKPDSv3UWQsVzvRsDjdP KcUJwz8I4VfiFJQtaXw3nTgusBtCvwKMLcdWc2H/jloRYyl/ZPhX3CnOXiy8hNUh5ZBk t/0hKB1tceDwTCojSLmGqk3ywS4K7yCyQGeIfoniqi2H5y8sKtllUCE1vWNr+zRZWfTl 4rNw== X-Gm-Message-State: AOAM533r5yBYl+1SvngoT00qVB3hu58cZi9PE/xo5gtXtXvcND62Bdev 6RXN7ARQSS2S3IpCL3N6SE0BBA== X-Received: by 2002:adf:f6c9:: with SMTP id y9mr1825994wrp.265.1626781258810; Tue, 20 Jul 2021 04:40:58 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y3sm23723340wrh.16.2021.07.20.04.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 04:40:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EE7E1FF87; Tue, 20 Jul 2021 12:40:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] hw/tricore: fix inclusion of tricore_testboard Date: Tue, 20 Jul 2021 12:40:55 +0100 Message-Id: <20210720114057.32053-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210720114057.32053-1-alex.bennee@linaro.org> References: <20210720114057.32053-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Peter Maydell , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Bastian Koppelmann Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We inadvertently added a symbol clash causing the build not to include the testboard needed for check-tcg. Fixes: f4063f9c31 ("meson: Introduce target-specific Kconfig") Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Alex Bennée --- v3 - rename to CONFIG_TRICORE_TESTBOARD --- configs/devices/tricore-softmmu/default.mak | 1 + hw/tricore/Kconfig | 3 +-- hw/tricore/meson.build | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) -- 2.32.0.264.g75ae10bc75 diff --git a/configs/devices/tricore-softmmu/default.mak b/configs/devices/tricore-softmmu/default.mak index 5cc91cebce..cb8fc286eb 100644 --- a/configs/devices/tricore-softmmu/default.mak +++ b/configs/devices/tricore-softmmu/default.mak @@ -1 +1,2 @@ +CONFIG_TRICORE_TESTBOARD=y CONFIG_TRIBOARD=y diff --git a/hw/tricore/Kconfig b/hw/tricore/Kconfig index 506e6183c1..33c1e852c3 100644 --- a/hw/tricore/Kconfig +++ b/hw/tricore/Kconfig @@ -1,9 +1,8 @@ -config TRICORE +config TRICORE_TESTBOARD bool config TRIBOARD bool - select TRICORE select TC27X_SOC config TC27X_SOC diff --git a/hw/tricore/meson.build b/hw/tricore/meson.build index 47e36bb077..7e3585daf8 100644 --- a/hw/tricore/meson.build +++ b/hw/tricore/meson.build @@ -1,6 +1,6 @@ tricore_ss = ss.source_set() -tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testboard.c')) -tricore_ss.add(when: 'CONFIG_TRICORE', if_true: files('tricore_testdevice.c')) +tricore_ss.add(when: 'CONFIG_TRICORE_TESTBOARD', if_true: files('tricore_testboard.c')) +tricore_ss.add(when: 'CONFIG_TRICORE_TESTBOARD', if_true: files('tricore_testdevice.c')) tricore_ss.add(when: 'CONFIG_TRIBOARD', if_true: files('triboard.c')) tricore_ss.add(when: 'CONFIG_TC27X_SOC', if_true: files('tc27x_soc.c')) From patchwork Tue Jul 20 11:40:56 2021 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: 481498 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5048757jao; Tue, 20 Jul 2021 04:54:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyt/iVauKTAViQv5wZ/jwOhKtSVFZKYJMHoGo7aGGRInY7yeZTEzQtg+tsBbKh2c3MIp9H3 X-Received: by 2002:a0c:c78f:: with SMTP id k15mr29923597qvj.20.1626782046207; Tue, 20 Jul 2021 04:54:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626782046; cv=none; d=google.com; s=arc-20160816; b=jF8mwQvNfUl1PNM5hux8QY7NfmjvRWKbMLAi5AjLeTY8kAaIGE9TWvlRIsGytoeDML APt6XqCbvkH7+P4p82YFkFeoz3AakyK10/IJ5CXWgfj/a1p+yF9ZFk4+7pB19aDMZ425 BmCpsSPCUWveoOS/mUUSFJ255WhhcamiL5HLazQBZEpPQr/ky602pwwY1L3FabwndAX6 SsQg1x/3pqHRqGQ4phwp/VwQBBlUuF0xVoCj+vahSe6rpmaXOPbFU21GejNv7FQm5wpb QAiaJQw8Jt/DmoEGqG8lPsn1eCYwh/6Lu8yld1Cwcs+vcJGNaEWXBo0l+IBslaJoX3It dlWw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=AQYO1Y0AJh/tmas1GISkGsXZ+3UIAJXf/zORob+fY34=; b=UuWWjUQKZzY7dfH0DiVtteHk/gNvt/GGCpfUHxP06DwW60qBx/8uqoMocZkHCXWxbO zD8B/ZPNIjMmLFbE0x/Be9qMypIUmE/dd2bI1rHxYEvkdwrNZY3GuvvY7lzcveYxnGIu z1BLSWUoFWtX3BJkFJsuTq/NEb3kkgU78K+1ua7tc1j4Qmj1CLDIzc7OB7vqpGnwLzP6 5ASflVeX5R1WTFy/NGrIzM8uP+6k1BJcAZGIz3u92aQAncruIOU/wDVQ0JGxkw68+4ji NFdsB9lHsgSu0qUeXyRkMTCN7Izv4TqeDlakd47O8Uc+HewwN7iDqlLY3pvnPN1nKOMD FgIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="AHQ/8PKX"; 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 z12si16308955qkj.54.2021.07.20.04.54.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 04:54:06 -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="AHQ/8PKX"; 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]:54016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5oK5-0006MV-Hl for patch@linaro.org; Tue, 20 Jul 2021 07:54:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5o7U-0005Qi-Ip for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:04 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:34797) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5o7S-0008EL-WB for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:04 -0400 Received: by mail-wr1-x430.google.com with SMTP id u1so25702923wrs.1 for ; Tue, 20 Jul 2021 04:41:02 -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=AQYO1Y0AJh/tmas1GISkGsXZ+3UIAJXf/zORob+fY34=; b=AHQ/8PKXqUMRCH1FXdZvEst+XNYqD52/72NCSX9ijIn3BiAHDkGdQT09jVR5YTy1YW xTeWa413A6qILkbzZNiCi9oT9Hrcrj5MXDfPpP1OekOW22JhhmW5/fuNN82wJ5NfgYF2 eK1cHuDam6Ct+KRbOiBrhns+h2s9rwrDbpbuUSe0die/xEPUIlZWfaJ8NjTHxGSCclk+ aO9TXK5Afw+XG5lWxlCWOGCfiQri/oLq8fCLKYVmrcUXoxP7ZoUfVhpMaHM7NszZ/cwT ABIFiX1bv5dT/ol8kbXzM/qmLwkcq7G22xe1hR23mXjBMwx0njHSeMn1bd4ZvhxXsBfP rpZw== 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=AQYO1Y0AJh/tmas1GISkGsXZ+3UIAJXf/zORob+fY34=; b=Glt0ekxMr6l0adCSAuPwYE4VCuIco8ROHjcigwfX6Rg00Yrt7yY+b6z4uGpdYPSiAG fEXplnMiSv2druyukoSwNwSv0d6bf5Kve4mBSeYIuC4LgKWImBy8Sb3ARoe0NxXBEfLy qrv/8KrkSr6gV5hdPtrxhiQowH5+rC81D+5bw/qB+tVqouHMVDxJWKinmOX29XyWFryk 9/8beFm2oOtxFROzqZKX/JIydlRWIu7XjeDXxJRKVlwv0zz8246tMo851tPUEGziD6Kn 3vHPK3KmldbbXgANc6SisAmzXfj1uc1sNcw+fdFDc/5zXhK98fRaE51FD5qFNyym4ySN e9Jg== X-Gm-Message-State: AOAM532xsPVDBIaFyQRDb3mHZaZY92MyOo402XJcUXYjE85iIr+w5bG0 wLAqPUjfFxHUm3VXrXuMkz0e7g== X-Received: by 2002:a5d:4d4b:: with SMTP id a11mr35729051wru.325.1626781261434; Tue, 20 Jul 2021 04:41:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n5sm16699189wrp.80.2021.07.20.04.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 04:40:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9404E1FF8C; Tue, 20 Jul 2021 12:40:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/3] tests/tcg/configure.sh: add handling for assembler only builds Date: Tue, 20 Jul 2021 12:40:56 +0100 Message-Id: <20210720114057.32053-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210720114057.32053-1-alex.bennee@linaro.org> References: <20210720114057.32053-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Up until this point we only handled local compilers or assumed we had everything in the container. This falls down when we are building QEMU inside the container. This special handling only affects tricore for now but I put it in a case just in case we add any other "special" targets. Setting CROSS_CC_GUEST is a bit of a hack just to ensure the test runs as we gate on a detected compiler even though the Makefile won't actually use it. It also means we display something sane in the configure output. Signed-off-by: Alex Bennée --- tests/tcg/configure.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.32.0.264.g75ae10bc75 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index aa7c24328a..1f985ccfc0 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -72,6 +72,10 @@ fi : ${cross_cc_x86_64="x86_64-linux-gnu-gcc"} : ${cross_cc_cflags_x86_64="-m64"} +# tricore is special as it doesn't have a compiler +: ${cross_as_tricore="tricore-as"} +: ${cross_ld_tricore="tricore-ld"} + for target in $target_list; do arch=${target%%-*} @@ -247,6 +251,20 @@ for target in $target_list; do fi fi fi + + # Special handling for assembler only tests + eval "target_as=\"\${cross_as_$arch}\"" + eval "target_ld=\"\${cross_ld_$arch}\"" + if has $target_as && has $target_ld; then + case $target in + tricore-softmmu) + echo "CROSS_CC_GUEST=$target_as" >> $config_target_mak + echo "CROSS_AS_GUEST=$target_as" >> $config_target_mak + echo "CROSS_LD_GUEST=$target_ld" >> $config_target_mak + got_cross_cc=yes + ;; + esac + fi fi if test $got_cross_cc = yes; then From patchwork Tue Jul 20 11:40:57 2021 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: 481497 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5045231jao; Tue, 20 Jul 2021 04:48:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynEBUdK9Xvof3UuSHitUEh0QcBFZNKCYMaD5Jk9EGpaXgwwxl0Nt2LH6upQSGWfLT3VAh5 X-Received: by 2002:a25:2b47:: with SMTP id r68mr37521275ybr.206.1626781737954; Tue, 20 Jul 2021 04:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626781737; cv=none; d=google.com; s=arc-20160816; b=IYF5iGIa6RUavnIbgslY2meehPPCpmT7npM4i/PCAxmWbdjgj6LazcJqys/wjG9p+I 89Ul6ZwN/MVHZca5vUX7d1S71T3pK7LJK0Gz51P12xEnYv78B/XbY+gjAXHoxWw/M+0f bj9ltFTQPhE2CZcnioOmv19h6DckgUPMHO+8lZRlCBp44NqwOK9VetPs6j0iAoePLzNZ CmTAb6FTfd1bm/X203yTBGtvsb45aaky07frS6BD9Ith3uZdE7JWckt3IYIsL2ySJ690 HaRAUCunQKVv1zGPSup8BkKdoxBqEBkKl4+8JFwT1vuFNcLKZCrEQwlNxocx9WtEh2al y6/A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=y0+GPJUpv/2AzF0aBnfTMkoDpWD3ukBFAJPYuPusAuc=; b=L48R5m6meeT/xJTtNngKA3yXZx5zwdW6/rXuB2265PyK7V+zBl0eaYEr7XsDXYsMNA OxnzHwFGmt/xxO5pqNXWsSbi+pZ5C1GdNgZ10h6wzaPV7vf5JOkrvOel38zwlG9c//zv W16HqieWQ9v4henuA8ul8yd/l6bKPiuofEOQyDZ+CXhe2lEzM28j3LpS5r0gynlyk/XQ SeoTuynqpbSMLZ9Gt6qr+Tck/NN6Qo5H/mHu/Q1hY9y5N5SrccYQm6/elMlnwCDBUCNh gjkeSMIT2ZJ1yZ41MorycF3WL1Xj0arPrye7XqoPc39AC9stGpTkYMm6iBLJI/Ub8+5i x+/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S2YN4hCF; 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 q4si20831695ybm.217.2021.07.20.04.48.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Jul 2021 04:48:57 -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=S2YN4hCF; 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]:60518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5oF7-0000Fu-Db for patch@linaro.org; Tue, 20 Jul 2021 07:48:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36212) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5o7W-0005VG-FR for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:06 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:33408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m5o7U-0008FM-Hy for qemu-devel@nongnu.org; Tue, 20 Jul 2021 07:41:06 -0400 Received: by mail-wr1-x42d.google.com with SMTP id d2so25707255wrn.0 for ; Tue, 20 Jul 2021 04:41:04 -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=y0+GPJUpv/2AzF0aBnfTMkoDpWD3ukBFAJPYuPusAuc=; b=S2YN4hCFJ5yz3o7Dvzdrh7WaIb7wgHrLD70bWWIQTCeAOdzaZjhS3m0gdcRU2j8tGz oXs6RIMYR5lKq99aajxQ3VfKW0SSc/lC3lxyVfZQH4GenCoauZNbiICdJNFVoLAa+L7V CLeR9hGQMFLoM2GMDUL3yOayxkPU9APZ2Bi2Ar8RDLtphMqY7VaEacEJlx0ICE2YCzkv vp/JA5xM1/xn1AAFOMj2uJWj4VNRBN+6yhYXgjsEYBCCwuUPOU15fQQRNGSESRjgmHQs WBFFITStY3aaGMfzMMouucQktgbLlN2ZbLYQnBRQFmXw4Xks145JEePCXlh4ERUM+TgO OQlA== 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=y0+GPJUpv/2AzF0aBnfTMkoDpWD3ukBFAJPYuPusAuc=; b=rUOoHPHZ1K93LJ0dsaNkWiCo4hQ5HRGcuEnHp/n0wKn2nxVTz1E8PF335K8t1sxleh CDK41pT/5YRlxf6Z6k8mF1+WU4g1N2h8LSM0olsaDl5BfbIZlVHWToZTtumb/q9thOs5 5mzYpXMWgmi5nPR5jm0JDEabJCBrSwYuHv/mt1WE4jO6VlFWFxdcm8kgaLE6Z+mHJOC/ Cmwu62opGH3PxdMaOUic+4k+PEsYy1ocrP8C2ezqhflBDp2yX0qkz2oAYc+Ij1FvvUuJ 3hebIAkonR5iOolcJTQUXATmCqPjBZRMcjpuwOaChWY/oE+3MT4Kxr5CEPh1ynlEXpLY eJMA== X-Gm-Message-State: AOAM533Egln0zk/JC/Eqo5F2yxq0nRaWfhOeHA81XaxOUdlTlqyKI4ih 3dRekW6+2634jIJ0exT5vo+/Cg== X-Received: by 2002:adf:facf:: with SMTP id a15mr35053871wrs.39.1626781263149; Tue, 20 Jul 2021 04:41:03 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y6sm19223920wma.48.2021.07.20.04.40.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 04:41:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AD1411FF8F; Tue, 20 Jul 2021 12:40:57 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 3/3] gitlab: enable a very minimal build with the tricore container Date: Tue, 20 Jul 2021 12:40:57 +0100 Message-Id: <20210720114057.32053-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.32.0.264.g75ae10bc75 In-Reply-To: <20210720114057.32053-1-alex.bennee@linaro.org> References: <20210720114057.32053-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Willian Rampazzo , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Rather than base of the shared Debian 10 container which would require us to bring in even more dependencies just bring in what is needed for building tricore-softmmu in GitLab. We don't even remove the container from the DOCKER_PARTIAL_IMAGES lest we cause more confusion. Signed-off-by: Alex Bennée --- v3 - make a uni-container (but not based from common code) --- .gitlab-ci.d/buildtest.yml | 11 ++++++ .../dockerfiles/debian-tricore-cross.docker | 34 ++++++++++++++++--- 2 files changed, 40 insertions(+), 5 deletions(-) -- 2.32.0.264.g75ae10bc75 diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 89df51517c..48cb45a783 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -354,6 +354,17 @@ build-some-softmmu: TARGETS: xtensa-softmmu arm-softmmu aarch64-softmmu alpha-softmmu MAKE_CHECK_ARGS: check-tcg +# We build tricore in a very minimal tricore only container +build-tricore-softmmu: + extends: .native_build_job_template + needs: + job: tricore-debian-cross-container + variables: + IMAGE: debian-tricore-cross + CONFIGURE_ARGS: --disable-tools --disable-fdt --enable-debug + TARGETS: tricore-softmmu + MAKE_CHECK_ARGS: check-tcg + clang-system: extends: .native_build_job_template needs: diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 985925134c..d8df2c6117 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -1,23 +1,47 @@ # # Docker TriCore cross-compiler target # -# This docker target builds on the debian Stretch base image. +# This docker target builds on the Debian Buster base image but +# doesn't inherit from the common one to avoid bringing in unneeded +# dependencies. # # Copyright (c) 2018 Philippe Mathieu-Daudé # # SPDX-License-Identifier: GPL-2.0-or-later # -FROM qemu/debian10 +FROM docker.io/library/debian:buster-slim MAINTAINER Philippe Mathieu-Daudé +RUN apt update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ + DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy \ + bzip2 \ + ca-certificates \ + ccache \ + g++ \ + gcc \ + git \ + libglib2.0-dev \ + libpixman-1-dev \ + libtest-harness-perl \ + locales \ + make \ + ninja-build \ + perl-base \ + pkgconf \ + python3-pip \ + python3-setuptools \ + python3-wheel + RUN git clone --single-branch \ https://github.com/bkoppelmann/tricore-binutils.git \ /usr/src/binutils && \ cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=-w ./configure --prefix=/usr --disable-nls --target=tricore && \ + CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ make && make install && \ rm -rf /usr/src/binutils -# This image isn't designed for building QEMU but building tests -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-user +# This image can only build a very minimal QEMU as well as the tests +ENV DEF_TARGET_LIST tricore-softmmu +ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt