Received-SPF: pass (google.com: domain of linux-kernel+bounces-215597-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: John Hubbard <jhubbard@nvidia.com>
To: Shuah Khan <shuah@kernel.org>
Cc: "Jason A . Donenfeld" <Jason@zx2c4.com>,
	Andy Lutomirski <luto@kernel.org>,
	Mark Brown <broonie@kernel.org>,
	Vincenzo Frascino <vincenzo.frascino@arm.com>,
	Colin Ian King <colin.i.king@gmail.com>,
	Valentin Obst <kernel@valentinobst.de>,
	linux-kselftest@vger.kernel.org,
	LKML <linux-kernel@vger.kernel.org>,
	llvm@lists.linux.dev,
	John Hubbard <jhubbard@nvidia.com>
Subject: [PATCH v3 3/3] selftests/vDSO: remove duplicate compiler invocations from Makefile
Date: Fri, 14 Jun 2024 16:31:05 -0700
Message-ID: <20240614233105.265009-4-jhubbard@nvidia.com>
In-Reply-To: <20240614233105.265009-1-jhubbard@nvidia.com>
References: <20240614233105.265009-1-jhubbard@nvidia.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?3Lx6prSk/fXx71xnxpzV2zXr+f8xAmm1bJRUOswVVAZUawdlfNW2CfNphMy2?=
 =?us-ascii?Q?gYQCxuVFu9clVZnQbRadpb5bnhiGgRMfJ2LC6ucffU0fpQYx2cUabMAWcho3?=
 =?us-ascii?Q?GSIoA12wWMD9BzGJfpqibFjnhCNAS9wKvqfVykyCYl8RbiLuw9Vn0AXPTvPj?=
 =?us-ascii?Q?dFgUPxUy3qWZaBtA/Qh+f24onrzqwwmqkg48sSBHrlr2R/ziow/J5wHheWxF?=
 =?us-ascii?Q?wQxjNjChha2DCPzKt4HT0QywnU9Tg9JYOwwAP3+twAaBEvFon4HghjEhabVg?=
 =?us-ascii?Q?pklsY/I3bKy/124mYX6r127uuFd0txZns6HXm4Lr3RzV8PVxr08lTNBX+oYT?=
 =?us-ascii?Q?ivpAIJnCO/IZgO2YS4TTC9RBgGHpFS5ou1wtWgp885CJXcOQUg8hwRF5rgbg?=
 =?us-ascii?Q?Wt+HVCXceZd3+GifbrKOJ9kQXidP9029aWL7gC9ThMzlU2WYMXOeUQI6MqDW?=
 =?us-ascii?Q?PwjIMV2Bgv1/qe435YJxhgrVIAWRcoVnU9VAUCaoAxEnLhxgP5JkfVI8jE2Y?=
 =?us-ascii?Q?5Q5jR+ITAn3kSYNiEFnUsPjuBi0rtEsqco6sfNMivqu2QxvjUWUGDBqf3k7z?=
 =?us-ascii?Q?28TYBztloBnh3vkkSe4Fq9UYdz/F4dudGT7Qt11yJYddePT8EzSx7ldbemh6?=
 =?us-ascii?Q?4bhgl4ilaZknAI1arSi7n0ZJs2u9vO5TcEC9GBNRoENFLlyHdSrA92Ce5jSt?=
 =?us-ascii?Q?Rssrhx+H7hDLEWShJoS4PvSxF8aT6SDnCSrpborqYhIWyrKLOnqgeM0f0bvs?=
 =?us-ascii?Q?8VUgMeJk82xEQQ1eh2JPbjh8an5PU5VxF+OUfhLGfUJKKvau7lptHy8LoMSc?=
 =?us-ascii?Q?Hg40QypUzWFQMaeYVR9AuGwUQOLaxDi+gbpzsOMP3IQEszBHgEYQ3G86/vkW?=
 =?us-ascii?Q?F6krJRZfRdXja13SWVLkDCPfHxB+81sDbH2WNrT5ZVxgvSzVyz3E1iN/jlxW?=
 =?us-ascii?Q?74QccFNJkRiOYTc+v/q4fncKz/Z/JupXcndNrIxVZEise48QShsrGVGzJD2P?=
 =?us-ascii?Q?7mynFagqbdfGs3Y50ckhcIuRd7EGZlKKRqLEus5nr4MbMr/HJXCuoLOTc3am?=
 =?us-ascii?Q?72zWMZ0k3bxkJIjuivhthtevTHnSClABwiT/7o4kP3+IZb9e7UWMxo5R3yvG?=
 =?us-ascii?Q?qsHbiRaMeAlJ+k6Oz+SK+frX1P647DKhzybEQNNSSTbfKm5fpIuZsjuO5vIq?=
 =?us-ascii?Q?SiT17Z4GvNpy7twyF90Z0ZeYfZIOOW7f60Jrdhdp3lyNCZoApaweN9/mBsTr?=
 =?us-ascii?Q?lisTAQt66INHsiXvZPCgGrmCVrhOh6Voccm7AdGMRSyUNbVOcE1iKNQGjwm8?=
 =?us-ascii?Q?feZ2/ozgTLqkbhTkmHHFaqEXtnjFxK5rb+guQiYsFarm0Clk/+3Zjn4IpBpm?=
 =?us-ascii?Q?Z05+/DO3Ws8TZpkYCVoCLlVzeB0dVSKqzka/Zf+wHAGWP4m8b0Nl0+oXBqt0?=
 =?us-ascii?Q?+ph2L4TDqGvwDFBhsCmAjW0YnlYkClit8sSfmBcZgDzFVRf3bLYa6XE3pQVI?=
 =?us-ascii?Q?4psxHWEZQYRcmTd3gIO8NCfc5lWZfz8dEVlLABbE2yNFzcJJoqo8NFqKt6js?=
 =?us-ascii?Q?bcuiSVKjGUzeyhVsMRdE4KWeMjh8hayHgI9xrVrf?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: aac556d2-4411-442f-84c0-08dc8cca113c
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 23:31:08.0859
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: gjBL79TXJx4EFgeG6hy8B07oilDh6gJvI0NVg12AkmKjqA/34Oy8zxEqFWWg7rNY4qMEJE/ry1KhpGtJNC/R5w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6953

The Makefile open-codes compiler invocations that ../lib.mk already
provides.

Avoid this by using a Make feature that allows setting per-target
variables, which in this case are: CFLAGS and LDFLAGS. This approach
generates the exact same compiler invocations as before, but removes all
of the code duplication, along with the quirky mangled variable names.
So now the Makefile is smaller, less unusual, and easier to read.

The new dependencies are listed after including lib.mk, in order to
let lib.mk provide the first target ("all:"), and are grouped together
with their respective source file dependencies, for visual clarity.

Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 tools/testing/selftests/vDSO/Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile
index 209ede5de208..98d8ba2afa00 100644
--- a/tools/testing/selftests/vDSO/Makefile
+++ b/tools/testing/selftests/vDSO/Makefile
@@ -12,8 +12,7 @@ endif
 TEST_GEN_PROGS += vdso_test_correctness
 
 CFLAGS := -std=gnu99
-CFLAGS_vdso_standalone_test_x86 := -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector
-LDFLAGS_vdso_test_correctness := -ldl
+
 ifeq ($(CONFIG_X86_32),y)
 LDLIBS += -lgcc_s
 endif
@@ -23,12 +22,9 @@ $(OUTPUT)/vdso_test_gettimeofday: parse_vdso.c vdso_test_gettimeofday.c
 $(OUTPUT)/vdso_test_getcpu: parse_vdso.c vdso_test_getcpu.c
 $(OUTPUT)/vdso_test_abi: parse_vdso.c vdso_test_abi.c
 $(OUTPUT)/vdso_test_clock_getres: vdso_test_clock_getres.c
+
 $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c
-	$(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \
-		vdso_standalone_test_x86.c parse_vdso.c \
-		-o $@
+$(OUTPUT)/vdso_standalone_test_x86: CFLAGS +=-nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector
+
 $(OUTPUT)/vdso_test_correctness: vdso_test_correctness.c
-	$(CC) $(CFLAGS) \
-		vdso_test_correctness.c \
-		-o $@ \
-		$(LDFLAGS_vdso_test_correctness)
+$(OUTPUT)/vdso_test_correctness: LDFLAGS += -ldl
-- 
2.45.2