Received-SPF: pass (google.com: domain of linux-kernel+bounces-197642-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: John Hubbard <jhubbard@nvidia.com>
To: Shuah Khan <shuah@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	=?UTF-8?q?Ilpo=20J=C3=A4rvinen?= <ilpo.jarvinen@linux.intel.com>,
	Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>,
	Ryan Roberts <ryan.roberts@arm.com>,
	Christian Brauner <brauner@kernel.org>,
	Muhammad Usama Anjum <usama.anjum@collabora.com>,
	Alexey Gladkov <legion@kernel.org>,
	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 v2 1/2] selftests/openat2: fix clang build failures: -static-libasan, LOCAL_HDRS
Date: Fri, 31 May 2024 18:45:33 -0700
Message-ID: <20240601014534.268360-2-jhubbard@nvidia.com>
In-Reply-To: <20240601014534.268360-1-jhubbard@nvidia.com>
References: <20240601014534.268360-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?jeZtWOURLQD3BAQzKCQ+wNdpF+8ncK8h3HXTVJlU30rjBx20xFMQuklh4IR2?=
 =?us-ascii?Q?d/JFic9PSfqzSzPCKNauhAEQk7oL7A3Lt7blENLslT00DCDEIDfQDBbLhwmo?=
 =?us-ascii?Q?zNS+4eRjQHULcFYIDIsSfpe6MnWQ/C1mT7xLjYa83p+4BcfFdWVPx62H9jZr?=
 =?us-ascii?Q?FEn3QZRNcM20OJoMxAK6dfsDB0oQWc7G+S/ILfP7rhkEE1CFU0uToFEghVcU?=
 =?us-ascii?Q?teLP3JZXVSbdbFb68Lx5o6z8mo964gR+fs8RsR95hLEq7w2f23HWt+edmYjp?=
 =?us-ascii?Q?oDonx+EHPjGMbwJEmF9CIr7/byecOJTWwzgj5UN/A9JSK/sGyNDcKI28/Wu1?=
 =?us-ascii?Q?5uRL3reOUCDvgkiRCxoehmuty/XQORLUvwAtAGDZUxwj4oHQdAsrSDRF8e+A?=
 =?us-ascii?Q?fIYHjM15T4h8gRpFYkadM0krH8f3UuSKhoMxE1GxMhJMsW55ITLDAL9reBAX?=
 =?us-ascii?Q?lWgChdbSZSKTd7focfjaLgXglbqoN0QxXgTOI0ylSMM6PH0Cg3U0QJEs0Fpe?=
 =?us-ascii?Q?NtwirjjVrhlChl/Jq1qg1yj8F7WBcRV5abh29kLq8RK5V+sRdmT3Z1w1iqhT?=
 =?us-ascii?Q?0d5OfwZSDRJe+y/gBKAvkK6sCOcWFppyFoChDcxYSaTc9+Jpu9xjXHai+TB1?=
 =?us-ascii?Q?R6UOv7IPBQ1CkPrNreiF4jZXsTjIdkwFDX8ZICrrJA/m2bBIXdoGQdJJk5Fy?=
 =?us-ascii?Q?amisWY2TquItMXOba7VYqJIMdvyWByjy4RwmEiwThx14DNwzkvOVZkBxZgHo?=
 =?us-ascii?Q?9s3h0C/nBoiuXAcG5YfLMgZQeUNaWqfz1GPZpuEshzbAeAkTTXVnK6u0EONG?=
 =?us-ascii?Q?HySo4AhdvVkz04I/IsffLZummnGY8nZRri6iLsQ+NYCnVwQrNo/Dj5uNqkwG?=
 =?us-ascii?Q?INU3OQWftC01WOquy3AqiBeYBxdLsChSs5M4V9ZV9kBub1hXCoRLaV+hjbks?=
 =?us-ascii?Q?1rJOuQpr8S+5fYLlUN4qq4SUu276HDB2bXmn6aS21paeC77xF/UhHMeyozur?=
 =?us-ascii?Q?0bkNMrO3NPhOhW/EDfhuI7oLkKzxGXaMQK6p2GwGEKQzYejW2kZRm0N2miEq?=
 =?us-ascii?Q?KQgXp5REfywvTruU+r9LUf1Vz6CWd2bGZB1ZFjFcwvQohp7yZuQcAW9bweQx?=
 =?us-ascii?Q?fOybBKJf/xR703iTWF6eGMXzMciiyugjX4y1YDvgvXGV+yKyoK9ZPQTNvq9x?=
 =?us-ascii?Q?oUHAkos9cbxJn26+F9R9SMe644eIj/iE29dp3ovQ7xuQNzDN6ixx6r9v+jug?=
 =?us-ascii?Q?TIWf0Rt+AFbwWECz1rdE7x+aoWb43mZqrbPpdNqWodpMsWpkhf/0Arn8xBYI?=
 =?us-ascii?Q?umM2KzMIHUZA1oTGHzHOkKeOwUim1z3HYG8PtnlCpBGxyWG3BfNxJl4t3Yor?=
 =?us-ascii?Q?fKVI0aKUI+CO5XChp5oxLYX1j/UXEKawTML3Rpl9wYEvoyGFAsHvzGachuJP?=
 =?us-ascii?Q?dhqzDoyvpFdh0yuYHPWKRIuzPHUp43xxuN3z9zDA5kDaT5/Atb8Z66BeG/gu?=
 =?us-ascii?Q?xXW+ENzrWOfle2klSMw2sCkQxmNhf+qAT92Omol2BEZrqBXiijfLaxhUQT1J?=
 =?us-ascii?Q?r9QijwilNgrIEKObfsT1LXpasrqqeIX4ZpzW3aF1?=
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c8aaf136-bb09-4956-d77e-08dc81dc890b
X-MS-Exchange-CrossTenant-AuthSource: BY5PR12MB4130.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2024 01:45:37.2366
 (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: tBV9ijaBXdud1rS+xpqL3otWW85g3IFUGf1z7L4Yxkv6FD2udadGnmUW9vbFgqVNUKJ1w4GEeOdn6qQQAo+yCw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5931

When building with clang via:

    make LLVM=1 -C tools/testing/selftests

two distinct failures occur:

1) gcc requires -static-libasan in order to ensure that Address
Sanitizer's library is the first one loaded. However, this leads to
build failures on clang, when building via:

       make LLVM=1 -C tools/testing/selftests

However, clang already does the right thing by default: it statically
links the Address Sanitizer if -fsanitize is specified. Therefore, fix
this by simply omitting -static-libasan for clang builds. And leave
behind a comment, because the whole reason for static linking might not
be obvious.

2) clang won't accept invocations of this form, but gcc will:

    $(CC) file1.c header2.h

Fix this by using selftests/lib.mk facilities for tracking local header
file dependencies: add them to LOCAL_HDRS, leaving only the .c files to
be passed to the compiler.

Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 tools/testing/selftests/openat2/Makefile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/openat2/Makefile b/tools/testing/selftests/openat2/Makefile
index 254d676a2689..185dc76ebb5f 100644
--- a/tools/testing/selftests/openat2/Makefile
+++ b/tools/testing/selftests/openat2/Makefile
@@ -1,8 +1,18 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined -static-libasan
+CFLAGS += -Wall -O2 -g -fsanitize=address -fsanitize=undefined
 TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test
 
+# gcc requires -static-libasan in order to ensure that Address Sanitizer's
+# library is the first one loaded. However, clang already statically links the
+# Address Sanitizer if -fsanitize is specified. Therefore, simply omit
+# -static-libasan for clang builds.
+ifeq ($(LLVM),)
+    CFLAGS += -static-libasan
+endif
+
+LOCAL_HDRS += helpers.h
+
 include ../lib.mk
 
-$(TEST_GEN_PROGS): helpers.c helpers.h
+$(TEST_GEN_PROGS): helpers.c
-- 
2.45.1