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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 18C29C43334 for ; Mon, 6 Jun 2022 20:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2v59pD+B9O8B/XTDz+UYfEu+dKhTEAV2jfPoVXfXpro=; b=gC6vIbqb8S0KXG hn17Ap7l4QcEjPYemY9B8V0HK4btVm/KB8GQqLMbTKTczasbYmOT2x0QUJvEICEMwuauo9W0/pAvN Ip9ofUekQR6u6qvH9DfL9644Ya6SM09uaX7aSL4WJ3R6C853kvJhKiX6O/Os6hQzoHJrBu8jZLBUP aZpDq6YkS26v510tii3vbw6Mq3+XO/lY9KbHUtuTjG2aHqyBfrh5v9IAb/HV2K1tLfCCJlUJ57yj+ ftvtmJACsdi1fvLU/B7B5AWfP87Q1A0Ca6IU67wNlDad0b8I1R+ZlQwb9fzbzWg+X0curpFAARAXC ELy+qvbhhGDhV9g3Z3DA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJ9t-002Yna-RI; Mon, 06 Jun 2022 20:17:05 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nyJ9j-002Yj9-5s for linux-arm-kernel@lists.infradead.org; Mon, 06 Jun 2022 20:16:56 +0000 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 B0FC16150D; Mon, 6 Jun 2022 20:16:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5969C3411D; Mon, 6 Jun 2022 20:16:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1654546614; bh=FwV7g9vps4f8llHdDx1TV2QkYBRAw/wPuETrmaSQAiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hWFaWn58+WIrddWOp9gx+W79bTyNctg5dqdMhzJvCzKGx0whq8sUF6KvAG8a8pHpz DYn7D4r/j2BEWseTP/iIVO2Sro3Kxp+E0q4flDrL4FNjnoR7OtfAF6Kmz4w6MPrwxT /12mLLt8+cFZUtLVm+UG+IQIQoXAD2cHEzp22zLil6O68NztRP/NodPMf73ZbNz35Q CpFiM0fe9BKeQoCix29kHopCghJRDlWj1QJ0tSsp8o8PA4z9Y5++fq+W/9Su2YyZbQ KYNgWwTcsbf2W3asYlWxxmkFA6TEsV00sltoe7XflYwespe4+riDdhYSjBLndNZuck 7HJnwRleXfoMw== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v1 02/17] arm64/sysreg: Add LINKER_SCRIPT guards for sysreg.h Date: Mon, 6 Jun 2022 21:12:39 +0100 Message-Id: <20220606201254.104659-3-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220606201254.104659-1-broonie@kernel.org> References: <20220606201254.104659-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1595; h=from:subject; bh=FwV7g9vps4f8llHdDx1TV2QkYBRAw/wPuETrmaSQAiU=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBinl+582gEuXkf9goV/JoWa3nZwY8eJVHHJLHbqQ2y 2kYipMqJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYp5fuQAKCRAk1otyXVSH0N1OB/ 4uMu77PYwgOvvDcJwaEbyefjOr6OZ0w7B64uDOf3qiHN2p5XzjzjSquibmRu51V+NapXvy3q5vzGdU pIjWTSfKqxfOQSdOXyc14Lrge+7KhATgTFauewrMtSOV9DqS4MaIjki30Ot0M0lD2CbwQiDdQ/XLWS 0W8x9B9NL5HtwwF4UWAKBCMEwph531ArFrK9dGf9vbRZFH42L60XEx66tckMeILSyXR0Dep7Jz4sqN zvSdkh8DK1cIvUBBtv2UHNSrdoF8/ACGgy4LCsEatGdfXyK2i/tZ8BkpBKw1ACs1wk3zSwkDsPBOvw 9yNWTW1gloNKvfJouBa9P4/lR0d/hn X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220606_131655_312186_08F8C727 X-CRM114-Status: GOOD ( 12.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Linker scripts are preprocessed with __ASSEMBLY__ defined which works well for most things but not for assembler macros. In preparation for allowing sysreg.h to be included in linker files add some LINKER_SCRIPT guard defines around assembler macros in headers so the headers are safe for inclusion in linker scripts. Signed-off-by: Mark Brown --- arch/arm64/include/asm/gpr-num.h | 3 +++ arch/arm64/include/asm/sysreg.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/arch/arm64/include/asm/gpr-num.h b/arch/arm64/include/asm/gpr-num.h index 05da4a7c5788..72c44f63fb41 100644 --- a/arch/arm64/include/asm/gpr-num.h +++ b/arch/arm64/include/asm/gpr-num.h @@ -4,12 +4,15 @@ #ifdef __ASSEMBLY__ +#ifndef LINKER_SCRIPT + .irp num,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30 .equ .L__gpr_num_x\num, \num .equ .L__gpr_num_w\num, \num .endr .equ .L__gpr_num_xzr, 31 .equ .L__gpr_num_wzr, 31 +#endif /* !LINKER_SCRIPT */ #else /* __ASSEMBLY__ */ diff --git a/arch/arm64/include/asm/sysreg.h b/arch/arm64/include/asm/sysreg.h index 55f998c3dc28..4f5685d9a31b 100644 --- a/arch/arm64/include/asm/sysreg.h +++ b/arch/arm64/include/asm/sysreg.h @@ -1219,6 +1219,7 @@ #ifdef __ASSEMBLY__ +#ifndef LINKER_SCRIPT .macro mrs_s, rt, sreg __emit_inst(0xd5200000|(\sreg)|(.L__gpr_num_\rt)) .endm @@ -1226,6 +1227,7 @@ .macro msr_s, sreg, rt __emit_inst(0xd5000000|(\sreg)|(.L__gpr_num_\rt)) .endm +#endif /* !LINKER_SCRIPT */ #else -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel