From mboxrd@z Thu Jan 1 00:00:00 1970 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 7006CC43334 for ; Wed, 22 Jun 2022 17:54:20 +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=N7m6rA+SY7Y2ZdVgZ/gE2xn46kXeSvywZgCud9nfU2w=; b=YgOE1HIUt9/k2S 9DF9sgFK04xt2bLWIBfuS/JQUGr8lbYjJ6dB2okA5lo8pssJBYWhNY1HEAfi3I+1ZCkYX6peG6vkw LeWGgIYGN0JQEbthes8IIt6znfP/4CbR6gRupouOcrbNEdAokz86CUEQUz0mUFCmVyD8Ymfg2z9YD JU80miHl+PaaLreKHsF4v/53juzfj5pNUnAgXqVRSEB/QOOqnxD04WjGANv+mNs0bajDfCy02fv5x 2NbwS1DFc+OMhxSnT9Go8giUTt9mm+yqOjSVRkWKrfYkOc/VXKEvbVB6czV9YFHb4Dvma3QYEg3QB quWE1vBlumgAs2dXKOaQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44XZ-00Ble6-Dp; Wed, 22 Jun 2022 17:53:21 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o44X7-00BlSx-HG for linux-arm-kernel@lists.infradead.org; Wed, 22 Jun 2022 17:52:54 +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 E6A3A61CC9; Wed, 22 Jun 2022 17:52:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCAC3C385A5; Wed, 22 Jun 2022 17:52:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655920372; bh=KcNDVGah6acFLtY5arEim8rZJff/2fy0mbc1avPAGhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MEqXu3XZrECB3xWO+OSYUuZflhtwzrPl2GTDYXR2HpYL1b+gLUCO+Fdst5kQyFkdt bl5V5xkGw9RW01PCyFK5wlWDMoFref+yG4MCodGSKIqPDhL9aaGpnuQKnG2k+2id2q rplXnIq6OIqibpsu3uhpPrq8Gnt/E5TurrOJFBFHR5Z8iS1WCDhWeulzj34DKBgFo8 4eNysM5pwgeN/z+nRSLJFKO2jfPpN0ZnFL2o+mH0kf+1kHXeLJuDdrApB1A3FqtHQ5 RQkFTtp45PzYD3+zyLRgygvxp+XKxjqVScDFq832DIoRGGZYNkJjCCh/D6ewEjyqKg vXOvY1htTUeWg== From: Mark Brown To: Catalin Marinas , Will Deacon Cc: Mark Rutland , Joey Gouly , linux-arm-kernel@lists.infradead.org, Mark Brown Subject: [PATCH v5 03/27] arm64/sysreg: Add LINKER_SCRIPT guards for sysreg.h Date: Wed, 22 Jun 2022 18:43:52 +0100 Message-Id: <20220622174416.1406282-4-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220622174416.1406282-1-broonie@kernel.org> References: <20220622174416.1406282-1-broonie@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1663; h=from:subject; bh=KcNDVGah6acFLtY5arEim8rZJff/2fy0mbc1avPAGhg=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBis1TbumBGqmxV9ciYJdW1IkZhGUfdU4c3iQmXres1 WQZi+5SJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCYrNU2wAKCRAk1otyXVSH0Mr5CA CA6rx8ey57NuzoOIzf2KfYBw4EOBVYLMjmBWuLHAbtSOJ55u8UdJV8NCEKAJn3xkpDpjIv7UeFEC6w VIYD5wrt0xtBI4bXg/+/qKl30KVY0xYifLQf3CZB9tbwcoF/yKJlTAYAmISUXPMJeFFy33Xkq/77sT c1d48jSgeco6iZXI+bm3YwG7cIcgfKuhXh6Zs5MLvDtHVEPJE4fmjm5iUY7ZLlXWlxVRXjKYBI8/pE yh7NmYVlwMRHni01wCFxihB0VvXTgNlckTtFMMiDedpkRoKpsDjK33oq0miyN/jQni9A13d/V8qg+Z nUrZjJuyA+zZ1pizI7pb0AYp8MEB7p 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-20220622_105253_650551_93F5ACD1 X-CRM114-Status: GOOD ( 11.81 ) 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 In subsequent patches sysreg.h and gpr-num.h will be included from other headers which can be included from linker scripts (e.g. via cache.h), and contain assember macro directives that don't work in linker scripts (e.g. `.macro` and `.irp`). To avoid needing LINKER_SCRIPT guards in every file which could have a transitive dependency, add those directly to sysreg.h and gpr-num.h. 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 42ff95dba6da..6c7be1a2114b 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