From patchwork Tue Apr 19 20:04:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 563594 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EA4FC433EF for ; Tue, 19 Apr 2022 20:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356453AbiDSUHp (ORCPT ); Tue, 19 Apr 2022 16:07:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356516AbiDSUHo (ORCPT ); Tue, 19 Apr 2022 16:07:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34EE46277 for ; Tue, 19 Apr 2022 13:04:59 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5DF96616B2 for ; Tue, 19 Apr 2022 20:04:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 303F2C385A9; Tue, 19 Apr 2022 20:04:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650398698; bh=O9mTXZ51XW67vYoYCAP8nyhOfuxV/KXn/4qe9Y37o9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nA+lndyq2nuRa5DCVgxF7CHYWzPZpp72PxenTRdUoIo2ersIXu9ymJMEUaWm+EcbC TVYqMtddG5U5/ATfSV5xuX7siZ3H0zB+9Y6ys10teElAczqLrbxVGTTvMxmNfZF6ZO VbdgH/tOHpzxQoQlsfGv5J2s4b52duCtUu0W8hLdfGKuXNT26qcAGQookBOHrnGmWE OcFcUgoNUo+IC+GiUx1l5CzcG5ObkDk42405TQw3YO5Bw4kfTsnds7VFIUHOHWZ4t6 0+vIshe0yYWH32KljYHM+2hlrjv31x5gXCD3bh/P8BbGhqbmr41vjTVnBA5oGtIimB gvu1H/XXv43Xg== From: Mark Brown To: Catalin Marinas , Will Deacon , Shuah Khan , Shuah Khan Cc: linux-arm-kernel@lists.infradead.org, linux-kselftest@vger.kernel.org, Mark Brown Subject: [PATCH v2 4/4] selftests/arm64: Fix O= builds for the floating point tests Date: Tue, 19 Apr 2022 21:04:42 +0100 Message-Id: <20220419200442.1374548-5-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220419200442.1374548-1-broonie@kernel.org> References: <20220419200442.1374548-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1923; h=from:subject; bh=O9mTXZ51XW67vYoYCAP8nyhOfuxV/KXn/4qe9Y37o9E=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBiXxXZFnp2XJdfrJJ+IraaSXi82rN8btIuPd3SDuKT baVby8uJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYl8V2QAKCRAk1otyXVSH0PuyB/ 9hzMfitS2eGLSXNCQXpMcMpghJMIExHbwqAYSN+qoSM7I37xTxo2tjqsPxbV1c1P3fnVLr1dQQ6lNG JZ3Wjy7Eob225NLToe9gGd5Xgjb1RwwrhaPKyzvC8pShu68Vqt7Y9qZBycwezhl6fCpkowGx2SEVnx 0PywoOSyAT4XyFhg48rwjYpm521yp1LaGX92+bV6kV5kBDLvFiPAh6PDm7IHoPnHRkNYESjIAS+/+b tsyWHLH8TWiiRlW4gZS/cTrIz1rWxHWP6uBMQwlKcrt76MGU/6LAFlLomlnbtxD54EGZwZol02LcgV L6MS5+Uzj/cGKCM2vanBXjmpcdlahr X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Currently the arm64 floating point tests don't support out of tree builds due to two quirks of the kselftest build system. One is that when building a program from multiple files we shouldn't separately compile the main program to an object file as that will result in the pattern rule not matching when adjusted for the output directory. The other is that we also need to include $(OUTPUT) in the names of the binaries when specifying the dependencies in order to ensure that they get picked up with O=. Rewrite the dependencies for the executables to fix these issues. The kselftest build system will ensure OUTPUT is always defined. Signed-off-by: Mark Brown --- tools/testing/selftests/arm64/fp/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/arm64/fp/Makefile b/tools/testing/selftests/arm64/fp/Makefile index 927b1e83f469..45bbbf1c5b97 100644 --- a/tools/testing/selftests/arm64/fp/Makefile +++ b/tools/testing/selftests/arm64/fp/Makefile @@ -14,16 +14,16 @@ TEST_PROGS_EXTENDED := fpsimd-stress sve-stress EXTRA_CLEAN += $(OUTPUT)/asm-utils.o $(OUTPUT)/rdvl.o -fp-pidbench: fp-pidbench.S asm-utils.o +$(OUTPUT)/fp-pidbench: fp-pidbench.S asm-utils.o $(CC) -nostdlib $^ -o $@ -fpsimd-test: fpsimd-test.o asm-utils.o +$(OUTPUT)/fpsimd-test: fpsimd-test.S asm-utils.o $(CC) -nostdlib $^ -o $@ -rdvl-sve: rdvl-sve.o rdvl.o -sve-ptrace: sve-ptrace.o -sve-probe-vls: sve-probe-vls.o rdvl.o -sve-test: sve-test.o asm-utils.o +$(OUTPUT)/rdvl-sve: rdvl-sve.c rdvl.o +$(OUTPUT)/sve-ptrace: sve-ptrace.c +$(OUTPUT)/sve-probe-vls: sve-probe-vls.c rdvl.o +$(OUTPUT)/sve-test: sve-test.S asm-utils.o $(CC) -nostdlib $^ -o $@ -vec-syscfg: vec-syscfg.o rdvl.o -vlset: vlset.o +$(OUTPUT)/vec-syscfg: vec-syscfg.c rdvl.o +$(OUTPUT)/vlset: vlset.c include ../../lib.mk